WordImpress / Give

includes/admin/dashboard-widgets.php

Spacing +32 added lines, -32 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,12 +21,12 @@ 
  * @return void
  */
 function give_register_dashboard_widgets() {
-	if ( current_user_can( apply_filters( 'give_dashboard_stats_cap', 'view_give_reports' ) ) ) {
-		wp_add_dashboard_widget( 'give_dashboard_sales', __( 'Give: Donation Statistics', 'give' ), 'give_dashboard_sales_widget' );
+	if (current_user_can(apply_filters('give_dashboard_stats_cap', 'view_give_reports'))) {
+		wp_add_dashboard_widget('give_dashboard_sales', __('Give: Donation Statistics', 'give'), 'give_dashboard_sales_widget');
 	}
 }
 
-add_action( 'wp_dashboard_setup', 'give_register_dashboard_widgets', 10 );
+add_action('wp_dashboard_setup', 'give_register_dashboard_widgets', 10);
 
 /**
  * Sales Summary Dashboard Widget
@@ -38,7 +38,7 @@ 
  */
 function give_dashboard_sales_widget() {
 
-	if ( ! current_user_can( apply_filters( 'give_dashboard_stats_cap', 'view_give_reports' ) ) ) {
+	if ( ! current_user_can(apply_filters('give_dashboard_stats_cap', 'view_give_reports'))) {
 		return;
 	}
 	$stats = new Give_Payment_Stats; ?>
@@ -46,19 +46,19 @@ 
 	<div class="give-dashboard-widget">
 
 		<div class="give-dashboard-today give-clearfix">
-			<h3 class="give-dashboard-date-today"><?php echo date( 'F j, Y' ); ?></h3>
+			<h3 class="give-dashboard-date-today"><?php echo date('F j, Y'); ?></h3>
 
-			<p class="give-dashboard-happy-day"><?php printf( __( 'Happy %1$s!', 'give' ), date( 'l', current_time( 'timestamp' ) ) ); ?></p>
+			<p class="give-dashboard-happy-day"><?php printf(__('Happy %1$s!', 'give'), date('l', current_time('timestamp'))); ?></p>
 
-			<?php $earnings_today = $stats->get_earnings( 0, 'today', false ); ?>
+			<?php $earnings_today = $stats->get_earnings(0, 'today', false); ?>
 
-			<p class="give-dashboard-today-earnings"><?php echo give_currency_filter( give_format_amount( $earnings_today ) ); ?></p>
+			<p class="give-dashboard-today-earnings"><?php echo give_currency_filter(give_format_amount($earnings_today)); ?></p>
 
-			<p class="give-orders-today"><?php $donations_today = $stats->get_sales( 0, 'today', false, array(
+			<p class="give-orders-today"><?php $donations_today = $stats->get_sales(0, 'today', false, array(
 					'publish',
 					'revoked'
-				) ); ?><?php echo give_format_amount( $donations_today, false ); ?>
-				<span><?php echo _x( 'donations today', 'Displays in WP admin dashboard widget after the day\'s total donations', 'give' ); ?></span>
+				)); ?><?php echo give_format_amount($donations_today, false); ?>
+				<span><?php echo _x('donations today', 'Displays in WP admin dashboard widget after the day\'s total donations', 'give'); ?></span>
 			</p>
 
 
@@ -68,34 +68,34 @@ 
 		<table class="give-table-stats">
 			<thead style="display: none;">
 			<tr>
-				<th><?php _e( 'This Week', 'give' ); ?></th>
-				<th><?php _e( 'This Month', 'give' ); ?></th>
-				<th><?php _e( 'Past 30 Days', 'give' ); ?></th>
+				<th><?php _e('This Week', 'give'); ?></th>
+				<th><?php _e('This Month', 'give'); ?></th>
+				<th><?php _e('Past 30 Days', 'give'); ?></th>
 			</tr>
 			</thead>
 			<tbody>
 			<tr id="give-table-stats-tr-1">
 				<td>
-					<p class="give-dashboard-stat-total"><?php echo give_currency_filter( give_format_amount( $stats->get_earnings( 0, 'this_week' ) ) ); ?></p>
+					<p class="give-dashboard-stat-total"><?php echo give_currency_filter(give_format_amount($stats->get_earnings(0, 'this_week'))); ?></p>
 
-					<p class="give-dashboard-stat-total-label"><?php _e( 'this week', 'give' ); ?></p>
+					<p class="give-dashboard-stat-total-label"><?php _e('this week', 'give'); ?></p>
 				</td>
 				<td>
-					<p class="give-dashboard-stat-total"><?php echo give_currency_filter( give_format_amount( $stats->get_earnings( 0, 'this_month' ) ) ); ?></p>
+					<p class="give-dashboard-stat-total"><?php echo give_currency_filter(give_format_amount($stats->get_earnings(0, 'this_month'))); ?></p>
 
-					<p class="give-dashboard-stat-total-label"><?php _e( 'this month', 'give' ); ?></p>
+					<p class="give-dashboard-stat-total-label"><?php _e('this month', 'give'); ?></p>
 				</td>
 			</tr>
 			<tr id="give-table-stats-tr-2">
 				<td>
-					<p class="give-dashboard-stat-total"><?php echo give_currency_filter( give_format_amount( $stats->get_earnings( 0, 'last_month' ) ) ) ?></p>
+					<p class="give-dashboard-stat-total"><?php echo give_currency_filter(give_format_amount($stats->get_earnings(0, 'last_month'))) ?></p>
 
-					<p class="give-dashboard-stat-total-label"><?php _e( 'last month', 'give' ); ?></p>
+					<p class="give-dashboard-stat-total-label"><?php _e('last month', 'give'); ?></p>
 				</td>
 				<td>
-					<p class="give-dashboard-stat-total"><?php echo give_currency_filter( give_format_amount( $stats->get_earnings( 0, 'this_year', false ) ) ) ?></p>
+					<p class="give-dashboard-stat-total"><?php echo give_currency_filter(give_format_amount($stats->get_earnings(0, 'this_year', false))) ?></p>
 
-					<p class="give-dashboard-stat-total-label"><?php _e( 'this year', 'give' ); ?></p>
+					<p class="give-dashboard-stat-total-label"><?php _e('this year', 'give'); ?></p>
 				</td>
 			</tr>
 			</tbody>
@@ -112,18 +112,18 @@ 
  * @since  1.0
  * @return void
  */
-function give_dashboard_at_a_glance_widget( $items ) {
-	$num_posts = wp_count_posts( 'give_forms' );
+function give_dashboard_at_a_glance_widget($items) {
+	$num_posts = wp_count_posts('give_forms');
 
-	if ( $num_posts && $num_posts->publish ) {
-		$text = sprintf( _n( '%1$s Give %2$s', '%1$s Give %3$s', $num_posts->publish, 'give' ), $num_posts->publish, give_get_forms_label_singular(), give_get_forms_label_plural() );
+	if ($num_posts && $num_posts->publish) {
+		$text = sprintf(_n('%1$s Give %2$s', '%1$s Give %3$s', $num_posts->publish, 'give'), $num_posts->publish, give_get_forms_label_singular(), give_get_forms_label_plural());
 
-		$text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
+		$text = sprintf($text, number_format_i18n($num_posts->publish));
 
-		if ( current_user_can( 'edit_give_forms', get_the_ID() ) ) {
-			$text = sprintf( '<a class="give-forms-count" href="edit.php?post_type=give_forms">%1$s</a>', $text );
+		if (current_user_can('edit_give_forms', get_the_ID())) {
+			$text = sprintf('<a class="give-forms-count" href="edit.php?post_type=give_forms">%1$s</a>', $text);
 		} else {
-			$text = sprintf( '<span class="give-forms-count">%1$s</span>', $text );
+			$text = sprintf('<span class="give-forms-count">%1$s</span>', $text);
 		}
 
 		$items[] = $text;
@@ -132,4 +132,4 @@ 
 	return $items;
 }
 
-add_filter( 'dashboard_glance_items', 'give_dashboard_at_a_glance_widget', 1, 1);
+add_filter('dashboard_glance_items', 'give_dashboard_at_a_glance_widget', 1, 1);

includes/admin/forms/metabox.php

Spacing +167 added lines, -167 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,17 +23,17 @@ 
  *

  * @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 );

-	$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);

+	$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 ) ) {

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

+	if (empty($price)) {

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

 	}

 

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

@@ -42,275 +42,275 @@ 
 	/**

 	 * 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 silver, $20 gold, $50 platinum)?', '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 silver, $20 gold, $50 platinum)?', '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.', 'give' ),

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

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

+					'description'  => __('This is the set donation amount for this form.', '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' ),

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

 						'value'       => $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'),

 								'rows'        => 3,

 							),

 						),

 						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 Text', 'give' ),

-					'description' => __( 'This text appears as a label next to the custom amount field for single level forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option). Add your own message or leave this field blank to prevent it from displaying within your form.', 'give' ),

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

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

+					'description' => __('This text appears as a label next to the custom amount field for single level forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option). Add your own message or leave this field blank to prevent it from displaying within your form.', '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'        => __( 'Set Goal?', 'give' ),

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

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

+					'name'        => __('Set 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'         => __( 'Set Goal', 'give' ),

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

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

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

+					'description'  => __('This is the goal you want to achieve for this 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 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',

 				),

 			)

 		)

-	) );

+	));

 

 

 	/**

 	 * 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 clicks 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 clicks 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 checkout section for non-logged-in users. Note: this option will not require users to register or log in prior to completing a donation. It simply determines whether the login and/or registration form are displayed on the checkout page.', 'give' ),

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

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

+						'desc'    => __('Display the registration and login forms in the checkout section for non-logged-in users. Note: this option will not require users to register or log in prior to completing a donation. It simply determines whether the login and/or registration form are displayed on the checkout page.', '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' ),

-						'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',

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

+						'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',

 					)

@@ -322,47 +322,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;

 

@@ -371,18 +371,18 @@ 
 /**

  * Repeatable Levels Custom Field

  */

-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);

 function give_cmb_render_levels_repeater_header() {

 	?>

 

 	<div class="table-container">

 		<div class="table-row">

-			<div class="table-cell col-id"><?php _e( 'ID', '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 class="table-cell col-id"><?php _e('ID', '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>

@@ -397,22 +397,22 @@ 
  * @description: Custom CMB2 incremental Levels ID Field

  * @since      1.0

  */

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

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

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

+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);

 

 }

 

@@ -420,10 +420,10 @@ 
 /**

  * CMB2 Repeatable Default ID Field

  */

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

-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);

+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>';

 

 }

 

@@ -435,20 +435,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');

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'] );
-$number     = give_get_payment_number( $payment_id );
-$item       = get_post( $payment_id );
+$payment_id = absint($_GET['id']);
+$number     = give_get_payment_number($payment_id);
+$item       = get_post($payment_id);
 
 // Sanity check... fail if purchase ID is invalid
-if ( ! is_object( $item ) || $item->post_type != 'give_payment' ) {
-	wp_die( __( 'The specified ID does not belong to a payment. Please try again', 'give' ), __( 'Error', 'give' ) );
+if ( ! is_object($item) || $item->post_type != 'give_payment') {
+	wp_die(__('The specified ID does not belong to a payment. Please try again', 'give'), __('Error', 'give'));
 }
 
-$payment_meta   = give_get_payment_meta( $payment_id );
-$transaction_id = esc_attr( give_get_payment_transaction_id( $payment_id ) );
-$user_id        = give_get_payment_user_id( $payment_id );
-$donor_id       = give_get_payment_customer_id( $payment_id );
-$payment_date   = strtotime( $item->post_date );
-$user_info      = give_get_payment_meta_user_info( $payment_id );
-$address        = ! empty( $user_info['address'] ) ? $user_info['address'] : array(
+$payment_meta   = give_get_payment_meta($payment_id);
+$transaction_id = esc_attr(give_get_payment_transaction_id($payment_id));
+$user_id        = give_get_payment_user_id($payment_id);
+$donor_id       = give_get_payment_customer_id($payment_id);
+$payment_date   = strtotime($item->post_date);
+$user_info      = give_get_payment_meta_user_info($payment_id);
+$address        = ! empty($user_info['address']) ? $user_info['address'] : array(
 	'line1'   => '',
 	'line2'   => '',
 	'city'    => '',
@@ -48,72 +48,72 @@ 
 	'state'   => '',
 	'zip'     => ''
 );
-$gateway        = give_get_payment_gateway( $payment_id );
-$currency_code  = give_get_payment_currency_code( $payment_id );
+$gateway        = give_get_payment_gateway($payment_id);
+$currency_code  = give_get_payment_currency_code($payment_id);
 ?>
 <div class="wrap give-wrap">
-	<h2><?php printf( __( 'Payment %s', 'give' ), $number ); ?></h2>
-	<?php do_action( 'give_view_order_details_before', $payment_id ); ?>
+	<h2><?php printf(__('Payment %s', 'give'), $number); ?></h2>
+	<?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( give_get_payment_status( $item, true ), $status ); ?>><?php echo esc_html( $status ); ?></option>
+													<?php foreach (give_get_payment_statuses() as $key => $status) : ?>
+														<option value="<?php echo esc_attr($key); ?>"<?php selected(give_get_payment_status($item, true), $status); ?>><?php echo esc_html($status); ?></option>
 													<?php endforeach; ?>
 												</select>
-												<span class="give-donation-status status-<?php echo sanitize_title( give_get_payment_status( $item, true ) ); ?>"><span class="give-donation-status-icon"></span></span>
+												<span class="give-donation-status status-<?php echo sanitize_title(give_get_payment_status($item, true)); ?>"><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
-										$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>
@@ -123,12 +123,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_meta['currency'] ); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text" 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_meta['currency']); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text" 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 -->
@@ -137,20 +137,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 -->
 
@@ -160,55 +160,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 -->
@@ -219,7 +219,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 -->
@@ -230,12 +230,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">
@@ -243,25 +243,25 @@ 
 									<table style="width:100%;text-align:left;">
 										<thead>
 										<tr>
-											<?php do_action( 'give_donation_details_thead_before', $payment_id ); ?>
-											<th><?php _e( 'Form ID', 'give' ) ?></th>
-											<th><?php _e( 'Form Title', 'give' ) ?></th>
-											<th><?php _e( 'Date and Time', '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('Form ID', 'give') ?></th>
+											<th><?php _e('Form Title', 'give') ?></th>
+											<th><?php _e('Date and Time', '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 echo date( 'm/d/Y', $payment_date ) . ' ' . date_i18n( 'H:i', $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 ); ?>
+											<td><?php echo date('m/d/Y', $payment_date).' '.date_i18n('H:i', $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); ?>
 
 										</tr>
 									</table>
@@ -273,64 +273,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( give_get_payment_customer_id( $payment_id ) ); ?>
+									<?php $customer = new Give_Customer(give_get_payment_customer_id($payment_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>
@@ -341,7 +341,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">
@@ -352,62 +352,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 echo _x( 'City:', 'Address 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 echo _x('City:', 'Address 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 echo _x( 'Zip / Postal Code:', 'Zip / Postal code of address', '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 echo _x('Zip / Postal Code:', 'Zip / Postal code of address', '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 echo _x( 'Country:', 'Address country', 'give' ); ?></strong><br />
+														<strong class="order-data-address-line"><?php echo _x('Country:', 'Address 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 echo _x( 'State / Province:', 'State / province of address', 'give' ); ?></strong><br />
+														<strong class="order-data-address-line"><?php echo _x('State / Province:', 'State / province of address', '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>
@@ -417,39 +417,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>
@@ -458,7 +458,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>
@@ -469,10 +469,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/register-settings.php

Spacing +278 added lines, -278 removed lines

@@ -43,23 +43,23 @@ 
 	 */

 	public function __construct() {

 

-		add_action( 'admin_init', array( $this, 'init' ) );

+		add_action('admin_init', array($this, 'init'));

 

 		//Customize CMB2 URL

-		add_filter( 'cmb2_meta_box_url', array( $this, 'give_update_cmb_meta_box_url' ) );

+		add_filter('cmb2_meta_box_url', array($this, 'give_update_cmb_meta_box_url'));

 

 		//Custom CMB2 Settings Fields

-		add_action( 'cmb2_render_give_title', 'give_title_callback', 10, 5 );

-		add_action( 'cmb2_render_enabled_gateways', 'give_enabled_gateways_callback', 10, 5 );

-		add_action( 'cmb2_render_default_gateway', 'give_default_gateway_callback', 10, 5 );

-		add_action( 'cmb2_render_email_preview_buttons', 'give_email_preview_buttons_callback', 10, 5 );

-		add_action( 'cmb2_render_system_info', 'give_system_info_callback', 10, 5 );

-		add_action( 'cmb2_render_api', 'give_api_callback', 10, 5 );

-		add_action( 'cmb2_render_license_key', 'give_license_key_callback', 10, 5 );

-		add_action( "cmb2_save_options-page_fields", array( $this, 'settings_notices' ), 10, 3 );

+		add_action('cmb2_render_give_title', 'give_title_callback', 10, 5);

+		add_action('cmb2_render_enabled_gateways', 'give_enabled_gateways_callback', 10, 5);

+		add_action('cmb2_render_default_gateway', 'give_default_gateway_callback', 10, 5);

+		add_action('cmb2_render_email_preview_buttons', 'give_email_preview_buttons_callback', 10, 5);

+		add_action('cmb2_render_system_info', 'give_system_info_callback', 10, 5);

+		add_action('cmb2_render_api', 'give_api_callback', 10, 5);

+		add_action('cmb2_render_license_key', 'give_license_key_callback', 10, 5);

+		add_action("cmb2_save_options-page_fields", array($this, 'settings_notices'), 10, 3);

 

 		// Include CMB CSS in the head to avoid FOUC

-		add_action( "admin_print_styles-give_forms_page_give-settings", array( 'CMB2_hookup', 'enqueue_cmb_css' ) );

+		add_action("admin_print_styles-give_forms_page_give-settings", array('CMB2_hookup', 'enqueue_cmb_css'));

 

 	}

 

@@ -68,7 +68,7 @@ 
 	 * @since  1.0

 	 */

 	public function init() {

-		register_setting( $this->key, $this->key );

+		register_setting($this->key, $this->key);

 

 	}

 

@@ -82,9 +82,9 @@ 
 	 *

 	 * @return mixed

 	 */

-	public function give_update_cmb_meta_box_url( $url ) {

+	public function give_update_cmb_meta_box_url($url) {

 		//Path to Give's CMB

-		return GIVE_PLUGIN_URL . '/includes/libraries/cmb2';

+		return GIVE_PLUGIN_URL.'/includes/libraries/cmb2';

 	}

 

 

@@ -96,27 +96,27 @@ 
 	 */

 	public function give_get_settings_tabs() {

 

-		$settings = $this->give_settings( null );

+		$settings = $this->give_settings(null);

 

 		$tabs             = array();

-		$tabs['general']  = __( 'General', 'give' );

-		$tabs['gateways'] = __( 'Payment Gateways', 'give' );

-		$tabs['display']  = __( 'Display Options', 'give' );

-		$tabs['emails']   = __( 'Emails', 'give' );

+		$tabs['general']  = __('General', 'give');

+		$tabs['gateways'] = __('Payment Gateways', 'give');

+		$tabs['display']  = __('Display Options', 'give');

+		$tabs['emails']   = __('Emails', 'give');

 

-		if ( ! empty( $settings['addons']['fields'] ) ) {

-			$tabs['addons'] = __( 'Add-ons', 'give' );

+		if ( ! empty($settings['addons']['fields'])) {

+			$tabs['addons'] = __('Add-ons', 'give');

 		}

 

-		if ( ! empty( $settings['licenses']['fields'] ) ) {

-			$tabs['licenses'] = __( 'Licenses', 'give' );

+		if ( ! empty($settings['licenses']['fields'])) {

+			$tabs['licenses'] = __('Licenses', 'give');

 		}

 

-		$tabs['advanced']    = __( 'Advanced', 'give' );

-		$tabs['api']         = __( 'API', 'give' );

-		$tabs['system_info'] = __( 'System Info', 'give' );

+		$tabs['advanced']    = __('Advanced', 'give');

+		$tabs['api']         = __('API', 'give');

+		$tabs['system_info'] = __('System Info', 'give');

 

-		return apply_filters( 'give_settings_tabs', $tabs );

+		return apply_filters('give_settings_tabs', $tabs);

 	}

 

 

@@ -126,31 +126,31 @@ 
 	 */

 	public function admin_page_display() {

 

-		$active_tab = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $this->give_get_settings_tabs() ) ? $_GET['tab'] : 'general';

+		$active_tab = isset($_GET['tab']) && array_key_exists($_GET['tab'], $this->give_get_settings_tabs()) ? $_GET['tab'] : 'general';

 

 		?>

 

 		<div class="wrap give_settings_page cmb2_options_page <?php echo $this->key; ?>">

 			<h1 class="nav-tab-wrapper">

 				<?php

-				foreach ( $this->give_get_settings_tabs() as $tab_id => $tab_name ) {

+				foreach ($this->give_get_settings_tabs() as $tab_id => $tab_name) {

 

-					$tab_url = esc_url( add_query_arg( array(

+					$tab_url = esc_url(add_query_arg(array(

 						'settings-updated' => false,

 						'tab'              => $tab_id

-					) ) );

+					)));

 

 					$active = $active_tab == $tab_id ? ' nav-tab-active' : '';

 

-					echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';

-					echo esc_html( $tab_name );

+					echo '<a href="'.esc_url($tab_url).'" title="'.esc_attr($tab_name).'" class="nav-tab'.$active.'">';

+					echo esc_html($tab_name);

 

 					echo '</a>';

 				}

 				?>

 			</h1>

 

-			<?php cmb2_metabox_form( $this->give_settings( $active_tab ), $this->key ); ?>

+			<?php cmb2_metabox_form($this->give_settings($active_tab), $this->key); ?>

 

 		</div><!-- .wrap -->

 

@@ -166,7 +166,7 @@ 
 	 *

 	 * @return array

 	 */

-	public function give_settings( $active_tab ) {

+	public function give_settings($active_tab) {

 

 		$give_settings = array(

 			/**

@@ -174,60 +174,60 @@ 
 			 */

 			'general'     => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'General Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

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

+				'give_title' => __('General Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

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

 						array(

-							'name' => __( 'General Settings', 'give' ),

+							'name' => __('General Settings', 'give'),

 							'desc' => '<hr>',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_1'

 						),

 						array(

-							'name'    => __( 'Success Page', 'give' ),

-							'desc'    => __( 'This is the page donators are sent to after completing their donations. The <code>[give_receipt]</code> shortcode should be on this page.', 'give' ),

+							'name'    => __('Success Page', 'give'),

+							'desc'    => __('This is the page donators are sent to after completing their donations. The <code>[give_receipt]</code> shortcode should be on this page.', 'give'),

 							'id'      => 'success_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Failed Transaction Page', 'give' ),

-							'desc'    => __( 'This is the page donors are sent to if their transaction is cancelled or fails.', 'give' ),

+							'name'    => __('Failed Transaction Page', 'give'),

+							'desc'    => __('This is the page donors are sent to if their transaction is cancelled or fails.', 'give'),

 							'id'      => 'failure_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Donation History Page', 'give' ),

-							'desc'    => __( 'This page shows a complete donation history for the current user. The <code>[donation_history]</code> shortcode should be on this page.', 'give' ),

+							'name'    => __('Donation History Page', 'give'),

+							'desc'    => __('This page shows a complete donation history for the current user. The <code>[donation_history]</code> shortcode should be on this page.', 'give'),

 							'id'      => 'history_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Base Country', 'give' ),

-							'desc'    => __( 'Where does your site operate from?', 'give' ),

+							'name'    => __('Base Country', 'give'),

+							'desc'    => __('Where does your site operate from?', 'give'),

 							'id'      => 'base_country',

 							'type'    => 'select',

 							'options' => give_get_country_list(),

 						),

 						array(

-							'name' => __( 'Currency Settings', 'give' ),

+							'name' => __('Currency Settings', 'give'),

 							'desc' => '<hr>',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_2'

 						),

 						array(

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

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

 							'desc'    => 'Choose your currency. Note that some payment gateways have currency restrictions.',

 							'id'      => 'currency',

 							'type'    => 'select',

@@ -235,26 +235,26 @@ 
 							'default' => 'USD',

 						),

 						array(

-							'name'    => __( 'Currency Position', 'give' ),

+							'name'    => __('Currency Position', 'give'),

 							'desc'    => 'Choose the position of the currency sign.',

 							'id'      => 'currency_position',

 							'type'    => 'select',

 							'options' => array(

-								'before' => __( 'Before - $10', 'give' ),

-								'after'  => __( 'After - 10$', 'give' )

+								'before' => __('Before - $10', 'give'),

+								'after'  => __('After - 10$', 'give')

 							),

 							'default' => 'before',

 						),

 						array(

-							'name'    => __( 'Thousands Separator', 'give' ),

-							'desc'    => __( 'The symbol (typically , or .) to separate thousands', 'give' ),

+							'name'    => __('Thousands Separator', 'give'),

+							'desc'    => __('The symbol (typically , or .) to separate thousands', 'give'),

 							'id'      => 'thousands_separator',

 							'type'    => 'text_small',

 							'default' => ',',

 						),

 						array(

-							'name'    => __( 'Decimal Separator', 'give' ),

-							'desc'    => __( 'The symbol (usually , or .) to separate decimal points', 'give' ),

+							'name'    => __('Decimal Separator', 'give'),

+							'desc'    => __('The symbol (usually , or .) to separate decimal points', 'give'),

 							'id'      => 'decimal_separator',

 							'type'    => 'text_small',

 							'default' => '.',

@@ -267,83 +267,83 @@ 
 			 */

 			'gateways'    => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Payment Gateways', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

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

+				'give_title' => __('Payment Gateways', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

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

 						array(

-							'name' => __( 'Gateways Settings', 'give' ),

+							'name' => __('Gateways Settings', 'give'),

 							'desc' => '<hr>',

 							'id'   => 'give_title_gateway_settings_1',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Test Mode', 'give' ),

-							'desc' => __( 'While in test mode no live transactions are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give' ),

+							'name' => __('Test Mode', 'give'),

+							'desc' => __('While in test mode no live transactions are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give'),

 							'id'   => 'test_mode',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enabled Gateways', 'give' ),

-							'desc' => __( 'Choose the payment gateways you would like enabled.', 'give' ),

+							'name' => __('Enabled Gateways', 'give'),

+							'desc' => __('Choose the payment gateways you would like enabled.', 'give'),

 							'id'   => 'gateways',

 							'type' => 'enabled_gateways'

 						),

 						array(

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

-							'desc' => __( 'This is the gateway that will be selected by default.', 'give' ),

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

+							'desc' => __('This is the gateway that will be selected by default.', 'give'),

 							'id'   => 'default_gateway',

 							'type' => 'default_gateway'

 						),

 						array(

-							'name' => __( 'PayPal Standard', 'give' ),

+							'name' => __('PayPal Standard', 'give'),

 							'desc' => '<hr>',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_2',

 						),

 						array(

-							'name' => __( 'PayPal Email', 'give' ),

-							'desc' => __( 'Enter your PayPal account\'s email', 'give' ),

+							'name' => __('PayPal Email', 'give'),

+							'desc' => __('Enter your PayPal account\'s email', 'give'),

 							'id'   => 'paypal_email',

 							'type' => 'text_email',

 						),

 						array(

-							'name' => __( 'PayPal Page Style', 'give' ),

-							'desc' => __( 'Enter the name of the page style to use, or leave blank to use the default', 'give' ),

+							'name' => __('PayPal Page Style', 'give'),

+							'desc' => __('Enter the name of the page style to use, or leave blank to use the default', 'give'),

 							'id'   => 'paypal_page_style',

 							'type' => 'text',

 						),

 						array(

-							'name'    => __( 'PayPal Transaction Type', 'give' ),

-							'desc'    => __( 'Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give' ),

+							'name'    => __('PayPal Transaction Type', 'give'),

+							'desc'    => __('Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give'),

 							'id'      => 'paypal_button_type',

 							'type'    => 'radio_inline',

 							'options' => array(

-								'donation' => __( 'Donation', 'give' ),

-								'standard' => __( 'Standard Transaction', 'give' )

+								'donation' => __('Donation', 'give'),

+								'standard' => __('Standard Transaction', 'give')

 							),

 							'default' => 'donation',

 						),

 						array(

-							'name' => __( 'Disable PayPal IPN Verification', 'give' ),

-							'desc' => __( 'If donations are not getting marked as complete, then check this box. This forces the site to use a slightly less secure method of verifying donations.', 'give' ),

+							'name' => __('Disable PayPal IPN Verification', 'give'),

+							'desc' => __('If donations are not getting marked as complete, then check this box. This forces the site to use a slightly less secure method of verifying donations.', 'give'),

 							'id'   => 'disable_paypal_verification',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Offline Donations', 'give' ),

+							'name' => __('Offline Donations', 'give'),

 							'desc' => '<hr>',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_3',

 						),

 						array(

-							'name' => __( 'Collect Billing Details', 'give' ),

-							'desc' => __( 'This option will enable the billing details section for offline donations. The fieldset will appear above the offline donation instructions. Note: You may customize this option per form as needed.', 'give' ),

+							'name' => __('Collect Billing Details', 'give'),

+							'desc' => __('This option will enable the billing details section for offline donations. The fieldset will appear above the offline donation instructions. Note: You may customize this option per form as needed.', 'give'),

 							'id'   => 'give_offline_donation_enable_billing_fields',

 							'type' => 'checkbox'

 						),

 						array(

-							'name'    => __( 'Offline Donation Instructions', 'give' ),

-							'desc'    => __( 'The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give' ),

+							'name'    => __('Offline Donation Instructions', 'give'),

+							'desc'    => __('The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give'),

 							'id'      => 'global_offline_donation_content',

 							'default' => give_get_default_offline_donation_content(),

 							'type'    => 'wysiwyg',

@@ -352,15 +352,15 @@ 
 							)

 						),

 						array(

-							'name'    => __( 'Offline Donation Email Instructions Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation receipt email.', 'give' ),

+							'name'    => __('Offline Donation Email Instructions Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation receipt email.', 'give'),

 							'id'      => 'offline_donation_subject',

-							'default' => __( '{donation} - Offline Donation Instructions', 'give' ),

+							'default' => __('{donation} - Offline Donation Instructions', 'give'),

 							'type'    => 'text'

 						),

 						array(

-							'name'    => __( 'Offline Donation Email Instructions', 'give' ),

-							'desc'    => __( 'Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ),

+							'name'    => __('Offline Donation Email Instructions', 'give'),

+							'desc'    => __('Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give'),

 							'id'      => 'global_offline_donation_email',

 							'default' => give_get_default_offline_donation_email_content(),

 							'type'    => 'wysiwyg',

@@ -374,84 +374,84 @@ 
 			/** Display Settings */

 			'display'     => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Display Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

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

+				'give_title' => __('Display Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

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

 						array(

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

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

 							'desc' => '<hr>',

 							'id'   => 'give_title_display_settings_1',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable CSS', 'give' ),

-							'desc' => __( 'Enable this option if you would like to disable all of Give\'s included CSS stylesheets.', 'give' ),

+							'name' => __('Disable CSS', 'give'),

+							'desc' => __('Enable this option if you would like to disable all of Give\'s included CSS stylesheets.', 'give'),

 							'id'   => 'disable_css',

 							'type' => 'checkbox'

 						),

 						array(

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

-							'desc' => sprintf( __( 'Enable this option if you would like to enable <a href="%s" target="_blank">floating labels</a> in Give\'s donation forms.<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/" ) ),

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

+							'desc' => sprintf(__('Enable this option if you would like to enable <a href="%s" target="_blank">floating labels</a> in Give\'s donation forms.<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'   => 'enable_floatlabels',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Welcome Screen', 'give' ),

-							'desc' => sprintf( __( 'Enable this option if you would like to disable the Give Welcome screen every time Give is activated and/or updated. You can always access the Welcome Screen <a href="%s">here</a> if you want in the future.', 'give' ), esc_url( admin_url( 'index.php?page=give-about' ) ) ),

+							'name' => __('Disable Welcome Screen', 'give'),

+							'desc' => sprintf(__('Enable this option if you would like to disable the Give Welcome screen every time Give is activated and/or updated. You can always access the Welcome Screen <a href="%s">here</a> if you want in the future.', 'give'), esc_url(admin_url('index.php?page=give-about'))),

 							'id'   => 'disable_welcome',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Post Types', 'give' ),

+							'name' => __('Post Types', 'give'),

 							'desc' => '<hr>',

 							'id'   => 'give_title_display_settings_2',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable Form Single Views', 'give' ),

-							'desc' => __( 'By default, all forms have single views enabled which create a specific URL on your website for that form. This option disables the singular and archive views from being publicly viewable. Note: you will need to embed forms using a shortcode or widget if enabled.', 'give' ),

+							'name' => __('Disable Form Single Views', 'give'),

+							'desc' => __('By default, all forms have single views enabled which create a specific URL on your website for that form. This option disables the singular and archive views from being publicly viewable. Note: you will need to embed forms using a shortcode or widget if enabled.', 'give'),

 							'id'   => 'disable_forms_singular',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Archives', 'give' ),

-							'desc' => __( 'Archives pages list all the forms you have created. This option will disable only the form\'s archive page(s). The single form\'s view will remain in place. Note: you will need to refresh your permalinks after this option has been enabled.', 'give' ),

+							'name' => __('Disable Form Archives', 'give'),

+							'desc' => __('Archives pages list all the forms you have created. This option will disable only the form\'s archive page(s). The single form\'s view will remain in place. Note: you will need to refresh your permalinks after this option has been enabled.', 'give'),

 							'id'   => 'disable_forms_archives',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Excerpts', 'give' ),

-							'desc' => __( 'The excerpt is an optional summary or description of a donation form; in short, a summary as to why the user should give.', 'give' ),

+							'name' => __('Disable Form Excerpts', 'give'),

+							'desc' => __('The excerpt is an optional summary or description of a donation form; in short, a summary as to why the user should give.', 'give'),

 							'id'   => 'disable_forms_excerpt',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Featured Image', 'give' ),

-							'desc' => __( 'The Featured Image is an image that is chosen as the representative image for donation form. The display of this image is largely up to the theme. If you do not wish to use the featured image you can disable it using this option.', 'give' ),

+							'name' => __('Disable Form Featured Image', 'give'),

+							'desc' => __('The Featured Image is an image that is chosen as the representative image for donation form. The display of this image is largely up to the theme. If you do not wish to use the featured image you can disable it using this option.', 'give'),

 							'id'   => 'disable_form_featured_img',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Single Form Sidebar', 'give' ),

-							'desc' => __( 'The sidebar allows you to add additional widget to the Give single form view. If you don\'t plan on using the sidebar you may disable it with this option.', 'give' ),

+							'name' => __('Disable Single Form Sidebar', 'give'),

+							'desc' => __('The sidebar allows you to add additional widget to the Give single form view. If you don\'t plan on using the sidebar you may disable it with this option.', 'give'),

 							'id'   => 'disable_form_sidebar',

 							'type' => 'checkbox'

 						),

 						array(

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

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

 							'desc' => '<hr>',

 							'id'   => 'give_title_display_settings_3',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Enable Form Categories', 'give' ),

-							'desc' => __( 'Check this option if you would like to categorize your donation forms. This option enables the form\'s category taxonomy.', 'give' ),

+							'name' => __('Enable Form Categories', 'give'),

+							'desc' => __('Check this option if you would like to categorize your donation forms. This option enables the form\'s category taxonomy.', 'give'),

 							'id'   => 'enable_categories',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enable Form Tags', 'give' ),

-							'desc' => __( 'Check this option if you would like to tag your donation forms. This option enables the form\'s tag taxonomy.', 'give' ),

+							'name' => __('Enable Form Tags', 'give'),

+							'desc' => __('Check this option if you would like to tag your donation forms. This option enables the form\'s tag taxonomy.', 'give'),

 							'id'   => 'enable_tags',

 							'type' => 'checkbox'

 						),

@@ -464,93 +464,93 @@ 
 			 */

 			'emails'      => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Give Email Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

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

+				'give_title' => __('Give Email Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

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

 						array(

-							'name' => __( 'Email Settings', 'give' ),

+							'name' => __('Email Settings', 'give'),

 							'desc' => '<hr>',

 							'id'   => 'give_title_email_settings_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'email_template',

-							'name'    => __( 'Email Template', 'give' ),

-							'desc'    => __( 'Choose a template. Click "Save Changes" then "Preview Donation Receipt" to see the new template.', 'give' ),

+							'name'    => __('Email Template', 'give'),

+							'desc'    => __('Choose a template. Click "Save Changes" then "Preview Donation Receipt" to see the new template.', 'give'),

 							'type'    => 'select',

 							'options' => give_get_email_templates()

 						),

 						array(

 							'id'   => 'email_logo',

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

-							'desc' => __( 'Upload or choose a logo to be displayed at the top of the donation receipt emails. Displayed on HTML emails only.', 'give' ),

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

+							'desc' => __('Upload or choose a logo to be displayed at the top of the donation receipt emails. Displayed on HTML emails only.', 'give'),

 							'type' => 'file'

 						),

 						array(

 							'id'      => 'from_name',

-							'name'    => __( 'From Name', 'give' ),

-							'desc'    => __( 'The name donation receipts are said to come from. This should probably be your site or shop name.', 'give' ),

-							'default' => get_bloginfo( 'name' ),

+							'name'    => __('From Name', 'give'),

+							'desc'    => __('The name donation receipts are said to come from. This should probably be your site or shop name.', 'give'),

+							'default' => get_bloginfo('name'),

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'from_email',

-							'name'    => __( 'From Email', 'give' ),

-							'desc'    => __( 'Email to send donation receipts from. This will act as the "from" and "reply-to" address.', 'give' ),

-							'default' => get_bloginfo( 'admin_email' ),

+							'name'    => __('From Email', 'give'),

+							'desc'    => __('Email to send donation receipts from. This will act as the "from" and "reply-to" address.', 'give'),

+							'default' => get_bloginfo('admin_email'),

 							'type'    => 'text'

 						),

 						array(

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

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

 							'desc' => '<hr>',

 							'id'   => 'give_title_email_settings_2',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_subject',

-							'name'    => __( 'Donation Email Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation receipt email', 'give' ),

-							'default' => __( 'Donation Receipt', 'give' ),

+							'name'    => __('Donation Email Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation receipt email', 'give'),

+							'default' => __('Donation Receipt', 'give'),

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'donation_receipt',

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

-							'desc'    => __( 'Enter the email that is sent to users after completing a successful donation. HTML is accepted. Available template tags:', 'give' ) . '<br/>' . give_get_emails_tags_list(),

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

+							'desc'    => __('Enter the email that is sent to users after completing a successful donation. HTML is accepted. Available template tags:', 'give').'<br/>'.give_get_emails_tags_list(),

 							'type'    => 'wysiwyg',

-							'default' => __( "Dear", "give" ) . " {name},\n\n" . __( "Thank you for your donation. Your generosity is appreciated! Please click on the link below to view your receipt.", "give" ) . "\n\n{receipt_link}\n\nSincerely,\n{sitename}"

+							'default' => __("Dear", "give")." {name},\n\n".__("Thank you for your donation. Your generosity is appreciated! Please click on the link below to view your receipt.", "give")."\n\n{receipt_link}\n\nSincerely,\n{sitename}"

 						),

 						array(

-							'name' => __( 'New Donation Notification', 'give' ),

+							'name' => __('New Donation Notification', 'give'),

 							'desc' => '<hr>',

 							'id'   => 'give_title_email_settings_3',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_notification_subject',

-							'name'    => __( 'Donation Notification Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation notification email', 'give' ),

+							'name'    => __('Donation Notification Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation notification email', 'give'),

 							'type'    => 'text',

-							'default' => __( 'New Donation - #{payment_id}', 'give' )

+							'default' => __('New Donation - #{payment_id}', 'give')

 						),

 						array(

 							'id'      => 'donation_notification',

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

-							'desc'    => __( 'Enter the email that is sent to donation notification emails after completion of a donation. HTML is accepted. Available template tags:', 'give' ) . '<br/>' . give_get_emails_tags_list(),

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

+							'desc'    => __('Enter the email that is sent to donation notification emails after completion of a donation. HTML is accepted. Available template tags:', 'give').'<br/>'.give_get_emails_tags_list(),

 							'type'    => 'wysiwyg',

 							'default' => give_get_default_donation_notification_email()

 						),

 						array(

 							'id'      => 'admin_notice_emails',

-							'name'    => __( 'Donation Notification Emails', 'give' ),

-							'desc'    => sprintf( __( 'Enter the email address(es) that should receive a notification anytime a donation is made, please only enter %1$sone email address per line%2$s and not separated by commas.', 'give' ), '<span class="give-underline">', '</span>' ),

+							'name'    => __('Donation Notification Emails', 'give'),

+							'desc'    => sprintf(__('Enter the email address(es) that should receive a notification anytime a donation is made, please only enter %1$sone email address per line%2$s and not separated by commas.', 'give'), '<span class="give-underline">', '</span>'),

 							'type'    => 'textarea',

-							'default' => get_bloginfo( 'admin_email' )

+							'default' => get_bloginfo('admin_email')

 						),

 						array(

 							'id'   => 'disable_admin_notices',

-							'name' => __( 'Disable Admin Notifications', 'give' ),

-							'desc' => __( 'Check this box if you do not want to receive emails when new donations are made.', 'give' ),

+							'name' => __('Disable Admin Notifications', 'give'),

+							'desc' => __('Check this box if you do not want to receive emails when new donations are made.', 'give'),

 							'type' => 'checkbox'

 						)

 					)

@@ -559,76 +559,76 @@ 
 			/** Extension Settings */

 			'addons'      => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Give Add-ons Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_addons', array()

+				'give_title' => __('Give Add-ons Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_addons', array()

 				)

 			),

 			/** Licenses Settings */

 			'licenses'    => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Give Licenses', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_licenses', array()

+				'give_title' => __('Give Licenses', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_licenses', array()

 				)

 			),

 			/** Advanced Options */

 			'advanced'    => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Advanced Options', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

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

+				'give_title' => __('Advanced Options', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

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

 						array(

-							'name' => __( 'Session Control', 'give' ),

+							'name' => __('Session Control', 'give'),

 							'desc' => '<hr>',

 							'id'   => 'give_title_session_control_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'session_lifetime',

-							'name'    => __( 'Session Lifetime', 'give' ),

-							'desc'    => __( 'Give will start a new session per user once they have donated. This option controls the lifetime a user\'s session is kept alive. An active session allows users to view donation receipts on your site without having to be logged in.', 'give' ),

+							'name'    => __('Session Lifetime', 'give'),

+							'desc'    => __('Give will start a new session per user once they have donated. This option controls the lifetime a user\'s session is kept alive. An active session allows users to view donation receipts on your site without having to be logged in.', 'give'),

 							'type'    => 'select',

 							'options' => array(

-								'86400'  => __( '24 Hours', 'give' ),

-								'172800' => __( '48 Hours', 'give' ),

-								'259200' => __( '72 Hours', 'give' ),

-								'604800' => __( '1 Week', 'give' ),

+								'86400'  => __('24 Hours', 'give'),

+								'172800' => __('48 Hours', 'give'),

+								'259200' => __('72 Hours', 'give'),

+								'604800' => __('1 Week', 'give'),

 							)

 						),

 						array(

-							'name' => __( 'Data Control', 'give' ),

+							'name' => __('Data Control', 'give'),

 							'desc' => '<hr>',

 							'id'   => 'give_title_data_control_2',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Remove All Data on Uninstall?', 'give' ),

-							'desc' => __( 'Check this box if you would like Give to completely remove all of its data when the plugin is deleted.', 'give' ),

+							'name' => __('Remove All Data on Uninstall?', 'give'),

+							'desc' => __('Check this box if you would like Give to completely remove all of its data when the plugin is deleted.', 'give'),

 							'id'   => 'uninstall_on_delete',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Filter Control', 'give' ),

+							'name' => __('Filter Control', 'give'),

 							'desc' => '<hr>',

 							'id'   => 'give_title_filter_control',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable <code>the_content</code> filter', 'give' ),

-							'desc' => sprintf( __( 'If you are seeing extra social buttons, related posts, or other unwanted elements appearing within your forms then you can disable WordPress\' content filter. <a href="%s" target="_blank">Learn more</a> about the_content filter.', 'give' ), esc_url( 'https://codex.wordpress.org/Plugin_API/Filter_Reference/the_content' ) ),

+							'name' => __('Disable <code>the_content</code> filter', 'give'),

+							'desc' => sprintf(__('If you are seeing extra social buttons, related posts, or other unwanted elements appearing within your forms then you can disable WordPress\' content filter. <a href="%s" target="_blank">Learn more</a> about the_content filter.', 'give'), esc_url('https://codex.wordpress.org/Plugin_API/Filter_Reference/the_content')),

 							'id'   => 'disable_the_content_filter',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Script Loading', 'give' ),

+							'name' => __('Script Loading', 'give'),

 							'desc' => '<hr>',

 							'id'   => 'give_title_script_control',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Load Scripts in Footer?', 'give' ),

-							'desc' => __( 'Check this box if you would like Give to load all frontend JavaScript files in the footer.', 'give' ),

+							'name' => __('Load Scripts in Footer?', 'give'),

+							'desc' => __('Check this box if you would like Give to load all frontend JavaScript files in the footer.', 'give'),

 							'id'   => 'scripts_footer',

 							'type' => 'checkbox'

 						)

@@ -638,13 +638,13 @@ 
 			/** API Settings */

 			'api'         => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'API', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

+				'give_title' => __('API', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

 				'show_names' => false, // Hide field names on the left

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

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

 						array(

 							'id'   => 'api',

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

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

 							'type' => 'api'

 						)

 					)

@@ -653,13 +653,13 @@ 
 			/** Licenses Settings */

 			'system_info' => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'System Info', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

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

+				'give_title' => __('System Info', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

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

 						array(

 							'id'   => 'system_info',

-							'name' => __( 'System Info', 'give' ),

-							'desc' => __( 'Please copy and paste this information in your ticket when contacting support.', 'give' ),

+							'name' => __('System Info', 'give'),

+							'desc' => __('Please copy and paste this information in your ticket when contacting support.', 'give'),

 							'type' => 'system_info'

 						)

 					)

@@ -668,12 +668,12 @@ 
 		);

 

 		//Return all settings array if necessary

-		if ( $active_tab === null || ! isset( $give_settings[ $active_tab ] ) ) {

-			return apply_filters( 'give_registered_settings', $give_settings );

+		if ($active_tab === null || ! isset($give_settings[$active_tab])) {

+			return apply_filters('give_registered_settings', $give_settings);

 		}

 

 		// Add other tabs and settings fields as needed

-		return apply_filters( 'give_registered_settings', $give_settings[ $active_tab ] );

+		return apply_filters('give_registered_settings', $give_settings[$active_tab]);

 

 	}

 

@@ -684,18 +684,18 @@ 
 	 * @param $updated

 	 * @param $cmb

 	 */

-	public function settings_notices( $object_id, $updated, $cmb ) {

+	public function settings_notices($object_id, $updated, $cmb) {

 

 		//Sanity check

-		if ( $object_id !== $this->key ) {

+		if ($object_id !== $this->key) {

 			return;

 		}

 

-		if ( did_action( 'cmb2_save_options-page_fields' ) === 1 ) {

-			settings_errors( 'give-notices' );

+		if (did_action('cmb2_save_options-page_fields') === 1) {

+			settings_errors('give-notices');

 		}

 

-		add_settings_error( 'give-notices', 'global-settings-updated', __( 'Settings updated.', 'give' ), 'updated' );

+		add_settings_error('give-notices', 'global-settings-updated', __('Settings updated.', 'give'), 'updated');

 

 	}

 

@@ -709,17 +709,17 @@ 
 	 *

 	 * @return mixed          Field value or exception is thrown

 	 */

-	public function __get( $field ) {

+	public function __get($field) {

 

 		// Allowed fields to retrieve

-		if ( in_array( $field, array( 'key', 'fields', 'give_title', 'options_page' ), true ) ) {

+		if (in_array($field, array('key', 'fields', 'give_title', 'options_page'), true)) {

 			return $this->{$field};

 		}

-		if ( 'option_metabox' === $field ) {

+		if ('option_metabox' === $field) {

 			return $this->option_metabox();

 		}

 

-		throw new Exception( 'Invalid property: ' . $field );

+		throw new Exception('Invalid property: '.$field);

 	}

 

 

@@ -736,12 +736,12 @@ 
  *

  * @return mixed        Option value

  */

-function give_get_option( $key = '', $default = false ) {

+function give_get_option($key = '', $default = false) {

 	global $give_options;

-	$value = ! empty( $give_options[ $key ] ) ? $give_options[ $key ] : $default;

-	$value = apply_filters( 'give_get_option', $value, $key, $default );

+	$value = ! empty($give_options[$key]) ? $give_options[$key] : $default;

+	$value = apply_filters('give_get_option', $value, $key, $default);

 

-	return apply_filters( 'give_get_option_' . $key, $value, $key, $default );

+	return apply_filters('give_get_option_'.$key, $value, $key, $default);

 }

 

 

@@ -759,33 +759,33 @@ 
  *

  * @return boolean True if updated, false if not.

  */

-function give_update_option( $key = '', $value = false ) {

+function give_update_option($key = '', $value = false) {

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

-	if ( empty( $value ) ) {

-		$remove_option = give_delete_option( $key );

+	if (empty($value)) {

+		$remove_option = give_delete_option($key);

 

 		return $remove_option;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

 	// Let's let devs alter that value coming in

-	$value = apply_filters( 'give_update_option', $value, $key );

+	$value = apply_filters('give_update_option', $value, $key);

 

 	// Next let's try to update the value

-	$options[ $key ] = $value;

-	$did_update      = update_option( 'give_settings', $options );

+	$options[$key] = $value;

+	$did_update      = update_option('give_settings', $options);

 

 	// If it updated, let's update the global variable

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

-		$give_options[ $key ] = $value;

+		$give_options[$key] = $value;

 	}

 

 	return $did_update;

@@ -802,27 +802,27 @@ 
  *

  * @return boolean True if updated, false if not.

  */

-function give_delete_option( $key = '' ) {

+function give_delete_option($key = '') {

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

 	// Next let's try to update the value

-	if ( isset( $options[ $key ] ) ) {

+	if (isset($options[$key])) {

 

-		unset( $options[ $key ] );

+		unset($options[$key]);

 

 	}

 

-	$did_update = update_option( 'give_settings', $options );

+	$did_update = update_option('give_settings', $options);

 

 	// If it updated, let's update the global variable

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

 		$give_options = $options;

 	}

@@ -841,9 +841,9 @@ 
  */

 function give_get_settings() {

 

-	$settings = get_option( 'give_settings' );

+	$settings = get_option('give_settings');

 

-	return (array) apply_filters( 'give_get_settings', $settings );

+	return (array) apply_filters('give_get_settings', $settings);

 

 }

 

@@ -857,7 +857,7 @@ 
  * @global $give_options Array of all the Give Options

  * @return void

  */

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

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

 

 	$id                = $field_type_object->field->args['id'];

 	$field_description = $field_type_object->field->args['desc'];

@@ -865,21 +865,21 @@ 
 

 	echo '<ul class="cmb2-checkbox-list cmb2-list">';

 

-	foreach ( $gateways as $key => $option ) :

+	foreach ($gateways as $key => $option) :

 

-		if ( is_array( $escaped_value ) && array_key_exists( $key, $escaped_value ) ) {

+		if (is_array($escaped_value) && array_key_exists($key, $escaped_value)) {

 			$enabled = '1';

 		} else {

 			$enabled = null;

 		}

 

-		echo '<li><input name="' . $id . '[' . $key . ']" id="' . $id . '[' . $key . ']" type="checkbox" value="1" ' . checked( '1', $enabled, false ) . '/>&nbsp;';

-		echo '<label for="' . $id . '[' . $key . ']">' . $option['admin_label'] . '</label></li>';

+		echo '<li><input name="'.$id.'['.$key.']" id="'.$id.'['.$key.']" type="checkbox" value="1" '.checked('1', $enabled, false).'/>&nbsp;';

+		echo '<label for="'.$id.'['.$key.']">'.$option['admin_label'].'</label></li>';

 

 	endforeach;

 

-	if ( $field_description ) {

-		echo '<p class="cmb2-metabox-description">' . $field_description . '</p>';

+	if ($field_description) {

+		echo '<p class="cmb2-metabox-description">'.$field_description.'</p>';

 	}

 

 	echo '</ul>';

@@ -898,31 +898,31 @@ 
  *

  * @return void

  */

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

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

 

 	$id                = $field_type_object->field->args['id'];

 	$field_description = $field_type_object->field->args['desc'];

 	$gateways          = give_get_enabled_payment_gateways();

 

-	echo '<select class="cmb2_select" name="' . $id . '" id="' . $id . '">';

+	echo '<select class="cmb2_select" name="'.$id.'" id="'.$id.'">';

 

 	//Add a field to the Give Form admin single post view of this field

-	if ( $field_type_object->field->object_type === 'post' ) {

-		echo '<option value="global">' . __( 'Global Default', 'give' ) . '</option>';

+	if ($field_type_object->field->object_type === 'post') {

+		echo '<option value="global">'.__('Global Default', 'give').'</option>';

 	}

 

-	foreach ( $gateways as $key => $option ) :

+	foreach ($gateways as $key => $option) :

 

-		$selected = isset( $escaped_value ) ? selected( $key, $escaped_value, false ) : '';

+		$selected = isset($escaped_value) ? selected($key, $escaped_value, false) : '';

 

 

-		echo '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';

+		echo '<option value="'.esc_attr($key).'"'.$selected.'>'.esc_html($option['admin_label']).'</option>';

 

 	endforeach;

 

 	echo '</select>';

 

-	echo '<p class="cmb2-metabox-description">' . $field_description . '</p>';

+	echo '<p class="cmb2-metabox-description">'.$field_description.'</p>';

 

 }

 

@@ -937,7 +937,7 @@ 
  *

  * @return void

  */

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

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

 

 	$id                = $field_type_object->field->args['id'];

 	$title             = $field_type_object->field->args['name'];

@@ -956,25 +956,25 @@ 
  * @see: https://github.com/WebDevStudios/CMB2/wiki/Adding-your-own-field-types

  * @return array An array of options that matches the CMB2 options array

  */

-function give_cmb2_get_post_options( $query_args, $force = false ) {

+function give_cmb2_get_post_options($query_args, $force = false) {

 

-	$post_options = array( '' => '' ); // Blank option

+	$post_options = array('' => ''); // Blank option

 

-	if ( ( ! isset( $_GET['page'] ) || 'give-settings' != $_GET['page'] ) && ! $force ) {

+	if (( ! isset($_GET['page']) || 'give-settings' != $_GET['page']) && ! $force) {

 		return $post_options;

 	}

 

-	$args = wp_parse_args( $query_args, array(

+	$args = wp_parse_args($query_args, array(

 		'post_type'   => 'page',

 		'numberposts' => 10,

-	) );

+	));

 

-	$posts = get_posts( $args );

+	$posts = get_posts($args);

 

-	if ( $posts ) {

-		foreach ( $posts as $post ) {

+	if ($posts) {

+		foreach ($posts as $post) {

 

-			$post_options[ $post->ID ] = $post->post_title;

+			$post_options[$post->ID] = $post->post_title;

 

 		}

 	}

@@ -991,14 +991,14 @@ 
  * @since 1.0

  */

 

-add_filter( 'cmb2_get_metabox_form_format', 'give_modify_cmb2_form_output', 10, 3 );

+add_filter('cmb2_get_metabox_form_format', 'give_modify_cmb2_form_output', 10, 3);

 

-function give_modify_cmb2_form_output( $form_format, $object_id, $cmb ) {

+function give_modify_cmb2_form_output($form_format, $object_id, $cmb) {

 

 	//only modify the give settings form

-	if ( 'give_settings' == $object_id && 'options_page' == $cmb->cmb_id ) {

+	if ('give_settings' == $object_id && 'options_page' == $cmb->cmb_id) {

 

-		return '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="object_id" value="%2$s">%3$s<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="' . __( 'Save Settings', 'give' ) . '" class="button-primary"></div></form>';

+		return '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="object_id" value="%2$s">%3$s<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="'.__('Save Settings', 'give').'" class="button-primary"></div></form>';

 	}

 

 	return $form_format;

@@ -1016,35 +1016,35 @@ 
  *

  * @return void

  */

-if ( ! function_exists( 'give_license_key_callback' ) ) {

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

+if ( ! function_exists('give_license_key_callback')) {

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

 

 		$id                = $field_type_object->field->args['id'];

 		$field_description = $field_type_object->field->args['desc'];

-		$license_status    = get_option( $field_type_object->field->args['options']['is_valid_license_option'] );

+		$license_status    = get_option($field_type_object->field->args['options']['is_valid_license_option']);

 		$field_classes     = 'regular-text give-license-field';

-		$type              = empty( $escaped_value ) ? 'text' : 'password';

+		$type              = empty($escaped_value) ? 'text' : 'password';

 

-		if ( $license_status === 'valid' ) {

+		if ($license_status === 'valid') {

 			$field_classes .= ' give-license-active';

 		}

 

-		$html = $field_type_object->input( array(

+		$html = $field_type_object->input(array(

 			'class' => $field_classes,

 			'type'  => $type

-		) );

+		));

 

 		//License is active so show deactivate button

-		if ( $license_status === 'valid' ) {

-			$html .= '<input type="submit" class="button-secondary give-license-deactivate" name="' . $id . '_deactivate" value="' . __( 'Deactivate License', 'give' ) . '"/>';

+		if ($license_status === 'valid') {

+			$html .= '<input type="submit" class="button-secondary give-license-deactivate" name="'.$id.'_deactivate" value="'.__('Deactivate License', 'give').'"/>';

 		} else {

 			//This license is not valid so delete it

-			give_delete_option( $id );

+			give_delete_option($id);

 		}

 

-		$html .= '<label for="give_settings[' . $id . ']"> ' . $field_description . '</label>';

+		$html .= '<label for="give_settings['.$id.']"> '.$field_description.'</label>';

 

-		wp_nonce_field( $id . '-nonce', $id . '-nonce' );

+		wp_nonce_field($id.'-nonce', $id.'-nonce');

 

 		echo $html;

 	}

@@ -1059,13 +1059,13 @@ 
  */

 function give_api_callback() {

 

-	if ( ! current_user_can( 'manage_give_settings' ) ) {

+	if ( ! current_user_can('manage_give_settings')) {

 		return;

 	}

 

-	do_action( 'give_tools_api_keys_before' );

+	do_action('give_tools_api_keys_before');

 

-	require_once GIVE_PLUGIN_DIR . 'includes/admin/class-api-keys-table.php';

+	require_once GIVE_PLUGIN_DIR.'includes/admin/class-api-keys-table.php';

 

 	$api_keys_table = new Give_API_Keys_Table();

 	$api_keys_table->prepare_items();

@@ -1073,7 +1073,7 @@ 
 	?>

 	<p>

 		<?php printf(

-			__( 'API keys allow users to use the <a href="%s">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%s">Zapier</a>.', 'give' ),

+			__('API keys allow users to use the <a href="%s">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%s">Zapier</a>.', 'give'),

 			'https://givewp.com/documentation/give-api-reference/',

 			'https://givewp.com/addons/zapier/'

 		); ?>

@@ -1086,10 +1086,10 @@ 
 	</style>

 	<?php

 

-	do_action( 'give_tools_api_keys_after' );

+	do_action('give_tools_api_keys_after');

 }

 

-add_action( 'give_settings_tab_api_keys', 'give_api_callback' );

+add_action('give_settings_tab_api_keys', 'give_api_callback');

 

 /**

  * Hook Callback

@@ -1102,8 +1102,8 @@ 
  *

  * @return void

  */

-function give_hook_callback( $args ) {

-	do_action( 'give_' . $args['id'] );

+function give_hook_callback($args) {

+	do_action('give_'.$args['id']);

 }

 

 /**

@@ -1113,10 +1113,10 @@ 
  *

  */

 

-if ( file_exists( WP_PLUGIN_DIR . '/cmb2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once WP_PLUGIN_DIR . '/cmb2/init.php';

-} elseif ( file_exists( GIVE_PLUGIN_DIR . '/includes/libraries/cmb2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/cmb2/init.php';

-} elseif ( file_exists( GIVE_PLUGIN_DIR . '/includes/libraries/CMB2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/CMB2/init.php';

+if (file_exists(WP_PLUGIN_DIR.'/cmb2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once WP_PLUGIN_DIR.'/cmb2/init.php';

+} elseif (file_exists(GIVE_PLUGIN_DIR.'/includes/libraries/cmb2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/cmb2/init.php';

+} elseif (file_exists(GIVE_PLUGIN_DIR.'/includes/libraries/CMB2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/CMB2/init.php';

 }
\ No newline at end of file

includes/admin/welcome.php

Spacing +104 added lines, -104 removed lines

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

includes/process-purchase.php

Spacing +226 added lines, -226 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,34 +25,34 @@ 
  */
 function give_process_purchase_form() {
 
-	do_action( 'give_pre_process_purchase' );
+	do_action('give_pre_process_purchase');
 
 	// Validate the form $_POST data
 	$valid_data = give_purchase_form_validate_fields();
 
 	// Allow themes and plugins to hook to errors
-	do_action( 'give_checkout_error_checks', $valid_data, $_POST );
+	do_action('give_checkout_error_checks', $valid_data, $_POST);
 
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	// Process the login form
-	if ( isset( $_POST['give_login_submit'] ) ) {
+	if (isset($_POST['give_login_submit'])) {
 		give_process_form_login();
 	}
 
 	// Validate the user
-	$user = give_get_purchase_form_user( $valid_data );
+	$user = give_get_purchase_form_user($valid_data);
 
-	if ( give_get_errors() || ! $user ) {
-		if ( $is_ajax ) {
-			do_action( 'give_ajax_checkout_errors' );
+	if (give_get_errors() || ! $user) {
+		if ($is_ajax) {
+			do_action('give_ajax_checkout_errors');
 			give_die();
 		} else {
 			return false;
 		}
 	}
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		echo 'success';
 		give_die();
 	}
@@ -66,15 +66,15 @@ 
 		'address'    => $user['address']
 	);
 
-	$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
+	$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
 
 	// Setup purchase information
 	$purchase_data = array(
-		'price'        => ( isset( $_POST['give-amount'] ) ? (float) apply_filters( 'give_donation_total', give_sanitize_amount( give_format_amount( $_POST['give-amount'] ) ) ) : '0.00' ),
-		'purchase_key' => strtolower( md5( $user['user_email'] . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'give', true ) ) ),
+		'price'        => (isset($_POST['give-amount']) ? (float) apply_filters('give_donation_total', give_sanitize_amount(give_format_amount($_POST['give-amount']))) : '0.00'),
+		'purchase_key' => strtolower(md5($user['user_email'].date('Y-m-d H:i:s').$auth_key.uniqid('give', true))),
 		'user_email'   => $user['user_email'],
-		'date'         => date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ),
-		'user_info'    => stripslashes_deep( $user_info ),
+		'date'         => date('Y-m-d H:i:s', current_time('timestamp')),
+		'user_info'    => stripslashes_deep($user_info),
 		'post_data'    => $_POST,
 		'gateway'      => $valid_data['gateway'],
 		'card_info'    => $valid_data['cc_info']
@@ -84,36 +84,36 @@ 
 	$valid_data['user'] = $user;
 
 	// Allow themes and plugins to hook before the gateway
-	do_action( 'give_checkout_before_gateway', $_POST, $user_info, $valid_data );
+	do_action('give_checkout_before_gateway', $_POST, $user_info, $valid_data);
 
 
-	if ( ! $purchase_data['price'] ) {
+	if ( ! $purchase_data['price']) {
 		// Revert to manual
 		$purchase_data['gateway'] = 'manual';
 		$_POST['give-gateway']    = 'manual';
 	}
 
 	// Allow the purchase data to be modified before it is sent to the gateway
-	$purchase_data = apply_filters( 'give_purchase_data_before_gateway', $purchase_data, $valid_data );
+	$purchase_data = apply_filters('give_purchase_data_before_gateway', $purchase_data, $valid_data);
 
 	// Setup the data we're storing in the purchase session
 	$session_data = $purchase_data;
 
 	// Make sure credit card numbers are never stored in sessions
-	unset( $session_data['card_info']['card_number'] );
+	unset($session_data['card_info']['card_number']);
 
 	// Used for showing data to non logged-in users after purchase, and for other plugins needing purchase data.
-	give_set_purchase_session( $session_data );
+	give_set_purchase_session($session_data);
 
 	// Send info to the gateway for payment processing
-	give_send_to_gateway( $purchase_data['gateway'], $purchase_data );
+	give_send_to_gateway($purchase_data['gateway'], $purchase_data);
 	give_die();
 
 }
 
-add_action( 'give_purchase', 'give_process_purchase_form' );
-add_action( 'wp_ajax_give_process_checkout', 'give_process_purchase_form' );
-add_action( 'wp_ajax_nopriv_give_process_checkout', 'give_process_purchase_form' );
+add_action('give_purchase', 'give_process_purchase_form');
+add_action('wp_ajax_give_process_checkout', 'give_process_purchase_form');
+add_action('wp_ajax_nopriv_give_process_checkout', 'give_process_purchase_form');
 
 /**
  * Process the checkout login form
@@ -124,32 +124,32 @@ 
  */
 function give_process_form_login() {
 
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	$user_data = give_purchase_form_validate_user_login();
 
-	if ( give_get_errors() || $user_data['user_id'] < 1 ) {
-		if ( $is_ajax ) {
-			do_action( 'give_ajax_checkout_errors' );
+	if (give_get_errors() || $user_data['user_id'] < 1) {
+		if ($is_ajax) {
+			do_action('give_ajax_checkout_errors');
 			give_die();
 		} else {
-			wp_redirect( $_SERVER['HTTP_REFERER'] );
+			wp_redirect($_SERVER['HTTP_REFERER']);
 			exit;
 		}
 	}
 
-	give_log_user_in( $user_data['user_id'], $user_data['user_login'], $user_data['user_pass'] );
+	give_log_user_in($user_data['user_id'], $user_data['user_login'], $user_data['user_pass']);
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		echo 'success';
 		give_die();
 	} else {
-		wp_redirect( $_SERVER['HTTP_REFERER'] );
+		wp_redirect($_SERVER['HTTP_REFERER']);
 	}
 }
 
-add_action( 'wp_ajax_give_process_checkout_login', 'give_process_form_login' );
-add_action( 'wp_ajax_nopriv_give_process_checkout_login', 'give_process_form_login' );
+add_action('wp_ajax_give_process_checkout_login', 'give_process_form_login');
+add_action('wp_ajax_nopriv_give_process_checkout_login', 'give_process_form_login');
 
 /**
  * Purchase Form Validate Fields
@@ -163,43 +163,43 @@ 
 	global $give_options;
 
 	// Check if there is $_POST
-	if ( empty( $_POST ) ) {
+	if (empty($_POST)) {
 		return false;
 	}
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an array to collect valid data
 	$valid_data = array(
 		'gateway'          => give_purchase_form_validate_gateway(), // Gateway fallback
-		'need_new_user'    => false,     // New user flag
-		'need_user_login'  => false,     // Login user flag
-		'logged_user_data' => array(),   // Logged user collected data
-		'new_user_data'    => array(),   // New user collected data
-		'login_user_data'  => array(),   // Login user collected data
-		'guest_user_data'  => array(),   // Guest user collected data
+		'need_new_user'    => false, // New user flag
+		'need_user_login'  => false, // Login user flag
+		'logged_user_data' => array(), // Logged user collected data
+		'new_user_data'    => array(), // New user collected data
+		'login_user_data'  => array(), // Login user collected data
+		'guest_user_data'  => array(), // Guest user collected data
 		'cc_info'          => give_purchase_form_validate_cc()    // Credit card info
 	);
 
 	// Validate agree to terms
-	$terms_option = get_post_meta( $form_id, '_give_terms_option', true );
-	if ( isset( $terms_option ) && $terms_option === 'yes' ) {
+	$terms_option = get_post_meta($form_id, '_give_terms_option', true);
+	if (isset($terms_option) && $terms_option === 'yes') {
 		give_purchase_form_validate_agree_to_terms();
 	}
 
 	//Validate amount is more than 0
 
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		// Collect logged in user data
 		$valid_data['logged_in_user'] = give_purchase_form_validate_logged_in_user();
-	} else if ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-register' ) {
+	} else if (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-register') {
 		// Set new user registration as required
 		$valid_data['need_new_user'] = true;
 		// Validate new user data
 		$valid_data['new_user_data'] = give_purchase_form_validate_new_user();
 		// Check if login validation is needed
-	} else if ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-login' ) {
+	} else if (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-login') {
 		// Set user login as required
 		$valid_data['need_user_login'] = true;
 		// Validate users login info
@@ -222,27 +222,27 @@ 
  */
 function give_purchase_form_validate_gateway() {
 
-	$gateway = give_get_default_gateway( $_REQUEST['give-form-id'] );
+	$gateway = give_get_default_gateway($_REQUEST['give-form-id']);
 
 	// Check if a gateway value is present
-	if ( ! empty( $_REQUEST['give-gateway'] ) ) {
+	if ( ! empty($_REQUEST['give-gateway'])) {
 
-		$gateway = sanitize_text_field( $_REQUEST['give-gateway'] );
+		$gateway = sanitize_text_field($_REQUEST['give-gateway']);
 
 		//Is amount being donated in LIVE mode above 0.00?
-		if ( '0.00' == $_REQUEST['give-amount'] && ! give_is_test_mode() ) {
+		if ('0.00' == $_REQUEST['give-amount'] && ! give_is_test_mode()) {
 
-			give_set_error( 'invalid_donation_amount', __( 'Please insert a valid donation amount.', 'give' ) );
+			give_set_error('invalid_donation_amount', __('Please insert a valid donation amount.', 'give'));
 
 		} //Is this test mode zero donation? Let it through but set to manual gateway
-		elseif ( '0.00' == $_REQUEST['give-amount'] && give_is_test_mode() ) {
+		elseif ('0.00' == $_REQUEST['give-amount'] && give_is_test_mode()) {
 
 			$gateway = 'manual';
 
 		} //Check if this gateway is active
-		elseif ( ! give_is_gateway_active( $gateway ) ) {
+		elseif ( ! give_is_gateway_active($gateway)) {
 
-			give_set_error( 'invalid_gateway', __( 'The selected payment gateway is not enabled', 'give' ) );
+			give_set_error('invalid_gateway', __('The selected payment gateway is not enabled', 'give'));
 
 		}
 
@@ -261,9 +261,9 @@ 
  */
 function give_purchase_form_validate_agree_to_terms() {
 	// Validate agree to terms
-	if ( ! isset( $_POST['give_agree_to_terms'] ) || $_POST['give_agree_to_terms'] != 1 ) {
+	if ( ! isset($_POST['give_agree_to_terms']) || $_POST['give_agree_to_terms'] != 1) {
 		// User did not agree
-		give_set_error( 'agree_to_terms', apply_filters( 'give_agree_to_terms_text', __( 'You must agree to the terms of use', 'give' ) ) );
+		give_set_error('agree_to_terms', apply_filters('give_agree_to_terms_text', __('You must agree to the terms of use', 'give')));
 	}
 }
 
@@ -277,47 +277,47 @@ 
  *
  * @return      array
  */
-function give_purchase_form_required_fields( $form_id ) {
+function give_purchase_form_required_fields($form_id) {
 
-	$payment_mode = give_get_chosen_gateway( $form_id );
+	$payment_mode = give_get_chosen_gateway($form_id);
 
 	$required_fields = array(
 		'give_email' => array(
 			'error_id'      => 'invalid_email',
-			'error_message' => __( 'Please enter a valid email address', 'give' )
+			'error_message' => __('Please enter a valid email address', 'give')
 		),
 		'give_first' => array(
 			'error_id'      => 'invalid_first_name',
-			'error_message' => __( 'Please enter your first name', 'give' )
+			'error_message' => __('Please enter your first name', 'give')
 		)
 	);
 
-	$require_address = give_require_billing_address( $payment_mode );
+	$require_address = give_require_billing_address($payment_mode);
 
-	if ( $require_address ) {
-		$required_fields['card_address']    = array(
+	if ($require_address) {
+		$required_fields['card_address'] = array(
 			'error_id'      => 'invalid_card_address',
-			'error_message' => __( 'Please enter your primary billing address', 'give' )
+			'error_message' => __('Please enter your primary billing address', 'give')
 		);
-		$required_fields['card_zip']        = array(
+		$required_fields['card_zip'] = array(
 			'error_id'      => 'invalid_zip_code',
-			'error_message' => __( 'Please enter your zip / postal code', 'give' )
+			'error_message' => __('Please enter your zip / postal code', 'give')
 		);
-		$required_fields['card_city']       = array(
+		$required_fields['card_city'] = array(
 			'error_id'      => 'invalid_city',
-			'error_message' => __( 'Please enter your billing city', 'give' )
+			'error_message' => __('Please enter your billing city', 'give')
 		);
 		$required_fields['billing_country'] = array(
 			'error_id'      => 'invalid_country',
-			'error_message' => __( 'Please select your billing country', 'give' )
+			'error_message' => __('Please select your billing country', 'give')
 		);
-		$required_fields['card_state']      = array(
+		$required_fields['card_state'] = array(
 			'error_id'      => 'invalid_state',
-			'error_message' => __( 'Please enter billing state / province', 'give' )
+			'error_message' => __('Please enter billing state / province', 'give')
 		);
 	}
 
-	return apply_filters( 'give_purchase_form_required_fields', $required_fields, $form_id );
+	return apply_filters('give_purchase_form_required_fields', $required_fields, $form_id);
 
 }
 
@@ -330,16 +330,16 @@ 
  *
  * @return mixed|void
  */
-function give_require_billing_address( $payment_mode ) {
+function give_require_billing_address($payment_mode) {
 
 	$return = false;
 
-	if ( isset( $_POST['billing_country'] ) || did_action( "give_{$payment_mode}_cc_form" ) || did_action( 'give_cc_form' ) ) {
+	if (isset($_POST['billing_country']) || did_action("give_{$payment_mode}_cc_form") || did_action('give_cc_form')) {
 		$return = true;
 	}
 
 	// Let payment gateways and other extensions determine if address fields should be required
-	return apply_filters( 'give_require_billing_address', $return );
+	return apply_filters('give_require_billing_address', $return);
 
 }
 
@@ -353,43 +353,43 @@ 
 function give_purchase_form_validate_logged_in_user() {
 	global $user_ID;
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start empty array to collect valid user data
 	$valid_user_data = array(
 		// Assume there will be errors
-		'user_id' => - 1
+		'user_id' => -1
 	);
 
 	// Verify there is a user_ID
-	if ( $user_ID > 0 ) {
+	if ($user_ID > 0) {
 		// Get the logged in user data
-		$user_data = get_userdata( $user_ID );
+		$user_data = get_userdata($user_ID);
 
 		// Loop through required fields and show error messages
-		foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-			if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-				give_set_error( $value['error_id'], $value['error_message'] );
+		foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+			if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+				give_set_error($value['error_id'], $value['error_message']);
 			}
 		}
 
 		// Verify data
-		if ( $user_data ) {
+		if ($user_data) {
 			// Collected logged in user data
 			$valid_user_data = array(
 				'user_id'    => $user_ID,
-				'user_email' => isset( $_POST['give_email'] ) ? sanitize_email( $_POST['give_email'] ) : $user_data->user_email,
-				'user_first' => isset( $_POST['give_first'] ) && ! empty( $_POST['give_first'] ) ? sanitize_text_field( $_POST['give_first'] ) : $user_data->first_name,
-				'user_last'  => isset( $_POST['give_last'] ) && ! empty( $_POST['give_last'] ) ? sanitize_text_field( $_POST['give_last'] ) : $user_data->last_name,
+				'user_email' => isset($_POST['give_email']) ? sanitize_email($_POST['give_email']) : $user_data->user_email,
+				'user_first' => isset($_POST['give_first']) && ! empty($_POST['give_first']) ? sanitize_text_field($_POST['give_first']) : $user_data->first_name,
+				'user_last'  => isset($_POST['give_last']) && ! empty($_POST['give_last']) ? sanitize_text_field($_POST['give_last']) : $user_data->last_name,
 			);
 
-			if ( ! is_email( $valid_user_data['user_email'] ) ) {
-				give_set_error( 'email_invalid', __( 'Invalid email', 'give' ) );
+			if ( ! is_email($valid_user_data['user_email'])) {
+				give_set_error('email_invalid', __('Invalid email', 'give'));
 			}
 
 		} else {
 			// Set invalid user error
-			give_set_error( 'invalid_user', __( 'The user information is invalid', 'give' ) );
+			give_set_error('invalid_user', __('The user information is invalid', 'give'));
 		}
 	}
 
@@ -407,92 +407,92 @@ 
 function give_purchase_form_validate_new_user() {
 	$registering_new_user = false;
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an empty array to collect valid user data
 	$valid_user_data = array(
 		// Assume there will be errors
-		'user_id'    => - 1,
+		'user_id'    => -1,
 		// Get first name
-		'user_first' => isset( $_POST['give_first'] ) ? sanitize_text_field( $_POST['give_first'] ) : '',
+		'user_first' => isset($_POST['give_first']) ? sanitize_text_field($_POST['give_first']) : '',
 		// Get last name
-		'user_last'  => isset( $_POST['give_last'] ) ? sanitize_text_field( $_POST['give_last'] ) : '',
+		'user_last'  => isset($_POST['give_last']) ? sanitize_text_field($_POST['give_last']) : '',
 	);
 
 	// Check the new user's credentials against existing ones
-	$user_login   = isset( $_POST['give_user_login'] ) ? trim( $_POST['give_user_login'] ) : false;
-	$user_email   = isset( $_POST['give_email'] ) ? trim( $_POST['give_email'] ) : false;
-	$user_pass    = isset( $_POST['give_user_pass'] ) ? trim( $_POST['give_user_pass'] ) : false;
-	$pass_confirm = isset( $_POST['give_user_pass_confirm'] ) ? trim( $_POST['give_user_pass_confirm'] ) : false;
+	$user_login   = isset($_POST['give_user_login']) ? trim($_POST['give_user_login']) : false;
+	$user_email   = isset($_POST['give_email']) ? trim($_POST['give_email']) : false;
+	$user_pass    = isset($_POST['give_user_pass']) ? trim($_POST['give_user_pass']) : false;
+	$pass_confirm = isset($_POST['give_user_pass_confirm']) ? trim($_POST['give_user_pass_confirm']) : false;
 
 	// Loop through required fields and show error messages
-	foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+			give_set_error($value['error_id'], $value['error_message']);
 		}
 	}
 
 	// Check if we have an username to register
-	if ( $user_login && strlen( $user_login ) > 0 ) {
+	if ($user_login && strlen($user_login) > 0) {
 		$registering_new_user = true;
 
 		// We have an user name, check if it already exists
-		if ( username_exists( $user_login ) ) {
+		if (username_exists($user_login)) {
 			// Username already registered
-			give_set_error( 'username_unavailable', __( 'Username already taken', 'give' ) );
+			give_set_error('username_unavailable', __('Username already taken', 'give'));
 			// Check if it's valid
-		} else if ( ! give_validate_username( $user_login ) ) {
+		} else if ( ! give_validate_username($user_login)) {
 			// Invalid username
-			if ( is_multisite() ) {
-				give_set_error( 'username_invalid', __( 'Invalid username. Only lowercase letters (a-z) and numbers are allowed', 'give' ) );
+			if (is_multisite()) {
+				give_set_error('username_invalid', __('Invalid username. Only lowercase letters (a-z) and numbers are allowed', 'give'));
 			} else {
-				give_set_error( 'username_invalid', __( 'Invalid username', 'give' ) );
+				give_set_error('username_invalid', __('Invalid username', 'give'));
 			}
 		} else {
 			// All the checks have run and it's good to go
 			$valid_user_data['user_login'] = $user_login;
 		}
 	} else {
-		if ( give_no_guest_checkout( $form_id ) ) {
-			give_set_error( 'registration_required', __( 'You must register or login to complete your donation', 'give' ) );
+		if (give_no_guest_checkout($form_id)) {
+			give_set_error('registration_required', __('You must register or login to complete your donation', 'give'));
 		}
 	}
 
 	// Check if we have an email to verify
-	if ( $user_email && strlen( $user_email ) > 0 ) {
+	if ($user_email && strlen($user_email) > 0) {
 		// Validate email
-		if ( ! is_email( $user_email ) ) {
-			give_set_error( 'email_invalid', __( 'Invalid email', 'give' ) );
+		if ( ! is_email($user_email)) {
+			give_set_error('email_invalid', __('Invalid email', 'give'));
 			// Check if email exists
-		} else if ( email_exists( $user_email ) && $registering_new_user ) {
-			give_set_error( 'email_used', __( 'Email already used', 'give' ) );
+		} else if (email_exists($user_email) && $registering_new_user) {
+			give_set_error('email_used', __('Email already used', 'give'));
 		} else {
 			// All the checks have run and it's good to go
 			$valid_user_data['user_email'] = $user_email;
 		}
 	} else {
 		// No email
-		give_set_error( 'email_empty', __( 'Enter an email', 'give' ) );
+		give_set_error('email_empty', __('Enter an email', 'give'));
 	}
 
 	// Check password
-	if ( $user_pass && $pass_confirm ) {
+	if ($user_pass && $pass_confirm) {
 		// Verify confirmation matches
-		if ( $user_pass != $pass_confirm ) {
+		if ($user_pass != $pass_confirm) {
 			// Passwords do not match
-			give_set_error( 'password_mismatch', __( 'Passwords don\'t match', 'give' ) );
+			give_set_error('password_mismatch', __('Passwords don\'t match', 'give'));
 		} else {
 			// All is good to go
 			$valid_user_data['user_pass'] = $user_pass;
 		}
 	} else {
 		// Password or confirmation missing
-		if ( ! $user_pass && $registering_new_user ) {
+		if ( ! $user_pass && $registering_new_user) {
 			// The password is invalid
-			give_set_error( 'password_empty', __( 'Enter a password', 'give' ) );
-		} else if ( ! $pass_confirm && $registering_new_user ) {
+			give_set_error('password_empty', __('Enter a password', 'give'));
+		} else if ( ! $pass_confirm && $registering_new_user) {
 			// Confirmation password is invalid
-			give_set_error( 'confirmation_empty', __( 'Enter the password confirmation', 'give' ) );
+			give_set_error('confirmation_empty', __('Enter the password confirmation', 'give'));
 		}
 	}
 
@@ -511,34 +511,34 @@ 
 	// Start an array to collect valid user data
 	$valid_user_data = array(
 		// Assume there will be errors
-		'user_id' => - 1
+		'user_id' => -1
 	);
 
 	// Username
-	if ( ! isset( $_POST['give_user_login'] ) || $_POST['give_user_login'] == '' ) {
-		give_set_error( 'must_log_in', __( 'You must login or register to complete your donation', 'give' ) );
+	if ( ! isset($_POST['give_user_login']) || $_POST['give_user_login'] == '') {
+		give_set_error('must_log_in', __('You must login or register to complete your donation', 'give'));
 
 		return $valid_user_data;
 	}
 
 	// Get the user by login
-	$user_data = get_user_by( 'login', strip_tags( $_POST['give_user_login'] ) );
+	$user_data = get_user_by('login', strip_tags($_POST['give_user_login']));
 
 	// Check if user exists
-	if ( $user_data ) {
+	if ($user_data) {
 		// Get password
-		$user_pass = isset( $_POST['give_user_pass'] ) ? $_POST['give_user_pass'] : false;
+		$user_pass = isset($_POST['give_user_pass']) ? $_POST['give_user_pass'] : false;
 
 		// Check user_pass
-		if ( $user_pass ) {
+		if ($user_pass) {
 			// Check if password is valid
-			if ( ! wp_check_password( $user_pass, $user_data->user_pass, $user_data->ID ) ) {
+			if ( ! wp_check_password($user_pass, $user_data->user_pass, $user_data->ID)) {
 				// Incorrect password
 				give_set_error(
 					'password_incorrect',
 					sprintf(
-						__( 'The password you entered is incorrect. %sReset Password%s', 'give' ),
-						'<a href="' . wp_lostpassword_url( "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]" ) . '" title="' . __( 'Lost Password', 'give' ) . '">',
+						__('The password you entered is incorrect. %sReset Password%s', 'give'),
+						'<a href="'.wp_lostpassword_url("http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]").'" title="'.__('Lost Password', 'give').'">',
 						'</a>'
 					)
 				);
@@ -556,11 +556,11 @@ 
 			}
 		} else {
 			// Empty password
-			give_set_error( 'password_empty', __( 'Enter a password', 'give' ) );
+			give_set_error('password_empty', __('Enter a password', 'give'));
 		}
 	} else {
 		// no username
-		give_set_error( 'username_incorrect', __( 'The username you entered does not exist', 'give' ) );
+		give_set_error('username_incorrect', __('The username you entered does not exist', 'give'));
 	}
 
 	return $valid_user_data;
@@ -575,7 +575,7 @@ 
  */
 function give_purchase_form_validate_guest_user() {
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an array to collect valid user data
 	$valid_user_data = array(
@@ -584,32 +584,32 @@ 
 	);
 
 	// Show error message if user must be logged in
-	if ( give_logged_in_only() ) {
-		give_set_error( 'logged_in_only', __( 'You must be logged into an account to donation', 'give' ) );
+	if (give_logged_in_only()) {
+		give_set_error('logged_in_only', __('You must be logged into an account to donation', 'give'));
 	}
 
 	// Get the guest email
-	$guest_email = isset( $_POST['give_email'] ) ? $_POST['give_email'] : false;
+	$guest_email = isset($_POST['give_email']) ? $_POST['give_email'] : false;
 
 	// Check email
-	if ( $guest_email && strlen( $guest_email ) > 0 ) {
+	if ($guest_email && strlen($guest_email) > 0) {
 		// Validate email
-		if ( ! is_email( $guest_email ) ) {
+		if ( ! is_email($guest_email)) {
 			// Invalid email
-			give_set_error( 'email_invalid', __( 'Invalid email', 'give' ) );
+			give_set_error('email_invalid', __('Invalid email', 'give'));
 		} else {
 			// All is good to go
 			$valid_user_data['user_email'] = $guest_email;
 		}
 	} else {
 		// No email
-		give_set_error( 'email_empty', __( 'Enter an email', 'give' ) );
+		give_set_error('email_empty', __('Enter an email', 'give'));
 	}
 
 	// Loop through required fields and show error messages
-	foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+			give_set_error($value['error_id'], $value['error_message']);
 		}
 	}
 
@@ -625,42 +625,42 @@ 
  * @since   1.0
  * @return  integer
  */
-function give_register_and_login_new_user( $user_data = array() ) {
+function give_register_and_login_new_user($user_data = array()) {
 	// Verify the array
-	if ( empty( $user_data ) ) {
-		return - 1;
+	if (empty($user_data)) {
+		return -1;
 	}
 
-	if ( give_get_errors() ) {
-		return - 1;
+	if (give_get_errors()) {
+		return -1;
 	}
 
-	$user_args = apply_filters( 'give_insert_user_args', array(
-		'user_login'      => isset( $user_data['user_login'] ) ? $user_data['user_login'] : '',
-		'user_pass'       => isset( $user_data['user_pass'] ) ? $user_data['user_pass'] : '',
-		'user_email'      => isset( $user_data['user_email'] ) ? $user_data['user_email'] : '',
-		'first_name'      => isset( $user_data['user_first'] ) ? $user_data['user_first'] : '',
-		'last_name'       => isset( $user_data['user_last'] ) ? $user_data['user_last'] : '',
-		'user_registered' => date( 'Y-m-d H:i:s' ),
-		'role'            => get_option( 'default_role' )
-	), $user_data );
+	$user_args = apply_filters('give_insert_user_args', array(
+		'user_login'      => isset($user_data['user_login']) ? $user_data['user_login'] : '',
+		'user_pass'       => isset($user_data['user_pass']) ? $user_data['user_pass'] : '',
+		'user_email'      => isset($user_data['user_email']) ? $user_data['user_email'] : '',
+		'first_name'      => isset($user_data['user_first']) ? $user_data['user_first'] : '',
+		'last_name'       => isset($user_data['user_last']) ? $user_data['user_last'] : '',
+		'user_registered' => date('Y-m-d H:i:s'),
+		'role'            => get_option('default_role')
+	), $user_data);
 
 	// Insert new user
-	$user_id = wp_insert_user( $user_args );
+	$user_id = wp_insert_user($user_args);
 
 	// Validate inserted user
-	if ( is_wp_error( $user_id ) ) {
-		return - 1;
+	if (is_wp_error($user_id)) {
+		return -1;
 	}
 
 	// Allow themes and plugins to filter the user data
-	$user_data = apply_filters( 'give_insert_user_data', $user_data, $user_args );
+	$user_data = apply_filters('give_insert_user_data', $user_data, $user_args);
 
 	// Allow themes and plugins to hook
-	do_action( 'give_insert_user', $user_id, $user_data );
+	do_action('give_insert_user', $user_id, $user_data);
 
 	// Login new user
-	give_log_user_in( $user_id, $user_data['user_login'], $user_data['user_pass'] );
+	give_log_user_in($user_id, $user_data['user_login'], $user_data['user_pass']);
 
 	// Return user id
 	return $user_id;
@@ -675,27 +675,27 @@ 
  * @since   1.0
  * @return  array
  */
-function give_get_purchase_form_user( $valid_data = array() ) {
+function give_get_purchase_form_user($valid_data = array()) {
 	// Initialize user
 	$user    = false;
-	$is_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+	$is_ajax = defined('DOING_AJAX') && DOING_AJAX;
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		// Do not create or login the user during the ajax submission (check for errors only)
 		return true;
-	} else if ( is_user_logged_in() ) {
+	} else if (is_user_logged_in()) {
 		// Set the valid user as the logged in collected data
 
 		$user = $valid_data['logged_in_user'];
-	} else if ( $valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true ) {
+	} else if ($valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true) {
 		// New user registration
-		if ( $valid_data['need_new_user'] === true ) {
+		if ($valid_data['need_new_user'] === true) {
 			// Set user
 			$user = $valid_data['new_user_data'];
 			// Register and login new user
-			$user['user_id'] = give_register_and_login_new_user( $user );
+			$user['user_id'] = give_register_and_login_new_user($user);
 			// User login
-		} else if ( $valid_data['need_user_login'] === true && ! $is_ajax ) {
+		} else if ($valid_data['need_user_login'] === true && ! $is_ajax) {
 
 			/*
 			 * The login form is now processed in the give_process_purchase_login() function.
@@ -710,48 +710,48 @@ 
 			// Set user
 			$user = $valid_data['login_user_data'];
 			// Login user
-			give_log_user_in( $user['user_id'], $user['user_login'], $user['user_pass'] );
+			give_log_user_in($user['user_id'], $user['user_login'], $user['user_pass']);
 		}
 	}
 
 	// Check guest checkout
-	if ( false === $user && false === give_no_guest_checkout( $_POST['give-form-id'] ) ) {
+	if (false === $user && false === give_no_guest_checkout($_POST['give-form-id'])) {
 		// Set user
 		$user = $valid_data['guest_user_data'];
 	}
 
 	// Verify we have an user
-	if ( false === $user || empty( $user ) ) {
+	if (false === $user || empty($user)) {
 		// Return false
 		return false;
 	}
 
 	// Get user first name
-	if ( ! isset( $user['user_first'] ) || strlen( trim( $user['user_first'] ) ) < 1 ) {
-		$user['user_first'] = isset( $_POST["give_first"] ) ? strip_tags( trim( $_POST["give_first"] ) ) : '';
+	if ( ! isset($user['user_first']) || strlen(trim($user['user_first'])) < 1) {
+		$user['user_first'] = isset($_POST["give_first"]) ? strip_tags(trim($_POST["give_first"])) : '';
 	}
 
 	// Get user last name
-	if ( ! isset( $user['user_last'] ) || strlen( trim( $user['user_last'] ) ) < 1 ) {
-		$user['user_last'] = isset( $_POST["give_last"] ) ? strip_tags( trim( $_POST["give_last"] ) ) : '';
+	if ( ! isset($user['user_last']) || strlen(trim($user['user_last'])) < 1) {
+		$user['user_last'] = isset($_POST["give_last"]) ? strip_tags(trim($_POST["give_last"])) : '';
 	}
 
 	// Get the user's billing address details
 	$user['address']            = array();
-	$user['address']['line1']   = ! empty( $_POST['card_address'] ) ? sanitize_text_field( $_POST['card_address'] ) : false;
-	$user['address']['line2']   = ! empty( $_POST['card_address_2'] ) ? sanitize_text_field( $_POST['card_address_2'] ) : false;
-	$user['address']['city']    = ! empty( $_POST['card_city'] ) ? sanitize_text_field( $_POST['card_city'] ) : false;
-	$user['address']['state']   = ! empty( $_POST['card_state'] ) ? sanitize_text_field( $_POST['card_state'] ) : false;
-	$user['address']['country'] = ! empty( $_POST['billing_country'] ) ? sanitize_text_field( $_POST['billing_country'] ) : false;
-	$user['address']['zip']     = ! empty( $_POST['card_zip'] ) ? sanitize_text_field( $_POST['card_zip'] ) : false;
-
-	if ( empty( $user['address']['country'] ) ) {
+	$user['address']['line1']   = ! empty($_POST['card_address']) ? sanitize_text_field($_POST['card_address']) : false;
+	$user['address']['line2']   = ! empty($_POST['card_address_2']) ? sanitize_text_field($_POST['card_address_2']) : false;
+	$user['address']['city']    = ! empty($_POST['card_city']) ? sanitize_text_field($_POST['card_city']) : false;
+	$user['address']['state']   = ! empty($_POST['card_state']) ? sanitize_text_field($_POST['card_state']) : false;
+	$user['address']['country'] = ! empty($_POST['billing_country']) ? sanitize_text_field($_POST['billing_country']) : false;
+	$user['address']['zip']     = ! empty($_POST['card_zip']) ? sanitize_text_field($_POST['card_zip']) : false;
+
+	if (empty($user['address']['country'])) {
 		$user['address'] = false;
 	} // Country will always be set if address fields are present
 
-	if ( ! empty( $user['user_id'] ) && $user['user_id'] > 0 && ! empty( $user['address'] ) ) {
+	if ( ! empty($user['user_id']) && $user['user_id'] > 0 && ! empty($user['address'])) {
 		// Store the address in the user's meta so the cart can be pre-populated with it on return purchases
-		update_user_meta( $user['user_id'], '_give_user_address', $user['address'] );
+		update_user_meta($user['user_id'], '_give_user_address', $user['address']);
 	}
 
 	// Return valid user
@@ -770,16 +770,16 @@ 
 	$card_data = give_get_purchase_cc_info();
 
 	// Validate the card zip
-	if ( ! empty( $card_data['card_zip'] ) ) {
-		if ( ! give_purchase_form_validate_cc_zip( $card_data['card_zip'], $card_data['card_country'] ) ) {
-			give_set_error( 'invalid_cc_zip', __( 'The zip / postal code you entered for your billing address is invalid', 'give' ) );
+	if ( ! empty($card_data['card_zip'])) {
+		if ( ! give_purchase_form_validate_cc_zip($card_data['card_zip'], $card_data['card_country'])) {
+			give_set_error('invalid_cc_zip', __('The zip / postal code you entered for your billing address is invalid', 'give'));
 		}
 	}
 
 	//Ensure no spaces
-	if ( ! empty( $card_data['card_number'] ) ) {
-		$card_data['card_number'] = str_replace( '+', '', $card_data['card_number'] ); //no "+" signs
-		$card_data['card_number'] = str_replace( ' ', '', $card_data['card_number'] ); // No spaces
+	if ( ! empty($card_data['card_number'])) {
+		$card_data['card_number'] = str_replace('+', '', $card_data['card_number']); //no "+" signs
+		$card_data['card_number'] = str_replace(' ', '', $card_data['card_number']); // No spaces
 	}
 
 	// This should validate card numbers at some point too
@@ -795,17 +795,17 @@ 
  */
 function give_get_purchase_cc_info() {
 	$cc_info                   = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] ) ? sanitize_text_field( $_POST['card_name'] ) : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] ) ? sanitize_text_field( $_POST['card_number'] ) : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] ) ? sanitize_text_field( $_POST['card_cvc'] ) : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] ) ? sanitize_text_field( $_POST['card_exp_month'] ) : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] ) ? sanitize_text_field( $_POST['card_exp_year'] ) : '';
-	$cc_info['card_address']   = isset( $_POST['card_address'] ) ? sanitize_text_field( $_POST['card_address'] ) : '';
-	$cc_info['card_address_2'] = isset( $_POST['card_address_2'] ) ? sanitize_text_field( $_POST['card_address_2'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['card_city'] ) ? sanitize_text_field( $_POST['card_city'] ) : '';
-	$cc_info['card_state']     = isset( $_POST['card_state'] ) ? sanitize_text_field( $_POST['card_state'] ) : '';
-	$cc_info['card_country']   = isset( $_POST['billing_country'] ) ? sanitize_text_field( $_POST['billing_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['card_zip'] ) ? sanitize_text_field( $_POST['card_zip'] ) : '';
+	$cc_info['card_name']      = isset($_POST['card_name']) ? sanitize_text_field($_POST['card_name']) : '';
+	$cc_info['card_number']    = isset($_POST['card_number']) ? sanitize_text_field($_POST['card_number']) : '';
+	$cc_info['card_cvc']       = isset($_POST['card_cvc']) ? sanitize_text_field($_POST['card_cvc']) : '';
+	$cc_info['card_exp_month'] = isset($_POST['card_exp_month']) ? sanitize_text_field($_POST['card_exp_month']) : '';
+	$cc_info['card_exp_year']  = isset($_POST['card_exp_year']) ? sanitize_text_field($_POST['card_exp_year']) : '';
+	$cc_info['card_address']   = isset($_POST['card_address']) ? sanitize_text_field($_POST['card_address']) : '';
+	$cc_info['card_address_2'] = isset($_POST['card_address_2']) ? sanitize_text_field($_POST['card_address_2']) : '';
+	$cc_info['card_city']      = isset($_POST['card_city']) ? sanitize_text_field($_POST['card_city']) : '';
+	$cc_info['card_state']     = isset($_POST['card_state']) ? sanitize_text_field($_POST['card_state']) : '';
+	$cc_info['card_country']   = isset($_POST['billing_country']) ? sanitize_text_field($_POST['billing_country']) : '';
+	$cc_info['card_zip']       = isset($_POST['card_zip']) ? sanitize_text_field($_POST['card_zip']) : '';
 
 	// Return cc info
 	return $cc_info;
@@ -821,14 +821,14 @@ 
  *
  * @return bool|mixed|void
  */
-function give_purchase_form_validate_cc_zip( $zip = 0, $country_code = '' ) {
+function give_purchase_form_validate_cc_zip($zip = 0, $country_code = '') {
 	$ret = false;
 
-	if ( empty( $zip ) || empty( $country_code ) ) {
+	if (empty($zip) || empty($country_code)) {
 		return $ret;
 	}
 
-	$country_code = strtoupper( $country_code );
+	$country_code = strtoupper($country_code);
 
 	$zip_regex = array(
 		"AD" => "AD\d{3}",
@@ -988,11 +988,11 @@ 
 		"ZM" => "\d{5}"
 	);
 
-	if ( ! isset ( $zip_regex[ $country_code ] ) || preg_match( "/" . $zip_regex[ $country_code ] . "/i", $zip ) ) {
+	if ( ! isset ($zip_regex[$country_code]) || preg_match("/".$zip_regex[$country_code]."/i", $zip)) {
 		$ret = true;
 	}
 
-	return apply_filters( 'give_is_zip_valid', $ret, $zip, $country_code );
+	return apply_filters('give_is_zip_valid', $ret, $zip, $country_code);
 }
 
 
@@ -1002,48 +1002,48 @@ 
  * @since       1.0
  * @return      void
  */
-function give_check_purchase_email( $valid_data, $posted ) {
+function give_check_purchase_email($valid_data, $posted) {
 	$is_banned = false;
 	$banned    = give_get_banned_emails();
 
-	if ( empty( $banned ) ) {
+	if (empty($banned)) {
 		return;
 	}
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 
 		// The user is logged in, check that their account email is not banned
-		$user_data = get_userdata( get_current_user_id() );
-		if ( give_is_email_banned( $user_data->user_email ) ) {
+		$user_data = get_userdata(get_current_user_id());
+		if (give_is_email_banned($user_data->user_email)) {
 
 			$is_banned = true;
 		}
 
-		if ( give_is_email_banned( $posted['give_email'] ) ) {
+		if (give_is_email_banned($posted['give_email'])) {
 			$is_banned = true;
 		}
 
-	} elseif ( isset( $posted['give-purchase-var'] ) && $posted['give-purchase-var'] == 'needs-to-login' ) {
+	} elseif (isset($posted['give-purchase-var']) && $posted['give-purchase-var'] == 'needs-to-login') {
 
 		// The user is logging in, check that their email is not banned
-		$user_data = get_user_by( 'login', $posted['give_user_login'] );
-		if ( $user_data && give_is_email_banned( $user_data->user_email ) ) {
+		$user_data = get_user_by('login', $posted['give_user_login']);
+		if ($user_data && give_is_email_banned($user_data->user_email)) {
 			$is_banned = true;
 		}
 
 	} else {
 
 		// Guest purchase, check that the email is not banned
-		if ( give_is_email_banned( $posted['give_email'] ) ) {
+		if (give_is_email_banned($posted['give_email'])) {
 			$is_banned = true;
 		}
 
 	}
 
-	if ( $is_banned ) {
+	if ($is_banned) {
 		// Set an error and give the donor a general error (don't alert them that they were banned)
-		give_set_error( 'email_banned', __( 'An internal error has occurred, please try again or contact support.', 'give' ) );
+		give_set_error('email_banned', __('An internal error has occurred, please try again or contact support.', 'give'));
 	}
 }
 
-add_action( 'give_checkout_error_checks', 'give_check_purchase_email', 10, 2 );
+add_action('give_checkout_error_checks', 'give_check_purchase_email', 10, 2);

includes/shortcodes.php

Spacing +101 added lines, -101 removed lines

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