WordImpress / Give

includes/emails/class-give-email-tags.php

Doc Comments +2 added lines, -1 removed lines

@@ -50,6 +50,7 @@ 
 	 *
 	 * @param string   $tag  Email tag to be replace in email
 	 * @param callable $func Hook to run when email tag is found
+	 * @param string $description
 	 */
 	public function add( $tag, $description, $func ) {
 		if ( is_callable( $func ) ) {
@@ -477,7 +478,7 @@ 
  *
  * @param int $payment_id
  *
- * @return int payment_id
+ * @return string payment_id
  */
 function give_email_tag_payment_id( $payment_id ) {
 	return give_get_payment_number( $payment_id );

Spacing +93 added lines, -93 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,9 +54,9 @@ 
 	 * @param string $tag Email tag to be replace in email
 	 * @param callable $func Hook to run when email tag is found
 	 */
-	public function add( $tag, $description, $func ) {
-		if ( is_callable( $func ) ) {
-			$this->tags[ $tag ] = array(
+	public function add($tag, $description, $func) {
+		if (is_callable($func)) {
+			$this->tags[$tag] = array(
 				'tag'         => $tag,
 				'description' => $description,
 				'func'        => $func
@@ -71,8 +71,8 @@ 
 	 *
 	 * @param string $tag Email tag to remove hook from
 	 */
-	public function remove( $tag ) {
-		unset( $this->tags[ $tag ] );
+	public function remove($tag) {
+		unset($this->tags[$tag]);
 	}
 
 	/**
@@ -84,8 +84,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function email_tag_exists( $tag ) {
-		return array_key_exists( $tag, $this->tags );
+	public function email_tag_exists($tag) {
+		return array_key_exists($tag, $this->tags);
 	}
 
 	/**
@@ -109,16 +109,16 @@ 
 	 *
 	 * @return string Content with email tags filtered out.
 	 */
-	public function do_tags( $content, $payment_id ) {
+	public function do_tags($content, $payment_id) {
 
 		// Check if there is atleast one tag added
-		if ( empty( $this->tags ) || ! is_array( $this->tags ) ) {
+		if (empty($this->tags) || ! is_array($this->tags)) {
 			return $content;
 		}
 
 		$this->payment_id = $payment_id;
 
-		$new_content = preg_replace_callback( "/{([A-z0-9\-\_]+)}/s", array( $this, 'do_tag' ), $content );
+		$new_content = preg_replace_callback("/{([A-z0-9\-\_]+)}/s", array($this, 'do_tag'), $content);
 
 		$this->payment_id = null;
 
@@ -134,17 +134,17 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function do_tag( $m ) {
+	public function do_tag($m) {
 
 		// Get tag
 		$tag = $m[1];
 
 		// Return tag if tag not set
-		if ( ! $this->email_tag_exists( $tag ) ) {
+		if ( ! $this->email_tag_exists($tag)) {
 			return $m[0];
 		}
 
-		return call_user_func( $this->tags[ $tag ]['func'], $this->payment_id, $tag );
+		return call_user_func($this->tags[$tag]['func'], $this->payment_id, $tag);
 	}
 
 }
@@ -158,8 +158,8 @@ 
  * @param string $description Description of the email tag added
  * @param callable $func Hook to run when email tag is found
  */
-function give_add_email_tag( $tag, $description, $func ) {
-	Give()->email_tags->add( $tag, $description, $func );
+function give_add_email_tag($tag, $description, $func) {
+	Give()->email_tags->add($tag, $description, $func);
 }
 
 /**
@@ -169,8 +169,8 @@ 
  *
  * @param string $tag Email tag to remove hook from
  */
-function give_remove_email_tag( $tag ) {
-	Give()->email_tags->remove( $tag );
+function give_remove_email_tag($tag) {
+	Give()->email_tags->remove($tag);
 }
 
 /**
@@ -182,8 +182,8 @@ 
  *
  * @return bool
  */
-function give_email_tag_exists( $tag ) {
-	return Give()->email_tags->email_tag_exists( $tag );
+function give_email_tag_exists($tag) {
+	return Give()->email_tags->email_tag_exists($tag);
 }
 
 /**
@@ -212,13 +212,13 @@ 
 	$email_tags = give_get_email_tags();
 
 	// Check
-	if ( count( $email_tags ) > 0 ) {
+	if (count($email_tags) > 0) {
 
 		// Loop
-		foreach ( $email_tags as $email_tag ) {
+		foreach ($email_tags as $email_tag) {
 
 			// Add email tag to list
-			$list .= '<code>{' . $email_tag['tag'] . '}</code> - ' . $email_tag['description'] . '<br/>';
+			$list .= '<code>{'.$email_tag['tag'].'}</code> - '.$email_tag['description'].'<br/>';
 
 		}
 
@@ -238,13 +238,13 @@ 
  *
  * @return string Content with email tags filtered out.
  */
-function give_do_email_tags( $content, $payment_id ) {
+function give_do_email_tags($content, $payment_id) {
 
 	// Replace all tags
-	$content = Give()->email_tags->do_tags( $content, $payment_id );
+	$content = Give()->email_tags->do_tags($content, $payment_id);
 
 	// Maintaining backwards compatibility
-	$content = apply_filters( 'give_email_template_tags', $content, give_get_payment_meta( $payment_id ), $payment_id );
+	$content = apply_filters('give_email_template_tags', $content, give_get_payment_meta($payment_id), $payment_id);
 
 	// Return content
 	return $content;
@@ -256,10 +256,10 @@ 
  * @since 1.0
  */
 function give_load_email_tags() {
-	do_action( 'give_add_email_tags' );
+	do_action('give_add_email_tags');
 }
 
-add_action( 'init', 'give_load_email_tags', - 999 );
+add_action('init', 'give_load_email_tags', - 999);
 
 /**
  * Add default Give email template tags
@@ -272,82 +272,82 @@ 
 	$email_tags = array(
 		array(
 			'tag'         => 'donation',
-			'description' => esc_html( 'The name of completed donation form and the donation level chosen if applicable.', 'give' ),
+			'description' => esc_html('The name of completed donation form and the donation level chosen if applicable.', 'give'),
 			'function'    => 'give_email_tag_donation'
 		),
 		array(
 			'tag'         => 'name',
-			'description' => esc_html( 'The donor\'s first name.', 'give' ),
+			'description' => esc_html('The donor\'s first name.', 'give'),
 			'function'    => 'give_email_tag_first_name'
 		),
 		array(
 			'tag'         => 'fullname',
-			'description' => esc_html( 'The donor\'s full name, first and last.', 'give' ),
+			'description' => esc_html('The donor\'s full name, first and last.', 'give'),
 			'function'    => 'give_email_tag_fullname'
 		),
 		array(
 			'tag'         => 'username',
-			'description' => esc_html( 'The donor\'s user name on the site, if they registered an account.', 'give' ),
+			'description' => esc_html('The donor\'s user name on the site, if they registered an account.', 'give'),
 			'function'    => 'give_email_tag_username'
 		),
 		array(
 			'tag'         => 'user_email',
-			'description' => esc_html( 'The donor\'s email address.', 'give' ),
+			'description' => esc_html('The donor\'s email address.', 'give'),
 			'function'    => 'give_email_tag_user_email'
 		),
 		array(
 			'tag'         => 'billing_address',
-			'description' => esc_html( 'The donor\'s billing address.', 'give' ),
+			'description' => esc_html('The donor\'s billing address.', 'give'),
 			'function'    => 'give_email_tag_billing_address'
 		),
 		array(
 			'tag'         => 'date',
-			'description' => esc_html( 'The date of the donation.', 'give' ),
+			'description' => esc_html('The date of the donation.', 'give'),
 			'function'    => 'give_email_tag_date'
 		),
 		array(
 			'tag'         => 'price',
-			'description' => esc_html( 'The total price of the donation.', 'give' ),
+			'description' => esc_html('The total price of the donation.', 'give'),
 			'function'    => 'give_email_tag_price'
 		),
 		array(
 			'tag'         => 'payment_id',
-			'description' => esc_html( 'The unique ID number for this donation.', 'give' ),
+			'description' => esc_html('The unique ID number for this donation.', 'give'),
 			'function'    => 'give_email_tag_payment_id'
 		),
 		array(
 			'tag'         => 'receipt_id',
-			'description' => esc_html( 'The unique ID number for this donation receipt.', 'give' ),
+			'description' => esc_html('The unique ID number for this donation receipt.', 'give'),
 			'function'    => 'give_email_tag_receipt_id'
 		),
 		array(
 			'tag'         => 'payment_method',
-			'description' => esc_html( 'The method of payment used for this donation.', 'give' ),
+			'description' => esc_html('The method of payment used for this donation.', 'give'),
 			'function'    => 'give_email_tag_payment_method'
 		),
 		array(
 			'tag'         => 'sitename',
-			'description' => esc_html( 'Your site name', 'give' ),
+			'description' => esc_html('Your site name', 'give'),
 			'function'    => 'give_email_tag_sitename'
 		),
 		array(
 			'tag'         => 'receipt_link',
-			'description' => esc_html( 'Adds a link so users can view their receipt directly on your website if they are unable to view it in the browser correctly.', 'give' ),
+			'description' => esc_html('Adds a link so users can view their receipt directly on your website if they are unable to view it in the browser correctly.', 'give'),
 			'function'    => 'give_email_tag_receipt_link'
 		),
 	);
 
 	// Apply give_email_tags filter
-	$email_tags = apply_filters( 'give_email_tags', $email_tags );
+	$email_tags = apply_filters('give_email_tags', $email_tags);
 
 	// Add email tags
-	foreach ( $email_tags as $email_tag ) {
-		give_add_email_tag( $email_tag['tag'], $email_tag['description'], $email_tag['function'] );
+	foreach ($email_tags as $email_tag) {
+		give_add_email_tag($email_tag['tag'], $email_tag['description'], $email_tag['function']);
 	}
 
 }
 
-add_action( 'give_add_email_tags', 'give_setup_email_tags' );
+add_action('give_add_email_tags', 'give_setup_email_tags');
 
 
 /**
@@ -358,15 +358,15 @@ 
  *
  * @return string name
  */
-function give_email_tag_first_name( $payment_id ) {
-	$payment   = new Give_Payment( $payment_id );
+function give_email_tag_first_name($payment_id) {
+	$payment   = new Give_Payment($payment_id);
 	$user_info = $payment->user_info;
 
-	if ( empty( $user_info ) ) {
+	if (empty($user_info)) {
 		return '';
 	}
 
-	$email_name = give_get_email_names( $user_info );
+	$email_name = give_get_email_names($user_info);
 
 	return $email_name['name'];
 }
@@ -379,15 +379,15 @@ 
  *
  * @return string fullname
  */
-function give_email_tag_fullname( $payment_id ) {
-	$payment   = new Give_Payment( $payment_id );
+function give_email_tag_fullname($payment_id) {
+	$payment   = new Give_Payment($payment_id);
 	$user_info = $payment->user_info;
 
-	if ( empty( $user_info ) ) {
+	if (empty($user_info)) {
 		return '';
 	}
 
-	$email_name = give_get_email_names( $user_info );
+	$email_name = give_get_email_names($user_info);
 
 	return $email_name['fullname'];
 }
@@ -400,15 +400,15 @@ 
  *
  * @return string username
  */
-function give_email_tag_username( $payment_id ) {
-	$payment   = new Give_Payment( $payment_id );
+function give_email_tag_username($payment_id) {
+	$payment   = new Give_Payment($payment_id);
 	$user_info = $payment->user_info;
 
-	if ( empty( $user_info ) ) {
+	if (empty($user_info)) {
 		return '';
 	}
 
-	$email_name = give_get_email_names( $user_info );
+	$email_name = give_get_email_names($user_info);
 
 	return $email_name['username'];
 }
@@ -421,8 +421,8 @@ 
  *
  * @return string user_email
  */
-function give_email_tag_user_email( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_user_email($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->email;
 }
@@ -435,10 +435,10 @@ 
  *
  * @return string billing_address
  */
-function give_email_tag_billing_address( $payment_id ) {
+function give_email_tag_billing_address($payment_id) {
 
-	$user_info    = give_get_payment_meta_user_info( $payment_id );
-	$user_address = ! empty( $user_info['address'] ) ? $user_info['address'] : array(
+	$user_info    = give_get_payment_meta_user_info($payment_id);
+	$user_address = ! empty($user_info['address']) ? $user_info['address'] : array(
 		'line1'   => '',
 		'line2'   => '',
 		'city'    => '',
@@ -447,11 +447,11 @@ 
 		'zip'     => ''
 	);
 
-	$return = $user_address['line1'] . "\n";
-	if ( ! empty( $user_address['line2'] ) ) {
-		$return .= $user_address['line2'] . "\n";
+	$return = $user_address['line1']."\n";
+	if ( ! empty($user_address['line2'])) {
+		$return .= $user_address['line2']."\n";
 	}
-	$return .= $user_address['city'] . ' ' . $user_address['zip'] . ' ' . $user_address['state'] . "\n";
+	$return .= $user_address['city'].' '.$user_address['zip'].' '.$user_address['state']."\n";
 	$return .= $user_address['country'];
 
 	return $return;
@@ -465,10 +465,10 @@ 
  *
  * @return string date
  */
-function give_email_tag_date( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_date($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
-	return date_i18n( get_option( 'date_format' ), strtotime( $payment->date ) );
+	return date_i18n(get_option('date_format'), strtotime($payment->date));
 }
 
 /**
@@ -479,11 +479,11 @@ 
  *
  * @return string price
  */
-function give_email_tag_price( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
-	$price   = give_currency_filter( give_format_amount( $payment->total ), $payment->currency );
+function give_email_tag_price($payment_id) {
+	$payment = new Give_Payment($payment_id);
+	$price   = give_currency_filter(give_format_amount($payment->total), $payment->currency);
 
-	return html_entity_decode( $price, ENT_COMPAT, 'UTF-8' );
+	return html_entity_decode($price, ENT_COMPAT, 'UTF-8');
 }
 
 /**
@@ -494,8 +494,8 @@ 
  *
  * @return int payment_id
  */
-function give_email_tag_payment_id( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_payment_id($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->number;
 }
@@ -508,8 +508,8 @@ 
  *
  * @return string receipt_id
  */
-function give_email_tag_receipt_id( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_receipt_id($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->key;
 }
@@ -523,11 +523,11 @@ 
  *
  * @return string $form_title
  */
-function give_email_tag_donation( $payment_id ) {
-	$payment    = new Give_Payment( $payment_id );
-	$form_title = strip_tags( give_get_payment_form_title( $payment->meta, false, '-' ) );
+function give_email_tag_donation($payment_id) {
+	$payment    = new Give_Payment($payment_id);
+	$form_title = strip_tags(give_get_payment_form_title($payment->meta, false, '-'));
 
-	return ! empty( $form_title ) ? $form_title : esc_html( 'There was an error retrieving this donation title.', 'give' );
+	return ! empty($form_title) ? $form_title : esc_html('There was an error retrieving this donation title.', 'give');
 
 }
 
@@ -539,10 +539,10 @@ 
  *
  * @return string gateway
  */
-function give_email_tag_payment_method( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_payment_method($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
-	return give_get_gateway_checkout_label( $payment->gateway );
+	return give_get_gateway_checkout_label($payment->gateway);
 }
 
 /**
@@ -553,8 +553,8 @@ 
  *
  * @return string sitename
  */
-function give_email_tag_sitename( $payment_id ) {
-	return wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+function give_email_tag_sitename($payment_id) {
+	return wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES);
 }
 
 /**
@@ -566,19 +566,19 @@ 
  *
  * @return string receipt_link
  */
-function give_email_tag_receipt_link( $payment_id ) {
+function give_email_tag_receipt_link($payment_id) {
 
-	$receipt_url = esc_url( add_query_arg( array(
-		'payment_key' => give_get_payment_key( $payment_id ),
+	$receipt_url = esc_url(add_query_arg(array(
+		'payment_key' => give_get_payment_key($payment_id),
 		'give_action' => 'view_receipt'
-	), home_url() ) );
-	$formatted   = sprintf(
+	), home_url()));
+	$formatted = sprintf(
 		'<a href="%1$s">%2$s</a>',
 		$receipt_url,
-		esc_html( 'View it in your browser', 'give' )
+		esc_html('View it in your browser', 'give')
 	);
 
-	if ( give_get_option( 'email_template' ) !== 'none' ) {
+	if (give_get_option('email_template') !== 'none') {
 		return $formatted;
 	} else {
 		return $receipt_url;

includes/error-tracking.php

Doc Comments +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
  *
  * @since 1.0
  * @uses  Give_Session::get()
- * @return mixed array if errors are present, false if none found
+ * @return string array if errors are present, false if none found
  */
 function give_get_errors() {
 	return Give()->session->get( 'give_errors' );
@@ -126,7 +126,7 @@ 
  * Register die handler for give_die()
  *
  * @since  1.0
- * @return void
+ * @return string|null
  */
 function _give_die_handler() {
 	if ( defined( 'GIVE_UNIT_TESTS' ) ) {

Spacing +30 added lines, -30 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,33 +29,33 @@ 
  *
  * @return void
  */
-function give_print_errors( $form_id ) {
+function give_print_errors($form_id) {
 
 	$errors = give_get_errors();
 
-	$request_form_id = isset( $_REQUEST['form-id'] ) ? intval( $_REQUEST['form-id'] ) : 0;
+	$request_form_id = isset($_REQUEST['form-id']) ? intval($_REQUEST['form-id']) : 0;
 
 	//Sanity checks first: Ensure that gateway returned errors display on the appropriate form
-	if ( ! isset( $_POST['give_ajax'] ) && $request_form_id !== $form_id ) {
+	if ( ! isset($_POST['give_ajax']) && $request_form_id !== $form_id) {
 		return;
 	}
 
-	if ( $errors ) {
-		$classes = apply_filters( 'give_error_class', array(
+	if ($errors) {
+		$classes = apply_filters('give_error_class', array(
 			'give_errors'
-		) );
-		echo '<div class="' . implode( ' ', $classes ) . '">';
+		));
+		echo '<div class="'.implode(' ', $classes).'">';
 		// Loop error codes and display errors
-		foreach ( $errors as $error_id => $error ) {
-			echo '<div class="give_error" id="give_error_' . $error_id . '"><p><strong>' . esc_html( 'Error', 'give' ) . '</strong>: ' . $error . '</p></div>';
+		foreach ($errors as $error_id => $error) {
+			echo '<div class="give_error" id="give_error_'.$error_id.'"><p><strong>'.esc_html('Error', 'give').'</strong>: '.$error.'</p></div>';
 		}
 		echo '</div>';
 		give_clear_errors();
 	}
 }
 
-add_action( 'give_purchase_form_before_personal_info', 'give_print_errors' );
-add_action( 'give_ajax_checkout_errors', 'give_print_errors' );
+add_action('give_purchase_form_before_personal_info', 'give_print_errors');
+add_action('give_ajax_checkout_errors', 'give_print_errors');
 
 /**
  * Get Errors
@@ -68,7 +68,7 @@ 
  * @return mixed array if errors are present, false if none found
  */
 function give_get_errors() {
-	return Give()->session->get( 'give_errors' );
+	return Give()->session->get('give_errors');
 }
 
 /**
@@ -84,13 +84,13 @@ 
  *
  * @return void
  */
-function give_set_error( $error_id, $error_message ) {
+function give_set_error($error_id, $error_message) {
 	$errors = give_get_errors();
-	if ( ! $errors ) {
+	if ( ! $errors) {
 		$errors = array();
 	}
-	$errors[ $error_id ] = $error_message;
-	Give()->session->set( 'give_errors', $errors );
+	$errors[$error_id] = $error_message;
+	Give()->session->set('give_errors', $errors);
 }
 
 /**
@@ -101,7 +101,7 @@ 
  * @return void
  */
 function give_clear_errors() {
-	Give()->session->set( 'give_errors', null );
+	Give()->session->set('give_errors', null);
 }
 
 /**
@@ -114,11 +114,11 @@ 
  *
  * @return string
  */
-function give_unset_error( $error_id ) {
+function give_unset_error($error_id) {
 	$errors = give_get_errors();
-	if ( $errors ) {
-		unset( $errors[ $error_id ] );
-		Give()->session->set( 'give_errors', $errors );
+	if ($errors) {
+		unset($errors[$error_id]);
+		Give()->session->set('give_errors', $errors);
 	}
 }
 
@@ -129,7 +129,7 @@ 
  * @return void
  */
 function _give_die_handler() {
-	if ( defined( 'GIVE_UNIT_TESTS' ) ) {
+	if (defined('GIVE_UNIT_TESTS')) {
 		return '_give_die_handler';
 	} else {
 		die();
@@ -144,10 +144,10 @@ 
  * @since  1.0
  * @return void
  */
-function give_die( $message = '', $title = '', $status = 400 ) {
-	add_filter( 'wp_die_ajax_handler', '_give_die_handler', 10, 3 );
-	add_filter( 'wp_die_handler', '_give_die_handler', 10, 3 );
-	wp_die( $message, $title, array( 'response' => $status ) );
+function give_die($message = '', $title = '', $status = 400) {
+	add_filter('wp_die_ajax_handler', '_give_die_handler', 10, 3);
+	add_filter('wp_die_handler', '_give_die_handler', 10, 3);
+	wp_die($message, $title, array('response' => $status));
 }
 
 /**
@@ -162,10 +162,10 @@ 
  *
  * @return   string  $error
  */
-function give_output_error( $message, $echo = true, $error_id = 'warning' ) {
-	$error = '<div class="give_errors" id="give_error_' . $error_id . '"><p class="give_error  give_' . $error_id . '">' . $message . '</p></div>';
+function give_output_error($message, $echo = true, $error_id = 'warning') {
+	$error = '<div class="give_errors" id="give_error_'.$error_id.'"><p class="give_error  give_'.$error_id.'">'.$message.'</p></div>';
 
-	if ( $echo ) {
+	if ($echo) {
 		echo $error;
 	} else {
 		return $error;

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

Indentation +2 added lines, -2 removed lines

@@ -115,8 +115,8 @@
 
 			case 'num_purchases' :
 				$value = '<a href="' .
-				         admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
-				         ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
+						 admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
+						 ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
 				break;
 
 			case 'amount_spent' :

Spacing +60 added lines, -60 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';
 }
 
 /**
@@ -62,11 +62,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => esc_html( 'Donor', 'give' ),     // Singular name of the listed records
-			'plural'   => esc_html( 'Donors', 'give' ),    // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => esc_html('Donor', 'give'), // Singular name of the listed records
+			'plural'   => esc_html('Donors', 'give'), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
 	}
 
@@ -83,7 +83,7 @@ 
 	 *
 	 * @return false
 	 */
-	public function search_box( $text, $input_id ) {
+	public function search_box($text, $input_id) {
 		return;
 	}
 
@@ -98,20 +98,20 @@ 
 	 *
 	 * @return void
 	 */
-	public function give_search_box( $text, $input_id ) {
-		$input_id = $input_id . '-search-input';
+	public function give_search_box($text, $input_id) {
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
 		}
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if ( ! empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
 		}
 		?>
 		<p class="search-box donor-search">
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-			<?php submit_button( $text, 'button', false, false, array( 'ID' => 'search-submit' ) ); ?>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?>
 		</p>
 	<?php
 	}
@@ -124,29 +124,29 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' == $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' == $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav give-clearfix <?php esc_attr_e( $which ); ?>">
+		<div class="tablenav give-clearfix <?php esc_attr_e($which); ?>">
 
-			<h3 class="alignleft reports-earnings-title"><span><?php esc_html_e( 'Donors Report', 'give' ); ?></span></h3>
+			<h3 class="alignleft reports-earnings-title"><span><?php esc_html_e('Donors Report', 'give'); ?></span></h3>
 
 			<div class="alignright tablenav-right">
 				<div class="actions bulkactions">
 					<?php
-					if ( 'top' == $which ) {
-						$this->give_search_box( esc_html( 'Search Donors', 'give' ), 'give-donors-report-search' );
+					if ('top' == $which) {
+						$this->give_search_box(esc_html('Search Donors', 'give'), 'give-donors-report-search');
 					}
 
-					$this->bulk_actions( $which ); ?>
+					$this->bulk_actions($which); ?>
 
 				</div>
 				<?php
-				$this->extra_tablenav( $which );
-				$this->pagination( $which );
+				$this->extra_tablenav($which);
+				$this->pagination($which);
 				?>
 			</div>
 
@@ -168,25 +168,25 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 
 			case 'num_purchases' :
-				$value = '<a href="' .
-				         admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
-				         ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
+				$value = '<a href="'.
+				         admin_url('/edit.php?post_type=give_forms&page=give-payment-history&user='.urlencode($item['email'])
+				         ).'">'.esc_html($item['num_purchases']).'</a>';
 				break;
 
 			case 'amount_spent' :
-				$value = give_currency_filter( give_format_amount( $item[ $column_name ] ) );
+				$value = give_currency_filter(give_format_amount($item[$column_name]));
 				break;
 
 			default:
-				$value = isset( $item[ $column_name ] ) ? $item[ $column_name ] : null;
+				$value = isset($item[$column_name]) ? $item[$column_name] : null;
 				break;
 		}
 
-		return apply_filters( 'give_report_column_' . $column_name, $value, $item['id'] );
+		return apply_filters('give_report_column_'.$column_name, $value, $item['id']);
 	}
 
 	/**
@@ -198,14 +198,14 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'name'          => esc_html( 'Name', 'give' ),
-			'id'            => esc_html( 'ID', 'give' ),
-			'email'         => esc_html( 'Email', 'give' ),
-			'num_purchases' => esc_html( 'Purchases', 'give' ),
-			'amount_spent'  => esc_html( 'Total Spent', 'give' )
+			'name'          => esc_html('Name', 'give'),
+			'id'            => esc_html('ID', 'give'),
+			'email'         => esc_html('Email', 'give'),
+			'num_purchases' => esc_html('Purchases', 'give'),
+			'amount_spent'  => esc_html('Total Spent', 'give')
 		);
 
-		return apply_filters( 'give_report_donor_columns', $columns );
+		return apply_filters('give_report_donor_columns', $columns);
 
 	}
 
@@ -218,10 +218,10 @@ 
 	 */
 	public function get_sortable_columns() {
 		return array(
-			'id'            => array( 'id', true ),
-			'name'          => array( 'name', true ),
-			'num_purchases' => array( 'purchase_count', false ),
-			'amount_spent'  => array( 'purchase_value', false ),
+			'id'            => array('id', true),
+			'name'          => array('name', true),
+			'num_purchases' => array('purchase_count', false),
+			'amount_spent'  => array('purchase_value', false),
 		);
 	}
 
@@ -232,7 +232,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();
 	}
@@ -245,7 +245,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;
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 	 * @return mixed string If search is present, false otherwise
 	 */
 	public function get_search() {
-		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;
+		return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false;
 	}
 
 	/**
@@ -273,10 +273,10 @@ 
 
 		$data    = array();
 		$paged   = $this->get_paged();
-		$offset  = $this->per_page * ( $paged - 1 );
+		$offset  = $this->per_page * ($paged - 1);
 		$search  = $this->get_search();
-		$order   = isset( $_GET['order'] ) ? sanitize_text_field( $_GET['order'] ) : 'DESC';
-		$orderby = isset( $_GET['orderby'] ) ? sanitize_text_field( $_GET['orderby'] ) : 'id';
+		$order   = isset($_GET['order']) ? sanitize_text_field($_GET['order']) : 'DESC';
+		$orderby = isset($_GET['orderby']) ? sanitize_text_field($_GET['orderby']) : 'id';
 
 		$args = array(
 			'number'  => $this->per_page,
@@ -285,21 +285,21 @@ 
 			'orderby' => $orderby
 		);
 
-		if ( is_email( $search ) ) {
+		if (is_email($search)) {
 			$args['email'] = $search;
-		} elseif ( is_numeric( $search ) ) {
+		} elseif (is_numeric($search)) {
 			$args['id'] = $search;
 		}
 
-		$donors = Give()->customers->get_customers( $args );
+		$donors = Give()->customers->get_customers($args);
 
-		if ( $donors ) {
+		if ($donors) {
 
-			$this->count = count( $donors );
+			$this->count = count($donors);
 
-			foreach ( $donors as $donor ) {
+			foreach ($donors as $donor) {
 
-				$user_id = ! empty( $donor->user_id ) ? absint( $donor->user_id ) : 0;
+				$user_id = ! empty($donor->user_id) ? absint($donor->user_id) : 0;
 
 				$data[] = array(
 					'id'            => $donor->id,
@@ -332,16 +332,16 @@ 
 		$hidden   = array(); // No hidden columns
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$this->items = $this->reports_data();
 
 		$this->total = give_count_total_customers();
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $this->total,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $this->total / $this->per_page )
-		) );
+			'total_pages' => ceil($this->total / $this->per_page)
+		));
 	}
 }
\ No newline at end of file

includes/forms/functions.php

Doc Comments +3 added lines, -3 removed lines

@@ -154,7 +154,7 @@ 
  * Used to redirect a user back to the purchase
  * page if there are errors present.
  *
- * @param array $args
+ * @param string $args
  *
  * @access public
  * @since  1.0
@@ -773,7 +773,7 @@ 
  *
  * @param int $form_id ID number of the form to retrieve the minimum price for
  *
- * @return mixed string|int Minimum price of the form
+ * @return string string|int Minimum price of the form
  */
 function give_get_form_minimum_price( $form_id = 0 ) {
 
@@ -878,7 +878,7 @@ 
  *
  * @param int $form_id ID number of the form to retrieve a goal for
  *
- * @return mixed string|int Goal of the form
+ * @return string string|int Goal of the form
  */
 function give_get_form_goal( $form_id = 0 ) {
 

Spacing +183 added lines, -183 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,14 +23,14 @@ 
 
 	global $typenow;
 
-	if ( $typenow != 'give_forms' ) {
+	if ($typenow != 'give_forms') {
 		return true;
 	}
 
 	return false;
 }
 
-add_filter( 'give_shortcode_button_condition', 'give_shortcode_button_condition' );
+add_filter('give_shortcode_button_condition', 'give_shortcode_button_condition');
 
 
 /**
@@ -40,11 +40,11 @@ 
  *
  * @return int|false
  */
-function get_form_id_from_args( $args ) {
+function get_form_id_from_args($args) {
 
-	if ( isset( $args['form_id'] ) && $args['form_id'] != 0 ) {
+	if (isset($args['form_id']) && $args['form_id'] != 0) {
 
-		return intval( $args['form_id'] );
+		return intval($args['form_id']);
 	}
 
 	return false;
@@ -59,23 +59,23 @@ 
  *
  * @return bool
  */
-function give_is_float_labels_enabled( $args ) {
+function give_is_float_labels_enabled($args) {
 
 	$float_labels = '';
 
-	if ( ! empty( $args['float_labels'] ) ) {
+	if ( ! empty($args['float_labels'])) {
 		$float_labels = $args['float_labels'];
 	}
 
-	if ( empty( $float_labels ) ) {
-		$float_labels = get_post_meta( $args['form_id'], '_give_form_floating_labels', true );
+	if (empty($float_labels)) {
+		$float_labels = get_post_meta($args['form_id'], '_give_form_floating_labels', true);
 	}
 
-	if ( empty( $float_labels ) ) {
-		$float_labels = give_get_option( 'enable_floatlabels' ) ? 'enabled' : 'disabled';
+	if (empty($float_labels)) {
+		$float_labels = give_get_option('enable_floatlabels') ? 'enabled' : 'disabled';
 	}
 
-	return ( $float_labels == 'enabled' ) ? true : false;
+	return ($float_labels == 'enabled') ? true : false;
 }
 
 /**
@@ -90,7 +90,7 @@ 
 
 	$can_checkout = true;
 
-	return (bool) apply_filters( 'give_can_checkout', $can_checkout );
+	return (bool) apply_filters('give_can_checkout', $can_checkout);
 }
 
 /**
@@ -103,9 +103,9 @@ 
 function give_get_success_page_uri() {
 	global $give_options;
 
-	$success_page = isset( $give_options['success_page'] ) ? get_permalink( absint( $give_options['success_page'] ) ) : get_bloginfo( 'url' );
+	$success_page = isset($give_options['success_page']) ? get_permalink(absint($give_options['success_page'])) : get_bloginfo('url');
 
-	return apply_filters( 'give_get_success_page_uri', $success_page );
+	return apply_filters('give_get_success_page_uri', $success_page);
 }
 
 /**
@@ -116,9 +116,9 @@ 
  */
 function give_is_success_page() {
 	global $give_options;
-	$is_success_page = isset( $give_options['success_page'] ) ? is_page( $give_options['success_page'] ) : false;
+	$is_success_page = isset($give_options['success_page']) ? is_page($give_options['success_page']) : false;
 
-	return apply_filters( 'give_is_success_page', $is_success_page );
+	return apply_filters('give_is_success_page', $is_success_page);
 }
 
 /**
@@ -132,17 +132,17 @@ 
  * @since       1.0
  * @return      void
  */
-function give_send_to_success_page( $query_string = null ) {
+function give_send_to_success_page($query_string = null) {
 
 	$redirect = give_get_success_page_uri();
 
-	if ( $query_string ) {
+	if ($query_string) {
 		$redirect .= $query_string;
 	}
 
-	$gateway = isset( $_REQUEST['give-gateway'] ) ? $_REQUEST['give-gateway'] : '';
+	$gateway = isset($_REQUEST['give-gateway']) ? $_REQUEST['give-gateway'] : '';
 
-	wp_redirect( apply_filters( 'give_success_page_redirect', $redirect, $gateway, $query_string ) );
+	wp_redirect(apply_filters('give_success_page_redirect', $redirect, $gateway, $query_string));
 	give_die();
 }
 
@@ -159,25 +159,25 @@ 
  * @since  1.0
  * @return Void
  */
-function give_send_back_to_checkout( $args = array() ) {
+function give_send_back_to_checkout($args = array()) {
 
-	$redirect = ( isset( $_POST['give-current-url'] ) ) ? $_POST['give-current-url'] : '';
-	$form_id  = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : 0;
+	$redirect = (isset($_POST['give-current-url'])) ? $_POST['give-current-url'] : '';
+	$form_id  = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : 0;
 
 	$defaults = array(
 		'form-id' => (int) $form_id
 	);
 
 	// Check for backward compatibility
-	if ( is_string( $args ) ) {
-		$args = str_replace( '?', '', $args );
+	if (is_string($args)) {
+		$args = str_replace('?', '', $args);
 	}
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	$redirect = add_query_arg( $args, $redirect ) . '#give-form-' . $form_id . '-wrap';
+	$redirect = add_query_arg($args, $redirect).'#give-form-'.$form_id.'-wrap';
 
-	wp_redirect( apply_filters( 'give_send_back_to_checkout', $redirect, $args ) );
+	wp_redirect(apply_filters('give_send_back_to_checkout', $redirect, $args));
 	give_die();
 }
 
@@ -192,16 +192,16 @@ 
  * @since       1.0
  * @return      string
  */
-function give_get_success_page_url( $query_string = null ) {
+function give_get_success_page_url($query_string = null) {
 
-	$success_page = give_get_option( 'success_page', 0 );
-	$success_page = get_permalink( $success_page );
+	$success_page = give_get_option('success_page', 0);
+	$success_page = get_permalink($success_page);
 
-	if ( $query_string ) {
+	if ($query_string) {
 		$success_page .= $query_string;
 	}
 
-	return apply_filters( 'give_success_page_url', $success_page );
+	return apply_filters('give_success_page_url', $success_page);
 
 }
 
@@ -215,15 +215,15 @@ 
  *
  * @return mixed|void Full URL to the Transaction Failed page, if present, home page if it doesn't exist
  */
-function give_get_failed_transaction_uri( $extras = false ) {
+function give_get_failed_transaction_uri($extras = false) {
 	global $give_options;
 
-	$uri = ! empty( $give_options['failure_page'] ) ? trailingslashit( get_permalink( $give_options['failure_page'] ) ) : home_url();
-	if ( $extras ) {
+	$uri = ! empty($give_options['failure_page']) ? trailingslashit(get_permalink($give_options['failure_page'])) : home_url();
+	if ($extras) {
 		$uri .= $extras;
 	}
 
-	return apply_filters( 'give_get_failed_transaction_uri', $uri );
+	return apply_filters('give_get_failed_transaction_uri', $uri);
 }
 
 /**
@@ -234,9 +234,9 @@ 
  */
 function give_is_failed_transaction_page() {
 	global $give_options;
-	$ret = isset( $give_options['failure_page'] ) ? is_page( $give_options['failure_page'] ) : false;
+	$ret = isset($give_options['failure_page']) ? is_page($give_options['failure_page']) : false;
 
-	return apply_filters( 'give_is_failure_page', $ret );
+	return apply_filters('give_is_failure_page', $ret);
 }
 
 /**
@@ -248,18 +248,18 @@ 
  */
 function give_listen_for_failed_payments() {
 
-	$failed_page = give_get_option( 'failure_page', 0 );
+	$failed_page = give_get_option('failure_page', 0);
 
-	if ( ! empty( $failed_page ) && is_page( $failed_page ) && ! empty( $_GET['payment-id'] ) ) {
+	if ( ! empty($failed_page) && is_page($failed_page) && ! empty($_GET['payment-id'])) {
 
-		$payment_id = absint( $_GET['payment-id'] );
-		give_update_payment_status( $payment_id, 'failed' );
+		$payment_id = absint($_GET['payment-id']);
+		give_update_payment_status($payment_id, 'failed');
 
 	}
 
 }
 
-add_action( 'template_redirect', 'give_listen_for_failed_payments' );
+add_action('template_redirect', 'give_listen_for_failed_payments');
 
 
 /**
@@ -272,11 +272,11 @@ 
  * @since       1.0
  * @return      bool
  */
-function give_field_is_required( $field = '', $form_id ) {
+function give_field_is_required($field = '', $form_id) {
 
-	$required_fields = give_purchase_form_required_fields( $form_id );
+	$required_fields = give_purchase_form_required_fields($form_id);
 
-	return array_key_exists( $field, $required_fields );
+	return array_key_exists($field, $required_fields);
 }
 
 /**
@@ -294,14 +294,14 @@ 
  *
  * @return void
  */
-function give_record_sale_in_log( $give_form_id = 0, $payment_id, $price_id = false, $sale_date = null ) {
+function give_record_sale_in_log($give_form_id = 0, $payment_id, $price_id = false, $sale_date = null) {
 	global $give_logs;
 
 	$log_data = array(
 		'post_parent'   => $give_form_id,
 		'log_type'      => 'sale',
-		'post_date'     => isset( $sale_date ) ? $sale_date : null,
-		'post_date_gmt' => isset( $sale_date ) ? $sale_date : null
+		'post_date'     => isset($sale_date) ? $sale_date : null,
+		'post_date_gmt' => isset($sale_date) ? $sale_date : null
 	);
 
 	$log_meta = array(
@@ -309,7 +309,7 @@ 
 		'price_id'   => (int) $price_id
 	);
 
-	$give_logs->insert_log( $log_data, $log_meta );
+	$give_logs->insert_log($log_data, $log_meta);
 }
 
 
@@ -323,11 +323,11 @@ 
  *
  * @return bool|int
  */
-function give_increase_purchase_count( $form_id = 0, $quantity = 1 ) {
+function give_increase_purchase_count($form_id = 0, $quantity = 1) {
 	$quantity = (int) $quantity;
-	$form     = new Give_Donate_Form( $form_id );
+	$form     = new Give_Donate_Form($form_id);
 
-	return $form->increase_sales( $quantity );
+	return $form->increase_sales($quantity);
 }
 
 /**
@@ -340,11 +340,11 @@ 
  *
  * @return bool|int
  */
-function give_decrease_purchase_count( $form_id = 0, $quantity = 1 ) {
+function give_decrease_purchase_count($form_id = 0, $quantity = 1) {
 	$quantity = (int) $quantity;
-	$form     = new Give_Donate_Form( $form_id );
+	$form     = new Give_Donate_Form($form_id);
 
-	return $form->decrease_sales( $quantity );
+	return $form->decrease_sales($quantity);
 }
 
 /**
@@ -357,10 +357,10 @@ 
  *
  * @return bool|int
  */
-function give_increase_earnings( $give_form_id = 0, $amount ) {
-	$form = new Give_Donate_Form( $give_form_id );
+function give_increase_earnings($give_form_id = 0, $amount) {
+	$form = new Give_Donate_Form($give_form_id);
 
-	return $form->increase_earnings( $amount );
+	return $form->increase_earnings($amount);
 }
 
 /**
@@ -373,10 +373,10 @@ 
  *
  * @return bool|int
  */
-function give_decrease_earnings( $form_id = 0, $amount ) {
-	$form = new Give_Donate_Form( $form_id );
+function give_decrease_earnings($form_id = 0, $amount) {
+	$form = new Give_Donate_Form($form_id);
 
-	return $form->decrease_earnings( $amount );
+	return $form->decrease_earnings($amount);
 }
 
 
@@ -389,8 +389,8 @@ 
  *
  * @return int $earnings Earnings for a certain form
  */
-function give_get_form_earnings_stats( $form_id = 0 ) {
-	$give_form = new Give_Donate_Form( $form_id );
+function give_get_form_earnings_stats($form_id = 0) {
+	$give_form = new Give_Donate_Form($form_id);
 
 	return $give_form->earnings;
 }
@@ -405,8 +405,8 @@ 
  *
  * @return int $sales Amount of sales for a certain form
  */
-function give_get_form_sales_stats( $give_form_id = 0 ) {
-	$give_form = new Give_Donate_Form( $give_form_id );
+function give_get_form_sales_stats($give_form_id = 0) {
+	$give_form = new Give_Donate_Form($give_form_id);
 
 	return $give_form->sales;
 }
@@ -421,16 +421,16 @@ 
  *
  * @return float $sales Average monthly sales
  */
-function give_get_average_monthly_form_sales( $form_id = 0 ) {
-	$sales        = give_get_form_sales_stats( $form_id );
-	$release_date = get_post_field( 'post_date', $form_id );
+function give_get_average_monthly_form_sales($form_id = 0) {
+	$sales        = give_get_form_sales_stats($form_id);
+	$release_date = get_post_field('post_date', $form_id);
 
-	$diff = abs( current_time( 'timestamp' ) - strtotime( $release_date ) );
+	$diff = abs(current_time('timestamp') - strtotime($release_date));
 
-	$months = floor( $diff / ( 30 * 60 * 60 * 24 ) ); // Number of months since publication
+	$months = floor($diff / (30 * 60 * 60 * 24)); // Number of months since publication
 
-	if ( $months > 0 ) {
-		$sales = ( $sales / $months );
+	if ($months > 0) {
+		$sales = ($sales / $months);
 	}
 
 	return $sales;
@@ -446,16 +446,16 @@ 
  *
  * @return float $earnings Average monthly earnings
  */
-function give_get_average_monthly_form_earnings( $form_id = 0 ) {
-	$earnings     = give_get_form_earnings_stats( $form_id );
-	$release_date = get_post_field( 'post_date', $form_id );
+function give_get_average_monthly_form_earnings($form_id = 0) {
+	$earnings     = give_get_form_earnings_stats($form_id);
+	$release_date = get_post_field('post_date', $form_id);
 
-	$diff = abs( current_time( 'timestamp' ) - strtotime( $release_date ) );
+	$diff = abs(current_time('timestamp') - strtotime($release_date));
 
-	$months = floor( $diff / ( 30 * 60 * 60 * 24 ) ); // Number of months since publication
+	$months = floor($diff / (30 * 60 * 60 * 24)); // Number of months since publication
 
-	if ( $months > 0 ) {
-		$earnings = ( $earnings / $months );
+	if ($months > 0) {
+		$earnings = ($earnings / $months);
 	}
 
 	return $earnings < 0 ? 0 : $earnings;
@@ -475,25 +475,25 @@ 
  *
  * @return string $price_name Name of the price option
  */
-function give_get_price_option_name( $form_id = 0, $price_id = 0, $payment_id = 0 ) {
+function give_get_price_option_name($form_id = 0, $price_id = 0, $payment_id = 0) {
 
-	$prices     = give_get_variable_prices( $form_id );
+	$prices     = give_get_variable_prices($form_id);
 	$price_name = '';
 
-	foreach ( $prices as $price ) {
+	foreach ($prices as $price) {
 
-		if ( intval( $price['_give_id']['level_id'] ) == intval( $price_id ) ) {
+		if (intval($price['_give_id']['level_id']) == intval($price_id)) {
 
-			$price_text     = isset( $price['_give_text'] ) ? $price['_give_text'] : '';
-			$price_fallback = give_currency_filter( give_format_amount( $price['_give_amount'] ) );
-			$price_name     = ! empty( $price_text ) ? $price_text : $price_fallback;
+			$price_text     = isset($price['_give_text']) ? $price['_give_text'] : '';
+			$price_fallback = give_currency_filter(give_format_amount($price['_give_amount']));
+			$price_name     = ! empty($price_text) ? $price_text : $price_fallback;
 
 		}
 
 	}
 
 
-	return apply_filters( 'give_get_price_option_name', $price_name, $form_id, $payment_id, $price_id );
+	return apply_filters('give_get_price_option_name', $price_name, $form_id, $payment_id, $price_id);
 }
 
 
@@ -506,14 +506,14 @@ 
  *
  * @return string $range A fully formatted price range
  */
-function give_price_range( $form_id = 0 ) {
-	$low   = give_get_lowest_price_option( $form_id );
-	$high  = give_get_highest_price_option( $form_id );
-	$range = '<span class="give_price_range_low">' . give_currency_filter( give_format_amount( $low ) ) . '</span>';
+function give_price_range($form_id = 0) {
+	$low   = give_get_lowest_price_option($form_id);
+	$high  = give_get_highest_price_option($form_id);
+	$range = '<span class="give_price_range_low">'.give_currency_filter(give_format_amount($low)).'</span>';
 	$range .= '<span class="give_price_range_sep">&nbsp;&ndash;&nbsp;</span>';
-	$range .= '<span class="give_price_range_high">' . give_currency_filter( give_format_amount( $high ) ) . '</span>';
+	$range .= '<span class="give_price_range_high">'.give_currency_filter(give_format_amount($high)).'</span>';
 
-	return apply_filters( 'give_price_range', $range, $form_id, $low, $high );
+	return apply_filters('give_price_range', $range, $form_id, $low, $high);
 }
 
 
@@ -528,36 +528,36 @@ 
  *
  * @return int ID of the lowest price
  */
-function give_get_lowest_price_id( $form_id = 0 ) {
+function give_get_lowest_price_id($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		$form_id = get_the_ID();
 	}
 
-	if ( ! give_has_variable_prices( $form_id ) ) {
-		return give_get_form_price( $form_id );
+	if ( ! give_has_variable_prices($form_id)) {
+		return give_get_form_price($form_id);
 	}
 
-	$prices = give_get_variable_prices( $form_id );
+	$prices = give_get_variable_prices($form_id);
 
 	$low    = 0.00;
 	$min_id = 1;
 
-	if ( ! empty( $prices ) ) {
+	if ( ! empty($prices)) {
 
-		foreach ( $prices as $key => $price ) {
+		foreach ($prices as $key => $price) {
 
-			if ( empty( $price['_give_amount'] ) ) {
+			if (empty($price['_give_amount'])) {
 				continue;
 			}
 
-			if ( ! isset( $min ) ) {
+			if ( ! isset($min)) {
 				$min = $price['_give_amount'];
 			} else {
-				$min = min( $min, $price['_give_amount'] );
+				$min = min($min, $price['_give_amount']);
 			}
 
-			if ( $price['_give_amount'] == $min ) {
+			if ($price['_give_amount'] == $min) {
 				$min_id = $price['_give_id']['level_id'];
 			}
 		}
@@ -575,43 +575,43 @@ 
  *
  * @return float Amount of the lowest price
  */
-function give_get_lowest_price_option( $form_id = 0 ) {
-	if ( empty( $form_id ) ) {
+function give_get_lowest_price_option($form_id = 0) {
+	if (empty($form_id)) {
 		$form_id = get_the_ID();
 	}
 
-	if ( ! give_has_variable_prices( $form_id ) ) {
-		return give_get_form_price( $form_id );
+	if ( ! give_has_variable_prices($form_id)) {
+		return give_get_form_price($form_id);
 	}
 
-	$prices = give_get_variable_prices( $form_id );
+	$prices = give_get_variable_prices($form_id);
 
 	$low = 0.00;
 
-	if ( ! empty( $prices ) ) {
+	if ( ! empty($prices)) {
 
-		foreach ( $prices as $key => $price ) {
+		foreach ($prices as $key => $price) {
 
-			if ( empty( $price['_give_amount'] ) ) {
+			if (empty($price['_give_amount'])) {
 				continue;
 			}
 
-			if ( ! isset( $min ) ) {
+			if ( ! isset($min)) {
 				$min = $price['_give_amount'];
 			} else {
-				$min = min( $min, give_sanitize_amount( $price['_give_amount'] ) );
+				$min = min($min, give_sanitize_amount($price['_give_amount']));
 			}
 
-			if ( $price['_give_amount'] == $min ) {
+			if ($price['_give_amount'] == $min) {
 				$min_id = $key;
 			}
 		}
 
-		$low = $prices[ $min_id ]['_give_amount'];
+		$low = $prices[$min_id]['_give_amount'];
 
 	}
 
-	return give_sanitize_amount( $low );
+	return give_sanitize_amount($low);
 }
 
 /**
@@ -623,41 +623,41 @@ 
  *
  * @return float Amount of the highest price
  */
-function give_get_highest_price_option( $form_id = 0 ) {
+function give_get_highest_price_option($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		$form_id = get_the_ID();
 	}
 
-	if ( ! give_has_variable_prices( $form_id ) ) {
-		return give_get_form_price( $form_id );
+	if ( ! give_has_variable_prices($form_id)) {
+		return give_get_form_price($form_id);
 	}
 
-	$prices = give_get_variable_prices( $form_id );
+	$prices = give_get_variable_prices($form_id);
 
 	$high = 0.00;
 
-	if ( ! empty( $prices ) ) {
+	if ( ! empty($prices)) {
 
 		$max = 0;
 
-		foreach ( $prices as $key => $price ) {
-			if ( empty( $price['_give_amount'] ) ) {
+		foreach ($prices as $key => $price) {
+			if (empty($price['_give_amount'])) {
 				continue;
 			}
-			$give_amount = give_sanitize_amount( $price['_give_amount'] );
+			$give_amount = give_sanitize_amount($price['_give_amount']);
 
-			$max = max( $max, $give_amount );
+			$max = max($max, $give_amount);
 
-			if ( $give_amount == $max ) {
+			if ($give_amount == $max) {
 				$max_id = $key;
 			}
 		}
 
-		$high = $prices[ $max_id ]['_give_amount'];
+		$high = $prices[$max_id]['_give_amount'];
 	}
 
-	return give_sanitize_amount( $high );
+	return give_sanitize_amount($high);
 }
 
 /**
@@ -669,15 +669,15 @@ 
  *
  * @return mixed string|int Price of the form
  */
-function give_get_form_price( $form_id = 0 ) {
+function give_get_form_price($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
-	return $form->__get( 'price' );
+	return $form->__get('price');
 }
 
 /**
@@ -689,15 +689,15 @@ 
  *
  * @return mixed string|int Minimum price of the form
  */
-function give_get_form_minimum_price( $form_id = 0 ) {
+function give_get_form_minimum_price($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
-	return $form->__get( 'minimum_price' );
+	return $form->__get('minimum_price');
 
 }
 
@@ -712,52 +712,52 @@ 
  *
  * @return int $formatted_price
  */
-function give_price( $form_id = 0, $echo = true, $price_id = false ) {
+function give_price($form_id = 0, $echo = true, $price_id = false) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		$form_id = get_the_ID();
 	}
 
-	if ( give_has_variable_prices( $form_id ) ) {
+	if (give_has_variable_prices($form_id)) {
 
-		$prices = give_get_variable_prices( $form_id );
+		$prices = give_get_variable_prices($form_id);
 
-		if ( false !== $price_id ) {
+		if (false !== $price_id) {
 
 			//loop through multi-prices to see which is default
-			foreach ( $prices as $price ) {
+			foreach ($prices as $price) {
 				//this is the default price
-				if ( isset( $price['_give_default'] ) && $price['_give_default'] === 'default' ) {
+				if (isset($price['_give_default']) && $price['_give_default'] === 'default') {
 					$price = (float) $price['_give_amount'];
 				};
 			}
 
 		} else {
 
-			$price = give_get_lowest_price_option( $form_id );
+			$price = give_get_lowest_price_option($form_id);
 		}
 
-		$price = give_sanitize_amount( $price );
+		$price = give_sanitize_amount($price);
 
 	} else {
 
-		$price = give_get_form_price( $form_id );
+		$price = give_get_form_price($form_id);
 
 	}
 
-	$price           = apply_filters( 'give_form_price', give_sanitize_amount( $price ), $form_id );
-	$formatted_price = '<span class="give_price" id="give_price_' . $form_id . '">' . $price . '</span>';
-	$formatted_price = apply_filters( 'give_form_price_after_html', $formatted_price, $form_id, $price );
+	$price           = apply_filters('give_form_price', give_sanitize_amount($price), $form_id);
+	$formatted_price = '<span class="give_price" id="give_price_'.$form_id.'">'.$price.'</span>';
+	$formatted_price = apply_filters('give_form_price_after_html', $formatted_price, $form_id, $price);
 
-	if ( $echo ) {
+	if ($echo) {
 		echo $formatted_price;
 	} else {
 		return $formatted_price;
 	}
 }
 
-add_filter( 'give_form_price', 'give_format_amount', 10 );
-add_filter( 'give_form_price', 'give_currency_filter', 20 );
+add_filter('give_form_price', 'give_format_amount', 10);
+add_filter('give_form_price', 'give_currency_filter', 20);
 
 
 /**
@@ -771,18 +771,18 @@ 
  *
  * @return float $amount Amount of the price option
  */
-function give_get_price_option_amount( $form_id = 0, $price_id = 0 ) {
-	$prices = give_get_variable_prices( $form_id );
+function give_get_price_option_amount($form_id = 0, $price_id = 0) {
+	$prices = give_get_variable_prices($form_id);
 
 	$amount = 0.00;
 
-	foreach ( $prices as $price ) {
-		if ( isset( $price['_give_id']['level_id'] ) && $price['_give_id']['level_id'] == $price_id ) {
-			$amount = isset( $price['_give_amount'] ) ? $price['_give_amount'] : 0.00;
+	foreach ($prices as $price) {
+		if (isset($price['_give_id']['level_id']) && $price['_give_id']['level_id'] == $price_id) {
+			$amount = isset($price['_give_amount']) ? $price['_give_amount'] : 0.00;
 		};
 	}
 
-	return apply_filters( 'give_get_price_option_amount', give_sanitize_amount( $amount ), $form_id, $price_id );
+	return apply_filters('give_get_price_option_amount', give_sanitize_amount($amount), $form_id, $price_id);
 }
 
 /**
@@ -794,13 +794,13 @@ 
  *
  * @return mixed string|int Goal of the form
  */
-function give_get_form_goal( $form_id = 0 ) {
+function give_get_form_goal($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
 	return $form->goal;
 
@@ -816,27 +816,27 @@ 
  *
  * @return string $formatted_goal
  */
-function give_goal( $form_id = 0, $echo = true ) {
+function give_goal($form_id = 0, $echo = true) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		$form_id = get_the_ID();
 	}
 
-	$goal = give_get_form_goal( $form_id );
+	$goal = give_get_form_goal($form_id);
 
-	$goal           = apply_filters( 'give_form_goal', give_sanitize_amount( $goal ), $form_id );
-	$formatted_goal = '<span class="give_price" id="give_price_' . $form_id . '">' . $goal . '</span>';
-	$formatted_goal = apply_filters( 'give_form_price_after_html', $formatted_goal, $form_id, $goal );
+	$goal           = apply_filters('give_form_goal', give_sanitize_amount($goal), $form_id);
+	$formatted_goal = '<span class="give_price" id="give_price_'.$form_id.'">'.$goal.'</span>';
+	$formatted_goal = apply_filters('give_form_price_after_html', $formatted_goal, $form_id, $goal);
 
-	if ( $echo ) {
+	if ($echo) {
 		echo $formatted_goal;
 	} else {
 		return $formatted_goal;
 	}
 }
 
-add_filter( 'give_form_goal', 'give_format_amount', 10 );
-add_filter( 'give_form_goal', 'give_currency_filter', 20 );
+add_filter('give_form_goal', 'give_format_amount', 10);
+add_filter('give_form_goal', 'give_currency_filter', 20);
 
 
 /**
@@ -846,13 +846,13 @@ 
  * @global $give_options
  * @return bool $ret Whether or not the logged_in_only setting is set
  */
-function give_logged_in_only( $form_id ) {
+function give_logged_in_only($form_id) {
 
-	$form_option = get_post_meta( $form_id, '_give_logged_in_only', true );
+	$form_option = get_post_meta($form_id, '_give_logged_in_only', true);
 
-	$ret = ! empty( $form_option ) ? $form_option : false;
+	$ret = ! empty($form_option) ? $form_option : false;
 
-	return (bool) apply_filters( 'give_logged_in_only', $ret, $form_id );
+	return (bool) apply_filters('give_logged_in_only', $ret, $form_id);
 
 }
 
@@ -864,10 +864,10 @@ 
  *
  * @param $form_id
  */
-function give_show_login_register_option( $form_id ) {
+function give_show_login_register_option($form_id) {
 
-	$show_register_form = get_post_meta( $form_id, '_give_show_register_form', true );
+	$show_register_form = get_post_meta($form_id, '_give_show_register_form', true);
 
-	return apply_filters( 'give_show_register_form', $show_register_form, $form_id );
+	return apply_filters('give_show_register_form', $show_register_form, $form_id);
 
 }
\ No newline at end of file

includes/plugin-compatibility.php

Spacing +2 added lines, -2 removed lines

@@ -19,6 +19,6 @@
  * @return void
  */
 function give_disable_mandrill_nl2br() {
-	add_filter( 'mandrill_nl2br', '__return_false' );
+	add_filter('mandrill_nl2br', '__return_false');
 }
-add_action( 'give_email_send_before', 'give_disable_mandrill_nl2br');
+add_action('give_email_send_before', 'give_disable_mandrill_nl2br');

includes/class-give-session.php

Doc Comments +4 added lines, -5 removed lines

@@ -165,10 +165,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 ) {
 
@@ -220,12 +219,12 @@ 
 	/**
 	 * 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 +61 added lines, -61 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -70,53 +70,53 @@ 
 	public function __construct() {
 
 		$this->use_php_sessions = $this->use_php_sessions();
-		$this->exp_option       = give_get_option( 'session_lifetime' );
+		$this->exp_option       = give_get_option('session_lifetime');
 
 		//PHP Sessions
-		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();
 
 			}
 
-			add_action( 'init', array( $this, 'maybe_start_session' ), - 2 );
+			add_action('init', array($this, 'maybe_start_session'), - 2);
 
 		} else {
 
-			if ( ! $this->should_start_session() ) {
+			if ( ! $this->should_start_session()) {
 				return;
 			}
 
 			// Use WP_Session
-			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/sessions/class-recursive-arrayaccess.php';
+			if ( ! class_exists('Recursive_ArrayAccess')) {
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/class-recursive-arrayaccess.php';
 			}
 
-			if ( ! class_exists( 'WP_Session' ) ) {
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/sessions/class-wp-session.php';
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/sessions/wp-session.php';
+			if ( ! class_exists('WP_Session')) {
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/class-wp-session.php';
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/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);
 
 		}
 
 		//Init Session
-		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);
 		}
 
 		//Set cookie on Donation Completion page
-		add_action( 'give_pre_process_purchase', array( $this, 'set_session_cookies' ) );
+		add_action('give_pre_process_purchase', array($this, 'set_session_cookies'));
 
 	}
 
@@ -129,8 +129,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();
 		}
@@ -162,10 +162,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;
 
 	}
 
@@ -179,21 +179,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,10 +206,10 @@ 
 	 * @since 1.4
 	 */
 	public function set_session_cookies() {
-		if( ! headers_sent() ) {
-			$lifetime = current_time( 'timestamp' ) + $this->set_expiration_time();
-			@setcookie( session_name(), session_id(), $lifetime, COOKIEPATH, COOKIE_DOMAIN, false  );
-			@setcookie( session_name() . '_expiration', $lifetime, $lifetime,  COOKIEPATH, COOKIE_DOMAIN, false  );
+		if ( ! headers_sent()) {
+			$lifetime = current_time('timestamp') + $this->set_expiration_time();
+			@setcookie(session_name(), session_id(), $lifetime, COOKIEPATH, COOKIE_DOMAIN, false);
+			@setcookie(session_name().'_expiration', $lifetime, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false);
 		}
 	}
 
@@ -225,7 +225,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);
 	}
 
 	/**
@@ -240,7 +240,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);
 	}
 
 	/**
@@ -258,21 +258,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);
 
 				}
 
@@ -284,13 +284,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);
 	}
 
 	/**
@@ -303,9 +303,9 @@ 
 
 		$start_session = true;
 
-		if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
+		if ( ! empty($_SERVER['REQUEST_URI'])) {
 
-			$blacklist = apply_filters( 'give_session_start_uri_blacklist', array(
+			$blacklist = apply_filters('give_session_start_uri_blacklist', array(
 				'feed',
 				'feed',
 				'feed/rss',
@@ -313,21 +313,21 @@ 
 				'feed/rdf',
 				'feed/atom',
 				'comments/feed/'
-			) );
-			$uri       = ltrim( $_SERVER['REQUEST_URI'], '/' );
-			$uri       = untrailingslashit( $uri );
-			if ( in_array( $uri, $blacklist ) ) {
+			));
+			$uri       = ltrim($_SERVER['REQUEST_URI'], '/');
+			$uri       = untrailingslashit($uri);
+			if (in_array($uri, $blacklist)) {
 				$start_session = false;
 			}
-			if ( false !== strpos( $uri, 'feed=' ) ) {
+			if (false !== strpos($uri, 'feed=')) {
 				$start_session = false;
 			}
-			if ( is_admin() ) {
+			if (is_admin()) {
 				$start_session = false;
 			}
 		}
 
-		return apply_filters( 'give_start_session', $start_session );
+		return apply_filters('give_start_session', $start_session);
 	}
 
 	/**
@@ -338,11 +338,11 @@ 
 	 */
 	public function maybe_start_session() {
 
-		if ( ! $this->should_start_session() ) {
+		if ( ! $this->should_start_session()) {
 			return;
 		}
 
-		if ( ! session_id() && ! headers_sent() ) {
+		if ( ! session_id() && ! headers_sent()) {
 			session_start();
 		}
 
@@ -358,9 +358,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']));
 
 		}
 

includes/admin/system-info.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
  *
  * @since: 1.4
  *
- * @return bool
+ * @return boolean|null
  */
 function give_allow_sessions_for_sysinfo() {
 	if ( is_admin() && ( isset( $_GET['page'] ) && isset( $_GET['tab'] ) ) && ( $_GET['tab'] == 'system_info' && $_GET['page'] == 'give-settings' ) ) {

Spacing +146 added lines, -146 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,14 +24,14 @@ 
  */
 function give_system_info_callback() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 	?>
-	<textarea readonly="readonly" onclick="this.focus(); this.select()" id="system-info-textarea" name="give-sysinfo" title="<?php esc_attr_e( 'To copy the system info, click below then press Ctrl + C (PC) or Cmd + C (Mac).', 'give' ); ?>"><?php echo give_tools_sysinfo_get(); ?></textarea>
+	<textarea readonly="readonly" onclick="this.focus(); this.select()" id="system-info-textarea" name="give-sysinfo" title="<?php esc_attr_e('To copy the system info, click below then press Ctrl + C (PC) or Cmd + C (Mac).', 'give'); ?>"><?php echo give_tools_sysinfo_get(); ?></textarea>
 	<p class="submit">
 		<input type="hidden" name="give-action" value="download_sysinfo"/>
-		<?php submit_button( esc_html( 'Download System Info File', 'give' ), 'secondary', 'give-download-sysinfo', false ); ?>
+		<?php submit_button(esc_html('Download System Info File', 'give'), 'secondary', 'give-download-sysinfo', false); ?>
 	</p>
 	<?php
 }
@@ -47,12 +47,12 @@ 
  * @return bool
  */
 function give_allow_sessions_for_sysinfo() {
-	if ( is_admin() && ( isset( $_GET['page'] ) && isset( $_GET['tab'] ) ) && ( $_GET['tab'] == 'system_info' && $_GET['page'] == 'give-settings' ) ) {
+	if (is_admin() && (isset($_GET['page']) && isset($_GET['tab'])) && ($_GET['tab'] == 'system_info' && $_GET['page'] == 'give-settings')) {
 		return true;
 	}
 }
 
-add_filter( 'give_start_session', 'give_allow_sessions_for_sysinfo' );
+add_filter('give_start_session', 'give_allow_sessions_for_sysinfo');
 
 
 /**
@@ -67,63 +67,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 = wp_get_theme( get_stylesheet_directory() . '/style.css' );
-		$theme      = $theme_data['Name'] . ' ' . $theme_data['Version'];
+	if (get_bloginfo('version') < '3.4') {
+		$theme_data = wp_get_theme(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
@@ -132,205 +132,205 @@ 
 	$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 .= 'URL-aware fopen:          ' . ( ini_get( 'allow_url_fopen' ) ? 'On (' . ini_get( 'allow_url_fopen' ) . ')' : 'N/A' ) . "\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 .= 'URL-aware fopen:          '.(ini_get('allow_url_fopen') ? 'On ('.ini_get('allow_url_fopen').')' : 'N/A')."\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 .= 'zlib:                     ' . ( function_exists( 'gzcompress' ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'GD:                       ' . ( ( extension_loaded( 'gd' ) && function_exists( 'gd_info' ) ) ? 'Supported' : 'Not Supported' ) . "\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 .= 'DOM:                      ' . ( extension_loaded( 'dom' ) ? 'Installed' : 'Not Installed' ) . "\n";
-	$return .= 'MBString:                 ' . ( extension_loaded( 'mbstring' ) ? 'Installed' : 'Not Installed' ) . "\n";
+	$return .= 'zlib:                     '.(function_exists('gzcompress') ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'GD:                       '.((extension_loaded('gd') && function_exists('gd_info')) ? 'Supported' : 'Not Supported')."\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 .= 'DOM:                      '.(extension_loaded('dom') ? 'Installed' : 'Not Installed')."\n";
+	$return .= 'MBString:                 '.(extension_loaded('mbstring') ? '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;
 }
@@ -344,17 +344,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/class-give-db-customers.php

Doc Comments +2 added lines, -2 removed lines

@@ -282,7 +282,7 @@ 
 	 * @param int $user_id
 	 * @param $old_user_data
 	 *
-	 * @return bool
+	 * @return false|null
 	 */
 	public function update_customer_email_on_user_update( $user_id = 0, $old_user_data ) {
 
@@ -331,7 +331,7 @@ 
 	 * @since  1.0
 	 *
 	 * @param  string $field id or email
-	 * @param  mixed  $value The Customer ID or email to search
+	 * @param  integer  $value The Customer ID or email to search
 	 *
 	 * @return mixed          Upon success, an object of the customer. Upon failure, NULL
 	 */

Spacing +129 added lines, -129 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -33,11 +33,11 @@ 
 
 		global $wpdb;
 
-		$this->table_name  = $wpdb->prefix . 'give_customers';
+		$this->table_name  = $wpdb->prefix.'give_customers';
 		$this->primary_key = 'id';
 		$this->version     = '1.0';
 		
-		add_action( 'profile_update', array( $this, 'update_customer_email_on_user_update' ), 10, 2 );
+		add_action('profile_update', array($this, 'update_customer_email_on_user_update'), 10, 2);
 
 	}
 
@@ -76,7 +76,7 @@ 
 			'purchase_value' => 0.00,
 			'purchase_count' => 0,
 			'notes'          => '',
-			'date_created'   => date( 'Y-m-d H:i:s' ),
+			'date_created'   => date('Y-m-d H:i:s'),
 		);
 	}
 
@@ -86,40 +86,40 @@ 
 	 * @access  public
 	 * @since   1.0
 	 */
-	public function add( $data = array() ) {
+	public function add($data = array()) {
 
 		$defaults = array(
 			'payment_ids' => ''
 		);
 
-		$args = wp_parse_args( $data, $defaults );
+		$args = wp_parse_args($data, $defaults);
 
-		if ( empty( $args['email'] ) ) {
+		if (empty($args['email'])) {
 			return false;
 		}
 
-		if ( ! empty( $args['payment_ids'] ) && is_array( $args['payment_ids'] ) ) {
-			$args['payment_ids'] = implode( ',', array_unique( array_values( $args['payment_ids'] ) ) );
+		if ( ! empty($args['payment_ids']) && is_array($args['payment_ids'])) {
+			$args['payment_ids'] = implode(',', array_unique(array_values($args['payment_ids'])));
 		}
 
-		$customer = $this->get_customer_by( 'email', $args['email'] );
+		$customer = $this->get_customer_by('email', $args['email']);
 
-		if ( $customer ) {
+		if ($customer) {
 			// update an existing customer
 
 			// Update the payment IDs attached to the customer
-			if ( ! empty( $args['payment_ids'] ) ) {
+			if ( ! empty($args['payment_ids'])) {
 
-				if ( empty( $customer->payment_ids ) ) {
+				if (empty($customer->payment_ids)) {
 
 					$customer->payment_ids = $args['payment_ids'];
 
 				} else {
 
-					$existing_ids          = array_map( 'absint', explode( ',', $customer->payment_ids ) );
-					$payment_ids           = array_map( 'absint', explode( ',', $args['payment_ids'] ) );
-					$payment_ids           = array_merge( $payment_ids, $existing_ids );
-					$customer->payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+					$existing_ids          = array_map('absint', explode(',', $customer->payment_ids));
+					$payment_ids           = array_map('absint', explode(',', $args['payment_ids']));
+					$payment_ids           = array_merge($payment_ids, $existing_ids);
+					$customer->payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 				}
 
@@ -127,13 +127,13 @@ 
 
 			}
 
-			$this->update( $customer->id, $args );
+			$this->update($customer->id, $args);
 
 			return $customer->id;
 
 		} else {
 
-			return $this->insert( $args, 'customer' );
+			return $this->insert($args, 'customer');
 
 		}
 
@@ -152,20 +152,20 @@ 
 	 *
 	 * @return bool|false|int
 	 */
-	public function delete( $_id_or_email = false ) {
+	public function delete($_id_or_email = false) {
 
-		if ( empty( $_id_or_email ) ) {
+		if (empty($_id_or_email)) {
 			return false;
 		}
 
-		$column   = is_email( $_id_or_email ) ? 'email' : 'id';
-		$customer = $this->get_customer_by( $column, $_id_or_email );
+		$column   = is_email($_id_or_email) ? 'email' : 'id';
+		$customer = $this->get_customer_by($column, $_id_or_email);
 
-		if ( $customer->id > 0 ) {
+		if ($customer->id > 0) {
 
 			global $wpdb;
 
-			return $wpdb->delete( $this->table_name, array( 'id' => $customer->id ), array( '%d' ) );
+			return $wpdb->delete($this->table_name, array('id' => $customer->id), array('%d'));
 
 		} else {
 			return false;
@@ -179,14 +179,14 @@ 
 	 * @access  public
 	 * @since   1.0
 	 */
-	public function exists( $value = '', $field = 'email' ) {
+	public function exists($value = '', $field = 'email') {
 		
 		$columns = $this->get_columns();
-		if ( ! array_key_exists( $field, $columns ) ) {
+		if ( ! array_key_exists($field, $columns)) {
 			return false;
 		}
 
-		return (bool) $this->get_column_by( 'id', $field, $value );
+		return (bool) $this->get_column_by('id', $field, $value);
 
 	}
 
@@ -196,16 +196,16 @@ 
 	 * @access  public
 	 * @since   1.0
 	 */
-	public function attach_payment( $customer_id = 0, $payment_id = 0 ) {
+	public function attach_payment($customer_id = 0, $payment_id = 0) {
 
-		$customer = new Give_Customer( $customer_id );
+		$customer = new Give_Customer($customer_id);
 
-		if ( empty( $customer->id ) ) {
+		if (empty($customer->id)) {
 			return false;
 		}
 
 		// Attach the payment, but don't increment stats, as this function previously did not
-		return $customer->attach_payment( $payment_id, false );
+		return $customer->attach_payment($payment_id, false);
 
 	}
 
@@ -215,16 +215,16 @@ 
 	 * @access  public
 	 * @since   1.0
 	 */
-	public function remove_payment( $customer_id = 0, $payment_id = 0 ) {
+	public function remove_payment($customer_id = 0, $payment_id = 0) {
 
-		$customer = new Give_Customer( $customer_id );
+		$customer = new Give_Customer($customer_id);
 
-		if ( ! $customer ) {
+		if ( ! $customer) {
 			return false;
 		}
 
 		// Remove the payment, but don't decrease stats, as this function previously did not
-		return $customer->remove_payment( $payment_id, false );
+		return $customer->remove_payment($payment_id, false);
 
 	}
 
@@ -236,18 +236,18 @@ 
 	 *
 	 * @return bool
 	 */
-	public function increment_stats( $customer_id = 0, $amount = 0.00 ) {
+	public function increment_stats($customer_id = 0, $amount = 0.00) {
 
-		$customer = new Give_Customer( $customer_id );
+		$customer = new Give_Customer($customer_id);
 
-		if ( empty( $customer->id ) ) {
+		if (empty($customer->id)) {
 			return false;
 		}
 
 		$increased_count = $customer->increase_purchase_count();
-		$increased_value = $customer->increase_value( $amount );
+		$increased_value = $customer->increase_value($amount);
 
-		return ( $increased_count && $increased_value ) ? true : false;
+		return ($increased_count && $increased_value) ? true : false;
 
 	}
 
@@ -257,18 +257,18 @@ 
 	 * @access  public
 	 * @since   1.0
 	 */
-	public function decrement_stats( $customer_id = 0, $amount = 0.00 ) {
+	public function decrement_stats($customer_id = 0, $amount = 0.00) {
 
-		$customer = new Give_Customer( $customer_id );
+		$customer = new Give_Customer($customer_id);
 
-		if ( ! $customer ) {
+		if ( ! $customer) {
 			return false;
 		}
 
 		$decreased_count = $customer->decrease_purchase_count();
-		$decreased_value = $customer->decrease_value( $amount );
+		$decreased_value = $customer->decrease_value($amount);
 
-		return ( $decreased_count && $decreased_value ) ? true : false;
+		return ($decreased_count && $decreased_value) ? true : false;
 
 	}
 
@@ -284,37 +284,37 @@ 
 	 *
 	 * @return bool
 	 */
-	public function update_customer_email_on_user_update( $user_id = 0, $old_user_data ) {
+	public function update_customer_email_on_user_update($user_id = 0, $old_user_data) {
 
-		$customer = new Give_Customer( $user_id, true );
+		$customer = new Give_Customer($user_id, true);
 
-		if( ! $customer ) {
+		if ( ! $customer) {
 			return false;
 		}
 
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-		if( ! empty( $user ) && $user->user_email !== $customer->email ) {
+		if ( ! empty($user) && $user->user_email !== $customer->email) {
 
-			if( ! $this->get_customer_by( 'email', $user->user_email ) ) {
+			if ( ! $this->get_customer_by('email', $user->user_email)) {
 
-				$success = $this->update( $customer->id, array( 'email' => $user->user_email ) );
+				$success = $this->update($customer->id, array('email' => $user->user_email));
 
-				if( $success ) {
+				if ($success) {
 					// Update some payment meta if we need to
-					$payments_array = explode( ',', $customer->payment_ids );
+					$payments_array = explode(',', $customer->payment_ids);
 
-					if( ! empty( $payments_array ) ) {
+					if ( ! empty($payments_array)) {
 
-						foreach ( $payments_array as $payment_id ) {
+						foreach ($payments_array as $payment_id) {
 
-							give_update_payment_meta( $payment_id, 'email', $user->user_email );
+							give_update_payment_meta($payment_id, 'email', $user->user_email);
 
 						}
 
 					}
 
-					do_action( 'give_update_customer_email_on_user_update', $user, $customer );
+					do_action('give_update_customer_email_on_user_update', $user, $customer);
 
 				}
 
@@ -335,45 +335,45 @@ 
 	 *
 	 * @return mixed          Upon success, an object of the customer. Upon failure, NULL
 	 */
-	public function get_customer_by( $field = 'id', $value = 0 ) {
+	public function get_customer_by($field = 'id', $value = 0) {
 		global $wpdb;
 
-		if ( empty( $field ) || empty( $value ) ) {
+		if (empty($field) || empty($value)) {
 			return null;
 		}
 
-		if ( 'id' == $field || 'user_id' == $field ) {
+		if ('id' == $field || 'user_id' == $field) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) ) {
+			if ( ! is_numeric($value)) {
 				return false;
 			}
 
-			$value = intval( $value );
+			$value = intval($value);
 
-			if ( $value < 1 ) {
+			if ($value < 1) {
 				return false;
 			}
 
-		} elseif ( 'email' === $field ) {
+		} elseif ('email' === $field) {
 
-			if ( ! is_email( $value ) ) {
+			if ( ! is_email($value)) {
 				return false;
 			}
 
-			$value = trim( $value );
+			$value = trim($value);
 		}
 
-		if ( ! $value ) {
+		if ( ! $value) {
 			return false;
 		}
 
-		switch ( $field ) {
+		switch ($field) {
 			case 'id':
 				$db_field = 'id';
 				break;
 			case 'email':
-				$value    = sanitize_text_field( $value );
+				$value    = sanitize_text_field($value);
 				$db_field = 'email';
 				break;
 			case 'user_id':
@@ -383,7 +383,7 @@ 
 				return false;
 		}
 
-		if ( ! $customer = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $db_field = %s LIMIT 1", $value ) ) ) {
+		if ( ! $customer = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $db_field = %s LIMIT 1", $value))) {
 			return false;
 		}
 
@@ -396,7 +396,7 @@ 
 	 * @access  public
 	 * @since   1.0
 	 */
-	public function get_customers( $args = array() ) {
+	public function get_customers($args = array()) {
 
 		global $wpdb;
 
@@ -408,21 +408,21 @@ 
 			'order'   => 'DESC'
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		if ( $args['number'] < 1 ) {
+		if ($args['number'] < 1) {
 			$args['number'] = 999999999999;
 		}
 
 		$where = ' WHERE 1=1 ';
 
 		// specific customers
-		if ( ! empty( $args['id'] ) ) {
+		if ( ! empty($args['id'])) {
 
-			if ( is_array( $args['id'] ) ) {
-				$ids = implode( ',', array_map( 'intval', $args['id'] ) );
+			if (is_array($args['id'])) {
+				$ids = implode(',', array_map('intval', $args['id']));
 			} else {
-				$ids = intval( $args['id'] );
+				$ids = intval($args['id']);
 			}
 
 			$where .= " AND `id` IN( {$ids} ) ";
@@ -430,12 +430,12 @@ 
 		}
 
 		// customers for specific user accounts
-		if ( ! empty( $args['user_id'] ) ) {
+		if ( ! empty($args['user_id'])) {
 
-			if ( is_array( $args['user_id'] ) ) {
-				$user_ids = implode( ',', array_map( 'intval', $args['user_id'] ) );
+			if (is_array($args['user_id'])) {
+				$user_ids = implode(',', array_map('intval', $args['user_id']));
 			} else {
-				$user_ids = intval( $args['user_id'] );
+				$user_ids = intval($args['user_id']);
 			}
 
 			$where .= " AND `user_id` IN( {$user_ids} ) ";
@@ -443,41 +443,41 @@ 
 		}
 
 		//specific customers by email
-		if( ! empty( $args['email'] ) ) {
+		if ( ! empty($args['email'])) {
 
-			if( is_array( $args['email'] ) ) {
+			if (is_array($args['email'])) {
 
-				$emails_count       = count( $args['email'] );
-				$emails_placeholder = array_fill( 0, $emails_count, '%s' );
-				$emails             = implode( ', ', $emails_placeholder );
+				$emails_count       = count($args['email']);
+				$emails_placeholder = array_fill(0, $emails_count, '%s');
+				$emails             = implode(', ', $emails_placeholder);
 
-				$where .= $wpdb->prepare( " AND `email` IN( $emails ) ", $args['email'] );
+				$where .= $wpdb->prepare(" AND `email` IN( $emails ) ", $args['email']);
 			} else {
-				$where .= $wpdb->prepare( " AND `email` = %s ", $args['email'] );
+				$where .= $wpdb->prepare(" AND `email` = %s ", $args['email']);
 			}
 		}
 
 		// specific customers by name
-		if( ! empty( $args['name'] ) ) {
-			$where .= $wpdb->prepare( " AND `name` LIKE '%%%%" . '%s' . "%%%%' ", $args['name'] );
+		if ( ! empty($args['name'])) {
+			$where .= $wpdb->prepare(" AND `name` LIKE '%%%%".'%s'."%%%%' ", $args['name']);
 		}
 
 		// Customers created for a specific date or in a date range
-		if ( ! empty( $args['date'] ) ) {
+		if ( ! empty($args['date'])) {
 
-			if ( is_array( $args['date'] ) ) {
+			if (is_array($args['date'])) {
 
-				if ( ! empty( $args['date']['start'] ) ) {
+				if ( ! empty($args['date']['start'])) {
 
-					$start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
+					$start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
 
 					$where .= " AND `date_created` >= '{$start}'";
 
 				}
 
-				if ( ! empty( $args['date']['end'] ) ) {
+				if ( ! empty($args['date']['end'])) {
 
-					$end = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+					$end = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
 					$where .= " AND `date_created` <= '{$end}'";
 
@@ -485,31 +485,31 @@ 
 
 			} else {
 
-				$year  = date( 'Y', strtotime( $args['date'] ) );
-				$month = date( 'm', strtotime( $args['date'] ) );
-				$day   = date( 'd', strtotime( $args['date'] ) );
+				$year  = date('Y', strtotime($args['date']));
+				$month = date('m', strtotime($args['date']));
+				$day   = date('d', strtotime($args['date']));
 
 				$where .= " AND $year = YEAR ( date_created ) AND $month = MONTH ( date_created ) AND $day = DAY ( date_created )";
 			}
 
 		}
 
-		$args['orderby'] = ! array_key_exists( $args['orderby'], $this->get_columns() ) ? 'id' : $args['orderby'];
+		$args['orderby'] = ! array_key_exists($args['orderby'], $this->get_columns()) ? 'id' : $args['orderby'];
 
-		if ( 'purchase_value' == $args['orderby'] ) {
+		if ('purchase_value' == $args['orderby']) {
 			$args['orderby'] = 'purchase_value+0';
 		}
 
-		$cache_key = md5( 'give_customers_' . serialize( $args ) );
+		$cache_key = md5('give_customers_'.serialize($args));
 
-		$customers = wp_cache_get( $cache_key, 'customers' );
+		$customers = wp_cache_get($cache_key, 'customers');
 
-		$args['orderby'] = esc_sql( $args['orderby'] );
-		$args['order']   = esc_sql( $args['order'] );
+		$args['orderby'] = esc_sql($args['orderby']);
+		$args['order']   = esc_sql($args['order']);
 
-		if ( $customers === false ) {
-			$customers = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint( $args['offset'] ), absint( $args['number'] ) ) );
-			wp_cache_set( $cache_key, $customers, 'customers', 3600 );
+		if ($customers === false) {
+			$customers = $wpdb->get_results($wpdb->prepare("SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint($args['offset']), absint($args['number'])));
+			wp_cache_set($cache_key, $customers, 'customers', 3600);
 		}
 
 		return $customers;
@@ -523,26 +523,26 @@ 
 	 * @access  public
 	 * @since   1.0
 	 */
-	public function count( $args = array() ) {
+	public function count($args = array()) {
 
 		global $wpdb;
 
 		$where = ' WHERE 1=1 ';
 
-		if ( ! empty( $args['date'] ) ) {
+		if ( ! empty($args['date'])) {
 
-			if ( is_array( $args['date'] ) ) {
+			if (is_array($args['date'])) {
 
-				$start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
-				$end   = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+				$start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
+				$end   = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
 				$where .= " AND `date_created` >= '{$start}' AND `date_created` <= '{$end}'";
 
 			} else {
 
-				$year  = date( 'Y', strtotime( $args['date'] ) );
-				$month = date( 'm', strtotime( $args['date'] ) );
-				$day   = date( 'd', strtotime( $args['date'] ) );
+				$year  = date('Y', strtotime($args['date']));
+				$month = date('m', strtotime($args['date']));
+				$day   = date('d', strtotime($args['date']));
 
 				$where .= " AND $year = YEAR ( date_created ) AND $month = MONTH ( date_created ) AND $day = DAY ( date_created )";
 			}
@@ -550,16 +550,16 @@ 
 		}
 
 
-		$cache_key = md5( 'give_customers_count' . serialize( $args ) );
+		$cache_key = md5('give_customers_count'.serialize($args));
 
-		$count = wp_cache_get( $cache_key, 'customers' );
+		$count = wp_cache_get($cache_key, 'customers');
 
-		if ( $count === false ) {
-			$count = $wpdb->get_var( "SELECT COUNT($this->primary_key) FROM " . $this->table_name . "{$where};" );
-			wp_cache_set( $cache_key, $count, 'customers', 3600 );
+		if ($count === false) {
+			$count = $wpdb->get_var("SELECT COUNT($this->primary_key) FROM ".$this->table_name."{$where};");
+			wp_cache_set($cache_key, $count, 'customers', 3600);
 		}
 
-		return absint( $count );
+		return absint($count);
 
 	}
 
@@ -571,9 +571,9 @@ 
 	 */
 	public function create_table() {
 		
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
-		$sql = "CREATE TABLE " . $this->table_name . " (
+		$sql = "CREATE TABLE ".$this->table_name." (
 		id bigint(20) NOT NULL AUTO_INCREMENT,
 		user_id bigint(20) NOT NULL,
 		email varchar(50) NOT NULL,
@@ -588,9 +588,9 @@ 
 		KEY user (user_id)
 		) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
-		update_option( $this->table_name . '_db_version', $this->version );
+		update_option($this->table_name.'_db_version', $this->version);
 	}
 	
 	/**
@@ -600,6 +600,6 @@ 
 	 * @return bool Returns if the customers table was installed and upgrade routine run
 	 */
 	public function installed() {
-		return $this->table_exists( $this->table_name );
+		return $this->table_exists($this->table_name);
 	}
 }

includes/admin/payments/class-payments-table.php

Doc Comments -1 removed lines

@@ -304,7 +304,6 @@
 	 * @access public
 	 * @since  1.0
 	 *
-	 * @param array $item Contains all the data of the discount code
 	 * @param string $column_name The name of the column
 	 *
 	 * @return string Column Name

Spacing +182 added lines, -182 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';
 }
 
 /**
@@ -120,37 +120,37 @@ 
 		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?
-		) );
+		));
 
 		$this->get_payment_counts();
 		$this->process_bulk_action();
-		$this->base_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history' );
+		$this->base_url = admin_url('edit.php?post_type=give_forms&page=give-payment-history');
 	}
 
 	public function advanced_filters() {
-		$start_date = isset( $_GET['start-date'] ) ? sanitize_text_field( $_GET['start-date'] ) : null;
-		$end_date   = isset( $_GET['end-date'] ) ? sanitize_text_field( $_GET['end-date'] ) : null;
-		$status     = isset( $_GET['status'] ) ? $_GET['status'] : '';
+		$start_date = isset($_GET['start-date']) ? sanitize_text_field($_GET['start-date']) : null;
+		$end_date   = isset($_GET['end-date']) ? sanitize_text_field($_GET['end-date']) : null;
+		$status     = isset($_GET['status']) ? $_GET['status'] : '';
 		?>
 		<div id="give-payment-filters">
 			<span id="give-payment-date-filters">
-				<label for="start-date" class="give-start-date-label"><?php esc_html_e( 'Start Date:', 'give' ); ?></label>
+				<label for="start-date" class="give-start-date-label"><?php esc_html_e('Start Date:', 'give'); ?></label>
 				<input type="text" id="start-date" name="start-date" class="give_datepicker" value="<?php echo $start_date; ?>" placeholder="mm/dd/yyyy"/>
-				<label for="end-date" class="give-end-date-label"><?php esc_html_e( 'End Date:', 'give' ); ?></label>
+				<label for="end-date" class="give-end-date-label"><?php esc_html_e('End Date:', 'give'); ?></label>
 				<input type="text" id="end-date" name="end-date" class="give_datepicker" value="<?php echo $end_date; ?>" placeholder="mm/dd/yyyy"/>
-				<input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Apply', 'give' ); ?>"/>
+				<input type="submit" class="button-secondary" value="<?php esc_attr_e('Apply', 'give'); ?>"/>
 			</span>
-			<?php if ( ! empty( $status ) ) : ?>
-				<input type="hidden" name="status" value="<?php esc_attr_e( $status ); ?>"/>
+			<?php if ( ! empty($status)) : ?>
+				<input type="hidden" name="status" value="<?php esc_attr_e($status); ?>"/>
 			<?php endif; ?>
-			<?php if ( ! empty( $start_date ) || ! empty( $end_date ) ) : ?>
-				<a href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history' ); ?>" class="button-secondary"><?php esc_html_e( 'Clear Filter', 'give' ); ?></a>
+			<?php if ( ! empty($start_date) || ! empty($end_date)) : ?>
+				<a href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history'); ?>" class="button-secondary"><?php esc_html_e('Clear Filter', 'give'); ?></a>
 			<?php endif; ?>
-			<?php $this->search_box( esc_html( 'Search', 'give' ), 'give-payments' ); ?>
+			<?php $this->search_box(esc_html('Search', 'give'), 'give-payments'); ?>
 		</div>
 
 		<?php
@@ -167,25 +167,25 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+	public function search_box($text, $input_id) {
+		if (empty($_REQUEST['s']) && ! $this->has_items()) {
 			return;
 		}
 
-		$input_id = $input_id . '-search-input';
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
 		}
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if ( ! empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
 		}
 		?>
 		<p class="search-box">
-			<?php do_action( 'give_payment_history_search' ); ?>
+			<?php do_action('give_payment_history_search'); ?>
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>"/>
-			<?php submit_button( $text, 'button', false, false, array( 'ID' => 'search-submit' ) ); ?><br/>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?><br/>
 		</p>
 		<?php
 	}
@@ -199,52 +199,52 @@ 
 	 */
 	public function get_views() {
 
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count . ')</span>';
-		$complete_count  = '&nbsp;<span class="count">(' . $this->complete_count . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count . ')</span>';
-		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$refunded_count  = '&nbsp;<span class="count">(' . $this->refunded_count . ')</span>';
-		$failed_count    = '&nbsp;<span class="count">(' . $this->failed_count . ')</span>';
-		$abandoned_count = '&nbsp;<span class="count">(' . $this->abandoned_count . ')</span>';
-		$revoked_count   = '&nbsp;<span class="count">(' . $this->revoked_count . ')</span>';
+		$current         = isset($_GET['status']) ? $_GET['status'] : '';
+		$total_count     = '&nbsp;<span class="count">('.$this->total_count.')</span>';
+		$complete_count  = '&nbsp;<span class="count">('.$this->complete_count.')</span>';
+		$cancelled_count = '&nbsp;<span class="count">('.$this->cancelled_count.')</span>';
+		$pending_count   = '&nbsp;<span class="count">('.$this->pending_count.')</span>';
+		$refunded_count  = '&nbsp;<span class="count">('.$this->refunded_count.')</span>';
+		$failed_count    = '&nbsp;<span class="count">('.$this->failed_count.')</span>';
+		$abandoned_count = '&nbsp;<span class="count">('.$this->abandoned_count.')</span>';
+		$revoked_count   = '&nbsp;<span class="count">('.$this->revoked_count.')</span>';
 
 		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array(
+			'all'       => sprintf('<a href="%s"%s>%s</a>', remove_query_arg(array(
 				'status',
 				'paged'
-			) ), $current === 'all' || $current == '' ? ' class="current"' : '', esc_html( 'All', 'give' ) . $total_count ),
-			'publish'   => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			)), $current === 'all' || $current == '' ? ' class="current"' : '', esc_html('All', 'give').$total_count),
+			'publish'   => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'publish',
 				'paged'  => false
-			) ) ), $current === 'publish' ? ' class="current"' : '', esc_html( 'Completed', 'give' ) . $complete_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'publish' ? ' class="current"' : '', esc_html('Completed', 'give').$complete_count),
+			'pending'   => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'pending',
 				'paged'  => false
-			) ) ), $current === 'pending' ? ' class="current"' : '', esc_html( 'Pending', 'give' ) . $pending_count ),
-			'refunded'  => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'pending' ? ' class="current"' : '', esc_html('Pending', 'give').$pending_count),
+			'refunded'  => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'refunded',
 				'paged'  => false
-			) ) ), $current === 'refunded' ? ' class="current"' : '', esc_html( 'Refunded', 'give' ) . $refunded_count ),
-			'revoked'   => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'refunded' ? ' class="current"' : '', esc_html('Refunded', 'give').$refunded_count),
+			'revoked'   => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'revoked',
 				'paged'  => false
-			) ) ), $current === 'revoked' ? ' class="current"' : '', esc_html( 'Revoked', 'give' ) . $revoked_count ),
-			'failed'    => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'revoked' ? ' class="current"' : '', esc_html('Revoked', 'give').$revoked_count),
+			'failed'    => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'failed',
 				'paged'  => false
-			) ) ), $current === 'failed' ? ' class="current"' : '', esc_html( 'Failed', 'give' ) . $failed_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'failed' ? ' class="current"' : '', esc_html('Failed', 'give').$failed_count),
+			'cancelled' => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'cancelled',
 				'paged'  => false
-			) ) ), $current === 'cancelled' ? ' class="current"' : '', esc_html( 'Cancelled', 'give' ) . $cancelled_count ),
-			'abandoned' => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'cancelled' ? ' class="current"' : '', esc_html('Cancelled', 'give').$cancelled_count),
+			'abandoned' => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'abandoned',
 				'paged'  => false
-			) ) ), $current === 'abandoned' ? ' class="current"' : '', esc_html( 'Abandoned', 'give' ) . $abandoned_count )
+			))), $current === 'abandoned' ? ' class="current"' : '', esc_html('Abandoned', 'give').$abandoned_count)
 		);
 
-		return apply_filters( 'give_payments_table_views', $views );
+		return apply_filters('give_payments_table_views', $views);
 	}
 
 	/**
@@ -257,17 +257,17 @@ 
 	public function get_columns() {
 		$columns = array(
 			'cb'       => '<input type="checkbox" />', //Render a checkbox instead of text
-			'email'    => esc_html( 'Email', 'give' ),
-			'details'  => esc_html( 'Details', 'give' ),
-			'amount'   => esc_html( 'Amount', 'give' ),
-			'donation' => esc_html( 'Donation', 'give' ),
-			'status'   => esc_html( 'Status', 'give' ),
-			'date'     => esc_html( 'Date', 'give' ),
-			'donor'    => esc_html( 'Donor', 'give' ),
-			'ID'       => esc_html( 'ID', 'give' ),
+			'email'    => esc_html('Email', 'give'),
+			'details'  => esc_html('Details', 'give'),
+			'amount'   => esc_html('Amount', 'give'),
+			'donation' => esc_html('Donation', 'give'),
+			'status'   => esc_html('Status', 'give'),
+			'date'     => esc_html('Date', 'give'),
+			'donor'    => esc_html('Donor', 'give'),
+			'ID'       => esc_html('ID', 'give'),
 		);
 
-		return apply_filters( 'give_payments_table_columns', $columns );
+		return apply_filters('give_payments_table_columns', $columns);
 	}
 
 	/**
@@ -279,12 +279,12 @@ 
 	 */
 	public function get_sortable_columns() {
 		$columns = array(
-			'ID'     => array( 'ID', true ),
-			'amount' => array( 'amount', false ),
-			'date'   => array( 'date', false )
+			'ID'     => array('ID', true),
+			'amount' => array('amount', false),
+			'date'   => array('date', false)
 		);
 
-		return apply_filters( 'give_payments_table_sortable_columns', $columns );
+		return apply_filters('give_payments_table_sortable_columns', $columns);
 	}
 
 	/**
@@ -310,41 +310,41 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $payment, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($payment, $column_name) {
+		switch ($column_name) {
 			case 'amount' :
-				$amount = ! empty( $payment->total ) ? $payment->total : 0;
-				$value  = give_currency_filter( give_format_amount( $amount ), give_get_payment_currency_code( $payment->ID ) );
+				$amount = ! empty($payment->total) ? $payment->total : 0;
+				$value  = give_currency_filter(give_format_amount($amount), give_get_payment_currency_code($payment->ID));
 				break;
 			case 'donation' :
-				$value = '<a href="' . get_permalink( $payment->form_id ) . '">' . $payment->form_title . '</a>';
-				$level = give_get_payment_form_title( $payment->meta, true );
+				$value = '<a href="'.get_permalink($payment->form_id).'">'.$payment->form_title.'</a>';
+				$level = give_get_payment_form_title($payment->meta, true);
 
-				if ( ! empty( $level ) ) {
+				if ( ! empty($level)) {
 					$value .= $level;
 				}
 
 				break;
 			case 'date' :
-				$date  = strtotime( $payment->date );
-				$value = date_i18n( get_option( 'date_format' ), $date );
+				$date  = strtotime($payment->date);
+				$value = date_i18n(get_option('date_format'), $date);
 				break;
 			case 'status' :
-				$value = '<div class="give-donation-status status-' . sanitize_title( give_get_payment_status( $payment, true ) ) . '"><span class="give-donation-status-icon"></span> ' . give_get_payment_status( $payment, true ) . '</div>';
-				if ( $payment->mode == 'test' ) {
-					$value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="' . esc_attr( 'This payment was made in test mode', 'give' ) . '">' . esc_html( 'Test', 'give' ) . '</span>';
+				$value = '<div class="give-donation-status status-'.sanitize_title(give_get_payment_status($payment, true)).'"><span class="give-donation-status-icon"></span> '.give_get_payment_status($payment, true).'</div>';
+				if ($payment->mode == 'test') {
+					$value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="'.esc_attr('This payment was made in test mode', 'give').'">'.esc_html('Test', 'give').'</span>';
 				}
 				break;
 			case 'details' :
-				$value = '<div class="give-payment-details-link-wrap"><a href="' . esc_url( add_query_arg( 'id', $payment->ID, admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details' ) ) ) . '" class="give-payment-details-link button button-small">' . esc_html( 'View Details', 'give' ) . '</a></div>';
+				$value = '<div class="give-payment-details-link-wrap"><a href="'.esc_url(add_query_arg('id', $payment->ID, admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details'))).'" class="give-payment-details-link button button-small">'.esc_html('View Details', 'give').'</a></div>';
 				break;
 			default:
-				$value = isset( $payment->$column_name ) ? $payment->$column_name : '';
+				$value = isset($payment->$column_name) ? $payment->$column_name : '';
 				break;
 
 		}
 
-		return apply_filters( 'give_payments_table_column', $value, $payment->ID, $column_name );
+		return apply_filters('give_payments_table_column', $value, $payment->ID, $column_name);
 	}
 
 	/**
@@ -357,40 +357,40 @@ 
 	 *
 	 * @return string Data shown in the Email column
 	 */
-	public function column_email( $payment ) {
+	public function column_email($payment) {
 
 		$row_actions = array();
 
-		$email = give_get_payment_user_email( $payment->ID );
+		$email = give_get_payment_user_email($payment->ID);
 
 		// Add search term string back to base URL
-		$search_terms = ( isset( $_GET['s'] ) ? trim( $_GET['s'] ) : '' );
-		if ( ! empty( $search_terms ) ) {
-			$this->base_url = add_query_arg( 's', $search_terms, $this->base_url );
+		$search_terms = (isset($_GET['s']) ? trim($_GET['s']) : '');
+		if ( ! empty($search_terms)) {
+			$this->base_url = add_query_arg('s', $search_terms, $this->base_url);
 		}
 
-		if ( give_is_payment_complete( $payment->ID ) && ! empty( $email ) ) {
-			$row_actions['email_links'] = '<a href="' . add_query_arg( array(
+		if (give_is_payment_complete($payment->ID) && ! empty($email)) {
+			$row_actions['email_links'] = '<a href="'.add_query_arg(array(
 					'give-action' => 'email_links',
 					'purchase_id' => $payment->ID
-				), $this->base_url ) . '">' . esc_html( 'Resend Donation Receipt', 'give' ) . '</a>';
+				), $this->base_url).'">'.esc_html('Resend Donation Receipt', 'give').'</a>';
 
 		}
 
-		$row_actions['delete'] = '<a href="' . wp_nonce_url( add_query_arg( array(
+		$row_actions['delete'] = '<a href="'.wp_nonce_url(add_query_arg(array(
 				'give-action' => 'delete_payment',
 				'purchase_id' => $payment->ID
-			), $this->base_url ), 'give_payment_nonce' ) . '">' . esc_html( 'Delete', 'give' ) . '</a>';
+			), $this->base_url), 'give_payment_nonce').'">'.esc_html('Delete', 'give').'</a>';
 
-		$row_actions = apply_filters( 'give_payment_row_actions', $row_actions, $payment );
+		$row_actions = apply_filters('give_payment_row_actions', $row_actions, $payment);
 
-		if ( empty( $email ) ) {
-			$email = esc_html( '(unknown)', 'give' );
+		if (empty($email)) {
+			$email = esc_html('(unknown)', 'give');
 		}
 
-		$value = '<span class="give-email-column-value">' . $email . '</span>' . $this->row_actions( $row_actions );
+		$value = '<span class="give-email-column-value">'.$email.'</span>'.$this->row_actions($row_actions);
 
-		return apply_filters( 'give_payments_table_column', $value, $payment->ID, 'email' );
+		return apply_filters('give_payments_table_column', $value, $payment->ID, 'email');
 	}
 
 	/**
@@ -403,7 +403,7 @@ 
 	 *
 	 * @return string Displays a checkbox
 	 */
-	public function column_cb( $payment ) {
+	public function column_cb($payment) {
 		return sprintf(
 			'<input type="checkbox" name="%1$s[]" value="%2$s" />',
 			'payment',
@@ -421,8 +421,8 @@ 
 	 *
 	 * @return string Displays a checkbox
 	 */
-	public function column_ID( $payment ) {
-		return '<span class="give-payment-id">' . give_get_payment_number( $payment->ID ) . '</span>';
+	public function column_ID($payment) {
+		return '<span class="give-payment-id">'.give_get_payment_number($payment->ID).'</span>';
 	}
 
 	/**
@@ -435,19 +435,19 @@ 
 	 *
 	 * @return string Data shown in the User column
 	 */
-	public function column_donor( $payment ) {
+	public function column_donor($payment) {
 
-		$customer_id = give_get_payment_customer_id( $payment->ID );
+		$customer_id = give_get_payment_customer_id($payment->ID);
 
-		if ( ! empty( $customer_id ) ) {
-			$customer = new Give_Customer( $customer_id );
-			$value    = '<a href="' . esc_url( admin_url( "edit.php?post_type=give_forms&page=give-donors&view=overview&id=$customer_id" ) ) . '">' . $customer->name . '</a>';
+		if ( ! empty($customer_id)) {
+			$customer = new Give_Customer($customer_id);
+			$value    = '<a href="'.esc_url(admin_url("edit.php?post_type=give_forms&page=give-donors&view=overview&id=$customer_id")).'">'.$customer->name.'</a>';
 		} else {
-			$email = give_get_payment_user_email( $payment->ID );
-			$value = '<a href="' . esc_url( admin_url( "edit.php?post_type=give_forms&page=give-payment-history&s=$email" ) ) . '">' . esc_html( '(donor missing)', 'give' ) . '</a>';
+			$email = give_get_payment_user_email($payment->ID);
+			$value = '<a href="'.esc_url(admin_url("edit.php?post_type=give_forms&page=give-payment-history&s=$email")).'">'.esc_html('(donor missing)', 'give').'</a>';
 		}
 
-		return apply_filters( 'give_payments_table_column', $value, $payment->ID, 'donor' );
+		return apply_filters('give_payments_table_column', $value, $payment->ID, 'donor');
 	}
 
 	/**
@@ -459,18 +459,18 @@ 
 	 */
 	public function get_bulk_actions() {
 		$actions = array(
-			'delete'               => esc_html( 'Delete', 'give' ),
-			'set-status-publish'   => esc_html( 'Set To Completed', 'give' ),
-			'set-status-pending'   => esc_html( 'Set To Pending', 'give' ),
-			'set-status-refunded'  => esc_html( 'Set To Refunded', 'give' ),
-			'set-status-revoked'   => esc_html( 'Set To Revoked', 'give' ),
-			'set-status-failed'    => esc_html( 'Set To Failed', 'give' ),
-			'set-status-cancelled' => esc_html( 'Set To Cancelled', 'give' ),
-			'set-status-abandoned' => esc_html( 'Set To Abandoned', 'give' ),
-			'resend-receipt'       => esc_html( 'Resend Email Receipts', 'give' )
+			'delete'               => esc_html('Delete', 'give'),
+			'set-status-publish'   => esc_html('Set To Completed', 'give'),
+			'set-status-pending'   => esc_html('Set To Pending', 'give'),
+			'set-status-refunded'  => esc_html('Set To Refunded', 'give'),
+			'set-status-revoked'   => esc_html('Set To Revoked', 'give'),
+			'set-status-failed'    => esc_html('Set To Failed', 'give'),
+			'set-status-cancelled' => esc_html('Set To Cancelled', 'give'),
+			'set-status-abandoned' => esc_html('Set To Abandoned', 'give'),
+			'resend-receipt'       => esc_html('Resend Email Receipts', 'give')
 		);
 
-		return apply_filters( 'give_payments_table_bulk_actions', $actions );
+		return apply_filters('give_payments_table_bulk_actions', $actions);
 	}
 
 	/**
@@ -481,61 +481,61 @@ 
 	 * @return void
 	 */
 	public function process_bulk_action() {
-		$ids    = isset( $_GET['payment'] ) ? $_GET['payment'] : false;
+		$ids    = isset($_GET['payment']) ? $_GET['payment'] : false;
 		$action = $this->current_action();
 
-		if ( ! is_array( $ids ) ) {
-			$ids = array( $ids );
+		if ( ! is_array($ids)) {
+			$ids = array($ids);
 		}
 
-		if ( empty( $action ) ) {
+		if (empty($action)) {
 			return;
 		}
 
-		foreach ( $ids as $id ) {
+		foreach ($ids as $id) {
 
 			// Detect when a bulk action is being triggered...
-			if ( 'delete' === $this->current_action() ) {
-				give_delete_purchase( $id );
+			if ('delete' === $this->current_action()) {
+				give_delete_purchase($id);
 			}
 
-			if ( 'set-status-publish' === $this->current_action() ) {
-				give_update_payment_status( $id, 'publish' );
+			if ('set-status-publish' === $this->current_action()) {
+				give_update_payment_status($id, 'publish');
 			}
 
-			if ( 'set-status-pending' === $this->current_action() ) {
-				give_update_payment_status( $id, 'pending' );
+			if ('set-status-pending' === $this->current_action()) {
+				give_update_payment_status($id, 'pending');
 			}
 
-			if ( 'set-status-refunded' === $this->current_action() ) {
-				give_update_payment_status( $id, 'refunded' );
+			if ('set-status-refunded' === $this->current_action()) {
+				give_update_payment_status($id, 'refunded');
 			}
 
-			if ( 'set-status-revoked' === $this->current_action() ) {
-				give_update_payment_status( $id, 'revoked' );
+			if ('set-status-revoked' === $this->current_action()) {
+				give_update_payment_status($id, 'revoked');
 			}
 
-			if ( 'set-status-failed' === $this->current_action() ) {
-				give_update_payment_status( $id, 'failed' );
+			if ('set-status-failed' === $this->current_action()) {
+				give_update_payment_status($id, 'failed');
 			}
 
-			if ( 'set-status-cancelled' === $this->current_action() ) {
-				give_update_payment_status( $id, 'cancelled' );
+			if ('set-status-cancelled' === $this->current_action()) {
+				give_update_payment_status($id, 'cancelled');
 			}
 
-			if ( 'set-status-abandoned' === $this->current_action() ) {
-				give_update_payment_status( $id, 'abandoned' );
+			if ('set-status-abandoned' === $this->current_action()) {
+				give_update_payment_status($id, 'abandoned');
 			}
 
-			if ( 'set-status-preapproval' === $this->current_action() ) {
-				give_update_payment_status( $id, 'preapproval' );
+			if ('set-status-preapproval' === $this->current_action()) {
+				give_update_payment_status($id, 'preapproval');
 			}
 
-			if ( 'resend-receipt' === $this->current_action() ) {
-				give_email_donation_receipt( $id, false );
+			if ('resend-receipt' === $this->current_action()) {
+				give_email_donation_receipt($id, false);
 			}
 
-			do_action( 'give_payments_table_do_bulk_action', $id, $this->current_action() );
+			do_action('give_payments_table_do_bulk_action', $id, $this->current_action());
 		}
 
 	}
@@ -553,27 +553,27 @@ 
 
 		$args = array();
 
-		if ( isset( $_GET['user'] ) ) {
-			$args['user'] = urldecode( $_GET['user'] );
-		} elseif ( isset( $_GET['s'] ) ) {
-			$is_user = strpos( $_GET['s'], strtolower( 'user:' ) ) !== false;
-			if ( $is_user ) {
-				$args['user'] = absint( trim( str_replace( 'user:', '', strtolower( $_GET['s'] ) ) ) );
-				unset( $args['s'] );
+		if (isset($_GET['user'])) {
+			$args['user'] = urldecode($_GET['user']);
+		} elseif (isset($_GET['s'])) {
+			$is_user = strpos($_GET['s'], strtolower('user:')) !== false;
+			if ($is_user) {
+				$args['user'] = absint(trim(str_replace('user:', '', strtolower($_GET['s']))));
+				unset($args['s']);
 			} else {
-				$args['s'] = sanitize_text_field( $_GET['s'] );
+				$args['s'] = sanitize_text_field($_GET['s']);
 			}
 		}
 
-		if ( ! empty( $_GET['start-date'] ) ) {
-			$args['start-date'] = urldecode( $_GET['start-date'] );
+		if ( ! empty($_GET['start-date'])) {
+			$args['start-date'] = urldecode($_GET['start-date']);
 		}
 
-		if ( ! empty( $_GET['end-date'] ) ) {
-			$args['end-date'] = urldecode( $_GET['end-date'] );
+		if ( ! empty($_GET['end-date'])) {
+			$args['end-date'] = urldecode($_GET['end-date']);
 		}
 
-		$payment_count         = give_count_payments( $args );
+		$payment_count         = give_count_payments($args);
 		$this->complete_count  = $payment_count->publish;
 		$this->pending_count   = $payment_count->pending;
 		$this->refunded_count  = $payment_count->refunded;
@@ -582,7 +582,7 @@ 
 		$this->cancelled_count = $payment_count->cancelled;
 		$this->abandoned_count = $payment_count->abandoned;
 
-		foreach ( $payment_count as $count ) {
+		foreach ($payment_count as $count) {
 			$this->total_count += $count;
 		}
 	}
@@ -597,26 +597,26 @@ 
 	public function payments_data() {
 
 		$per_page   = $this->per_page;
-		$orderby    = isset( $_GET['orderby'] ) ? urldecode( $_GET['orderby'] ) : 'ID';
-		$order      = isset( $_GET['order'] ) ? $_GET['order'] : 'DESC';
-		$user       = isset( $_GET['user'] ) ? $_GET['user'] : null;
-		$status     = isset( $_GET['status'] ) ? $_GET['status'] : give_get_payment_status_keys();
-		$meta_key   = isset( $_GET['meta_key'] ) ? $_GET['meta_key'] : null;
-		$year       = isset( $_GET['year'] ) ? $_GET['year'] : null;
-		$month      = isset( $_GET['m'] ) ? $_GET['m'] : null;
-		$day        = isset( $_GET['day'] ) ? $_GET['day'] : null;
-		$search     = isset( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : null;
-		$start_date = isset( $_GET['start-date'] ) ? sanitize_text_field( $_GET['start-date'] ) : null;
-		$end_date   = isset( $_GET['end-date'] ) ? sanitize_text_field( $_GET['end-date'] ) : $start_date;
-
-		if ( ! empty( $search ) ) {
+		$orderby    = isset($_GET['orderby']) ? urldecode($_GET['orderby']) : 'ID';
+		$order      = isset($_GET['order']) ? $_GET['order'] : 'DESC';
+		$user       = isset($_GET['user']) ? $_GET['user'] : null;
+		$status     = isset($_GET['status']) ? $_GET['status'] : give_get_payment_status_keys();
+		$meta_key   = isset($_GET['meta_key']) ? $_GET['meta_key'] : null;
+		$year       = isset($_GET['year']) ? $_GET['year'] : null;
+		$month      = isset($_GET['m']) ? $_GET['m'] : null;
+		$day        = isset($_GET['day']) ? $_GET['day'] : null;
+		$search     = isset($_GET['s']) ? sanitize_text_field($_GET['s']) : null;
+		$start_date = isset($_GET['start-date']) ? sanitize_text_field($_GET['start-date']) : null;
+		$end_date   = isset($_GET['end-date']) ? sanitize_text_field($_GET['end-date']) : $start_date;
+
+		if ( ! empty($search)) {
 			$status = 'any'; // Force all payment statuses when searching
 		}
 
 		$args = array(
 			'output'     => 'payments',
 			'number'     => $per_page,
-			'page'       => isset( $_GET['paged'] ) ? $_GET['paged'] : null,
+			'page'       => isset($_GET['paged']) ? $_GET['paged'] : null,
 			'orderby'    => $orderby,
 			'order'      => $order,
 			'user'       => $user,
@@ -630,14 +630,14 @@ 
 			'end_date'   => $end_date,
 		);
 
-		if ( is_string( $search ) && false !== strpos( $search, 'txn:' ) ) {
+		if (is_string($search) && false !== strpos($search, 'txn:')) {
 
 			$args['search_in_notes'] = true;
-			$args['s']               = trim( str_replace( 'txn:', '', $args['s'] ) );
+			$args['s']               = trim(str_replace('txn:', '', $args['s']));
 
 		}
 
-		$p_query = new Give_Payments_Query( $args );
+		$p_query = new Give_Payments_Query($args);
 
 		return $p_query->get_payments();
 
@@ -657,17 +657,17 @@ 
 	 */
 	public function prepare_items() {
 
-		wp_reset_vars( array( 'action', 'payment', 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('action', 'payment', 'orderby', 'order', 's'));
 
 		$columns  = $this->get_columns();
 		$hidden   = array(); // No hidden columns
 		$sortable = $this->get_sortable_columns();
 		$data     = $this->payments_data();
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+		$status   = isset($_GET['status']) ? $_GET['status'] : 'any';
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'publish':
 				$total_items = $this->complete_count;
 				break;
@@ -694,18 +694,18 @@ 
 				break;
 			default:
 				// Retrieve the count of the non-default-Give status
-				$count       = wp_count_posts( 'give_payment' );
+				$count       = wp_count_posts('give_payment');
 				$total_items = $count->{$status};
 		}
 
 		$this->items = $data;
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				// WE have to calculate the total number of items
 				'per_page'    => $this->per_page,
 				// WE have to determine how many items to show on a page
-				'total_pages' => ceil( $total_items / $this->per_page )
+				'total_pages' => ceil($total_items / $this->per_page)
 				// WE have to calculate the total number of pages
 			)
 		);