WordImpress / Give

includes/scripts.php

Spacing +148 added lines, -148 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,106 +25,106 @@ 
  */
 function give_load_scripts() {
 
-	$js_dir         = GIVE_PLUGIN_URL . 'assets/js/frontend/';
-	$js_plugins     = GIVE_PLUGIN_URL . 'assets/js/plugins/';
-	$scripts_footer = ( give_get_option( 'scripts_footer' ) == 'on' ) ? true : false;
+	$js_dir         = GIVE_PLUGIN_URL.'assets/js/frontend/';
+	$js_plugins     = GIVE_PLUGIN_URL.'assets/js/plugins/';
+	$scripts_footer = (give_get_option('scripts_footer') == 'on') ? true : false;
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	//Localize / PHP to AJAX vars
-	$localize_give_checkout = apply_filters( 'give_global_script_vars', array(
+	$localize_give_checkout = apply_filters('give_global_script_vars', array(
 		'ajaxurl'             => give_get_ajax_url(),
-		'checkout_nonce'      => wp_create_nonce( 'give_checkout_nonce' ),
-		'currency_sign'       => give_currency_filter( '' ),
+		'checkout_nonce'      => wp_create_nonce('give_checkout_nonce'),
+		'currency_sign'       => give_currency_filter(''),
 		'currency_pos'        => give_get_currency_position(),
 		'thousands_separator' => give_get_price_thousand_separator(),
 		'decimal_separator'   => give_get_price_decimal_separator(),
-		'no_gateway'          => esc_html__( 'Please select a payment method.', 'give' ),
-		'bad_minimum'         => esc_html__( 'The minimum donation amount for this form is', 'give' ),
-		'general_loading'     => esc_html__( 'Loading...', 'give' ),
-		'purchase_loading'    => esc_html__( 'Please Wait...', 'give' ),
+		'no_gateway'          => esc_html__('Please select a payment method.', 'give'),
+		'bad_minimum'         => esc_html__('The minimum donation amount for this form is', 'give'),
+		'general_loading'     => esc_html__('Loading...', 'give'),
+		'purchase_loading'    => esc_html__('Please Wait...', 'give'),
 		'number_decimals'     => give_get_price_decimals(),
 		'give_version'        => GIVE_VERSION,
 		'form_translation'    => apply_filters(
 			'give_form_translation_js',
 			array(
 				// Field name               Validation message.
-				'payment-mode'           => esc_html__( 'Please select payment mode.', 'give' ),
-				'give_first'             => esc_html__( 'Please enter your first name.', 'give' ),
-				'give_email'             => esc_html__( 'Please enter a valid email address.', 'give' ),
-				'give_user_login'        => esc_html__( 'Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give' ),
-				'give_user_pass'         => esc_html__( 'Enter a password.', 'give' ),
-				'give_user_pass_confirm' => esc_html__( 'Enter a confirm password.', 'give' ),
+				'payment-mode'           => esc_html__('Please select payment mode.', 'give'),
+				'give_first'             => esc_html__('Please enter your first name.', 'give'),
+				'give_email'             => esc_html__('Please enter a valid email address.', 'give'),
+				'give_user_login'        => esc_html__('Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give'),
+				'give_user_pass'         => esc_html__('Enter a password.', 'give'),
+				'give_user_pass_confirm' => esc_html__('Enter a confirm password.', 'give'),
 			)
 		)
-	) );
-	$localize_give_ajax     = apply_filters( 'give_global_ajax_vars', array(
+	));
+	$localize_give_ajax = apply_filters('give_global_ajax_vars', array(
 		'ajaxurl'         => give_get_ajax_url(),
-		'loading'         => esc_html__( 'Loading', 'give' ),
+		'loading'         => esc_html__('Loading', 'give'),
 		// General loading message
-		'select_option'   => esc_html__( 'Please select an option', 'give' ),
+		'select_option'   => esc_html__('Please select an option', 'give'),
 		// Variable pricing error with multi-donation option enabled
-		'default_gateway' => give_get_default_gateway( null ),
-		'permalinks'      => get_option( 'permalink_structure' ) ? '1' : '0',
+		'default_gateway' => give_get_default_gateway(null),
+		'permalinks'      => get_option('permalink_structure') ? '1' : '0',
 		'number_decimals' => give_get_price_decimals()
-	) );
+	));
 
 	//DEBUG is On
-	if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+	if (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) {
 
-		if ( give_is_cc_verify_enabled() ) {
-			wp_register_script( 'give-cc-validator', $js_plugins . 'jquery.payment' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-			wp_enqueue_script( 'give-cc-validator' );
+		if (give_is_cc_verify_enabled()) {
+			wp_register_script('give-cc-validator', $js_plugins.'jquery.payment'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+			wp_enqueue_script('give-cc-validator');
 		}
 
-		wp_register_script( 'give-float-labels', $js_plugins . 'float-labels' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-float-labels' );
+		wp_register_script('give-float-labels', $js_plugins.'float-labels'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-float-labels');
 
-		wp_register_script( 'give-blockui', $js_plugins . 'jquery.blockUI' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-blockui' );
+		wp_register_script('give-blockui', $js_plugins.'jquery.blockUI'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-blockui');
 
-		wp_register_script( 'give-qtip', $js_plugins . 'jquery.qtip' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-qtip' );
+		wp_register_script('give-qtip', $js_plugins.'jquery.qtip'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-qtip');
 
-		wp_register_script( 'give-accounting', $js_plugins . 'accounting' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-accounting' );
+		wp_register_script('give-accounting', $js_plugins.'accounting'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-accounting');
 
-		wp_register_script( 'give-magnific', $js_plugins . 'jquery.magnific-popup' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-magnific' );
+		wp_register_script('give-magnific', $js_plugins.'jquery.magnific-popup'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-magnific');
 
-		wp_register_script( 'give-checkout-global', $js_dir . 'give-checkout-global' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-checkout-global' );
+		wp_register_script('give-checkout-global', $js_dir.'give-checkout-global'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-checkout-global');
 
 		//General scripts
-		wp_register_script( 'give-scripts', $js_dir . 'give' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-scripts' );
+		wp_register_script('give-scripts', $js_dir.'give'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-scripts');
 
 		// Load AJAX scripts, if enabled
-		wp_register_script( 'give-ajax', $js_dir . 'give-ajax' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-ajax' );
+		wp_register_script('give-ajax', $js_dir.'give-ajax'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-ajax');
 
 		//Localize / Pass AJAX vars from PHP
-		wp_localize_script( 'give-checkout-global', 'give_global_vars', $localize_give_checkout );
-		wp_localize_script( 'give-ajax', 'give_scripts', $localize_give_ajax );
+		wp_localize_script('give-checkout-global', 'give_global_vars', $localize_give_checkout);
+		wp_localize_script('give-ajax', 'give_scripts', $localize_give_ajax);
 
 
 	} else {
 
 		//DEBUG is OFF (one JS file to rule them all!)
-		wp_register_script( 'give', $js_dir . 'give.all.min.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give' );
+		wp_register_script('give', $js_dir.'give.all.min.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give');
 
 		//Localize / Pass AJAX vars from PHP
-		wp_localize_script( 'give', 'give_global_vars', $localize_give_checkout );
-		wp_localize_script( 'give', 'give_scripts', $localize_give_ajax );
+		wp_localize_script('give', 'give_global_vars', $localize_give_checkout);
+		wp_localize_script('give', 'give_scripts', $localize_give_ajax);
 
 	}
 
 
 }
 
-add_action( 'wp_enqueue_scripts', 'give_load_scripts' );
+add_action('wp_enqueue_scripts', 'give_load_scripts');
 
 /**
  * Register styles.
@@ -136,16 +136,16 @@ 
  */
 function give_register_styles() {
 
-	if ( give_get_option( 'disable_css', false ) ) {
+	if (give_get_option('disable_css', false)) {
 		return;
 	}
 
-	wp_register_style( 'give-styles', give_get_stylesheet_uri(), array(), GIVE_VERSION, 'all' );
-	wp_enqueue_style( 'give-styles' );
+	wp_register_style('give-styles', give_get_stylesheet_uri(), array(), GIVE_VERSION, 'all');
+	wp_enqueue_style('give-styles');
 
 }
 
-add_action( 'wp_enqueue_scripts', 'give_register_styles' );
+add_action('wp_enqueue_scripts', 'give_register_styles');
 
 
 /**
@@ -157,42 +157,42 @@ 
 function give_get_stylesheet_uri() {
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// LTR or RTL files
-	$direction = ( is_rtl() ) ? '-rtl' : '';
+	$direction = (is_rtl()) ? '-rtl' : '';
 
-	$file          = 'give' . $direction . $suffix . '.css';
+	$file          = 'give'.$direction.$suffix.'.css';
 	$templates_dir = give_get_theme_template_dir_name();
 
-	$child_theme_style_sheet    = trailingslashit( get_stylesheet_directory() ) . $templates_dir . $file;
-	$child_theme_style_sheet_2  = trailingslashit( get_stylesheet_directory() ) . $templates_dir . 'give' . $direction . '.css';
-	$parent_theme_style_sheet   = trailingslashit( get_template_directory() ) . $templates_dir . $file;
-	$parent_theme_style_sheet_2 = trailingslashit( get_template_directory() ) . $templates_dir . 'give' . $direction . '.css';
-	$give_plugin_style_sheet    = trailingslashit( give_get_templates_dir() ) . $file;
+	$child_theme_style_sheet    = trailingslashit(get_stylesheet_directory()).$templates_dir.$file;
+	$child_theme_style_sheet_2  = trailingslashit(get_stylesheet_directory()).$templates_dir.'give'.$direction.'.css';
+	$parent_theme_style_sheet   = trailingslashit(get_template_directory()).$templates_dir.$file;
+	$parent_theme_style_sheet_2 = trailingslashit(get_template_directory()).$templates_dir.'give'.$direction.'.css';
+	$give_plugin_style_sheet    = trailingslashit(give_get_templates_dir()).$file;
 
 	$uri = false;
 
 	// Look in the child theme directory first, followed by the parent theme, followed by the Give core templates directory
 	// Also look for the min version first, followed by non minified version, even if SCRIPT_DEBUG is not enabled.
 	// This allows users to copy just give.css to their theme
-	if ( file_exists( $child_theme_style_sheet ) || ( ! empty( $suffix ) && ( $nonmin = file_exists( $child_theme_style_sheet_2 ) ) ) ) {
-		if ( ! empty( $nonmin ) ) {
-			$uri = trailingslashit( get_stylesheet_directory_uri() ) . $templates_dir . 'give' . $direction . '.css';
+	if (file_exists($child_theme_style_sheet) || ( ! empty($suffix) && ($nonmin = file_exists($child_theme_style_sheet_2)))) {
+		if ( ! empty($nonmin)) {
+			$uri = trailingslashit(get_stylesheet_directory_uri()).$templates_dir.'give'.$direction.'.css';
 		} else {
-			$uri = trailingslashit( get_stylesheet_directory_uri() ) . $templates_dir . $file;
+			$uri = trailingslashit(get_stylesheet_directory_uri()).$templates_dir.$file;
 		}
-	} elseif ( file_exists( $parent_theme_style_sheet ) || ( ! empty( $suffix ) && ( $nonmin = file_exists( $parent_theme_style_sheet_2 ) ) ) ) {
-		if ( ! empty( $nonmin ) ) {
-			$uri = trailingslashit( get_template_directory_uri() ) . $templates_dir . 'give' . $direction . '.css';
+	} elseif (file_exists($parent_theme_style_sheet) || ( ! empty($suffix) && ($nonmin = file_exists($parent_theme_style_sheet_2)))) {
+		if ( ! empty($nonmin)) {
+			$uri = trailingslashit(get_template_directory_uri()).$templates_dir.'give'.$direction.'.css';
 		} else {
-			$uri = trailingslashit( get_template_directory_uri() ) . $templates_dir . $file;
+			$uri = trailingslashit(get_template_directory_uri()).$templates_dir.$file;
 		}
-	} elseif ( file_exists( $give_plugin_style_sheet ) || file_exists( $give_plugin_style_sheet ) ) {
-		$uri = trailingslashit( give_get_templates_url() ) . $file;
+	} elseif (file_exists($give_plugin_style_sheet) || file_exists($give_plugin_style_sheet)) {
+		$uri = trailingslashit(give_get_templates_url()).$file;
 	}
 
-	return apply_filters( 'give_get_stylesheet_uri', $uri );
+	return apply_filters('give_get_stylesheet_uri', $uri);
 
 }
 
@@ -209,70 +209,70 @@ 
  *
  * @return void
  */
-function give_load_admin_scripts( $hook ) {
+function give_load_admin_scripts($hook) {
 
 	global $post, $post_type;
 
 	$give_options = give_get_settings();
 
 	//Directories of assets
-	$js_dir     = GIVE_PLUGIN_URL . 'assets/js/admin/';
-	$js_plugins = GIVE_PLUGIN_URL . 'assets/js/plugins/';
-	$css_dir    = GIVE_PLUGIN_URL . 'assets/css/';
+	$js_dir     = GIVE_PLUGIN_URL.'assets/js/admin/';
+	$js_plugins = GIVE_PLUGIN_URL.'assets/js/plugins/';
+	$css_dir    = GIVE_PLUGIN_URL.'assets/css/';
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// LTR or RTL files
-	$direction = ( is_rtl() ) ? '-rtl' : '';
+	$direction = (is_rtl()) ? '-rtl' : '';
 
 	//Global Admin:
-	wp_register_style( 'give-admin-bar-notification', $css_dir . 'adminbar-style.css' );
-	wp_enqueue_style( 'give-admin-bar-notification' );
+	wp_register_style('give-admin-bar-notification', $css_dir.'adminbar-style.css');
+	wp_enqueue_style('give-admin-bar-notification');
 
 	//Give Admin Only:
-	if ( ! apply_filters( 'give_load_admin_scripts', give_is_admin_page(), $hook ) ) {
+	if ( ! apply_filters('give_load_admin_scripts', give_is_admin_page(), $hook)) {
 		return;
 	}
 
 	//CSS
-	wp_register_style( 'jquery-ui-css', $css_dir . 'jquery-ui-fresh' . $suffix . '.css' );
-	wp_enqueue_style( 'jquery-ui-css' );
-	wp_register_style( 'give-admin', $css_dir . 'give-admin' . $direction . $suffix . '.css', GIVE_VERSION );
-	wp_enqueue_style( 'give-admin' );
-	wp_register_style( 'jquery-chosen', $css_dir . 'chosen' . $suffix . '.css', array(), GIVE_VERSION );
-	wp_enqueue_style( 'jquery-chosen' );
-	wp_enqueue_style( 'thickbox' );
+	wp_register_style('jquery-ui-css', $css_dir.'jquery-ui-fresh'.$suffix.'.css');
+	wp_enqueue_style('jquery-ui-css');
+	wp_register_style('give-admin', $css_dir.'give-admin'.$direction.$suffix.'.css', GIVE_VERSION);
+	wp_enqueue_style('give-admin');
+	wp_register_style('jquery-chosen', $css_dir.'chosen'.$suffix.'.css', array(), GIVE_VERSION);
+	wp_enqueue_style('jquery-chosen');
+	wp_enqueue_style('thickbox');
 
 	//JS
-	wp_register_script( 'jquery-chosen', $js_plugins . 'chosen.jquery' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION );
-	wp_enqueue_script( 'jquery-chosen' );
+	wp_register_script('jquery-chosen', $js_plugins.'chosen.jquery'.$suffix.'.js', array('jquery'), GIVE_VERSION);
+	wp_enqueue_script('jquery-chosen');
 
-	wp_register_script( 'give-accounting', $js_plugins . 'accounting' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-accounting' );
+	wp_register_script('give-accounting', $js_plugins.'accounting'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-accounting');
 
-	wp_register_script( 'give-admin-scripts', $js_dir . 'admin-scripts' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-admin-scripts' );
+	wp_register_script('give-admin-scripts', $js_dir.'admin-scripts'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-admin-scripts');
 
-	wp_register_script( 'jquery-flot', $js_plugins . 'jquery.flot' . $suffix . '.js' );
-	wp_enqueue_script( 'jquery-flot' );
+	wp_register_script('jquery-flot', $js_plugins.'jquery.flot'.$suffix.'.js');
+	wp_enqueue_script('jquery-flot');
 
-	wp_register_script( 'give-qtip', $js_plugins . 'jquery.qtip' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-qtip' );
+	wp_register_script('give-qtip', $js_plugins.'jquery.qtip'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-qtip');
 
-	wp_enqueue_script( 'jquery-ui-datepicker' );
-	wp_enqueue_script( 'thickbox' );
+	wp_enqueue_script('jquery-ui-datepicker');
+	wp_enqueue_script('thickbox');
 
 	// Forms CPT Script.
-	if ( $post_type === 'give_forms' ) {
-		wp_register_script( 'give-admin-forms-scripts', $js_dir . 'admin-forms' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-		wp_enqueue_script( 'give-admin-forms-scripts' );
+	if ($post_type === 'give_forms') {
+		wp_register_script('give-admin-forms-scripts', $js_dir.'admin-forms'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+		wp_enqueue_script('give-admin-forms-scripts');
 	}
 
 	//Settings Scripts
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-settings' ) {
-		wp_register_script( 'give-admin-settings-scripts', $js_dir . 'admin-settings' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-		wp_enqueue_script( 'give-admin-settings-scripts' );
+	if (isset($_GET['page']) && $_GET['page'] == 'give-settings') {
+		wp_register_script('give-admin-settings-scripts', $js_dir.'admin-settings'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+		wp_enqueue_script('give-admin-settings-scripts');
 	}
 
 	// Price Separators.
@@ -280,46 +280,46 @@ 
 	$decimal_separator  = give_get_price_decimal_separator();
 
 	//Localize strings & variables for JS
-	wp_localize_script( 'give-admin-scripts', 'give_vars', array(
-		'post_id'                 => isset( $post->ID ) ? $post->ID : null,
+	wp_localize_script('give-admin-scripts', 'give_vars', array(
+		'post_id'                 => isset($post->ID) ? $post->ID : null,
 		'give_version'            => GIVE_VERSION,
 		'thousands_separator'     => $thousand_separator,
 		'decimal_separator'       => $decimal_separator,
-		'quick_edit_warning'      => esc_html__( 'Not available for variable priced forms.', 'give' ),
-		'delete_payment'          => esc_html__( 'Are you sure you wish to delete this payment?', 'give' ),
-		'delete_payment_note'     => esc_html__( 'Are you sure you wish to delete this note?', 'give' ),
-		'revoke_api_key'          => esc_html__( 'Are you sure you wish to revoke this API key?', 'give' ),
-		'regenerate_api_key'      => esc_html__( 'Are you sure you wish to regenerate this API key?', 'give' ),
-		'resend_receipt'          => esc_html__( 'Are you sure you wish to resend the donation receipt?', 'give' ),
-		'copy_download_link_text' => esc_html__( 'Copy these links to your clipboard and give them to your donor.', 'give' ),
-		'delete_payment_download' => esc_html__( 'Are you sure you wish to delete this form?', 'give' ),
-		'one_price_min'           => esc_html__( 'You must have at least one price.', 'give' ),
-		'one_file_min'            => esc_html__( 'You must have at least one file.', 'give' ),
-		'one_field_min'           => esc_html__( 'You must have at least one field.', 'give' ),
-		'one_option'              => esc_html__( 'Choose a form', 'give' ),
-		'one_or_more_option'      => esc_html__( 'Choose one or more forms', 'give' ),
-		'numeric_item_price'      => esc_html__( 'Item price must be numeric.', 'give' ),
-		'numeric_quantity'        => esc_html__( 'Quantity must be numeric.', 'give' ),
-		'currency_sign'           => give_currency_filter( '' ),
-		'currency_pos'            => isset( $give_options['currency_position'] ) ? $give_options['currency_position'] : 'before',
-		'currency_decimals'       => give_currency_decimal_filter( give_get_price_decimals() ),
-		'new_media_ui'            => apply_filters( 'give_use_35_media_ui', 1 ),
-		'remove_text'             => esc_html__( 'Remove', 'give' ),
-		'type_to_search'          => esc_html__( 'Type to search forms', 'give' ),
-		'batch_export_no_class'   => esc_html__( 'You must choose a method.', 'give' ),
-		'batch_export_no_reqs'    => esc_html__( 'Required fields not completed.', 'give' ),
-		'reset_stats_warn'        => __( 'Are you sure you want to reset Give? This process is <strong><em>not reversible</em></strong> and will delete all data regardless of test or live mode. Please be sure you have a recent backup before proceeding.', 'give' ),
-		'price_format_guide'      => sprintf( esc_html__( 'Please enter amount in monetary decimal ( %1$s ) format without thousand separator ( %2$s ) .', 'give' ), $decimal_separator, $thousand_separator )
-	) );
-
-	if ( function_exists( 'wp_enqueue_media' ) && version_compare( get_bloginfo( 'version' ), '3.5', '>=' ) ) {
+		'quick_edit_warning'      => esc_html__('Not available for variable priced forms.', 'give'),
+		'delete_payment'          => esc_html__('Are you sure you wish to delete this payment?', 'give'),
+		'delete_payment_note'     => esc_html__('Are you sure you wish to delete this note?', 'give'),
+		'revoke_api_key'          => esc_html__('Are you sure you wish to revoke this API key?', 'give'),
+		'regenerate_api_key'      => esc_html__('Are you sure you wish to regenerate this API key?', 'give'),
+		'resend_receipt'          => esc_html__('Are you sure you wish to resend the donation receipt?', 'give'),
+		'copy_download_link_text' => esc_html__('Copy these links to your clipboard and give them to your donor.', 'give'),
+		'delete_payment_download' => esc_html__('Are you sure you wish to delete this form?', 'give'),
+		'one_price_min'           => esc_html__('You must have at least one price.', 'give'),
+		'one_file_min'            => esc_html__('You must have at least one file.', 'give'),
+		'one_field_min'           => esc_html__('You must have at least one field.', 'give'),
+		'one_option'              => esc_html__('Choose a form', 'give'),
+		'one_or_more_option'      => esc_html__('Choose one or more forms', 'give'),
+		'numeric_item_price'      => esc_html__('Item price must be numeric.', 'give'),
+		'numeric_quantity'        => esc_html__('Quantity must be numeric.', 'give'),
+		'currency_sign'           => give_currency_filter(''),
+		'currency_pos'            => isset($give_options['currency_position']) ? $give_options['currency_position'] : 'before',
+		'currency_decimals'       => give_currency_decimal_filter(give_get_price_decimals()),
+		'new_media_ui'            => apply_filters('give_use_35_media_ui', 1),
+		'remove_text'             => esc_html__('Remove', 'give'),
+		'type_to_search'          => esc_html__('Type to search forms', 'give'),
+		'batch_export_no_class'   => esc_html__('You must choose a method.', 'give'),
+		'batch_export_no_reqs'    => esc_html__('Required fields not completed.', 'give'),
+		'reset_stats_warn'        => __('Are you sure you want to reset Give? This process is <strong><em>not reversible</em></strong> and will delete all data regardless of test or live mode. Please be sure you have a recent backup before proceeding.', 'give'),
+		'price_format_guide'      => sprintf(esc_html__('Please enter amount in monetary decimal ( %1$s ) format without thousand separator ( %2$s ) .', 'give'), $decimal_separator, $thousand_separator)
+	));
+
+	if (function_exists('wp_enqueue_media') && version_compare(get_bloginfo('version'), '3.5', '>=')) {
 		//call for new media manager
 		wp_enqueue_media();
 	}
 
 }
 
-add_action( 'admin_enqueue_scripts', 'give_load_admin_scripts', 100 );
+add_action('admin_enqueue_scripts', 'give_load_admin_scripts', 100);
 
 /**
  * Admin Give Icon
@@ -334,14 +334,14 @@ 
 	?>
 	<style type="text/css" media="screen">
 
-		<?php if( version_compare( get_bloginfo( 'version' ), '3.8-RC', '>=' ) || version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) ) { ?>
+		<?php if (version_compare(get_bloginfo('version'), '3.8-RC', '>=') || version_compare(get_bloginfo('version'), '3.8', '>=')) { ?>
 		@font-face {
 			font-family: 'give-icomoon';
-			src: url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.eot?-ngjl88'; ?>');
-			src: url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.eot?#iefix-ngjl88'?>') format('embedded-opentype'),
-			url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.woff?-ngjl88'; ?>') format('woff'),
-			url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.ttf?-ngjl88'; ?>') format('truetype'),
-			url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.svg?-ngjl88#icomoon'; ?>') format('svg');
+			src: url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.eot?-ngjl88'; ?>');
+			src: url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.eot?#iefix-ngjl88'?>') format('embedded-opentype'),
+			url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.woff?-ngjl88'; ?>') format('woff'),
+			url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.ttf?-ngjl88'; ?>') format('truetype'),
+			url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.svg?-ngjl88#icomoon'; ?>') format('svg');
 			font-weight: normal;
 			font-style: normal;
 		}
@@ -360,7 +360,7 @@ 
 	<?php
 }
 
-add_action( 'admin_head', 'give_admin_icon' );
+add_action('admin_head', 'give_admin_icon');
 
 /**
  * Admin js code
@@ -390,4 +390,4 @@ 
 	<?php
 }
 
-add_action( 'admin_head', 'give_admin_hide_notice_shortly_js' );
+add_action('admin_head', 'give_admin_hide_notice_shortly_js');

includes/gateways/paypal-standard.php

Spacing +183 added lines, -183 removed lines

@@ -9,7 +9,7 @@ 
  * @since       1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,7 +21,7 @@ 
  * @access private
  * @since  1.0
  */
-add_action( 'give_paypal_cc_form', '__return_false' );
+add_action('give_paypal_cc_form', '__return_false');
 
 /**
  * Process PayPal Purchase.
@@ -32,14 +32,14 @@ 
  *
  * @return void
  */
-function give_process_paypal_purchase( $purchase_data ) {
+function give_process_paypal_purchase($purchase_data) {
 
-	if ( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'give-gateway' ) ) {
-		wp_die( esc_html__( 'Nonce verification has failed.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($purchase_data['gateway_nonce'], 'give-gateway')) {
+		wp_die(esc_html__('Nonce verification has failed.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	$form_id  = intval( $purchase_data['post_data']['give-form-id'] );
-	$price_id = isset( $purchase_data['post_data']['give-price-id'] ) ? $purchase_data['post_data']['give-price-id'] : '';
+	$form_id  = intval($purchase_data['post_data']['give-form-id']);
+	$price_id = isset($purchase_data['post_data']['give-price-id']) ? $purchase_data['post_data']['give-price-id'] : '';
 
 	// Collect payment data.
 	$payment_data = array(
@@ -57,69 +57,69 @@ 
 	);
 
 	// Record the pending payment.
-	$payment = give_insert_payment( $payment_data );
+	$payment = give_insert_payment($payment_data);
 
 	// Check payment.
-	if ( ! $payment ) {
+	if ( ! $payment) {
 		// Record the error.
 		give_record_gateway_error(
-			esc_html__( 'Payment Error', 'give' ),
+			esc_html__('Payment Error', 'give'),
 			sprintf(
 			/* translators: %s: payment data */
-				esc_html__( 'Payment creation failed before sending buyer to PayPal. Payment data: %s', 'give' ),
-				json_encode( $payment_data )
+				esc_html__('Payment creation failed before sending buyer to PayPal. Payment data: %s', 'give'),
+				json_encode($payment_data)
 			),
 			$payment
 		);
 		// Problems? Send back.
-		give_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['give-gateway'] );
+		give_send_back_to_checkout('?payment-mode='.$purchase_data['post_data']['give-gateway']);
 
 	} else {
 
 		// Only send to PayPal if the pending payment is created successfully.
-		$listener_url = add_query_arg( 'give-listener', 'IPN', home_url( 'index.php' ) );
+		$listener_url = add_query_arg('give-listener', 'IPN', home_url('index.php'));
 
 		// Get the success url
-		$return_url = add_query_arg( array(
+		$return_url = add_query_arg(array(
 			'payment-confirmation' => 'paypal',
 			'payment-id'           => $payment
 
-		), get_permalink( give_get_option( 'success_page' ) ) );
+		), get_permalink(give_get_option('success_page')));
 
 		// Get the PayPal redirect uri
-		$paypal_redirect = trailingslashit( give_get_paypal_redirect() ) . '?';
+		$paypal_redirect = trailingslashit(give_get_paypal_redirect()).'?';
 
 		//Item name - pass level name if variable priced
 		$item_name = $purchase_data['post_data']['give-form-title'];
 
 		//Verify has variable prices
-		if ( give_has_variable_prices( $form_id ) && isset( $purchase_data['post_data']['give-price-id'] ) ) {
+		if (give_has_variable_prices($form_id) && isset($purchase_data['post_data']['give-price-id'])) {
 
-			$item_price_level_text = give_get_price_option_name( $form_id, $purchase_data['post_data']['give-price-id'] );
+			$item_price_level_text = give_get_price_option_name($form_id, $purchase_data['post_data']['give-price-id']);
 
-			$price_level_amount = give_get_price_option_amount( $form_id, $purchase_data['post_data']['give-price-id'] );
+			$price_level_amount = give_get_price_option_amount($form_id, $purchase_data['post_data']['give-price-id']);
 
 			//Donation given doesn't match selected level (must be a custom amount)
-			if ( $price_level_amount != give_sanitize_amount( $purchase_data['price'] ) ) {
-				$custom_amount_text = get_post_meta( $form_id, '_give_custom_amount_text', true );
+			if ($price_level_amount != give_sanitize_amount($purchase_data['price'])) {
+				$custom_amount_text = get_post_meta($form_id, '_give_custom_amount_text', true);
 				//user custom amount text if any, fallback to default if not
-				$item_name .= ' - ' . ( ! empty( $custom_amount_text ) ? $custom_amount_text : esc_html__( 'Custom Amount', 'give' ) );
+				$item_name .= ' - '.( ! empty($custom_amount_text) ? $custom_amount_text : esc_html__('Custom Amount', 'give'));
 
 			} //Is there any donation level text?
-			elseif ( ! empty( $item_price_level_text ) ) {
-				$item_name .= ' - ' . $item_price_level_text;
+			elseif ( ! empty($item_price_level_text)) {
+				$item_name .= ' - '.$item_price_level_text;
 			}
 
 		} //Single donation: Custom Amount
-		elseif ( give_get_form_price( $form_id ) !== give_sanitize_amount( $purchase_data['price'] ) ) {
-			$custom_amount_text = get_post_meta( $form_id, '_give_custom_amount_text', true );
+		elseif (give_get_form_price($form_id) !== give_sanitize_amount($purchase_data['price'])) {
+			$custom_amount_text = get_post_meta($form_id, '_give_custom_amount_text', true);
 			//user custom amount text if any, fallback to default if not
-			$item_name .= ' - ' . ( ! empty( $custom_amount_text ) ? $custom_amount_text : esc_html__( 'Custom Amount', 'give' ) );
+			$item_name .= ' - '.( ! empty($custom_amount_text) ? $custom_amount_text : esc_html__('Custom Amount', 'give'));
 		}
 
 		// Setup PayPal arguments
 		$paypal_args = array(
-			'business'      => give_get_option( 'paypal_email', false ),
+			'business'      => give_get_option('paypal_email', false),
 			'first_name'    => $purchase_data['user_info']['first_name'],
 			'last_name'     => $purchase_data['user_info']['last_name'],
 			'email'         => $purchase_data['user_email'],
@@ -132,28 +132,28 @@ 
 			'shipping'      => '0',
 			'no_note'       => '1',
 			'currency_code' => give_get_currency(),
-			'charset'       => get_bloginfo( 'charset' ),
+			'charset'       => get_bloginfo('charset'),
 			'custom'        => $payment,
 			'rm'            => '2',
 			'return'        => $return_url,
-			'cancel_return' => give_get_failed_transaction_uri( '?payment-id=' . $payment ),
+			'cancel_return' => give_get_failed_transaction_uri('?payment-id='.$payment),
 			'notify_url'    => $listener_url,
 			'page_style'    => give_get_paypal_page_style(),
-			'cbt'           => get_bloginfo( 'name' ),
+			'cbt'           => get_bloginfo('name'),
 			'bn'            => 'givewp_SP'
 		);
 
 		//Add user address if present.
-		if ( ! empty( $purchase_data['user_info']['address'] ) ) {
-			$paypal_args['address1'] = isset( $purchase_data['user_info']['address']['line1'] ) ? $purchase_data['user_info']['address']['line1'] : '';
-			$paypal_args['address2'] = isset( $purchase_data['user_info']['address']['line2'] ) ? $purchase_data['user_info']['address']['line2'] : '';
-			$paypal_args['city']     = isset( $purchase_data['user_info']['address']['city'] ) ? $purchase_data['user_info']['address']['city'] : '';
-			$paypal_args['state']    = isset( $purchase_data['user_info']['address']['state'] ) ? $purchase_data['user_info']['address']['state'] : '';
-			$paypal_args['country']  = isset( $purchase_data['user_info']['address']['country'] ) ? $purchase_data['user_info']['address']['country'] : '';
+		if ( ! empty($purchase_data['user_info']['address'])) {
+			$paypal_args['address1'] = isset($purchase_data['user_info']['address']['line1']) ? $purchase_data['user_info']['address']['line1'] : '';
+			$paypal_args['address2'] = isset($purchase_data['user_info']['address']['line2']) ? $purchase_data['user_info']['address']['line2'] : '';
+			$paypal_args['city']     = isset($purchase_data['user_info']['address']['city']) ? $purchase_data['user_info']['address']['city'] : '';
+			$paypal_args['state']    = isset($purchase_data['user_info']['address']['state']) ? $purchase_data['user_info']['address']['state'] : '';
+			$paypal_args['country']  = isset($purchase_data['user_info']['address']['country']) ? $purchase_data['user_info']['address']['country'] : '';
 		}
 
 		//Donations or regular transactions?
-		if ( give_get_option( 'paypal_button_type' ) === 'standard' ) {
+		if (give_get_option('paypal_button_type') === 'standard') {
 			$paypal_extra_args = array(
 				'cmd' => '_xclick',
 			);
@@ -163,23 +163,23 @@ 
 			);
 		}
 
-		$paypal_args = array_merge( $paypal_extra_args, $paypal_args );
-		$paypal_args = apply_filters( 'give_paypal_redirect_args', $paypal_args, $purchase_data );
+		$paypal_args = array_merge($paypal_extra_args, $paypal_args);
+		$paypal_args = apply_filters('give_paypal_redirect_args', $paypal_args, $purchase_data);
 
 		// Build query
-		$paypal_redirect .= http_build_query( $paypal_args );
+		$paypal_redirect .= http_build_query($paypal_args);
 
 		// Fix for some sites that encode the entities
-		$paypal_redirect = str_replace( '&', '&', $paypal_redirect );
+		$paypal_redirect = str_replace('&', '&', $paypal_redirect);
 
 		// Redirect to PayPal
-		wp_redirect( $paypal_redirect );
+		wp_redirect($paypal_redirect);
 		exit;
 	}
 
 }
 
-add_action( 'give_gateway_paypal', 'give_process_paypal_purchase' );
+add_action('give_gateway_paypal', 'give_process_paypal_purchase');
 
 /**
  * Listens for a PayPal IPN requests and then sends to the processing function
@@ -189,17 +189,17 @@ 
  */
 function give_listen_for_paypal_ipn() {
 	// Regular PayPal IPN
-	if ( isset( $_GET['give-listener'] ) && $_GET['give-listener'] == 'IPN' ) {
+	if (isset($_GET['give-listener']) && $_GET['give-listener'] == 'IPN') {
 		/**
 		 * Fires while verifying PayPal IPN
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_verify_paypal_ipn' );
+		do_action('give_verify_paypal_ipn');
 	}
 }
 
-add_action( 'init', 'give_listen_for_paypal_ipn' );
+add_action('init', 'give_listen_for_paypal_ipn');
 
 /**
  * Process PayPal IPN
@@ -210,7 +210,7 @@ 
 function give_process_paypal_ipn() {
 
 	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+	if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'POST') {
 		return;
 	}
 
@@ -218,11 +218,11 @@ 
 	$post_data = '';
 
 	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
+	if (ini_get('allow_url_fopen')) {
+		$post_data = file_get_contents('php://input');
 	} else {
 		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
+		ini_set('post_max_size', '12M');
 	}
 	// Start the encoded data collection with notification command
 	$encoded_data = 'cmd=_notify-validate';
@@ -231,40 +231,40 @@ 
 	$arg_separator = give_get_php_arg_separator_output();
 
 	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
+	if ($post_data || strlen($post_data) > 0) {
 		// Append the data
-		$encoded_data .= $arg_separator . $post_data;
+		$encoded_data .= $arg_separator.$post_data;
 	} else {
 		// Check if POST is empty
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			// Nothing to do
 			return;
 		} else {
 			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
+			foreach ($_POST as $key => $value) {
 				// Encode the value and append the data
-				$encoded_data .= $arg_separator . "$key=" . urlencode( $value );
+				$encoded_data .= $arg_separator."$key=".urlencode($value);
 			}
 		}
 	}
 
 	// Convert collected post data to an array
-	parse_str( $encoded_data, $encoded_data_array );
+	parse_str($encoded_data, $encoded_data_array);
 
-	foreach ( $encoded_data_array as $key => $value ) {
+	foreach ($encoded_data_array as $key => $value) {
 
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&', $new_key );
+		if (false !== strpos($key, 'amp;')) {
+			$new_key = str_replace('&', '&', $key);
+			$new_key = str_replace('amp;', '&', $new_key);
 
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
+			unset($encoded_data_array[$key]);
+			$encoded_data_array[$new_key] = $value;
 		}
 
 	}
 
 	//Validate IPN request w/ PayPal if user hasn't disabled this security measure
-	if ( ! give_get_option( 'disable_paypal_verification' ) ) {
+	if ( ! give_get_option('disable_paypal_verification')) {
 
 		$remote_post_vars = array(
 			'method'      => 'POST',
@@ -284,28 +284,28 @@ 
 		);
 
 		// Validate the IPN
-		$api_response = wp_remote_post( give_get_paypal_redirect(), $remote_post_vars );
+		$api_response = wp_remote_post(give_get_paypal_redirect(), $remote_post_vars);
 
-		if ( is_wp_error( $api_response ) ) {
+		if (is_wp_error($api_response)) {
 			give_record_gateway_error(
-				esc_html__( 'IPN Error', 'give' ),
+				esc_html__('IPN Error', 'give'),
 				sprintf(
 				/* translators: %s: Paypal IPN response */
-					esc_html__( 'Invalid IPN verification response. IPN data: %s', 'give' ),
-					json_encode( $api_response )
+					esc_html__('Invalid IPN verification response. IPN data: %s', 'give'),
+					json_encode($api_response)
 				)
 			);
 
 			return; // Something went wrong
 		}
 
-		if ( $api_response['body'] !== 'VERIFIED' && give_get_option( 'disable_paypal_verification', false ) ) {
+		if ($api_response['body'] !== 'VERIFIED' && give_get_option('disable_paypal_verification', false)) {
 			give_record_gateway_error(
-				esc_html__( 'IPN Error', 'give' ),
+				esc_html__('IPN Error', 'give'),
 				sprintf(
 				/* translators: %s: Paypal IPN response */
-					esc_html__( 'Invalid IPN verification response. IPN data: %s', 'give' ),
-					json_encode( $api_response )
+					esc_html__('Invalid IPN verification response. IPN data: %s', 'give'),
+					json_encode($api_response)
 				)
 			);
 
@@ -315,7 +315,7 @@ 
 	}
 
 	// Check if $post_data_array has been populated
-	if ( ! is_array( $encoded_data_array ) && ! empty( $encoded_data_array ) ) {
+	if ( ! is_array($encoded_data_array) && ! empty($encoded_data_array)) {
 		return;
 	}
 
@@ -324,12 +324,12 @@ 
 		'payment_status' => ''
 	);
 
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+	$encoded_data_array = wp_parse_args($encoded_data_array, $defaults);
 
-	$payment_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+	$payment_id = isset($encoded_data_array['custom']) ? absint($encoded_data_array['custom']) : 0;
 	$txn_type = $encoded_data_array['txn_type'];
 
-	if ( has_action( 'give_paypal_' . $txn_type ) ) {
+	if (has_action('give_paypal_'.$txn_type)) {
 		/**
 		 * Fires while processing PayPal IPN $txn_type.
 		 *
@@ -340,7 +340,7 @@ 
 		 * @param array $encoded_data_array Encoded data.
 		 * @param int   $payment_id         Payment id.
 		 */
-		do_action( "give_paypal_{$txn_type}", $encoded_data_array, $payment_id );
+		do_action("give_paypal_{$txn_type}", $encoded_data_array, $payment_id);
 	} else {
 		/**
 		 * Fires while process PayPal IPN.
@@ -352,12 +352,12 @@ 
 		 * @param array $encoded_data_array Encoded data.
 		 * @param int   $payment_id         Payment id.
 		 */
-		do_action( 'give_paypal_web_accept', $encoded_data_array, $payment_id );
+		do_action('give_paypal_web_accept', $encoded_data_array, $payment_id);
 	}
 	exit;
 }
 
-add_action( 'give_verify_paypal_ipn', 'give_process_paypal_ipn' );
+add_action('give_verify_paypal_ipn', 'give_process_paypal_ipn');
 
 /**
  * Process web accept (one time) payment IPNs.
@@ -368,224 +368,224 @@ 
  *
  * @return void
  */
-function give_process_paypal_web_accept_and_cart( $data, $payment_id ) {
+function give_process_paypal_web_accept_and_cart($data, $payment_id) {
 
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+	if ($data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded') {
 		return;
 	}
 
-	if ( empty( $payment_id ) ) {
+	if (empty($payment_id)) {
 		return;
 	}
 
 	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+	$purchase_key   = isset($data['invoice']) ? $data['invoice'] : $data['item_number'];
 	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = give_get_payment_meta( $payment_id );
+	$payment_status = strtolower($data['payment_status']);
+	$currency_code  = strtolower($data['mc_currency']);
+	$business_email = isset($data['business']) && is_email($data['business']) ? trim($data['business']) : trim($data['receiver_email']);
+	$payment_meta   = give_get_payment_meta($payment_id);
 
 
-	if ( give_get_payment_gateway( $payment_id ) != 'paypal' ) {
+	if (give_get_payment_gateway($payment_id) != 'paypal') {
 		return; // this isn't a PayPal standard IPN
 	}
 
 	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( give_get_option( 'paypal_email' ) ) ) != 0 ) {
+	if (strcasecmp($business_email, trim(give_get_option('paypal_email'))) != 0) {
 
 		give_record_gateway_error(
-			esc_html__( 'IPN Error', 'give' ),
+			esc_html__('IPN Error', 'give'),
 			sprintf(
 			/* translators: %s: Paypal IPN response */
-				esc_html__( 'Invalid business email in IPN response. IPN data: %s', 'give' ),
-				json_encode( $data )
+				esc_html__('Invalid business email in IPN response. IPN data: %s', 'give'),
+				json_encode($data)
 			),
 			$payment_id
 		);
-		give_update_payment_status( $payment_id, 'failed' );
-		give_insert_payment_note( $payment_id, esc_html__( 'Payment failed due to invalid PayPal business email.', 'give' ) );
+		give_update_payment_status($payment_id, 'failed');
+		give_insert_payment_note($payment_id, esc_html__('Payment failed due to invalid PayPal business email.', 'give'));
 
 		return;
 	}
 
 	// Verify payment currency.
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
+	if ($currency_code != strtolower($payment_meta['currency'])) {
 
 		give_record_gateway_error(
-			esc_html__( 'IPN Error', 'give' ),
+			esc_html__('IPN Error', 'give'),
 			sprintf(
 			/* translators: %s: Paypal IPN response */
-				esc_html__( 'Invalid currency in IPN response. IPN data: %s', 'give' ),
-				json_encode( $data )
+				esc_html__('Invalid currency in IPN response. IPN data: %s', 'give'),
+				json_encode($data)
 			),
 			$payment_id
 		);
-		give_update_payment_status( $payment_id, 'failed' );
-		give_insert_payment_note( $payment_id, esc_html__( 'Payment failed due to invalid currency in PayPal IPN.', 'give' ) );
+		give_update_payment_status($payment_id, 'failed');
+		give_insert_payment_note($payment_id, esc_html__('Payment failed due to invalid currency in PayPal IPN.', 'give'));
 
 		return;
 	}
 
-	if ( ! give_get_payment_user_email( $payment_id ) ) {
+	if ( ! give_get_payment_user_email($payment_id)) {
 
 		// No email associated with the donation, so store from PayPal
-		give_update_payment_meta( $payment_id, '_give_payment_user_email', $data['payer_email'] );
+		give_update_payment_meta($payment_id, '_give_payment_user_email', $data['payer_email']);
 
 		// Setup and store the donors's details.
 		$address            = array();
-		$address['line1']   = ! empty( $data['address_street'] ) ? sanitize_text_field( $data['address_street'] ) : false;
-		$address['city']    = ! empty( $data['address_city'] ) ? sanitize_text_field( $data['address_city'] ) : false;
-		$address['state']   = ! empty( $data['address_state'] ) ? sanitize_text_field( $data['address_state'] ) : false;
-		$address['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$address['zip']     = ! empty( $data['address_zip'] ) ? sanitize_text_field( $data['address_zip'] ) : false;
+		$address['line1']   = ! empty($data['address_street']) ? sanitize_text_field($data['address_street']) : false;
+		$address['city']    = ! empty($data['address_city']) ? sanitize_text_field($data['address_city']) : false;
+		$address['state']   = ! empty($data['address_state']) ? sanitize_text_field($data['address_state']) : false;
+		$address['country'] = ! empty($data['address_country_code']) ? sanitize_text_field($data['address_country_code']) : false;
+		$address['zip']     = ! empty($data['address_zip']) ? sanitize_text_field($data['address_zip']) : false;
 
 		$user_info = array(
 			'id'         => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
+			'email'      => sanitize_text_field($data['payer_email']),
+			'first_name' => sanitize_text_field($data['first_name']),
+			'last_name'  => sanitize_text_field($data['last_name']),
 			'discount'   => '',
 			'address'    => $address
 		);
 
 		$payment_meta['user_info'] = $user_info;
-		give_update_payment_meta( $payment_id, '_give_payment_meta', $payment_meta );
+		give_update_payment_meta($payment_id, '_give_payment_meta', $payment_meta);
 	}
 
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+	if ($payment_status == 'refunded' || $payment_status == 'reversed') {
 
 		// Process a refund
-		give_process_paypal_refund( $data, $payment_id );
+		give_process_paypal_refund($data, $payment_id);
 
 	} else {
 
-		if ( get_post_status( $payment_id ) == 'publish' ) {
+		if (get_post_status($payment_id) == 'publish') {
 			return; // Only complete payments once
 		}
 
 		// Retrieve the total donation amount (before PayPal)
-		$payment_amount = give_get_payment_amount( $payment_id );
+		$payment_amount = give_get_payment_amount($payment_id);
 
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+		if (number_format((float) $paypal_amount, 2) < number_format((float) $payment_amount, 2)) {
 			// The prices don't match
 			give_record_gateway_error(
-				esc_html__( 'IPN Error', 'give' ),
+				esc_html__('IPN Error', 'give'),
 				sprintf(
 				/* translators: %s: Paypal IPN response */
-					esc_html__( 'Invalid payment amount in IPN response. IPN data: %s', 'give' ),
-					json_encode( $data )
+					esc_html__('Invalid payment amount in IPN response. IPN data: %s', 'give'),
+					json_encode($data)
 				),
 				$payment_id
 			);
-			give_update_payment_status( $payment_id, 'failed' );
-			give_insert_payment_note( $payment_id, esc_html__( 'Payment failed due to invalid amount in PayPal IPN.', 'give' ) );
+			give_update_payment_status($payment_id, 'failed');
+			give_insert_payment_note($payment_id, esc_html__('Payment failed due to invalid amount in PayPal IPN.', 'give'));
 
 			return;
 		}
-		if ( $purchase_key != give_get_payment_key( $payment_id ) ) {
+		if ($purchase_key != give_get_payment_key($payment_id)) {
 			// Keys don't match
 			give_record_gateway_error(
-				esc_html__( 'IPN Error', 'give' ),
+				esc_html__('IPN Error', 'give'),
 				sprintf(
 					/* translators: %s: Paypal IPN response */
-					esc_html__( 'Invalid key in IPN response. IPN data: %s', 'give' ),
-					json_encode( $data )
+					esc_html__('Invalid key in IPN response. IPN data: %s', 'give'),
+					json_encode($data)
 				),
 				$payment_id
 			);
-			give_update_payment_status( $payment_id, 'failed' );
-			give_insert_payment_note( $payment_id, esc_html__( 'Payment failed due to invalid key in PayPal IPN.', 'give' ) );
+			give_update_payment_status($payment_id, 'failed');
+			give_insert_payment_note($payment_id, esc_html__('Payment failed due to invalid key in PayPal IPN.', 'give'));
 
 			return;
 		}
 
-		if ( $payment_status == 'completed' || give_is_test_mode() ) {
+		if ($payment_status == 'completed' || give_is_test_mode()) {
 			give_insert_payment_note(
 				$payment_id,
 				sprintf(
 				/* translators: %s: Paypal transaction ID */
-					esc_html__( 'PayPal Transaction ID: %s', 'give' ),
+					esc_html__('PayPal Transaction ID: %s', 'give'),
 					$data['txn_id']
 				)
 			);
-			give_set_payment_transaction_id( $payment_id, $data['txn_id'] );
-			give_update_payment_status( $payment_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+			give_set_payment_transaction_id($payment_id, $data['txn_id']);
+			give_update_payment_status($payment_id, 'publish');
+		} else if ('pending' == $payment_status && isset($data['pending_reason'])) {
 
 			// Look for possible pending reasons, such as an echeck
 
 			$note = '';
 
-			switch ( strtolower( $data['pending_reason'] ) ) {
+			switch (strtolower($data['pending_reason'])) {
 
 				case 'echeck' :
 
-					$note = esc_html__( 'Payment made via eCheck and will clear automatically in 5-8 days.', 'give' );
+					$note = esc_html__('Payment made via eCheck and will clear automatically in 5-8 days.', 'give');
 
 					break;
 
 				case 'address' :
 
-					$note = esc_html__( 'Payment requires a confirmed donor address and must be accepted manually through PayPal.', 'give' );
+					$note = esc_html__('Payment requires a confirmed donor address and must be accepted manually through PayPal.', 'give');
 
 					break;
 
 				case 'intl' :
 
-					$note = esc_html__( 'Payment must be accepted manually through PayPal due to international account regulations.', 'give' );
+					$note = esc_html__('Payment must be accepted manually through PayPal due to international account regulations.', 'give');
 
 					break;
 
 				case 'multi-currency' :
 
-					$note = esc_html__( 'Payment received in non-shop currency and must be accepted manually through PayPal.', 'give' );
+					$note = esc_html__('Payment received in non-shop currency and must be accepted manually through PayPal.', 'give');
 
 					break;
 
 				case 'paymentreview' :
 				case 'regulatory_review' :
 
-					$note = esc_html__( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations.', 'give' );
+					$note = esc_html__('Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations.', 'give');
 
 					break;
 
 				case 'unilateral' :
 
-					$note = esc_html__( 'Payment was sent to non-confirmed or non-registered email address.', 'give' );
+					$note = esc_html__('Payment was sent to non-confirmed or non-registered email address.', 'give');
 
 					break;
 
 				case 'upgrade' :
 
-					$note = esc_html__( 'PayPal account must be upgraded before this payment can be accepted.', 'give' );
+					$note = esc_html__('PayPal account must be upgraded before this payment can be accepted.', 'give');
 
 					break;
 
 				case 'verify' :
 
-					$note = esc_html__( 'PayPal account is not verified. Verify account in order to accept this payment.', 'give' );
+					$note = esc_html__('PayPal account is not verified. Verify account in order to accept this payment.', 'give');
 
 					break;
 
 				case 'other' :
 
-					$note = esc_html__( 'Payment is pending for unknown reasons. Contact PayPal support for assistance.', 'give' );
+					$note = esc_html__('Payment is pending for unknown reasons. Contact PayPal support for assistance.', 'give');
 
 					break;
 
 			}
 
-			if ( ! empty( $note ) ) {
+			if ( ! empty($note)) {
 
-				give_insert_payment_note( $payment_id, $note );
+				give_insert_payment_note($payment_id, $note);
 
 			}
 		}
 	}
 }
 
-add_action( 'give_paypal_web_accept', 'give_process_paypal_web_accept_and_cart', 10, 2 );
+add_action('give_paypal_web_accept', 'give_process_paypal_web_accept_and_cart', 10, 2);
 
 /**
  * Process PayPal IPN Refunds
@@ -596,28 +596,28 @@ 
  *
  * @return void
  */
-function give_process_paypal_refund( $data, $payment_id = 0 ) {
+function give_process_paypal_refund($data, $payment_id = 0) {
 
 	// Collect payment details
 
-	if ( empty( $payment_id ) ) {
+	if (empty($payment_id)) {
 		return;
 	}
 
-	if ( get_post_status( $payment_id ) == 'refunded' ) {
+	if (get_post_status($payment_id) == 'refunded') {
 		return; // Only refund payments once
 	}
 
-	$payment_amount = give_get_payment_amount( $payment_id );
+	$payment_amount = give_get_payment_amount($payment_id);
 	$refund_amount  = $data['payment_gross'] * - 1;
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+	if (number_format((float) $refund_amount, 2) < number_format((float) $payment_amount, 2)) {
 
 		give_insert_payment_note(
 			$payment_id,
 			sprintf(
 			/* translators: %s: Paypal parent transaction ID */
-				esc_html__( 'Partial PayPal refund processed: %s', 'give' ),
+				esc_html__('Partial PayPal refund processed: %s', 'give'),
 				$data['parent_txn_id']
 			)
 		);
@@ -630,7 +630,7 @@ 
 		$payment_id,
 		sprintf(
 			/* translators: 1: Paypal parent transaction ID 2. Paypal reason code */
-			esc_html__( 'PayPal Payment #%1$s Refunded for reason: %2$s', 'give' ),
+			esc_html__('PayPal Payment #%1$s Refunded for reason: %2$s', 'give'),
 			$data['parent_txn_id'],
 			$data['reason_code']
 		)
@@ -639,11 +639,11 @@ 
 		$payment_id,
 		sprintf(
 		/* translators: %s: Paypal transaction ID */
-			esc_html__( 'PayPal Refund Transaction ID: %s', 'give' ),
+			esc_html__('PayPal Refund Transaction ID: %s', 'give'),
 			$data['txn_id']
 		)
 	);
-	give_update_payment_status( $payment_id, 'refunded' );
+	give_update_payment_status($payment_id, 'refunded');
 }
 
 /**
@@ -655,24 +655,24 @@ 
  *
  * @return string
  */
-function give_get_paypal_redirect( $ssl_check = false ) {
+function give_get_paypal_redirect($ssl_check = false) {
 
-	if ( is_ssl() || ! $ssl_check ) {
+	if (is_ssl() || ! $ssl_check) {
 		$protocal = 'https://';
 	} else {
 		$protocal = 'http://';
 	}
 
 	// Check the current payment mode
-	if ( give_is_test_mode() ) {
+	if (give_is_test_mode()) {
 		// Test mode
-		$paypal_uri = $protocal . 'www.sandbox.paypal.com/cgi-bin/webscr';
+		$paypal_uri = $protocal.'www.sandbox.paypal.com/cgi-bin/webscr';
 	} else {
 		// Live mode
-		$paypal_uri = $protocal . 'www.paypal.com/cgi-bin/webscr';
+		$paypal_uri = $protocal.'www.paypal.com/cgi-bin/webscr';
 	}
 
-	return apply_filters( 'give_paypal_uri', $paypal_uri );
+	return apply_filters('give_paypal_uri', $paypal_uri);
 }
 
 /**
@@ -682,9 +682,9 @@ 
  * @return string
  */
 function give_get_paypal_page_style() {
-	$page_style = trim( give_get_option( 'paypal_page_style', 'PayPal' ) );
+	$page_style = trim(give_get_option('paypal_page_style', 'PayPal'));
 
-	return apply_filters( 'give_paypal_page_style', $page_style );
+	return apply_filters('give_paypal_page_style', $page_style);
 }
 
 /**
@@ -699,27 +699,27 @@ 
  * @return string
  *
  */
-function give_paypal_success_page_content( $content ) {
+function give_paypal_success_page_content($content) {
 
-	if ( ! isset( $_GET['payment-id'] ) && ! give_get_purchase_session() ) {
+	if ( ! isset($_GET['payment-id']) && ! give_get_purchase_session()) {
 		return $content;
 	}
 
-	$payment_id = isset( $_GET['payment-id'] ) ? absint( $_GET['payment-id'] ) : false;
+	$payment_id = isset($_GET['payment-id']) ? absint($_GET['payment-id']) : false;
 
-	if ( ! $payment_id ) {
+	if ( ! $payment_id) {
 		$session    = give_get_purchase_session();
-		$payment_id = give_get_purchase_id_by_key( $session['purchase_key'] );
+		$payment_id = give_get_purchase_id_by_key($session['purchase_key']);
 	}
 
-	$payment = get_post( $payment_id );
+	$payment = get_post($payment_id);
 
-	if ( $payment && 'pending' == $payment->post_status ) {
+	if ($payment && 'pending' == $payment->post_status) {
 
 		// Payment is still pending so show processing indicator to fix the Race Condition
 		ob_start();
 
-		give_get_template_part( 'payment', 'processing' );
+		give_get_template_part('payment', 'processing');
 
 		$content = ob_get_clean();
 
@@ -729,7 +729,7 @@ 
 
 }
 
-add_filter( 'give_payment_confirm_paypal', 'give_paypal_success_page_content' );
+add_filter('give_payment_confirm_paypal', 'give_paypal_success_page_content');
 
 /**
  * Given a Payment ID, extract the transaction ID
@@ -740,22 +740,22 @@ 
  *
  * @return string                   Transaction ID
  */
-function give_paypal_get_payment_transaction_id( $payment_id ) {
+function give_paypal_get_payment_transaction_id($payment_id) {
 
 	$transaction_id = '';
-	$notes          = give_get_payment_notes( $payment_id );
+	$notes          = give_get_payment_notes($payment_id);
 
-	foreach ( $notes as $note ) {
-		if ( preg_match( '/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match ) ) {
+	foreach ($notes as $note) {
+		if (preg_match('/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match)) {
 			$transaction_id = $match[1];
 			continue;
 		}
 	}
 
-	return apply_filters( 'give_paypal_set_payment_transaction_id', $transaction_id, $payment_id );
+	return apply_filters('give_paypal_set_payment_transaction_id', $transaction_id, $payment_id);
 }
 
-add_filter( 'give_get_payment_transaction_id-paypal', 'give_paypal_get_payment_transaction_id', 10, 1 );
+add_filter('give_get_payment_transaction_id-paypal', 'give_paypal_get_payment_transaction_id', 10, 1);
 
 /**
  * Given a transaction ID, generate a link to the PayPal transaction ID details
@@ -767,13 +767,13 @@ 
  *
  * @return string                 A link to the PayPal transaction details
  */
-function give_paypal_link_transaction_id( $transaction_id, $payment_id ) {
+function give_paypal_link_transaction_id($transaction_id, $payment_id) {
 
 	$paypal_base_url = 'https://history.paypal.com/cgi-bin/webscr?cmd=_history-details-from-hub&id=';
-	$transaction_url = '<a href="' . esc_url( $paypal_base_url . $transaction_id ) . '" target="_blank">' . $transaction_id . '</a>';
+	$transaction_url = '<a href="'.esc_url($paypal_base_url.$transaction_id).'" target="_blank">'.$transaction_id.'</a>';
 
-	return apply_filters( 'give_paypal_link_payment_details_transaction_id', $transaction_url );
+	return apply_filters('give_paypal_link_payment_details_transaction_id', $transaction_url);
 
 }
 
-add_filter( 'give_payment_details_transaction_id-paypal', 'give_paypal_link_transaction_id', 10, 2 );
+add_filter('give_payment_details_transaction_id-paypal', 'give_paypal_link_transaction_id', 10, 2);

includes/actions.php

Spacing +25 added lines, -25 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,14 +25,14 @@ 
  */
 function give_get_actions() {
 
-	$_get_action = ! empty( $_GET['give_action'] ) ? $_GET['give_action'] : null;
+	$_get_action = ! empty($_GET['give_action']) ? $_GET['give_action'] : null;
 
 	// Add backward compatibility to give-action param ( $_GET or $_POST )
-	if(  doing_action( 'admin_init' ) && empty( $_get_action ) ) {
-		$_get_action = ! empty( $_GET['give-action'] ) ? $_GET['give-action'] : null;
+	if (doing_action('admin_init') && empty($_get_action)) {
+		$_get_action = ! empty($_GET['give-action']) ? $_GET['give-action'] : null;
 	}
 
-	if ( isset( $_get_action ) ) {
+	if (isset($_get_action)) {
 		/**
 		 * Fires in WordPress init or admin init, when give_action is present in $_GET.
 		 *
@@ -40,13 +40,13 @@ 
 		 *
 		 * @param array $_GET Array of HTTP GET variables.
 		 */
-		do_action( "give_{$_get_action}", $_GET );
+		do_action("give_{$_get_action}", $_GET);
 	}
 
 }
 
-add_action( 'init', 'give_get_actions' );
-add_action( 'admin_init', 'give_get_actions' );
+add_action('init', 'give_get_actions');
+add_action('admin_init', 'give_get_actions');
 
 /**
  * Hooks Give actions, when present in the $_POST superglobal. Every give_action
@@ -59,15 +59,15 @@ 
  */
 function give_post_actions() {
 
-	$_post_action = ! empty( $_POST['give_action'] ) ? $_POST['give_action'] : null;
+	$_post_action = ! empty($_POST['give_action']) ? $_POST['give_action'] : null;
 
 
 	// Add backward compatibility to give-action param ( $_GET or $_POST )
-	if(  doing_action( 'admin_init' ) && empty( $_post_action ) ) {
-		$_post_action = ! empty( $_POST['give-action'] ) ? $_POST['give-action'] : null;
+	if (doing_action('admin_init') && empty($_post_action)) {
+		$_post_action = ! empty($_POST['give-action']) ? $_POST['give-action'] : null;
 	}
 
-	if ( isset( $_post_action ) ) {
+	if (isset($_post_action)) {
 		/**
 		 * Fires in WordPress init or admin init, when give_action is present in $_POST.
 		 *
@@ -75,13 +75,13 @@ 
 		 *
 		 * @param array $_POST Array of HTTP POST variables.
 		 */
-		do_action( "give_{$_post_action}", $_POST );
+		do_action("give_{$_post_action}", $_POST);
 	}
 
 }
 
-add_action( 'init', 'give_post_actions' );
-add_action( 'admin_init', 'give_post_actions' );
+add_action('init', 'give_post_actions');
+add_action('admin_init', 'give_post_actions');
 
 /**
  * Connect WordPress user with Donor.
@@ -91,24 +91,24 @@ 
  * @param  array $user_data User Data
  * @return void
  */
-function give_connect_donor_to_wpuser( $user_id, $user_data ){
-	$donor = new Give_Customer( $user_data['user_email'] );
+function give_connect_donor_to_wpuser($user_id, $user_data) {
+	$donor = new Give_Customer($user_data['user_email']);
 
 	// Validate donor id and check if do nor is already connect to wp user or not.
-	if( $donor->id && ! $donor->user_id ) {
+	if ($donor->id && ! $donor->user_id) {
 
 		// Update donor user_id.
-		if( $donor->update( array( 'user_id' => $user_id ) ) ) {
-			$donor_note    = __( sprintf( 'WordPress user #%d is connected to #%d', $user_id, $donor->id ), 'give' );
-			$donor->add_note( $donor_note );
+		if ($donor->update(array('user_id' => $user_id))) {
+			$donor_note = __(sprintf('WordPress user #%d is connected to #%d', $user_id, $donor->id), 'give');
+			$donor->add_note($donor_note);
 
 			// Update user_id meta in payments.
-			if( ! empty( $donor->payment_ids ) && ( $donations = explode( ',', $donor->payment_ids ) ) ) {
-				foreach ( $donations as $donation  ) {
-					update_post_meta( $donation, '_give_payment_user_id', $user_id );
+			if ( ! empty($donor->payment_ids) && ($donations = explode(',', $donor->payment_ids))) {
+				foreach ($donations as $donation) {
+					update_post_meta($donation, '_give_payment_user_id', $user_id);
 				}
 			}
 		}
 	}
 }
-add_action( 'give_insert_user', 'give_connect_donor_to_wpuser', 10, 2 );
+add_action('give_insert_user', 'give_connect_donor_to_wpuser', 10, 2);

includes/class-give-gravatars.php

Spacing +95 added lines, -95 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -62,50 +62,50 @@ 
 	 *
 	 * @return bool If the gravatar exists or not
 	 */
-	public function validate_gravatar( $id_or_email ) {
+	public function validate_gravatar($id_or_email) {
 		//id or email code borrowed from wp-includes/pluggable.php
 		$email = '';
-		if ( is_numeric( $id_or_email ) ) {
+		if (is_numeric($id_or_email)) {
 			$id   = (int) $id_or_email;
-			$user = get_userdata( $id );
-			if ( $user ) {
+			$user = get_userdata($id);
+			if ($user) {
 				$email = $user->user_email;
 			}
-		} elseif ( is_object( $id_or_email ) ) {
+		} elseif (is_object($id_or_email)) {
 			// No avatar for pingbacks or trackbacks
-			$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-			if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+			$allowed_comment_types = apply_filters('get_avatar_comment_types', array('comment'));
+			if ( ! empty($id_or_email->comment_type) && ! in_array($id_or_email->comment_type, (array) $allowed_comment_types)) {
 				return false;
 			}
 
-			if ( ! empty( $id_or_email->user_id ) ) {
+			if ( ! empty($id_or_email->user_id)) {
 				$id   = (int) $id_or_email->user_id;
-				$user = get_userdata( $id );
-				if ( $user ) {
+				$user = get_userdata($id);
+				if ($user) {
 					$email = $user->user_email;
 				}
-			} elseif ( ! empty( $id_or_email->comment_author_email ) ) {
+			} elseif ( ! empty($id_or_email->comment_author_email)) {
 				$email = $id_or_email->comment_author_email;
 			}
 		} else {
 			$email = $id_or_email;
 		}
 
-		$hashkey = md5( strtolower( trim( $email ) ) );
-		$uri     = 'http://www.gravatar.com/avatar/' . $hashkey . '?d=404';
+		$hashkey = md5(strtolower(trim($email)));
+		$uri     = 'http://www.gravatar.com/avatar/'.$hashkey.'?d=404';
 
-		$data = wp_cache_get( $hashkey );
-		if ( false === $data ) {
-			$response = wp_remote_head( $uri );
-			if ( is_wp_error( $response ) ) {
+		$data = wp_cache_get($hashkey);
+		if (false === $data) {
+			$response = wp_remote_head($uri);
+			if (is_wp_error($response)) {
 				$data = 'not200';
 			} else {
 				$data = $response['response']['code'];
 			}
-			wp_cache_set( $hashkey, $data, $group = '', $expire = 60 * 5 );
+			wp_cache_set($hashkey, $data, $group = '', $expire = 60 * 5);
 
 		}
-		if ( $data == '200' ) {
+		if ($data == '200') {
 			return true;
 		} else {
 			return false;
@@ -122,19 +122,19 @@ 
 	 *
 	 * @return array        IDs if logs, false otherwise
 	 */
-	public function get_log_ids( $form_id = '' ) {
+	public function get_log_ids($form_id = '') {
 
 		// get Give_Logging class
 		global $give_logs;
 
 		// get log for this form
-		$logs = $give_logs->get_logs( $form_id );
+		$logs = $give_logs->get_logs($form_id);
 
-		if ( $logs ) {
+		if ($logs) {
 			$log_ids = array();
 
 			// make an array with all the donor IDs
-			foreach ( $logs as $log ) {
+			foreach ($logs as $log) {
 				$log_ids[] = $log->ID;
 			}
 
@@ -155,51 +155,51 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function get_payment_ids( $form_id = '' ) {
+	public function get_payment_ids($form_id = '') {
 
 		$give_options = give_get_settings();
 
-		$log_ids = $this->get_log_ids( $form_id );
+		$log_ids = $this->get_log_ids($form_id);
 
-		if ( $log_ids ) {
+		if ($log_ids) {
 
 			$payment_ids = array();
 
-			foreach ( $log_ids as $id ) {
+			foreach ($log_ids as $id) {
 				// get the payment ID for each corresponding log ID
-				$payment_ids[] = get_post_meta( $id, '_give_log_payment_id', true );
+				$payment_ids[] = get_post_meta($id, '_give_log_payment_id', true);
 			}
 
 			// remove donors who have donated more than once so we can have unique avatars
 			$unique_emails = array();
 
-			foreach ( $payment_ids as $key => $id ) {
+			foreach ($payment_ids as $key => $id) {
 
-				$email = get_post_meta( $id, '_give_payment_user_email', true );
+				$email = get_post_meta($id, '_give_payment_user_email', true);
 
-				if ( isset ( $give_options['give_donors_gravatars_has_gravatar_account'] ) ) {
-					if ( ! $this->validate_gravatar( $email ) ) {
+				if (isset ($give_options['give_donors_gravatars_has_gravatar_account'])) {
+					if ( ! $this->validate_gravatar($email)) {
 						continue;
 					}
 				}
 
-				$unique_emails[ $id ] = get_post_meta( $id, '_give_payment_user_email', true );
+				$unique_emails[$id] = get_post_meta($id, '_give_payment_user_email', true);
 
 			}
 
 			$unique_ids = array();
 
 			// strip duplicate emails
-			$unique_emails = array_unique( $unique_emails );
+			$unique_emails = array_unique($unique_emails);
 
 			// convert the unique IDs back into simple array
-			foreach ( $unique_emails as $id => $email ) {
+			foreach ($unique_emails as $id => $email) {
 				$unique_ids[] = $id;
 			}
 
 			// randomize the payment IDs if enabled
-			if ( isset( $give_options['give_donors_gravatars_random_gravatars'] ) ) {
-				shuffle( $unique_ids );
+			if (isset($give_options['give_donors_gravatars_random_gravatars'])) {
+				shuffle($unique_ids);
 			}
 
 			// return our unique IDs
@@ -220,22 +220,22 @@ 
 	 *
 	 * @return string
 	 */
-	public function gravatars( $form_id = false, $title = '' ) {
+	public function gravatars($form_id = false, $title = '') {
 
 		// unique $payment_ids 
-		$payment_ids = $this->get_payment_ids( $form_id );
+		$payment_ids = $this->get_payment_ids($form_id);
 
 		$give_options = give_get_settings();
 
 		// return if no ID
-		if ( ! $form_id ) {
+		if ( ! $form_id) {
 			return;
 		}
 
 		// minimum amount of donations before showing gravatars
 		// if the number of items in array is not greater or equal to the number specified, then exit
-		if ( isset( $give_options['give_donors_gravatars_min_purchases_required'] ) && '' != $give_options['give_donors_gravatars_min_purchases_required'] ) {
-			if ( ! ( count( $payment_ids ) >= $give_options['give_donors_gravatars_min_purchases_required'] ) ) {
+		if (isset($give_options['give_donors_gravatars_min_purchases_required']) && '' != $give_options['give_donors_gravatars_min_purchases_required']) {
+			if ( ! (count($payment_ids) >= $give_options['give_donors_gravatars_min_purchases_required'])) {
 				return;
 			}
 		}
@@ -246,51 +246,51 @@ 
 		echo '<div id="give-purchase-gravatars">';
 
 
-		if ( isset ( $title ) ) {
+		if (isset ($title)) {
 
-			if ( $title ) {
-				echo apply_filters( 'give_donors_gravatars_title', '<h3 class="give-gravatars-title">' . esc_attr( $title ) . '</h3>' );
-			} elseif ( isset( $give_options['give_donors_gravatars_heading'] ) ) {
-				echo apply_filters( 'give_donors_gravatars_title', '<h3 class="give-gravatars-title">' . esc_attr( $give_options['give_donors_gravatars_heading'] ) . '</h2>' );
+			if ($title) {
+				echo apply_filters('give_donors_gravatars_title', '<h3 class="give-gravatars-title">'.esc_attr($title).'</h3>');
+			} elseif (isset($give_options['give_donors_gravatars_heading'])) {
+				echo apply_filters('give_donors_gravatars_title', '<h3 class="give-gravatars-title">'.esc_attr($give_options['give_donors_gravatars_heading']).'</h2>');
 			}
 
 		}
 		echo '<ul class="give-purchase-gravatars-list">';
 		$i = 0;
 
-		if ( $payment_ids ) {
-			foreach ( $payment_ids as $id ) {
+		if ($payment_ids) {
+			foreach ($payment_ids as $id) {
 
 				// Give saves a blank option even when the control is turned off, hence the extra check
-				if ( isset( $give_options['give_donors_gravatars_maximum_number'] ) && '' != $give_options['give_donors_gravatars_maximum_number'] && $i == $give_options['give_donors_gravatars_maximum_number'] ) {
+				if (isset($give_options['give_donors_gravatars_maximum_number']) && '' != $give_options['give_donors_gravatars_maximum_number'] && $i == $give_options['give_donors_gravatars_maximum_number']) {
 					continue;
 				}
 
 				// get the payment meta
-				$payment_meta = get_post_meta( $id, '_give_payment_meta', true );
+				$payment_meta = get_post_meta($id, '_give_payment_meta', true);
 
 				// unserialize the payment meta
-				$user_info = maybe_unserialize( $payment_meta['user_info'] );
+				$user_info = maybe_unserialize($payment_meta['user_info']);
 
 				// get donor's first name
 				$name = $user_info['first_name'];
 
 				// get donor's email
-				$email = get_post_meta( $id, '_give_payment_user_email', true );
+				$email = get_post_meta($id, '_give_payment_user_email', true);
 
 				// set gravatar size and provide filter
-				$size = isset( $give_options['give_donors_gravatars_gravatar_size'] ) ? apply_filters( 'give_donors_gravatars_gravatar_size', $give_options['give_donors_gravatars_gravatar_size'] ) : '';
+				$size = isset($give_options['give_donors_gravatars_gravatar_size']) ? apply_filters('give_donors_gravatars_gravatar_size', $give_options['give_donors_gravatars_gravatar_size']) : '';
 
 				// default image
-				$default_image = apply_filters( 'give_donors_gravatars_gravatar_default_image', false );
+				$default_image = apply_filters('give_donors_gravatars_gravatar_default_image', false);
 
 				// assemble output
 				$output .= '<li>';
 
-				$output .= get_avatar( $email, $size, $default_image, $name );
+				$output .= get_avatar($email, $size, $default_image, $name);
 				$output .= '</li>';
 
-				$i ++;
+				$i++;
 
 			} // end foreach
 		}
@@ -299,7 +299,7 @@ 
 		echo '</ul>';
 		echo '</div>';
 
-		return apply_filters( 'give_donors_gravatars', ob_get_clean() );
+		return apply_filters('give_donors_gravatars', ob_get_clean());
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 	 * @return void
 	 */
 	public function register_widget() {
-		register_widget( 'Give_Donors_Gravatars_Widget' );
+		register_widget('Give_Donors_Gravatars_Widget');
 	}
 
 	/**
@@ -327,19 +327,19 @@ 
 	 *
 	 * @todo   Set the ID to get_the_ID() if ID parameter is not passed through. Otherwise it will incorrectly get other gravatars
 	 */
-	public function shortcode( $atts, $content = null ) {
+	public function shortcode($atts, $content = null) {
 
-		$atts = shortcode_atts( array(
+		$atts = shortcode_atts(array(
 			'id'    => '',
 			'title' => ''
-		), $atts, 'give_donors_gravatars' );
+		), $atts, 'give_donors_gravatars');
 
 		// if no ID is passed on single give_forms pages, get the correct ID
-		if ( is_singular( 'give_forms' ) ) {
+		if (is_singular('give_forms')) {
 			$id = get_the_ID();
 		}
 
-		$content = $this->gravatars( $atts['id'], $atts['title'] );
+		$content = $this->gravatars($atts['id'], $atts['title']);
 
 		return $content;
 
@@ -355,56 +355,56 @@ 
 	 *
 	 * @return array           Gravatar settings.
 	 */
-	public function settings( $settings ) {
+	public function settings($settings) {
 
 		$give_gravatar_settings = array(
 			array(
-				'name' => esc_html__( 'Donator Gravatars', 'give' ),
+				'name' => esc_html__('Donator Gravatars', 'give'),
 				'desc' => '<hr>',
 				'id'   => 'give_title',
 				'type' => 'give_title'
 			),
 			array(
-				'name' => esc_html__( 'Heading', 'give' ),
-				'desc' => esc_html__( 'The heading to display above the Gravatars.', 'give' ),
+				'name' => esc_html__('Heading', 'give'),
+				'desc' => esc_html__('The heading to display above the Gravatars.', 'give'),
 				'type' => 'text',
 				'id'   => 'give_donors_gravatars_heading'
 			),
 			array(
-				'name'    => esc_html__( 'Gravatar Size', 'give' ),
-				'desc'    => esc_html__( 'The size of each Gravatar in pixels (512px maximum).', 'give' ),
+				'name'    => esc_html__('Gravatar Size', 'give'),
+				'desc'    => esc_html__('The size of each Gravatar in pixels (512px maximum).', 'give'),
 				'type'    => 'text_small',
 				'id'      => 'give_donors_gravatars_gravatar_size',
 				'default' => '64'
 			),
 			array(
-				'name' => esc_html__( 'Minimum Unique Donations Required', 'give' ),
-				'desc' => esc_html__( 'The minimum number of unique donations a form must have before the Gravatars are shown. Leave blank for no minimum.', 'give' ),
+				'name' => esc_html__('Minimum Unique Donations Required', 'give'),
+				'desc' => esc_html__('The minimum number of unique donations a form must have before the Gravatars are shown. Leave blank for no minimum.', 'give'),
 				'type' => 'text_small',
 				'id'   => 'give_donors_gravatars_min_purchases_required',
 			),
 			array(
-				'name'    => esc_html__( 'Maximum Gravatars To Show', 'give' ),
-				'desc'    => esc_html__( 'The maximum number of gravatars to show. Leave blank for no limit.', 'give' ),
+				'name'    => esc_html__('Maximum Gravatars To Show', 'give'),
+				'desc'    => esc_html__('The maximum number of gravatars to show. Leave blank for no limit.', 'give'),
 				'type'    => 'text',
 				'id'      => 'give_donors_gravatars_maximum_number',
 				'default' => '20',
 			),
 			array(
-				'name' => esc_html__( 'Gravatar Visibility', 'give' ),
-				'desc' => esc_html__( 'Show only donors with a Gravatar account.', 'give' ),
+				'name' => esc_html__('Gravatar Visibility', 'give'),
+				'desc' => esc_html__('Show only donors with a Gravatar account.', 'give'),
 				'id'   => 'give_donors_gravatars_has_gravatar_account',
 				'type' => 'checkbox',
 			),
 			array(
-				'name' => esc_html__( 'Randomize Gravatars', 'give' ),
-				'desc' => esc_html__( 'Randomize the Gravatars.', 'give' ),
+				'name' => esc_html__('Randomize Gravatars', 'give'),
+				'desc' => esc_html__('Randomize the Gravatars.', 'give'),
 				'id'   => 'give_donors_gravatars_random_gravatars',
 				'type' => 'checkbox',
 			),
 		);
 
-		return array_merge( $settings, $give_gravatar_settings );
+		return array_merge($settings, $give_gravatar_settings);
 	}
 
 }
@@ -430,7 +430,7 @@ 
 		// widget settings
 		$widget_ops = array(
 			'classname'   => 'give-donors-gravatars',
-			'description' => esc_html__( 'Displays gravatars of people who have donated using your your form. Will only show on the single form page.', 'give' ),
+			'description' => esc_html__('Displays gravatars of people who have donated using your your form. Will only show on the single form page.', 'give'),
 		);
 
 		// widget control settings
@@ -443,7 +443,7 @@ 
 		// create the widget
 		parent::__construct(
 			'give_donors_gravatars_widget',
-			esc_html__( 'Give Donors Gravatars', 'give' ),
+			esc_html__('Give Donors Gravatars', 'give'),
 			$widget_ops,
 			$control_ops
 		);
@@ -463,29 +463,29 @@ 
 	 *
 	 * @return void
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		//@TODO: Don't extract it!!!
-		extract( $args );
+		extract($args);
 
-		if ( ! is_singular( 'give_forms' ) ) {
+		if ( ! is_singular('give_forms')) {
 			return;
 		}
 
 		// Variables from widget settings
-		$title = apply_filters( 'widget_title', $instance['title'] );
+		$title = apply_filters('widget_title', $instance['title']);
 
 		// Used by themes. Opens the widget
 		echo $before_widget;
 
 		// Display the widget title
-		if ( $title ) {
-			echo $before_title . $title . $after_title;
+		if ($title) {
+			echo $before_title.$title.$after_title;
 		}
 
 		$gravatars = new Give_Donors_Gravatars();
 
-		echo $gravatars->gravatars( get_the_ID(), null ); // remove title
+		echo $gravatars->gravatars(get_the_ID(), null); // remove title
 
 		// Used by themes. Closes the widget
 		echo $after_widget;
@@ -505,11 +505,11 @@ 
 	 *
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
 		$instance = $old_instance;
 
-		$instance['title'] = strip_tags( $new_instance['title'] );
+		$instance['title'] = strip_tags($new_instance['title']);
 
 		return $instance;
 
@@ -527,19 +527,19 @@ 
 	 *
 	 * @return void
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
 		// Set up some default widget settings.
 		$defaults = array(
 			'title' => '',
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults ); ?>
+		$instance = wp_parse_args((array) $instance, $defaults); ?>
 
 		<!-- Title -->
 		<p>
-			<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php esc_html_e( 'Title:', 'give' ) ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $instance['title']; ?>" />
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php esc_html_e('Title:', 'give') ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $instance['title']; ?>" />
 		</p>
 
 		<?php

includes/admin/reporting/reports.php

Spacing +108 added lines, -108 removed lines

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

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

Spacing +56 added lines, -56 removed lines

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

includes/admin/reporting/pdf-reports.php

Spacing +146 added lines, -146 removed lines

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

includes/admin/reporting/tools.php

Spacing +27 added lines, -27 removed lines

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

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

Spacing +33 added lines, -33 removed lines

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