WordImpress / Give

includes/gateways/offline-donations.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Offline Donations Gateway
- *
- * @package     Give
- * @subpackage  Gateways
- * @copyright   Copyright (c) 2015, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+	 * Offline Donations Gateway
+	 *
+	 * @package     Give
+	 * @subpackage  Gateways
+	 * @copyright   Copyright (c) 2015, WordImpress
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.0
+	 */
 
 /**
  * Register the payment gateway

Spacing +117 added lines, -117 removed lines

@@ -18,17 +18,17 @@ 
  *
  * @return array
  */
-function give_offline_register_gateway( $gateways ) {
+function give_offline_register_gateway($gateways) {
 	// Format: ID => Name
 	$gateways['offline'] = array(
-		'admin_label'    => esc_attr__( 'Offline Donation', 'give' ),
-		'checkout_label' => esc_attr__( 'Offline Donation', 'give' )
+		'admin_label'    => esc_attr__('Offline Donation', 'give'),
+		'checkout_label' => esc_attr__('Offline Donation', 'give')
 	);
 
 	return $gateways;
 }
 
-add_filter( 'give_payment_gateways', 'give_offline_register_gateway', 1 );
+add_filter('give_payment_gateways', 'give_offline_register_gateway', 1);
 
 
 /**
@@ -40,47 +40,47 @@ 
  *
  * @return void
  */
-function give_offline_payment_cc_form( $form_id ) {
+function give_offline_payment_cc_form($form_id) {
 
-	$post_offline_customization_option = get_post_meta( $form_id, '_give_customize_offline_donations', true );
-	$post_offline_instructions         = get_post_meta( $form_id, '_give_offline_checkout_notes', true );
-	$global_offline_instruction        = give_get_option( 'global_offline_donation_content' );
+	$post_offline_customization_option = get_post_meta($form_id, '_give_customize_offline_donations', true);
+	$post_offline_instructions         = get_post_meta($form_id, '_give_offline_checkout_notes', true);
+	$global_offline_instruction        = give_get_option('global_offline_donation_content');
 	$offline_instructions              = $global_offline_instruction;
 
-	if ( $post_offline_customization_option == 'yes' ) {
+	if ($post_offline_customization_option == 'yes') {
 		$offline_instructions = $post_offline_instructions;
 	}
 
 
 	ob_start(); ?>
-	<?php do_action( 'give_before_offline_info_fields', $form_id ); ?>
+	<?php do_action('give_before_offline_info_fields', $form_id); ?>
 	<fieldset id="give_offline_payment_info">
 		<?php
-		$settings_url         = admin_url( 'post.php?post=' . $form_id . '&action=edit&message=1' );
-		$offline_instructions = ! empty( $offline_instructions ) ? $offline_instructions : sprintf( esc_attr__( 'Please enter offline donation instructions in the %s.', 'give' ), '<a href="' . $settings_url . '">' . __( 'this form\'s settings', 'give' ) . '</a>' );
-		echo wpautop( stripslashes( $offline_instructions ) );
+		$settings_url         = admin_url('post.php?post='.$form_id.'&action=edit&message=1');
+		$offline_instructions = ! empty($offline_instructions) ? $offline_instructions : sprintf(esc_attr__('Please enter offline donation instructions in the %s.', 'give'), '<a href="'.$settings_url.'">'.__('this form\'s settings', 'give').'</a>');
+		echo wpautop(stripslashes($offline_instructions));
 		?>
 	</fieldset>
-	<?php do_action( 'give_after_offline_info_fields', $form_id ); ?>
+	<?php do_action('give_after_offline_info_fields', $form_id); ?>
 	<?php
 	echo ob_get_clean();
 }
 
-add_action( 'give_offline_cc_form', 'give_offline_payment_cc_form' );
+add_action('give_offline_cc_form', 'give_offline_payment_cc_form');
 
 
-function give_offline_billing_fields( $form_id ) {
+function give_offline_billing_fields($form_id) {
 	//Enable Default CC fields (billing info)
-	$post_offline_cc_fields   = get_post_meta( $form_id, '_give_offline_donation_enable_billing_fields_single', true );
-	$global_offline_cc_fields = give_get_option( 'give_offline_donation_enable_billing_fields' );
+	$post_offline_cc_fields   = get_post_meta($form_id, '_give_offline_donation_enable_billing_fields_single', true);
+	$global_offline_cc_fields = give_get_option('give_offline_donation_enable_billing_fields');
 
 
-	if ( $global_offline_cc_fields == 'on' || $post_offline_cc_fields == 'on' ) {
-		give_default_cc_address_fields( $form_id );
+	if ($global_offline_cc_fields == 'on' || $post_offline_cc_fields == 'on') {
+		give_default_cc_address_fields($form_id);
 	}
 }
 
-add_action( 'give_before_offline_info_fields', 'give_offline_billing_fields', 10, 1 );
+add_action('give_before_offline_info_fields', 'give_offline_billing_fields', 10, 1);
 
 /**
  * Process the payment
@@ -91,15 +91,15 @@ 
  *
  * @return void
  */
-function give_offline_process_payment( $purchase_data ) {
+function give_offline_process_payment($purchase_data) {
 
-	$purchase_summary = give_get_purchase_summary( $purchase_data );
+	$purchase_summary = give_get_purchase_summary($purchase_data);
 
 	// setup the payment details
 	$payment_data = array(
 		'price'           => $purchase_data['price'],
 		'give_form_title' => $purchase_data['post_data']['give-form-title'],
-		'give_form_id'    => intval( $purchase_data['post_data']['give-form-id'] ),
+		'give_form_id'    => intval($purchase_data['post_data']['give-form-id']),
 		'date'            => $purchase_data['date'],
 		'user_email'      => $purchase_data['user_email'],
 		'purchase_key'    => $purchase_data['purchase_key'],
@@ -111,20 +111,20 @@ 
 
 
 	// record the pending payment
-	$payment = give_insert_payment( $payment_data );
+	$payment = give_insert_payment($payment_data);
 
-	if ( $payment ) {
-		give_offline_send_admin_notice( $payment );
-		give_offline_send_donor_instructions( $payment );
+	if ($payment) {
+		give_offline_send_admin_notice($payment);
+		give_offline_send_donor_instructions($payment);
 		give_send_to_success_page();
 	} else {
 		// if errors are present, send the user back to the donation form so they can be corrected
-		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']);
 	}
 
 }
 
-add_action( 'give_gateway_offline', 'give_offline_process_payment' );
+add_action('give_gateway_offline', 'give_offline_process_payment');
 
 
 /**
@@ -137,47 +137,47 @@ 
  * @since       1.0
  * @return void
  */
-function give_offline_send_donor_instructions( $payment_id = 0 ) {
+function give_offline_send_donor_instructions($payment_id = 0) {
 
-	$payment_data                      = give_get_payment_meta( $payment_id );
-	$post_offline_customization_option = get_post_meta( $payment_data['form_id'], '_give_customize_offline_donations', true );
+	$payment_data                      = give_get_payment_meta($payment_id);
+	$post_offline_customization_option = get_post_meta($payment_data['form_id'], '_give_customize_offline_donations', true);
 
 	//Customize email content depending on whether the single form has been customized
-	$email_content = give_get_option( 'global_offline_donation_email' );
+	$email_content = give_get_option('global_offline_donation_email');
 
-	if ( $post_offline_customization_option === 'yes' ) {
-		$email_content = get_post_meta( $payment_data['form_id'], '_give_offline_donation_email', true );
+	if ($post_offline_customization_option === 'yes') {
+		$email_content = get_post_meta($payment_data['form_id'], '_give_offline_donation_email', true);
 	}
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_from_address', $from_email, $payment_id, $payment_data);
 
-	$to_email = give_get_payment_user_email( $payment_id );
+	$to_email = give_get_payment_user_email($payment_id);
 
-	$subject = give_get_option( 'offline_donation_subject', __( 'Offline Donation Instructions', 'give' ) );
-	if ( $post_offline_customization_option === 'yes' ) {
-		$subject = get_post_meta( $payment_data['form_id'], '_give_offline_donation_subject', true );
+	$subject = give_get_option('offline_donation_subject', __('Offline Donation Instructions', 'give'));
+	if ($post_offline_customization_option === 'yes') {
+		$subject = get_post_meta($payment_data['form_id'], '_give_offline_donation_subject', true);
 	}
 
-	$subject = apply_filters( 'give_offline_donation_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = apply_filters('give_offline_donation_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$attachments = apply_filters( 'give_offline_donation_attachments', array(), $payment_id, $payment_data );
-	$message     = give_do_email_tags( $email_content, $payment_id );
+	$attachments = apply_filters('give_offline_donation_attachments', array(), $payment_id, $payment_data);
+	$message     = give_do_email_tags($email_content, $payment_id);
 
 	$emails = Give()->emails;
 
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', __( 'Offline Donation Instructions', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', __('Offline Donation Instructions', 'give'));
 
-	$headers = apply_filters( 'give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data );
-	$emails->__set( 'headers', $headers );
+	$headers = apply_filters('give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data);
+	$emails->__set('headers', $headers);
 
-	$emails->send( $to_email, $subject, $message, $attachments );
+	$emails->send($to_email, $subject, $message, $attachments);
 
 }
 
@@ -194,48 +194,48 @@ 
  * @return void
  *
  */
-function give_offline_send_admin_notice( $payment_id = 0 ) {
+function give_offline_send_admin_notice($payment_id = 0) {
 
 	/* Send an email notification to the admin */
 	$admin_email = give_get_admin_notice_emails();
-	$user_info   = give_get_payment_meta_user_info( $payment_id );
+	$user_info   = give_get_payment_meta_user_info($payment_id);
 
-	if ( isset( $user_info['id'] ) && $user_info['id'] > 0 ) {
-		$user_data = get_userdata( $user_info['id'] );
+	if (isset($user_info['id']) && $user_info['id'] > 0) {
+		$user_data = get_userdata($user_info['id']);
 		$name      = $user_data->display_name;
-	} elseif ( isset( $user_info['first_name'] ) && isset( $user_info['last_name'] ) ) {
-		$name = $user_info['first_name'] . ' ' . $user_info['last_name'];
+	} elseif (isset($user_info['first_name']) && isset($user_info['last_name'])) {
+		$name = $user_info['first_name'].' '.$user_info['last_name'];
 	} else {
 		$name = $user_info['email'];
 	}
 
-	$amount = give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) );
+	$amount = give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)));
 
-	$admin_subject = apply_filters( 'give_offline_admin_donation_notification_subject', esc_attr__( 'New Pending Donation', 'give' ), $payment_id );
+	$admin_subject = apply_filters('give_offline_admin_donation_notification_subject', esc_attr__('New Pending Donation', 'give'), $payment_id);
 
-	$admin_message = esc_attr__( 'Dear Admin,', 'give' ) . "\n\n";
-	$admin_message .= esc_attr__( 'An offline donation has been made on your website: ', 'give' ) . get_bloginfo( 'name' ) . ' ';
-	$admin_message .= esc_attr__( 'Hooray! The donation is in a pending status and is awaiting payment. Donation instructions have been emailed to the donor. Once you receive payment, be sure to mark the donation as complete using the link below.', 'give' ) . "\n\n";
+	$admin_message = esc_attr__('Dear Admin,', 'give')."\n\n";
+	$admin_message .= esc_attr__('An offline donation has been made on your website: ', 'give').get_bloginfo('name').' ';
+	$admin_message .= esc_attr__('Hooray! The donation is in a pending status and is awaiting payment. Donation instructions have been emailed to the donor. Once you receive payment, be sure to mark the donation as complete using the link below.', 'give')."\n\n";
 
 
-	$admin_message .= '<strong>' . esc_attr__( 'Donor: ', 'give' ) . '</strong>' . html_entity_decode( $name, ENT_COMPAT, 'UTF-8' ) . "\n";
-	$admin_message .= '<strong>' . esc_attr__( 'Amount: ', 'give' ) . '</strong>' . html_entity_decode( $amount, ENT_COMPAT, 'UTF-8' ) . "\n\n";
+	$admin_message .= '<strong>'.esc_attr__('Donor: ', 'give').'</strong>'.html_entity_decode($name, ENT_COMPAT, 'UTF-8')."\n";
+	$admin_message .= '<strong>'.esc_attr__('Amount: ', 'give').'</strong>'.html_entity_decode($amount, ENT_COMPAT, 'UTF-8')."\n\n";
 
 	//Order URL
-	$order_url = '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id=' . $payment_id ) . '">';
-	$admin_message .= sprintf( __( '%sClick Here to View and/or Update Donation Details%s', 'give' ), $order_url, ' &raquo;</a>' ) . "\n\n";
+	$order_url = '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id='.$payment_id).'">';
+	$admin_message .= sprintf(__('%sClick Here to View and/or Update Donation Details%s', 'give'), $order_url, ' &raquo;</a>')."\n\n";
 
-	$admin_message = apply_filters( 'give_offline_admin_donation_notification', $admin_message, $payment_id );
-	$attachments   = apply_filters( 'give_offline_admin_donation_notification_attachments', array(), $payment_id );
-	$admin_headers = apply_filters( 'give_offline_admin_donation_notification_headers', array(), $payment_id );
+	$admin_message = apply_filters('give_offline_admin_donation_notification', $admin_message, $payment_id);
+	$attachments   = apply_filters('give_offline_admin_donation_notification_attachments', array(), $payment_id);
+	$admin_headers = apply_filters('give_offline_admin_donation_notification_headers', array(), $payment_id);
 
 	//Send Email
 	$emails = Give()->emails;
-	if ( ! empty( $admin_headers ) ) {
-		$emails->__set( 'headers', $admin_headers );
+	if ( ! empty($admin_headers)) {
+		$emails->__set('headers', $admin_headers);
 	}
 
-	$emails->send( $admin_email, $admin_subject, $admin_message, $attachments );
+	$emails->send($admin_email, $admin_subject, $admin_message, $attachments);
 
 }
 
@@ -246,15 +246,15 @@ 
  * @since  1.0
  * @return array
  */
-function give_offline_add_settings( $settings ) {
+function give_offline_add_settings($settings) {
 
 	//Vars
 	$prefix = '_give_';
 
-	$is_gateway_active = give_is_gateway_active( 'offline' );
+	$is_gateway_active = give_is_gateway_active('offline');
 
 	//this gateway isn't active
-	if ( ! $is_gateway_active ) {
+	if ( ! $is_gateway_active) {
 		//return settings and bounce
 		return $settings;
 	}
@@ -263,27 +263,27 @@ 
 	$check_settings = array(
 
 		array(
-			'name'    => esc_attr__( 'Customize Offline Donations', 'give' ),
-			'desc'    => esc_attr__( 'If you would like to customize the donation instructions for this specific forms check this option.', 'give' ),
-			'id'      => $prefix . 'customize_offline_donations',
+			'name'    => esc_attr__('Customize Offline Donations', 'give'),
+			'desc'    => esc_attr__('If you would like to customize the donation instructions for this specific forms check this option.', 'give'),
+			'id'      => $prefix.'customize_offline_donations',
 			'type'    => 'radio_inline',
 			'default' => 'no',
 			'options' => array(
-				'yes' => esc_attr__( 'Yes', 'give' ),
-				'no'  => esc_attr__( 'No', 'give' ),
+				'yes' => esc_attr__('Yes', 'give'),
+				'no'  => esc_attr__('No', 'give'),
 			),
 		),
 		array(
-			'name'        => esc_attr__( 'Request Billing Information', 'give' ),
-			'desc'        => esc_attr__( 'This option will enable the billing details section for this form\'s offline donation payment gateway. The fieldset will appear above the offline donation instructions.', 'give' ),
-			'id'          => $prefix . 'offline_donation_enable_billing_fields_single',
+			'name'        => esc_attr__('Request Billing Information', 'give'),
+			'desc'        => esc_attr__('This option will enable the billing details section for this form\'s offline donation payment gateway. The fieldset will appear above the offline donation instructions.', 'give'),
+			'id'          => $prefix.'offline_donation_enable_billing_fields_single',
 			'row_classes' => 'give-subfield',
 			'type'        => 'checkbox'
 		),
 		array(
-			'id'          => $prefix . 'offline_checkout_notes',
-			'name'        => esc_attr__( 'Offline Donation Instructions', 'give' ),
-			'desc'        => esc_attr__( 'Enter the instructions you want to display to the donor during the donation process. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ),
+			'id'          => $prefix.'offline_checkout_notes',
+			'name'        => esc_attr__('Offline Donation Instructions', 'give'),
+			'desc'        => esc_attr__('Enter the instructions you want to display to the donor during the donation process. Most likely this would include important information like mailing address and who to make the check out to.', 'give'),
 			'default'     => give_get_default_offline_donation_content(),
 			'type'        => 'wysiwyg',
 			'row_classes' => 'give-subfield',
@@ -292,17 +292,17 @@ 
 			)
 		),
 		array(
-			'id'          => $prefix . 'offline_donation_subject',
-			'name'        => esc_attr__( 'Offline Donation Email Instructions Subject', 'give' ),
-			'desc'        => esc_attr__( 'Enter the subject line for the donation receipt email.', 'give' ),
-			'default'     => esc_attr__( '{donation} - Offline Donation Instructions', 'give' ),
+			'id'          => $prefix.'offline_donation_subject',
+			'name'        => esc_attr__('Offline Donation Email Instructions Subject', 'give'),
+			'desc'        => esc_attr__('Enter the subject line for the donation receipt email.', 'give'),
+			'default'     => esc_attr__('{donation} - Offline Donation Instructions', 'give'),
 			'row_classes' => 'give-subfield',
 			'type'        => 'text'
 		),
 		array(
-			'id'          => $prefix . 'offline_donation_email',
-			'name'        => esc_attr__( 'Offline Donation Email Instructions', 'give' ),
-			'desc'        => esc_attr__( 'Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ),
+			'id'          => $prefix.'offline_donation_email',
+			'name'        => esc_attr__('Offline Donation Email Instructions', 'give'),
+			'desc'        => esc_attr__('Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give'),
 			'default'     => give_get_default_offline_donation_email_content(),
 			'type'        => 'wysiwyg',
 			'row_classes' => 'give-subfield',
@@ -312,10 +312,10 @@ 
 		)
 	);
 
-	return array_merge( $settings, $check_settings );
+	return array_merge($settings, $check_settings);
 }
 
-add_filter( 'give_forms_display_options_metabox_fields', 'give_offline_add_settings' );
+add_filter('give_forms_display_options_metabox_fields', 'give_offline_add_settings');
 
 
 /**
@@ -327,20 +327,20 @@ 
  */
 function give_get_default_offline_donation_content() {
 
-	$sitename = get_bloginfo( 'sitename' );
+	$sitename = get_bloginfo('sitename');
 
-	$default_text = '<p>' . esc_attr__( 'In order to make an offline donation we ask that you please follow these instructions', 'give' ) . ': </p>';
+	$default_text = '<p>'.esc_attr__('In order to make an offline donation we ask that you please follow these instructions', 'give').': </p>';
 	$default_text .= '<ol>';
-	$default_text .= '<li>' . _x( 'Make a check payable to ', 'Step 1 for donating offline by check', 'give' ) . '"' . $sitename . '"' . '</li>';
-	$default_text .= '<li>' . _x( 'On the memo line of the check, please indicate that the donation is for ', 'Step 2 for donating by check; this explains who the check should be written to', 'give' ) . '"' . $sitename . '"' . '</li>';
-	$default_text .= '<li>' . _x( 'Please mail your check to:', 'Step 3; where to mail the check', 'give' ) . '</li>';
+	$default_text .= '<li>'._x('Make a check payable to ', 'Step 1 for donating offline by check', 'give').'"'.$sitename.'"'.'</li>';
+	$default_text .= '<li>'._x('On the memo line of the check, please indicate that the donation is for ', 'Step 2 for donating by check; this explains who the check should be written to', 'give').'"'.$sitename.'"'.'</li>';
+	$default_text .= '<li>'._x('Please mail your check to:', 'Step 3; where to mail the check', 'give').'</li>';
 	$default_text .= '</ol>';
-	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>' . $sitename . '</em><br>';
+	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>'.$sitename.'</em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>123 G Street </em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>San Diego, CA 92101 </em><br>';
-	$default_text .= '<p>' . esc_attr__( 'All contributions will be gratefully acknowledged and are tax deductible.', 'give' ) . '</p>';
+	$default_text .= '<p>'.esc_attr__('All contributions will be gratefully acknowledged and are tax deductible.', 'give').'</p>';
 
-	return apply_filters( 'give_default_offline_donation_content', $default_text );
+	return apply_filters('give_default_offline_donation_content', $default_text);
 
 }
 
@@ -353,21 +353,21 @@ 
  */
 function give_get_default_offline_donation_email_content() {
 
-	$sitename     = get_bloginfo( 'sitename' );
-	$default_text = '<p>' . esc_attr__( 'Dear {name},', 'give' ) . '</p>';
-	$default_text .= '<p>' . esc_attr__( 'Thank you for your offline donation request! Your generosity is greatly appreciated. In order to make an offline donation we ask that you please follow these instructions', 'give' ) . ': </p>';
+	$sitename     = get_bloginfo('sitename');
+	$default_text = '<p>'.esc_attr__('Dear {name},', 'give').'</p>';
+	$default_text .= '<p>'.esc_attr__('Thank you for your offline donation request! Your generosity is greatly appreciated. In order to make an offline donation we ask that you please follow these instructions', 'give').': </p>';
 	$default_text .= '<ol>';
-	$default_text .= '<li>' . _x( 'Make a check payable to ', 'Step 1 for donating offline by check', 'give' ) . '"' . $sitename . '"' . '</li>';
-	$default_text .= '<li>' . _x( 'On the memo line of the check, please indicate that the donation is for ', 'Step 2 for donating by check; this explains who the check should be written to', 'give' ) . '"' . $sitename . '"' . '</li>';
-	$default_text .= '<li>' . _x( 'Please mail your check to:', 'Step 3; where to mail the check', 'give' ) . '</li>';
+	$default_text .= '<li>'._x('Make a check payable to ', 'Step 1 for donating offline by check', 'give').'"'.$sitename.'"'.'</li>';
+	$default_text .= '<li>'._x('On the memo line of the check, please indicate that the donation is for ', 'Step 2 for donating by check; this explains who the check should be written to', 'give').'"'.$sitename.'"'.'</li>';
+	$default_text .= '<li>'._x('Please mail your check to:', 'Step 3; where to mail the check', 'give').'</li>';
 	$default_text .= '</ol>';
-	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>' . $sitename . '</em><br>';
+	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>'.$sitename.'</em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>123 G Street </em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>San Diego, CA 92101 </em><br>';
-	$default_text .= '<p>' . esc_attr__( 'Once your donation has been received we will mark it as complete and you will receive an email receipt for your records. Please contact us with any questions you may have!', 'give' ) . '</p>';
-	$default_text .= '<p>' . esc_attr__( 'Sincerely,', 'give' ) . '</p>';
-	$default_text .= '<p>' . $sitename . '</p>';
+	$default_text .= '<p>'.esc_attr__('Once your donation has been received we will mark it as complete and you will receive an email receipt for your records. Please contact us with any questions you may have!', 'give').'</p>';
+	$default_text .= '<p>'.esc_attr__('Sincerely,', 'give').'</p>';
+	$default_text .= '<p>'.$sitename.'</p>';
 
-	return apply_filters( 'give_default_offline_donation_content', $default_text );
+	return apply_filters('give_default_offline_donation_content', $default_text);
 
 }

includes/payments/actions.php

Spacing +72 added lines, -72 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -28,66 +28,66 @@ 
  *
  * @return void
  */
-function give_complete_purchase( $payment_id, $new_status, $old_status ) {
-	if ( $old_status == 'publish' || $old_status == 'complete' ) {
+function give_complete_purchase($payment_id, $new_status, $old_status) {
+	if ($old_status == 'publish' || $old_status == 'complete') {
 		return;
 	} // Make sure that payments are only completed once
 
 	// Make sure the payment completion is only processed when new status is complete
-	if ( $new_status != 'publish' && $new_status != 'complete' ) {
+	if ($new_status != 'publish' && $new_status != 'complete') {
 		return;
 	}
 
-	$payment_meta   = give_get_payment_meta( $payment_id );
-	$creation_date  = get_post_field( 'post_date', $payment_id, 'raw' );
-	$completed_date = give_get_payment_completed_date( $payment_id );
-	$user_info      = give_get_payment_meta_user_info( $payment_id );
-	$donor_id       = give_get_payment_customer_id( $payment_id );
-	$amount         = give_get_payment_amount( $payment_id );
+	$payment_meta   = give_get_payment_meta($payment_id);
+	$creation_date  = get_post_field('post_date', $payment_id, 'raw');
+	$completed_date = give_get_payment_completed_date($payment_id);
+	$user_info      = give_get_payment_meta_user_info($payment_id);
+	$donor_id       = give_get_payment_customer_id($payment_id);
+	$amount         = give_get_payment_amount($payment_id);
 
-	do_action( 'give_pre_complete_purchase', $payment_id );
+	do_action('give_pre_complete_purchase', $payment_id);
 
-	$price_id = isset( $_POST['give-price-id'] ) ? (int) $_POST['give-price-id'] : false;
+	$price_id = isset($_POST['give-price-id']) ? (int) $_POST['give-price-id'] : false;
 
 	// Ensure these actions only run once, ever
-	if ( empty( $completed_date ) ) {
+	if (empty($completed_date)) {
 
-		if ( ! give_is_test_mode() || apply_filters( 'give_log_test_payment_stats', false ) ) {
+		if ( ! give_is_test_mode() || apply_filters('give_log_test_payment_stats', false)) {
 
-			give_record_sale_in_log( $payment_meta['form_id'], $payment_id, $price_id, $creation_date );
-			give_increase_purchase_count( $payment_meta['form_id'] );
-			give_increase_earnings( $payment_meta['form_id'], $amount );
+			give_record_sale_in_log($payment_meta['form_id'], $payment_id, $price_id, $creation_date);
+			give_increase_purchase_count($payment_meta['form_id']);
+			give_increase_earnings($payment_meta['form_id'], $amount);
 
 		}
 
-		do_action( 'give_complete_form_donation', $payment_meta['form_id'], $payment_id, $payment_meta );
+		do_action('give_complete_form_donation', $payment_meta['form_id'], $payment_id, $payment_meta);
 	}
 
 
 	// Clear the total earnings cache
-	delete_transient( 'give_earnings_total' );
+	delete_transient('give_earnings_total');
 	// Clear the This Month earnings (this_monththis_month is NOT a typo)
-	delete_transient( md5( 'give_earnings_this_monththis_month' ) );
-	delete_transient( md5( 'give_earnings_todaytoday' ) );
+	delete_transient(md5('give_earnings_this_monththis_month'));
+	delete_transient(md5('give_earnings_todaytoday'));
 
 
 	// Increase the donor's purchase stats
-	Give()->customers->increment_stats( $donor_id, $amount );
+	Give()->customers->increment_stats($donor_id, $amount);
 
-	give_increase_total_earnings( $amount );
+	give_increase_total_earnings($amount);
 
 	// Ensure this action only runs once ever
-	if ( empty( $completed_date ) ) {
+	if (empty($completed_date)) {
 
 		// Save the completed date
-		give_update_payment_meta( $payment_id, '_give_completed_date', current_time( 'mysql' ) );
+		give_update_payment_meta($payment_id, '_give_completed_date', current_time('mysql'));
 
-		do_action( 'give_complete_purchase', $payment_id );
+		do_action('give_complete_purchase', $payment_id);
 	}
 
 }
 
-add_action( 'give_update_payment_status', 'give_complete_purchase', 100, 3 );
+add_action('give_update_payment_status', 'give_complete_purchase', 100, 3);
 
 
 /**
@@ -101,19 +101,19 @@ 
  *
  * @return void
  */
-function give_record_status_change( $payment_id, $new_status, $old_status ) {
+function give_record_status_change($payment_id, $new_status, $old_status) {
 
 	// Get the list of statuses so that status in the payment note can be translated
 	$stati      = give_get_payment_statuses();
-	$old_status = isset( $stati[ $old_status ] ) ? $stati[ $old_status ] : $old_status;
-	$new_status = isset( $stati[ $new_status ] ) ? $stati[ $new_status ] : $new_status;
+	$old_status = isset($stati[$old_status]) ? $stati[$old_status] : $old_status;
+	$new_status = isset($stati[$new_status]) ? $stati[$new_status] : $new_status;
 
-	$status_change = sprintf( __( 'Status changed from %s to %s', 'give' ), $old_status, $new_status );
+	$status_change = sprintf(__('Status changed from %s to %s', 'give'), $old_status, $new_status);
 
-	give_insert_payment_note( $payment_id, $status_change );
+	give_insert_payment_note($payment_id, $status_change);
 }
 
-add_action( 'give_update_payment_status', 'give_record_status_change', 100, 3 );
+add_action('give_update_payment_status', 'give_record_status_change', 100, 3);
 
 /**
  * Reduces earnings and donation stats when a donation is refunded
@@ -126,40 +126,40 @@ 
  *
  * @return void
  */
-function give_undo_donation_on_refund( $payment_id, $new_status, $old_status ) {
+function give_undo_donation_on_refund($payment_id, $new_status, $old_status) {
 
-	if ( 'publish' != $old_status && 'revoked' != $old_status ) {
+	if ('publish' != $old_status && 'revoked' != $old_status) {
 		return;
 	}
 
-	if ( 'refunded' != $new_status ) {
+	if ('refunded' != $new_status) {
 		return;
 	}
 
 	// Set necessary vars
-	$payment_meta = give_get_payment_meta( $payment_id );
-	$amount       = give_get_payment_amount( $payment_id );
+	$payment_meta = give_get_payment_meta($payment_id);
+	$amount       = give_get_payment_amount($payment_id);
 
 	// Undo this purchase
-	give_undo_purchase( $payment_meta['form_id'], $payment_id );
+	give_undo_purchase($payment_meta['form_id'], $payment_id);
 
 	// Decrease total earnings
-	give_decrease_total_earnings( $amount );
+	give_decrease_total_earnings($amount);
 
 	// Decrement the stats for the donor
-	$donor_id = give_get_payment_customer_id( $payment_id );
+	$donor_id = give_get_payment_customer_id($payment_id);
 
-	if ( $donor_id ) {
+	if ($donor_id) {
 
-		Give()->customers->decrement_stats( $donor_id, $amount );
+		Give()->customers->decrement_stats($donor_id, $amount);
 
 	}
 
 	// Clear the This Month earnings (this_monththis_month is NOT a typo)
-	delete_transient( md5( 'give_earnings_this_monththis_month' ) );
+	delete_transient(md5('give_earnings_this_monththis_month'));
 }
 
-add_action( 'give_update_payment_status', 'give_undo_donation_on_refund', 100, 3 );
+add_action('give_update_payment_status', 'give_undo_donation_on_refund', 100, 3);
 
 
 /**
@@ -172,13 +172,13 @@ 
  * @param $new_status the status of the payment, probably "publish"
  * @param $old_status the status of the payment prior to being marked as "complete", probably "pending"
  */
-function give_clear_user_history_cache( $payment_id, $new_status, $old_status ) {
-	$user_info = give_get_payment_meta_user_info( $payment_id );
+function give_clear_user_history_cache($payment_id, $new_status, $old_status) {
+	$user_info = give_get_payment_meta_user_info($payment_id);
 
-	delete_transient( 'give_user_' . $user_info['id'] . '_purchases' );
+	delete_transient('give_user_'.$user_info['id'].'_purchases');
 }
 
-add_action( 'give_update_payment_status', 'give_clear_user_history_cache', 10, 3 );
+add_action('give_update_payment_status', 'give_clear_user_history_cache', 10, 3);
 
 /**
  * Updates all old payments, prior to 1.2, with new
@@ -192,32 +192,32 @@ 
  *
  * @return void
  */
-function give_update_old_payments_with_totals( $data ) {
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give_upgrade_payments_nonce' ) ) {
+function give_update_old_payments_with_totals($data) {
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give_upgrade_payments_nonce')) {
 		return;
 	}
 
-	if ( get_option( 'give_payment_totals_upgraded' ) ) {
+	if (get_option('give_payment_totals_upgraded')) {
 		return;
 	}
 
-	$payments = give_get_payments( array(
+	$payments = give_get_payments(array(
 		'offset' => 0,
-		'number' => - 1,
+		'number' => -1,
 		'mode'   => 'all'
-	) );
+	));
 
-	if ( $payments ) {
-		foreach ( $payments as $payment ) {
-			$meta = give_get_payment_meta( $payment->ID );
-			give_update_payment_meta( $payment->ID, '_give_payment_total', $meta['amount'] );
+	if ($payments) {
+		foreach ($payments as $payment) {
+			$meta = give_get_payment_meta($payment->ID);
+			give_update_payment_meta($payment->ID, '_give_payment_total', $meta['amount']);
 		}
 	}
 
-	add_option( 'give_payment_totals_upgraded', 1 );
+	add_option('give_payment_totals_upgraded', 1);
 }
 
-add_action( 'give_upgrade_payments', 'give_update_old_payments_with_totals' );
+add_action('give_upgrade_payments', 'give_update_old_payments_with_totals');
 
 /**
  * Updates week-old+ 'pending' orders to 'abandoned'
@@ -226,29 +226,29 @@ 
  * @return void
  */
 function give_mark_abandoned_donations() {
-	$args     = array(
+	$args = array(
 		'status' => 'pending',
-		'number' => - 1,
+		'number' => -1,
 		'fields' => 'ids'
 	);
 
-	add_filter( 'posts_where', 'give_filter_where_older_than_week' );
+	add_filter('posts_where', 'give_filter_where_older_than_week');
 
-	$payments = give_get_payments( $args );
+	$payments = give_get_payments($args);
 
-	remove_filter( 'posts_where', 'give_filter_where_older_than_week' );
+	remove_filter('posts_where', 'give_filter_where_older_than_week');
 
-	if ( $payments ) {
-		foreach ( $payments as $payment ) {
-			$gateway = give_get_payment_gateway( $payment );
+	if ($payments) {
+		foreach ($payments as $payment) {
+			$gateway = give_get_payment_gateway($payment);
 			//Skip offline gateway payments
-			if ( $gateway == 'offline' ) {
+			if ($gateway == 'offline') {
 				continue;
 			}
 			//Non-offline get marked as 'abandoned'
-			give_update_payment_status( $payment, 'abandoned' );
+			give_update_payment_status($payment, 'abandoned');
 		}
 	}
 }
 
-add_action( 'give_weekly_scheduled_events', 'give_mark_abandoned_donations' );
\ No newline at end of file
+add_action('give_weekly_scheduled_events', 'give_mark_abandoned_donations');
\ No newline at end of file

includes/admin/upgrades/upgrade-functions.php

Spacing +57 added lines, -57 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,18 +25,18 @@ 
  */
 function give_show_upgrade_notices() {
 
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-upgrades' ) {
+	if (isset($_GET['page']) && $_GET['page'] == 'give-upgrades') {
 		return;
 	} // Don't show notices on the upgrades page
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
 	}
 
-	$give_version = preg_replace( '/[^0-9.].*/', '', $give_version );
+	$give_version = preg_replace('/[^0-9.].*/', '', $give_version);
 
 	/*
 	 *  NOTICE:
@@ -47,18 +47,18 @@ 
 	 */
 
 	//v1.3.2 Upgrades
-	if ( version_compare( $give_version, '1.3.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) {
+	if (version_compare($give_version, '1.3.2', '<') || ! give_has_upgrade_completed('upgrade_give_payment_customer_id')) {
 		printf(
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id'))
 		);
 	}
 
 	//v1.3.4 Upgrades //ensure the user has gone through 1.3.4
-	if ( version_compare( $give_version, '1.3.4', '<' ) || ( ! give_has_upgrade_completed( 'upgrade_give_offline_status' ) && give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) ) {
+	if (version_compare($give_version, '1.3.4', '<') || ( ! give_has_upgrade_completed('upgrade_give_offline_status') && give_has_upgrade_completed('upgrade_give_payment_customer_id'))) {
 		printf(
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status'))
 		);
 	}
 
@@ -68,7 +68,7 @@ 
 
 }
 
-add_action( 'admin_notices', 'give_show_upgrade_notices' );
+add_action('admin_notices', 'give_show_upgrade_notices');
 
 /**
  * Triggers all upgrade functions
@@ -80,26 +80,26 @@ 
  */
 function give_trigger_upgrades() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
-		add_option( 'give_version', $give_version );
+		add_option('give_version', $give_version);
 	}
 
-	update_option( 'give_version', GIVE_VERSION );
+	update_option('give_version', GIVE_VERSION);
 
-	if ( DOING_AJAX ) {
-		die( 'complete' );
+	if (DOING_AJAX) {
+		die('complete');
 	} // Let AJAX know that the upgrade is complete
 }
 
-add_action( 'wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades' );
+add_action('wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades');
 
 /**
  * Check if the upgrade routine has been run for a specific action
@@ -110,15 +110,15 @@ 
  *
  * @return bool                   If the action has been added to the completed actions array
  */
-function give_has_upgrade_completed( $upgrade_action = '' ) {
+function give_has_upgrade_completed($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
 	$completed_upgrades = give_get_completed_upgrades();
 
-	return in_array( $upgrade_action, $completed_upgrades );
+	return in_array($upgrade_action, $completed_upgrades);
 
 }
 
@@ -131,9 +131,9 @@ 
  *
  * @return bool                   If the function was successfully added
  */
-function give_set_upgrade_complete( $upgrade_action = '' ) {
+function give_set_upgrade_complete($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
@@ -141,9 +141,9 @@ 
 	$completed_upgrades[] = $upgrade_action;
 
 	// Remove any blanks, and only show uniques
-	$completed_upgrades = array_unique( array_values( $completed_upgrades ) );
+	$completed_upgrades = array_unique(array_values($completed_upgrades));
 
-	return update_option( 'give_completed_upgrades', $completed_upgrades );
+	return update_option('give_completed_upgrades', $completed_upgrades);
 }
 
 /**
@@ -154,9 +154,9 @@ 
  */
 function give_get_completed_upgrades() {
 
-	$completed_upgrades = get_option( 'give_completed_upgrades' );
+	$completed_upgrades = get_option('give_completed_upgrades');
 
-	if ( false === $completed_upgrades ) {
+	if (false === $completed_upgrades) {
 		$completed_upgrades = array();
 	}
 
@@ -175,30 +175,30 @@ 
  */
 function give_v132_upgrade_give_payment_customer_id() {
 	global $wpdb;
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	//UPDATE DB METAKEYS
 	$sql   = "UPDATE $wpdb->postmeta SET meta_key = '_give_payment_customer_id' WHERE meta_key = '_give_payment_donor_id'";
-	$query = $wpdb->query( $sql );
+	$query = $wpdb->query($sql);
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_payment_customer_id' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_payment_customer_id');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id' );
+add_action('give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id');
 
 /**
  * Upgrades the Offline Status
@@ -212,14 +212,14 @@ 
 
 	global $wpdb;
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	// Get abandoned offline payments
@@ -229,32 +229,32 @@ 
 	$where .= "AND ( p.post_status = 'abandoned' )";
 	$where .= "AND ( m.meta_key = '_give_payment_gateway' AND m.meta_value = 'offline' )";
 
-	$sql            = $select . $join . $where;
-	$found_payments = $wpdb->get_col( $sql );
+	$sql            = $select.$join.$where;
+	$found_payments = $wpdb->get_col($sql);
 
 
-	foreach ( $found_payments as $payment ) {
+	foreach ($found_payments as $payment) {
 
 		//Only change ones marked abandoned since our release last week
 		//because the admin may have marked some abandoned themselves
-		$modified_time = get_post_modified_time( 'U', false, $payment );
+		$modified_time = get_post_modified_time('U', false, $payment);
 
 		//1450124863 =  12/10/2015 20:42:25
-		if ( $modified_time >= 1450124863 ) {
+		if ($modified_time >= 1450124863) {
 
-			give_update_payment_status( $payment, 'pending' );
+			give_update_payment_status($payment, 'pending');
 
 		}
 
 	}
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_offline_status' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_offline_status');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status' );
+add_action('give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status');

includes/admin/system-info.php

Spacing +138 added lines, -138 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,7 +24,7 @@ 
  */
 function give_system_info_callback() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 
@@ -32,7 +32,7 @@ 
 	<textarea readonly="readonly" onclick="this.focus(); this.select()" id="system-info-textarea" name="give-sysinfo" title="To copy the system info, click below then press Ctrl + C (PC) or Cmd + C (Mac)."><?php echo give_tools_sysinfo_get(); ?></textarea>
 	<p class="submit">
 		<input type="hidden" name="give-action" value="download_sysinfo" />
-		<?php submit_button( 'Download System Info File', 'secondary', 'give-download-sysinfo', false ); ?>
+		<?php submit_button('Download System Info File', 'secondary', 'give-download-sysinfo', false); ?>
 	</p>
 	<style>
 		.give_forms_page_give-settings .give-submit-wrap {
@@ -55,63 +55,63 @@ 
 function give_tools_sysinfo_get() {
 	global $wpdb, $give_options;
 
-	if ( ! class_exists( 'Browser' ) ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/libraries/browser.php';
+	if ( ! class_exists('Browser')) {
+		require_once GIVE_PLUGIN_DIR.'includes/libraries/browser.php';
 	}
 
 	$browser = new Browser();
 
 	// Get theme info
-	if ( get_bloginfo( 'version' ) < '3.4' ) {
-		$theme_data = get_theme_data( get_stylesheet_directory() . '/style.css' );
-		$theme      = $theme_data['Name'] . ' ' . $theme_data['Version'];
+	if (get_bloginfo('version') < '3.4') {
+		$theme_data = get_theme_data(get_stylesheet_directory().'/style.css');
+		$theme      = $theme_data['Name'].' '.$theme_data['Version'];
 	} else {
 		$theme_data = wp_get_theme();
-		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
+		$theme      = $theme_data->Name.' '.$theme_data->Version;
 	}
 
 	// Try to identify the hosting provider
 	$host = give_get_host();
 
-	$return = '### Begin System Info ###' . "\n\n";
+	$return = '### Begin System Info ###'."\n\n";
 
 	// Start with the basics...
-	$return .= '-- Site Info' . "\n\n";
-	$return .= 'Site URL:                 ' . site_url() . "\n";
-	$return .= 'Home URL:                 ' . home_url() . "\n";
-	$return .= 'Multisite:                ' . ( is_multisite() ? 'Yes' : 'No' ) . "\n";
+	$return .= '-- Site Info'."\n\n";
+	$return .= 'Site URL:                 '.site_url()."\n";
+	$return .= 'Home URL:                 '.home_url()."\n";
+	$return .= 'Multisite:                '.(is_multisite() ? 'Yes' : 'No')."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_site_info', $return );
+	$return = apply_filters('give_sysinfo_after_site_info', $return);
 
 	// Can we determine the site's host?
-	if ( $host ) {
-		$return .= "\n" . '-- Hosting Provider' . "\n\n";
-		$return .= 'Host:                     ' . $host . "\n";
+	if ($host) {
+		$return .= "\n".'-- Hosting Provider'."\n\n";
+		$return .= 'Host:                     '.$host."\n";
 
-		$return = apply_filters( 'give_sysinfo_after_host_info', $return );
+		$return = apply_filters('give_sysinfo_after_host_info', $return);
 	}
 
 	// The local users' browser information, handled by the Browser class
-	$return .= "\n" . '-- User Browser' . "\n\n";
+	$return .= "\n".'-- User Browser'."\n\n";
 	$return .= $browser;
 
-	$return = apply_filters( 'give_sysinfo_after_user_browser', $return );
+	$return = apply_filters('give_sysinfo_after_user_browser', $return);
 
 	// WordPress configuration
-	$return .= "\n" . '-- WordPress Configuration' . "\n\n";
-	$return .= 'Version:                  ' . get_bloginfo( 'version' ) . "\n";
-	$return .= 'Language:                 ' . ( defined( 'WPLANG' ) && WPLANG ? WPLANG : 'en_US' ) . "\n";
-	$return .= 'Permalink Structure:      ' . ( get_option( 'permalink_structure' ) ? get_option( 'permalink_structure' ) : 'Default' ) . "\n";
-	$return .= 'Active Theme:             ' . $theme . "\n";
-	$return .= 'Show On Front:            ' . get_option( 'show_on_front' ) . "\n";
+	$return .= "\n".'-- WordPress Configuration'."\n\n";
+	$return .= 'Version:                  '.get_bloginfo('version')."\n";
+	$return .= 'Language:                 '.(defined('WPLANG') && WPLANG ? WPLANG : 'en_US')."\n";
+	$return .= 'Permalink Structure:      '.(get_option('permalink_structure') ? get_option('permalink_structure') : 'Default')."\n";
+	$return .= 'Active Theme:             '.$theme."\n";
+	$return .= 'Show On Front:            '.get_option('show_on_front')."\n";
 
 	// Only show page specs if frontpage is set to 'page'
-	if ( get_option( 'show_on_front' ) == 'page' ) {
-		$front_page_id = get_option( 'page_on_front' );
-		$blog_page_id  = get_option( 'page_for_posts' );
+	if (get_option('show_on_front') == 'page') {
+		$front_page_id = get_option('page_on_front');
+		$blog_page_id  = get_option('page_for_posts');
 
-		$return .= 'Page On Front:            ' . ( $front_page_id != 0 ? get_the_title( $front_page_id ) . ' (#' . $front_page_id . ')' : 'Unset' ) . "\n";
-		$return .= 'Page For Posts:           ' . ( $blog_page_id != 0 ? get_the_title( $blog_page_id ) . ' (#' . $blog_page_id . ')' : 'Unset' ) . "\n";
+		$return .= 'Page On Front:            '.($front_page_id != 0 ? get_the_title($front_page_id).' (#'.$front_page_id.')' : 'Unset')."\n";
+		$return .= 'Page For Posts:           '.($blog_page_id != 0 ? get_the_title($blog_page_id).' (#'.$blog_page_id.')' : 'Unset')."\n";
 	}
 
 	// Make sure wp_remote_post() is working
@@ -120,200 +120,200 @@ 
 	$params = array(
 		'sslverify'  => false,
 		'timeout'    => 60,
-		'user-agent' => 'Give/' . GIVE_VERSION,
+		'user-agent' => 'Give/'.GIVE_VERSION,
 		'body'       => $request
 	);
 
-	$response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', $params );
+	$response = wp_remote_post('https://www.paypal.com/cgi-bin/webscr', $params);
 
-	if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+	if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 		$WP_REMOTE_POST = 'wp_remote_post() works';
 	} else {
 		$WP_REMOTE_POST = 'wp_remote_post() does not work';
 	}
 
-	$return .= 'Remote Post:              ' . $WP_REMOTE_POST . "\n";
-	$return .= 'Table Prefix:             ' . 'Length: ' . strlen( $wpdb->prefix ) . '   Status: ' . ( strlen( $wpdb->prefix ) > 16 ? 'ERROR: Too long' : 'Acceptable' ) . "\n";
-	$return .= 'Admin AJAX:               ' . ( give_test_ajax_works() ? 'Accessible' : 'Inaccessible' ) . "\n";
-	$return .= 'WP_DEBUG:                 ' . ( defined( 'WP_DEBUG' ) ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set' ) . "\n";
-	$return .= 'Memory Limit:             ' . WP_MEMORY_LIMIT . "\n";
-	$return .= 'Registered Post Stati:    ' . implode( ', ', get_post_stati() ) . "\n";
+	$return .= 'Remote Post:              '.$WP_REMOTE_POST."\n";
+	$return .= 'Table Prefix:             '.'Length: '.strlen($wpdb->prefix).'   Status: '.(strlen($wpdb->prefix) > 16 ? 'ERROR: Too long' : 'Acceptable')."\n";
+	$return .= 'Admin AJAX:               '.(give_test_ajax_works() ? 'Accessible' : 'Inaccessible')."\n";
+	$return .= 'WP_DEBUG:                 '.(defined('WP_DEBUG') ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set')."\n";
+	$return .= 'Memory Limit:             '.WP_MEMORY_LIMIT."\n";
+	$return .= 'Registered Post Stati:    '.implode(', ', get_post_stati())."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_wordpress_config', $return );
+	$return = apply_filters('give_sysinfo_after_wordpress_config', $return);
 
 	// GIVE configuration
-	$return .= "\n" . '-- Give Configuration' . "\n\n";
-	$return .= 'Version:                  ' . GIVE_VERSION . "\n";
-	$return .= 'Upgraded From:            ' . get_option( 'give_version_upgraded_from', 'None' ) . "\n";
-	$return .= 'Test Mode:                ' . ( give_is_test_mode() ? "Enabled\n" : "Disabled\n" );
-	$return .= 'Currency Code:            ' . give_get_currency() . "\n";
-	$return .= 'Currency Position:        ' . give_get_option( 'currency_position', 'before' ) . "\n";
-	$return .= 'Decimal Separator:        ' . give_get_option( 'decimal_separator', '.' ) . "\n";
-	$return .= 'Thousands Separator:      ' . give_get_option( 'thousands_separator', ',' ) . "\n";
+	$return .= "\n".'-- Give Configuration'."\n\n";
+	$return .= 'Version:                  '.GIVE_VERSION."\n";
+	$return .= 'Upgraded From:            '.get_option('give_version_upgraded_from', 'None')."\n";
+	$return .= 'Test Mode:                '.(give_is_test_mode() ? "Enabled\n" : "Disabled\n");
+	$return .= 'Currency Code:            '.give_get_currency()."\n";
+	$return .= 'Currency Position:        '.give_get_option('currency_position', 'before')."\n";
+	$return .= 'Decimal Separator:        '.give_get_option('decimal_separator', '.')."\n";
+	$return .= 'Thousands Separator:      '.give_get_option('thousands_separator', ',')."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_give_config', $return );
+	$return = apply_filters('give_sysinfo_after_give_config', $return);
 
 	// GIVE pages
-	$return .= "\n" . '-- Give Page Configuration' . "\n\n";
-	$return .= 'Success Page:             ' . ( ! empty( $give_options['success_page'] ) ? get_permalink( $give_options['success_page'] ) . "\n" : "Unset\n" );
-	$return .= 'Failure Page:             ' . ( ! empty( $give_options['failure_page'] ) ? get_permalink( $give_options['failure_page'] ) . "\n" : "Unset\n" );
-	$return .= 'Give Forms Slug:           ' . ( defined( 'GIVE_SLUG' ) ? '/' . GIVE_SLUG . "\n" : "/donations\n" );
+	$return .= "\n".'-- Give Page Configuration'."\n\n";
+	$return .= 'Success Page:             '.( ! empty($give_options['success_page']) ? get_permalink($give_options['success_page'])."\n" : "Unset\n");
+	$return .= 'Failure Page:             '.( ! empty($give_options['failure_page']) ? get_permalink($give_options['failure_page'])."\n" : "Unset\n");
+	$return .= 'Give Forms Slug:           '.(defined('GIVE_SLUG') ? '/'.GIVE_SLUG."\n" : "/donations\n");
 
-	$return = apply_filters( 'give_sysinfo_after_give_pages', $return );
+	$return = apply_filters('give_sysinfo_after_give_pages', $return);
 
 	// GIVE gateways
-	$return .= "\n" . '-- Give Gateway Configuration' . "\n\n";
+	$return .= "\n".'-- Give Gateway Configuration'."\n\n";
 
 	$active_gateways = give_get_enabled_payment_gateways();
-	if ( $active_gateways ) {
-		$default_gateway_is_active = give_is_gateway_active( give_get_default_gateway( null ) );
-		if ( $default_gateway_is_active ) {
-			$default_gateway = give_get_default_gateway( null );
-			$default_gateway = $active_gateways[ $default_gateway ]['admin_label'];
+	if ($active_gateways) {
+		$default_gateway_is_active = give_is_gateway_active(give_get_default_gateway(null));
+		if ($default_gateway_is_active) {
+			$default_gateway = give_get_default_gateway(null);
+			$default_gateway = $active_gateways[$default_gateway]['admin_label'];
 		} else {
 			$default_gateway = 'Test Payment';
 		}
 
 		$gateways = array();
-		foreach ( $active_gateways as $gateway ) {
+		foreach ($active_gateways as $gateway) {
 			$gateways[] = $gateway['admin_label'];
 		}
 
-		$return .= 'Enabled Gateways:         ' . implode( ', ', $gateways ) . "\n";
-		$return .= 'Default Gateway:          ' . $default_gateway . "\n";
+		$return .= 'Enabled Gateways:         '.implode(', ', $gateways)."\n";
+		$return .= 'Default Gateway:          '.$default_gateway."\n";
 	} else {
-		$return .= 'Enabled Gateways:         None' . "\n";
+		$return .= 'Enabled Gateways:         None'."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_give_gateways', $return );
+	$return = apply_filters('give_sysinfo_after_give_gateways', $return);
 
 	// GIVE Templates
-	$dir = get_stylesheet_directory() . '/give_templates/*';
-	if ( is_dir( $dir ) && ( count( glob( "$dir/*" ) ) !== 0 ) ) {
-		$return .= "\n" . '-- Give Template Overrides' . "\n\n";
+	$dir = get_stylesheet_directory().'/give_templates/*';
+	if (is_dir($dir) && (count(glob("$dir/*")) !== 0)) {
+		$return .= "\n".'-- Give Template Overrides'."\n\n";
 
-		foreach ( glob( $dir ) as $file ) {
-			$return .= 'Filename:                 ' . basename( $file ) . "\n";
+		foreach (glob($dir) as $file) {
+			$return .= 'Filename:                 '.basename($file)."\n";
 		}
 
-		$return = apply_filters( 'give_sysinfo_after_give_templates', $return );
+		$return = apply_filters('give_sysinfo_after_give_templates', $return);
 	}
 
 	// Must-use plugins
 	$muplugins = get_mu_plugins();
-	if ( count( $muplugins > 0 ) ) {
-		$return .= "\n" . '-- Must-Use Plugins' . "\n\n";
+	if (count($muplugins > 0)) {
+		$return .= "\n".'-- Must-Use Plugins'."\n\n";
 
-		foreach ( $muplugins as $plugin => $plugin_data ) {
-			$return .= $plugin_data['Name'] . ': ' . $plugin_data['Version'] . "\n";
+		foreach ($muplugins as $plugin => $plugin_data) {
+			$return .= $plugin_data['Name'].': '.$plugin_data['Version']."\n";
 		}
 
-		$return = apply_filters( 'give_sysinfo_after_wordpress_mu_plugins', $return );
+		$return = apply_filters('give_sysinfo_after_wordpress_mu_plugins', $return);
 	}
 
 	// WordPress active plugins
-	$return .= "\n" . '-- WordPress Active Plugins' . "\n\n";
+	$return .= "\n".'-- WordPress Active Plugins'."\n\n";
 
 	$plugins        = get_plugins();
-	$active_plugins = get_option( 'active_plugins', array() );
+	$active_plugins = get_option('active_plugins', array());
 
-	foreach ( $plugins as $plugin_path => $plugin ) {
-		if ( ! in_array( $plugin_path, $active_plugins ) ) {
+	foreach ($plugins as $plugin_path => $plugin) {
+		if ( ! in_array($plugin_path, $active_plugins)) {
 			continue;
 		}
 
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_wordpress_plugins', $return );
+	$return = apply_filters('give_sysinfo_after_wordpress_plugins', $return);
 
 	// WordPress inactive plugins
-	$return .= "\n" . '-- WordPress Inactive Plugins' . "\n\n";
+	$return .= "\n".'-- WordPress Inactive Plugins'."\n\n";
 
-	foreach ( $plugins as $plugin_path => $plugin ) {
-		if ( in_array( $plugin_path, $active_plugins ) ) {
+	foreach ($plugins as $plugin_path => $plugin) {
+		if (in_array($plugin_path, $active_plugins)) {
 			continue;
 		}
 
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_wordpress_plugins_inactive', $return );
+	$return = apply_filters('give_sysinfo_after_wordpress_plugins_inactive', $return);
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		// WordPress Multisite active plugins
-		$return .= "\n" . '-- Network Active Plugins' . "\n\n";
+		$return .= "\n".'-- Network Active Plugins'."\n\n";
 
 		$plugins        = wp_get_active_network_plugins();
-		$active_plugins = get_site_option( 'active_sitewide_plugins', array() );
+		$active_plugins = get_site_option('active_sitewide_plugins', array());
 
-		foreach ( $plugins as $plugin_path ) {
-			$plugin_base = plugin_basename( $plugin_path );
+		foreach ($plugins as $plugin_path) {
+			$plugin_base = plugin_basename($plugin_path);
 
-			if ( ! array_key_exists( $plugin_base, $active_plugins ) ) {
+			if ( ! array_key_exists($plugin_base, $active_plugins)) {
 				continue;
 			}
 
-			$plugin = get_plugin_data( $plugin_path );
-			$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+			$plugin = get_plugin_data($plugin_path);
+			$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 		}
 
-		$return = apply_filters( 'give_sysinfo_after_wordpress_ms_plugins', $return );
+		$return = apply_filters('give_sysinfo_after_wordpress_ms_plugins', $return);
 	}
 
 	// Server configuration (really just versioning)
-	$return .= "\n" . '-- Webserver Configuration' . "\n\n";
-	$return .= 'PHP Version:              ' . PHP_VERSION . "\n";
-	$return .= 'MySQL Version:            ' . $wpdb->db_version() . "\n";
-	$return .= 'Webserver Info:           ' . $_SERVER['SERVER_SOFTWARE'] . "\n";
+	$return .= "\n".'-- Webserver Configuration'."\n\n";
+	$return .= 'PHP Version:              '.PHP_VERSION."\n";
+	$return .= 'MySQL Version:            '.$wpdb->db_version()."\n";
+	$return .= 'Webserver Info:           '.$_SERVER['SERVER_SOFTWARE']."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_webserver_config', $return );
+	$return = apply_filters('give_sysinfo_after_webserver_config', $return);
 
 	// PHP configs... now we're getting to the important stuff
-	$return .= "\n" . '-- PHP Configuration' . "\n\n";
-	$return .= 'Safe Mode:                ' . ( ini_get( 'safe_mode' ) ? 'Enabled' : 'Disabled' . "\n" );
-	$return .= 'Memory Limit:             ' . ini_get( 'memory_limit' ) . "\n";
-	$return .= 'Upload Max Size:          ' . ini_get( 'upload_max_filesize' ) . "\n";
-	$return .= 'Post Max Size:            ' . ini_get( 'post_max_size' ) . "\n";
-	$return .= 'Upload Max Filesize:      ' . ini_get( 'upload_max_filesize' ) . "\n";
-	$return .= 'Time Limit:               ' . ini_get( 'max_execution_time' ) . "\n";
-	$return .= 'Max Input Vars:           ' . ini_get( 'max_input_vars' ) . "\n";
-	$return .= 'Display Errors:           ' . ( ini_get( 'display_errors' ) ? 'On (' . ini_get( 'display_errors' ) . ')' : 'N/A' ) . "\n";
-
-	$return = apply_filters( 'give_sysinfo_after_php_config', $return );
+	$return .= "\n".'-- PHP Configuration'."\n\n";
+	$return .= 'Safe Mode:                '.(ini_get('safe_mode') ? 'Enabled' : 'Disabled'."\n");
+	$return .= 'Memory Limit:             '.ini_get('memory_limit')."\n";
+	$return .= 'Upload Max Size:          '.ini_get('upload_max_filesize')."\n";
+	$return .= 'Post Max Size:            '.ini_get('post_max_size')."\n";
+	$return .= 'Upload Max Filesize:      '.ini_get('upload_max_filesize')."\n";
+	$return .= 'Time Limit:               '.ini_get('max_execution_time')."\n";
+	$return .= 'Max Input Vars:           '.ini_get('max_input_vars')."\n";
+	$return .= 'Display Errors:           '.(ini_get('display_errors') ? 'On ('.ini_get('display_errors').')' : 'N/A')."\n";
+
+	$return = apply_filters('give_sysinfo_after_php_config', $return);
 
 	// PHP extensions and such
-	$return .= "\n" . '-- PHP Extensions' . "\n\n";
-	$return .= 'cURL:                     ' . ( function_exists( 'curl_init' ) ? 'Supported' : 'Not Supported' ) . "\n";
+	$return .= "\n".'-- PHP Extensions'."\n\n";
+	$return .= 'cURL:                     '.(function_exists('curl_init') ? 'Supported' : 'Not Supported')."\n";
 
 	//cURL version
-	if ( function_exists( 'curl_init' ) && function_exists( 'curl_version' ) ) {
+	if (function_exists('curl_init') && function_exists('curl_version')) {
 		$curl_values = curl_version();
-		$return .= 'cURL Version:             ' . $curl_values["version"] . "\n";
+		$return .= 'cURL Version:             '.$curl_values["version"]."\n";
 	}
-	$return .= 'fsockopen:                ' . ( function_exists( 'fsockopen' ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'SOAP Client:              ' . ( class_exists( 'SoapClient' ) ? 'Installed' : 'Not Installed' ) . "\n";
-	$return .= 'Suhosin:                  ' . ( extension_loaded( 'suhosin' ) ? 'Installed' : 'Not Installed' ) . "\n";
+	$return .= 'fsockopen:                '.(function_exists('fsockopen') ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'SOAP Client:              '.(class_exists('SoapClient') ? 'Installed' : 'Not Installed')."\n";
+	$return .= 'Suhosin:                  '.(extension_loaded('suhosin') ? 'Installed' : 'Not Installed')."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_php_ext', $return );
+	$return = apply_filters('give_sysinfo_after_php_ext', $return);
 
 	// Session stuff
-	$return .= "\n" . '-- Session Configuration' . "\n\n";
-	$return .= 'Give Use Sessions:        ' . ( defined( 'GIVE_USE_PHP_SESSIONS' ) && GIVE_USE_PHP_SESSIONS ? 'Enforced' : ( Give()->session->use_php_sessions() ? 'Enabled' : 'Disabled' ) ) . "\n";
-	$return .= 'Session:                  ' . ( isset( $_SESSION ) ? 'Enabled' : 'Disabled' ) . "\n";
+	$return .= "\n".'-- Session Configuration'."\n\n";
+	$return .= 'Give Use Sessions:        '.(defined('GIVE_USE_PHP_SESSIONS') && GIVE_USE_PHP_SESSIONS ? 'Enforced' : (Give()->session->use_php_sessions() ? 'Enabled' : 'Disabled'))."\n";
+	$return .= 'Session:                  '.(isset($_SESSION) ? 'Enabled' : 'Disabled')."\n";
 
 	// The rest of this is only relevant is session is enabled
-	if ( isset( $_SESSION ) ) {
-		$return .= 'Session Name:             ' . esc_html( ini_get( 'session.name' ) ) . "\n";
-		$return .= 'Cookie Path:              ' . esc_html( ini_get( 'session.cookie_path' ) ) . "\n";
-		$return .= 'Save Path:                ' . esc_html( ini_get( 'session.save_path' ) ) . "\n";
-		$return .= 'Use Cookies:              ' . ( ini_get( 'session.use_cookies' ) ? 'On' : 'Off' ) . "\n";
-		$return .= 'Use Only Cookies:         ' . ( ini_get( 'session.use_only_cookies' ) ? 'On' : 'Off' ) . "\n";
+	if (isset($_SESSION)) {
+		$return .= 'Session Name:             '.esc_html(ini_get('session.name'))."\n";
+		$return .= 'Cookie Path:              '.esc_html(ini_get('session.cookie_path'))."\n";
+		$return .= 'Save Path:                '.esc_html(ini_get('session.save_path'))."\n";
+		$return .= 'Use Cookies:              '.(ini_get('session.use_cookies') ? 'On' : 'Off')."\n";
+		$return .= 'Use Only Cookies:         '.(ini_get('session.use_only_cookies') ? 'On' : 'Off')."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_session_config', $return );
+	$return = apply_filters('give_sysinfo_after_session_config', $return);
 
-	$return .= "\n" . '### End System Info ###';
+	$return .= "\n".'### End System Info ###';
 
 	return $return;
 }
@@ -327,17 +327,17 @@ 
  */
 function give_tools_sysinfo_download() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 
 	nocache_headers();
 
-	header( 'Content-Type: text/plain' );
-	header( 'Content-Disposition: attachment; filename="give-system-info.txt"' );
+	header('Content-Type: text/plain');
+	header('Content-Disposition: attachment; filename="give-system-info.txt"');
 
-	echo wp_strip_all_tags( $_POST['give-sysinfo'] );
+	echo wp_strip_all_tags($_POST['give-sysinfo']);
 	give_die();
 }
 
-add_action( 'give_download_sysinfo', 'give_tools_sysinfo_download' );
\ No newline at end of file
+add_action('give_download_sysinfo', 'give_tools_sysinfo_download');
\ No newline at end of file

includes/admin/add-ons.php

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,12 +25,12 @@ 
 function give_add_ons_page() {
 	ob_start(); ?>
 	<div class="wrap" id="give-add-ons">
-		<h2><?php _e( 'Give Add-ons', 'give' ); ?>
-			&nbsp;&mdash;&nbsp;<a href="https://givewp.com/addons/" class="button-primary give-view-addons-all" title="<?php _e( 'Browse All Add-ons', 'give' ); ?>" target="_blank"><?php _e( 'View All Add-ons', 'give' ); ?>
+		<h2><?php _e('Give Add-ons', 'give'); ?>
+			&nbsp;&mdash;&nbsp;<a href="https://givewp.com/addons/" class="button-primary give-view-addons-all" title="<?php _e('Browse All Add-ons', 'give'); ?>" target="_blank"><?php _e('View All Add-ons', 'give'); ?>
 				<span class="dashicons dashicons-external"></span></a>
 		</h2>
 
-		<p><?php _e( 'The following Add-ons extend the functionality of Give.', 'give' ); ?></p>
+		<p><?php _e('The following Add-ons extend the functionality of Give.', 'give'); ?></p>
 		<?php echo give_add_ons_get_feed(); ?>
 	</div>
 	<?php
@@ -48,18 +48,18 @@ 
 function give_add_ons_get_feed() {
 
 	$addons_debug = false; //set to true to debug
-	$cache        = get_transient( 'give_add_ons_feed' );
+	$cache        = get_transient('give_add_ons_feed');
 
-	if ( $cache === false || $addons_debug === true && WP_DEBUG === true ) {
-		$feed = wp_remote_get( 'https://givewp.com/downloads/feed/', array( 'sslverify' => false ) );
+	if ($cache === false || $addons_debug === true && WP_DEBUG === true) {
+		$feed = wp_remote_get('https://givewp.com/downloads/feed/', array('sslverify' => false));
 
-		if ( ! is_wp_error( $feed ) ) {
-			if ( isset( $feed['body'] ) && strlen( $feed['body'] ) > 0 ) {
-				$cache = wp_remote_retrieve_body( $feed );
-				set_transient( 'give_add_ons_feed', $cache, 3600 );
+		if ( ! is_wp_error($feed)) {
+			if (isset($feed['body']) && strlen($feed['body']) > 0) {
+				$cache = wp_remote_retrieve_body($feed);
+				set_transient('give_add_ons_feed', $cache, 3600);
 			}
 		} else {
-			$cache = '<div class="error"><p>' . __( 'There was an error retrieving the Give Add-ons list from the server. Please try again later.', 'give' ) . '</div>';
+			$cache = '<div class="error"><p>'.__('There was an error retrieving the Give Add-ons list from the server. Please try again later.', 'give').'</div>';
 		}
 	}
 

includes/gateways/paypal-standard.php

Spacing +157 added lines, -157 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,13 +32,13 @@ 
  *
  * @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( __( 'Nonce verification has failed', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($purchase_data['gateway_nonce'], 'give-gateway')) {
+		wp_die(__('Nonce verification has failed', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	$form_id = intval( $purchase_data['post_data']['give-form-id'] );
+	$form_id = intval($purchase_data['post_data']['give-form-id']);
 
 	// Collect payment data
 	$payment_data = array(
@@ -55,59 +55,59 @@ 
 	);
 
 	// 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( __( 'Payment Error', 'give' ), sprintf( __( 'Payment creation failed before sending buyer to PayPal. Payment data: %s', 'give' ), json_encode( $payment_data ) ), $payment );
+		give_record_gateway_error(__('Payment Error', 'give'), sprintf(__('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 : __( 'Custom Amount', 'give' ) );
+				$item_name .= ' - '.( ! empty($custom_amount_text) ? $custom_amount_text : __('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 : __( 'Custom Amount', 'give' ) );
+			$item_name .= ' - '.( ! empty($custom_amount_text) ? $custom_amount_text : __('Custom Amount', 'give'));
 		}
 
 		// Setup PayPal arguments
 		$paypal_args = array(
-			'business'      => give_get_option( 'paypal_email', false ),
+			'business'      => give_get_option('paypal_email', false),
 			'email'         => $purchase_data['user_email'],
 			'invoice'       => $purchase_data['purchase_key'],
 			'amount'        => $purchase_data['price'],
@@ -118,25 +118,25 @@ 
 			'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'
 		);
 
-		if ( ! empty( $purchase_data['user_info']['address'] ) ) {
+		if ( ! empty($purchase_data['user_info']['address'])) {
 			$paypal_args['address1'] = $purchase_data['user_info']['address']['line1'];
 			$paypal_args['address2'] = $purchase_data['user_info']['address']['line2'];
 			$paypal_args['city']     = $purchase_data['user_info']['address']['city'];
 			$paypal_args['country']  = $purchase_data['user_info']['address']['country'];
 		}
 
-		if ( give_get_option( 'paypal_button_type' ) === 'standard' ) {
+		if (give_get_option('paypal_button_type') === 'standard') {
 			$paypal_extra_args = array(
 				'cmd' => '_xclick',
 			);
@@ -146,25 +146,25 @@ 
 			);
 		}
 
-		$paypal_args = array_merge( $paypal_extra_args, $paypal_args );
+		$paypal_args = array_merge($paypal_extra_args, $paypal_args);
 
 
-		$paypal_args = apply_filters( 'give_paypal_redirect_args', $paypal_args, $purchase_data );
+		$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
@@ -174,12 +174,12 @@ 
  */
 function give_listen_for_paypal_ipn() {
 	// Regular PayPal IPN
-	if ( isset( $_GET['give-listener'] ) && $_GET['give-listener'] == 'IPN' ) {
-		do_action( 'give_verify_paypal_ipn' );
+	if (isset($_GET['give-listener']) && $_GET['give-listener'] == '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
@@ -190,7 +190,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;
 	}
 
@@ -198,11 +198,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';
@@ -211,27 +211,27 @@ 
 	$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);
 
-	if ( ! give_get_option( 'disable_paypal_verification' ) ) {
+	if ( ! give_get_option('disable_paypal_verification')) {
 
 		// Validate the IPN
 
@@ -253,16 +253,16 @@ 
 		);
 
 		// Get response
-		$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 ) ) {
-			give_record_gateway_error( __( 'IPN Error', 'give' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'give' ), json_encode( $api_response ) ) );
+		if (is_wp_error($api_response)) {
+			give_record_gateway_error(__('IPN Error', 'give'), sprintf(__('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 ) ) {
-			give_record_gateway_error( __( 'IPN Error', 'give' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'give' ), json_encode( $api_response ) ) );
+		if ($api_response['body'] !== 'VERIFIED' && give_get_option('disable_paypal_verification', false)) {
+			give_record_gateway_error(__('IPN Error', 'give'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'give'), json_encode($api_response)));
 
 			return; // Response not okay
 		}
@@ -270,7 +270,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;
 	}
 
@@ -279,21 +279,21 @@ 
 		'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;
 
-	if ( has_action( 'give_paypal_' . $encoded_data_array['txn_type'] ) ) {
+	if (has_action('give_paypal_'.$encoded_data_array['txn_type'])) {
 		// Allow PayPal IPN types to be processed separately
-		do_action( 'give_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $payment_id );
+		do_action('give_paypal_'.$encoded_data_array['txn_type'], $encoded_data_array, $payment_id);
 	} else {
 		// Fallback to web accept just in case the txn_type isn't present
-		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
@@ -304,185 +304,185 @@ 
  *
  * @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( __( 'IPN Error', 'give' ), sprintf( __( '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, __( 'Payment failed due to invalid PayPal business email.', 'give' ) );
+		give_record_gateway_error(__('IPN Error', 'give'), sprintf(__('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, __('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( __( 'IPN Error', 'give' ), sprintf( __( '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, __( 'Payment failed due to invalid currency in PayPal IPN.', 'give' ) );
+		give_record_gateway_error(__('IPN Error', 'give'), sprintf(__('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, __('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 purchase, 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 purchase 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( __( 'IPN Error', 'give' ), sprintf( __( '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, __( 'Payment failed due to invalid amount in PayPal IPN.', 'give' ) );
+			give_record_gateway_error(__('IPN Error', 'give'), sprintf(__('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, __('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)) {
 			// Purchase keys don't match
-			give_record_gateway_error( __( 'IPN Error', 'give' ), sprintf( __( 'Invalid purchase 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, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'give' ) );
+			give_record_gateway_error(__('IPN Error', 'give'), sprintf(__('Invalid purchase 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, __('Payment failed due to invalid purchase key in PayPal IPN.', 'give'));
 
 			return;
 		}
 
-		if ( $payment_status == 'completed' || give_is_test_mode() ) {
-			give_insert_payment_note( $payment_id, sprintf( __( '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'] ) ) {
+		if ($payment_status == 'completed' || give_is_test_mode()) {
+			give_insert_payment_note($payment_id, sprintf(__('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'])) {
 
 			// Look for possible pending reasons, such as an echeck
 
 			$note = '';
 
-			switch ( strtolower( $data['pending_reason'] ) ) {
+			switch (strtolower($data['pending_reason'])) {
 
 				case 'echeck' :
 
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'give' );
+					$note = __('Payment made via eCheck and will clear automatically in 5-8 days', 'give');
 
 					break;
 
 				case 'address' :
 
-					$note = __( 'Payment requires a confirmed donor address and must be accepted manually through PayPal', 'give' );
+					$note = __('Payment requires a confirmed donor address and must be accepted manually through PayPal', 'give');
 
 					break;
 
 				case 'intl' :
 
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'give' );
+					$note = __('Payment must be accepted manually through PayPal due to international account regulations', 'give');
 
 					break;
 
 				case 'multi-currency' :
 
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'give' );
+					$note = __('Payment received in non-shop currency and must be accepted manually through PayPal', 'give');
 
 					break;
 
 				case 'paymentreview' :
 				case 'regulatory_review' :
 
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'give' );
+					$note = __('Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'give');
 
 					break;
 
 				case 'unilateral' :
 
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'give' );
+					$note = __('Payment was sent to non-confirmed or non-registered email address.', 'give');
 
 					break;
 
 				case 'upgrade' :
 
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'give' );
+					$note = __('PayPal account must be upgraded before this payment can be accepted', 'give');
 
 					break;
 
 				case 'verify' :
 
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'give' );
+					$note = __('PayPal account is not verified. Verify account in order to accept this payment', 'give');
 
 					break;
 
 				case 'other' :
 
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'give' );
+					$note = __('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
@@ -493,32 +493,32 @@ 
  *
  * @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( __( 'Partial PayPal refund processed: %s', 'give' ), $data['parent_txn_id'] ) );
+		give_insert_payment_note($payment_id, sprintf(__('Partial PayPal refund processed: %s', 'give'), $data['parent_txn_id']));
 
 		return; // This is a partial refund
 
 	}
 
-	give_insert_payment_note( $payment_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'give' ), $data['parent_txn_id'], $data['reason_code'] ) );
-	give_insert_payment_note( $payment_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'give' ), $data['txn_id'] ) );
-	give_update_payment_status( $payment_id, 'refunded' );
+	give_insert_payment_note($payment_id, sprintf(__('PayPal Payment #%s Refunded for reason: %s', 'give'), $data['parent_txn_id'], $data['reason_code']));
+	give_insert_payment_note($payment_id, sprintf(__('PayPal Refund Transaction ID: %s', 'give'), $data['txn_id']));
+	give_update_payment_status($payment_id, 'refunded');
 }
 
 /**
@@ -530,24 +530,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);
 }
 
 /**
@@ -558,9 +558,9 @@ 
  */
 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);
 }
 
 /**
@@ -575,29 +575,29 @@ 
  * @return string
  *
  */
-function give_paypal_success_page_content( $content ) {
+function give_paypal_success_page_content($content) {
 
 	global $payment;
 
-	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, issue #
 		ob_start();
 
-		give_get_template_part( 'payment', 'processing' );
+		give_get_template_part('payment', 'processing');
 
 		$content = ob_get_clean();
 
@@ -607,7 +607,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
@@ -618,22 +618,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
@@ -645,13 +645,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/admin/reporting/class-gateways-reports-table.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Gateways Reports Table Class
- *
- * @package     Give
- * @subpackage  Admin/Reports
- * @copyright   Copyright (c) 2016, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+	 * Gateways Reports Table Class
+	 *
+	 * @package     Give
+	 * @subpackage  Admin/Reports
+	 * @copyright   Copyright (c) 2016, WordImpress
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.0
+	 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {

Spacing +33 added lines, -33 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';
 }
 
 /**
@@ -45,11 +45,11 @@ 
 		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?
-		) );
+		));
 
 	}
 
@@ -64,10 +64,10 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -80,11 +80,11 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'label'           => esc_attr__( 'Gateway', 'give' ),
-			'complete_sales'  => esc_attr__( 'Complete Transactions', 'give' ),
-			'pending_sales'   => esc_attr__( 'Pending / Failed Transactions', 'give' ),
-			'total_sales'     => esc_attr__( 'Total Transactions', 'give' ),
-			'total_donations' => esc_attr__( 'Total Donations', 'give' )
+			'label'           => esc_attr__('Gateway', 'give'),
+			'complete_sales'  => esc_attr__('Complete Transactions', 'give'),
+			'pending_sales'   => esc_attr__('Pending / Failed Transactions', 'give'),
+			'total_sales'     => esc_attr__('Total Transactions', 'give'),
+			'total_donations' => esc_attr__('Total Donations', 'give')
 		);
 
 		return $columns;
@@ -99,7 +99,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;
 	}
 
 
@@ -110,7 +110,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();
 	}
@@ -123,23 +123,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 gateways-report-tablenav give-clearfix <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav gateways-report-tablenav give-clearfix <?php echo esc_attr($which); ?>">
 
-			<h3 class="alignleft reports-earnings-title"><span><?php _e( 'Payment Methods Report', 'give' ); ?></span></h3>
+			<h3 class="alignleft reports-earnings-title"><span><?php _e('Payment Methods 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>
 
@@ -164,18 +164,18 @@ 
 		$gateways     = give_get_payment_gateways();
 		$stats        = new Give_Payment_Stats();
 
-		foreach ( $gateways as $gateway_id => $gateway ) {
+		foreach ($gateways as $gateway_id => $gateway) {
 
-			$complete_count = give_count_sales_by_gateway( $gateway_id, 'publish' );
-			$pending_count  = give_count_sales_by_gateway( $gateway_id, array( 'pending', 'failed' ) );
+			$complete_count = give_count_sales_by_gateway($gateway_id, 'publish');
+			$pending_count  = give_count_sales_by_gateway($gateway_id, array('pending', 'failed'));
 
 			$reports_data[] = array(
 				'ID'              => $gateway_id,
 				'label'           => $gateway['admin_label'],
-				'complete_sales'  => give_format_amount( $complete_count, false ),
-				'pending_sales'   => give_format_amount( $pending_count, false ),
-				'total_sales'     => give_format_amount( $complete_count + $pending_count, false ),
-				'total_donations' => give_currency_filter( give_format_amount( $stats->get_earnings( 0, 0, 0, $gateway_id ) ) )
+				'complete_sales'  => give_format_amount($complete_count, false),
+				'pending_sales'   => give_format_amount($pending_count, false),
+				'total_sales'     => give_format_amount($complete_count + $pending_count, false),
+				'total_donations' => give_currency_filter(give_format_amount($stats->get_earnings(0, 0, 0, $gateway_id)))
 			);
 		}
 
@@ -197,7 +197,7 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->reports_data();
 
 	}

includes/payments/class-payment-stats.php

Spacing +46 added lines, -46 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -39,46 +39,46 @@ 
 	 *
 	 * @return float|int
 	 */
-	public function get_sales( $form_id = 0, $start_date = false, $end_date = false, $status = 'publish' ) {
+	public function get_sales($form_id = 0, $start_date = false, $end_date = false, $status = 'publish') {
 
-		$this->setup_dates( $start_date, $end_date );
+		$this->setup_dates($start_date, $end_date);
 
 		// Make sure start date is valid
-		if ( is_wp_error( $this->start_date ) ) {
+		if (is_wp_error($this->start_date)) {
 			return $this->start_date;
 		}
 
 		// Make sure end date is valid
-		if ( is_wp_error( $this->end_date ) ) {
+		if (is_wp_error($this->end_date)) {
 			return $this->end_date;
 		}
 
-		if ( empty( $form_id ) ) {
+		if (empty($form_id)) {
 
 			// Global sale stats
-			add_filter( 'give_count_payments_where', array( $this, 'count_where' ) );
+			add_filter('give_count_payments_where', array($this, 'count_where'));
 
-			if ( is_array( $status ) ) {
+			if (is_array($status)) {
 				$count = 0;
-				foreach ( $status as $payment_status ) {
+				foreach ($status as $payment_status) {
 					$count += give_count_payments()->$payment_status;
 				}
 			} else {
 				$count = give_count_payments()->$status;
 			}
 
-			remove_filter( 'give_count_payments_where', array( $this, 'count_where' ) );
+			remove_filter('give_count_payments_where', array($this, 'count_where'));
 
 		} else {
 
 			// Product specific stats
 			global $give_logs;
 
-			add_filter( 'posts_where', array( $this, 'payments_where' ) );
+			add_filter('posts_where', array($this, 'payments_where'));
 
-			$count = $give_logs->get_log_count( $form_id, 'sale' );
+			$count = $give_logs->get_log_count($form_id, 'sale');
 
-			remove_filter( 'posts_where', array( $this, 'payments_where' ) );
+			remove_filter('posts_where', array($this, 'payments_where'));
 
 		}
 
@@ -100,31 +100,31 @@ 
 	 *
 	 * @return float|int
 	 */
-	public function get_earnings( $form_id = 0, $start_date = false, $end_date = false, $gateway_id = false ) {
+	public function get_earnings($form_id = 0, $start_date = false, $end_date = false, $gateway_id = false) {
 
 		global $wpdb;
 
-		$this->setup_dates( $start_date, $end_date );
+		$this->setup_dates($start_date, $end_date);
 
 		// Make sure start date is valid
-		if ( is_wp_error( $this->start_date ) ) {
+		if (is_wp_error($this->start_date)) {
 			return $this->start_date;
 		}
 
 		// Make sure end date is valid
-		if ( is_wp_error( $this->end_date ) ) {
+		if (is_wp_error($this->end_date)) {
 			return $this->end_date;
 		}
 
-		add_filter( 'posts_where', array( $this, 'payments_where' ) );
+		add_filter('posts_where', array($this, 'payments_where'));
 
-		if ( empty( $form_id ) ) {
+		if (empty($form_id)) {
 
 			// Global earning stats
 			$args = array(
 				'post_type'              => 'give_payment',
 				'nopaging'               => true,
-				'post_status'            => array( 'publish', 'revoked' ),
+				'post_status'            => array('publish', 'revoked'),
 				'fields'                 => 'ids',
 				'update_post_term_cache' => false,
 				'suppress_filters'       => false,
@@ -136,24 +136,24 @@ 
 			);
 
 			//Filter by Gateway ID meta_key
-			if ( $gateway_id !== false ) {
+			if ($gateway_id !== false) {
 				$args['meta_key']   = '_give_payment_gateway';
 				$args['meta_value'] = $gateway_id;
 			}
 
-			$args = apply_filters( 'give_stats_earnings_args', $args );
-			$key  = 'give_stats_' . substr( md5( serialize( $args ) ), 0, 15 );
+			$args = apply_filters('give_stats_earnings_args', $args);
+			$key  = 'give_stats_'.substr(md5(serialize($args)), 0, 15);
 
-			$earnings = get_transient( $key );
-			if ( false === $earnings ) {
-				$sales    = get_posts( $args );
+			$earnings = get_transient($key);
+			if (false === $earnings) {
+				$sales    = get_posts($args);
 				$earnings = 0;
-				if ( $sales ) {
-					$sales = implode( ',', $sales );
-					$earnings += $wpdb->get_var( "SELECT SUM(meta_value) FROM $wpdb->postmeta WHERE meta_key = '_give_payment_total' AND post_id IN({$sales})" );
+				if ($sales) {
+					$sales = implode(',', $sales);
+					$earnings += $wpdb->get_var("SELECT SUM(meta_value) FROM $wpdb->postmeta WHERE meta_key = '_give_payment_total' AND post_id IN({$sales})");
 				}
 				// Cache the results for one hour
-				set_transient( $key, $earnings, HOUR_IN_SECONDS );
+				set_transient($key, $earnings, HOUR_IN_SECONDS);
 			}
 
 		} else {
@@ -174,34 +174,34 @@ 
 				// This is not a valid query arg, but is used for cache keying
 			);
 
-			$args = apply_filters( 'give_stats_earnings_args', $args );
-			$key  = 'give_stats_' . substr( md5( serialize( $args ) ), 0, 15 );
+			$args = apply_filters('give_stats_earnings_args', $args);
+			$key  = 'give_stats_'.substr(md5(serialize($args)), 0, 15);
 			//Set transient for faster stats
-			$earnings = get_transient( $key );
+			$earnings = get_transient($key);
 
-			if ( false === $earnings ) {
+			if (false === $earnings) {
 
-				$log_ids  = $give_logs->get_connected_logs( $args, 'sale' );
+				$log_ids  = $give_logs->get_connected_logs($args, 'sale');
 				$earnings = 0;
 
-				if ( $log_ids ) {
-					$log_ids     = implode( ',', $log_ids );
-					$payment_ids = $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids);" );
-					foreach ( $payment_ids as $payment_id ) {
-						$earnings += give_get_payment_amount( $payment_id );
+				if ($log_ids) {
+					$log_ids     = implode(',', $log_ids);
+					$payment_ids = $wpdb->get_col("SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids);");
+					foreach ($payment_ids as $payment_id) {
+						$earnings += give_get_payment_amount($payment_id);
 					}
 				}
 
 				// Cache the results for one hour
-				set_transient( $key, $earnings, 60 * 60 );
+				set_transient($key, $earnings, 60 * 60);
 			}
 		}
 
 		//remove our filter
-		remove_filter( 'posts_where', array( $this, 'payments_where' ) );
+		remove_filter('posts_where', array($this, 'payments_where'));
 
 		//return earnings
-		return round( $earnings, give_currency_decimal_filter() );
+		return round($earnings, give_currency_decimal_filter());
 
 	}
 
@@ -215,16 +215,16 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_best_selling( $number = 10 ) {
+	public function get_best_selling($number = 10) {
 
 		global $wpdb;
 
-		$give_forms = $wpdb->get_results( $wpdb->prepare(
+		$give_forms = $wpdb->get_results($wpdb->prepare(
 			"SELECT post_id as form_id, max(meta_value) as sales
 				FROM $wpdb->postmeta WHERE meta_key='_give_form_sales' AND meta_value > 0
 				GROUP BY meta_value+0
 				DESC LIMIT %d;", $number
-		) );
+		));
 
 		return $give_forms;
 	}

includes/class-give-session.php

Doc Comments +4 added lines, -5 removed lines

@@ -167,10 +167,9 @@ 
 	 *
 	 * @since 1.0
 	 *
-	 * @param $key   $_SESSION key
-	 * @param $value $_SESSION variable
 	 *
-	 * @return mixed Session variable
+	 * @param string $key
+	 * @return string Session variable
 	 */
 	public function set( $key, $value ) {
 
@@ -222,13 +221,13 @@ 
 	/**
 	 * Starts a new session if one hasn't started yet.
 	 *
-	 * @return null
+	 * @return boolean
 	 * Checks to see if the server supports PHP sessions
 	 * or if the GIVE_USE_PHP_SESSIONS constant is defined
 	 *
 	 * @access public
 	 * @since  1.0
-	 * @return bool $ret True if we are using PHP sessions, false otherwise
+	 * @return boolean $ret True if we are using PHP sessions, false otherwise
 	 */
 	public function use_php_sessions() {
 

Spacing +49 added lines, -49 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -71,49 +71,49 @@ 
 	public function __construct() {
 
 		//Frontend only
-		if ( is_admin() ) {
+		if (is_admin()) {
 			return false;
 		}
 
 		$this->use_php_sessions = $this->use_php_sessions();
-		$this->exp_option       = give_get_option( 'session_lifetime' );
+		$this->exp_option       = give_get_option('session_lifetime');
 
-		if ( $this->use_php_sessions ) {
+		if ($this->use_php_sessions) {
 
-			if ( is_multisite() ) {
+			if (is_multisite()) {
 
-				$this->prefix = '_' . get_current_blog_id();
+				$this->prefix = '_'.get_current_blog_id();
 
 			}
 
 			// Use PHP SESSION (must be enabled via the GIVE_USE_PHP_SESSIONS constant)
-			add_action( 'init', array( $this, 'maybe_start_session' ), - 2 );
+			add_action('init', array($this, 'maybe_start_session'), - 2);
 
 		} else {
 
 			// Use WP_Session (default)
-			if ( ! defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'give_wp_session' );
+			if ( ! defined('WP_SESSION_COOKIE')) {
+				define('WP_SESSION_COOKIE', 'give_wp_session');
 			}
 
-			if ( ! class_exists( 'Recursive_ArrayAccess' ) ) {
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/class-recursive-arrayaccess.php';
+			if ( ! class_exists('Recursive_ArrayAccess')) {
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/class-recursive-arrayaccess.php';
 			}
 
-			if ( ! class_exists( 'WP_Session' ) ) {
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/class-wp-session.php';
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/wp-session.php';
+			if ( ! class_exists('WP_Session')) {
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/class-wp-session.php';
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/wp-session.php';
 			}
 
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+			add_filter('wp_session_expiration_variant', array($this, 'set_expiration_variant_time'), 99999);
+			add_filter('wp_session_expiration', array($this, 'set_expiration_time'), 99999);
 
 		}
 
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
-			add_action( 'plugins_loaded', array( $this, 'init' ), - 1 );
+		if (empty($this->session) && ! $this->use_php_sessions) {
+			add_action('plugins_loaded', array($this, 'init'), - 1);
 		} else {
-			add_action( 'init', array( $this, 'init' ), - 1 );
+			add_action('init', array($this, 'init'), - 1);
 		}
 
 	}
@@ -127,8 +127,8 @@ 
 	 */
 	public function init() {
 
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION[ 'give' . $this->prefix ] ) && is_array( $_SESSION[ 'give' . $this->prefix ] ) ? $_SESSION[ 'give' . $this->prefix ] : array();
+		if ($this->use_php_sessions) {
+			$this->session = isset($_SESSION['give'.$this->prefix]) && is_array($_SESSION['give'.$this->prefix]) ? $_SESSION['give'.$this->prefix] : array();
 		} else {
 			$this->session = WP_Session::get_instance();
 		}
@@ -160,10 +160,10 @@ 
 	 *
 	 * @return string Session variable
 	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
+	public function get($key) {
+		$key = sanitize_key($key);
 
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+		return isset($this->session[$key]) ? maybe_unserialize($this->session[$key]) : false;
 
 	}
 
@@ -177,21 +177,21 @@ 
 	 *
 	 * @return mixed Session variable
 	 */
-	public function set( $key, $value ) {
+	public function set($key, $value) {
 
-		$key = sanitize_key( $key );
+		$key = sanitize_key($key);
 
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = serialize( $value );
+		if (is_array($value)) {
+			$this->session[$key] = serialize($value);
 		} else {
-			$this->session[ $key ] = $value;
+			$this->session[$key] = $value;
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION[ 'give' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['give'.$this->prefix] = $this->session;
 		}
 
-		return $this->session[ $key ];
+		return $this->session[$key];
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 */
 	public function set_expiration_variant_time() {
 
-		return ( ! empty( $this->exp_option ) ? ( intval( $this->exp_option ) - 3600 ) : 30 * 60 * 23 );
+		return ( ! empty($this->exp_option) ? (intval($this->exp_option) - 3600) : 30 * 60 * 23);
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 	 */
 	public function set_expiration_time() {
 
-		return ( ! empty( $this->exp_option ) ? intval( $this->exp_option ) : 30 * 60 * 24 );
+		return ( ! empty($this->exp_option) ? intval($this->exp_option) : 30 * 60 * 24);
 	}
 
 	/**
@@ -240,21 +240,21 @@ 
 		$ret = false;
 
 		// If the database variable is already set, no need to run autodetection
-		$give_use_php_sessions = (bool) get_option( 'give_use_php_sessions' );
+		$give_use_php_sessions = (bool) get_option('give_use_php_sessions');
 
-		if ( ! $give_use_php_sessions ) {
+		if ( ! $give_use_php_sessions) {
 
 			// Attempt to detect if the server supports PHP sessions
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
+			if (function_exists('session_start') && ! ini_get('safe_mode')) {
 
-				$this->set( 'give_use_php_sessions', 1 );
+				$this->set('give_use_php_sessions', 1);
 
-				if ( $this->get( 'give_use_php_sessions' ) ) {
+				if ($this->get('give_use_php_sessions')) {
 
 					$ret = true;
 
 					// Set the database option
-					update_option( 'give_use_php_sessions', true );
+					update_option('give_use_php_sessions', true);
 
 				}
 
@@ -265,13 +265,13 @@ 
 		}
 
 		// Enable or disable PHP Sessions based on the GIVE_USE_PHP_SESSIONS constant
-		if ( defined( 'GIVE_USE_PHP_SESSIONS' ) && GIVE_USE_PHP_SESSIONS ) {
+		if (defined('GIVE_USE_PHP_SESSIONS') && GIVE_USE_PHP_SESSIONS) {
 			$ret = true;
-		} else if ( defined( 'GIVE_USE_PHP_SESSIONS' ) && ! GIVE_USE_PHP_SESSIONS ) {
+		} else if (defined('GIVE_USE_PHP_SESSIONS') && ! GIVE_USE_PHP_SESSIONS) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'give_use_php_sessions', $ret );
+		return (bool) apply_filters('give_use_php_sessions', $ret);
 	}
 
 	/**
@@ -284,11 +284,11 @@ 
 
 		//		session_destroy(); //Uncomment for testing ONLY
 
-		if ( ! session_id() && ! headers_sent() ) {
-			$lifetime = current_time( 'timestamp' ) + $this->set_expiration_time();
+		if ( ! session_id() && ! headers_sent()) {
+			$lifetime = current_time('timestamp') + $this->set_expiration_time();
 			session_start();
-			setcookie( session_name(), session_id(), $lifetime ); //
-			setcookie( session_name() . '_expiration', $lifetime, $lifetime );
+			setcookie(session_name(), session_id(), $lifetime); //
+			setcookie(session_name().'_expiration', $lifetime, $lifetime);
 		}
 	}
 
@@ -303,9 +303,9 @@ 
 
 		$expiration = false;
 
-		if ( session_id() && isset( $_COOKIE[ session_name() . '_expiration' ] ) ) {
+		if (session_id() && isset($_COOKIE[session_name().'_expiration'])) {
 
-			$expiration = date( 'D, d M Y h:i:s', intval( $_COOKIE[ session_name() . '_expiration' ] ) );
+			$expiration = date('D, d M Y h:i:s', intval($_COOKIE[session_name().'_expiration']));
 
 		}