WordImpress / Give

includes/misc-functions.php

Indentation +8 added lines, -8 removed lines

@@ -727,10 +727,10 @@ 
 		}
 
 		if ( ! is_int( $params[1] )
-		     && ! is_float( $params[1] )
-		     && ! is_string( $params[1] )
-		     && $params[1] !== null
-		     && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
+			 && ! is_float( $params[1] )
+			 && ! is_string( $params[1] )
+			 && $params[1] !== null
+			 && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
 		) {
 			trigger_error( 'array_column(): The column key should be either a string or an integer', E_USER_WARNING );
 
@@ -738,10 +738,10 @@ 
 		}
 
 		if ( isset( $params[2] )
-		     && ! is_int( $params[2] )
-		     && ! is_float( $params[2] )
-		     && ! is_string( $params[2] )
-		     && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
+			 && ! is_int( $params[2] )
+			 && ! is_float( $params[2] )
+			 && ! is_string( $params[2] )
+			 && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
 		) {
 			trigger_error( 'array_column(): The index key should be either a string or an integer', E_USER_WARNING );
 

Doc Comments +6 added lines, -6 removed lines

@@ -339,7 +339,7 @@ 
  *
  * @since 1.0
  * @uses  Give()->session->get()
- * @return mixed array | false
+ * @return string array | false
  */
 function give_get_purchase_session() {
 	return Give()->session->get( 'give_purchase' );
@@ -376,7 +376,7 @@ 
  * Returns the webhost this site is using if possible
  *
  * @since 1.0
- * @return mixed string $host if detected, false otherwise
+ * @return string string $host if detected, false otherwise
  */
 function give_get_host() {
 	$host = false;
@@ -547,7 +547,7 @@ 
  *
  * @since 1.0
  *
- * @param unknown $n
+ * @param integer $n
  *
  * @return string Short month name
  */
@@ -677,9 +677,9 @@ 
 /**
  * Create SVG library function
  *
- * @param $icon
+ * @param string $icon
  *
- * @return mixed
+ * @return string
  */
 function give_svg_icons( $icon ) {
 
@@ -736,7 +736,7 @@ 
 	 *
 	 * @param array $input     A multi-dimensional array (record set) from which to pull
 	 *                         a column of values.
-	 * @param mixed $columnKey The column of values to return. This value may be the
+	 * @param string $columnKey The column of values to return. This value may be the
 	 *                         integer key of the column you wish to retrieve, or it
 	 *                         may be the string key name for an associative array.
 	 * @param mixed $indexKey  (Optional.) The column to use as the index/keys for

Spacing +154 added lines, -154 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,9 +24,9 @@ 
 function give_is_test_mode() {
 	global $give_options;
 
-	$ret = ! empty( $give_options['test_mode'] );
+	$ret = ! empty($give_options['test_mode']);
 
-	return (bool) apply_filters( 'give_is_test_mode', $ret );
+	return (bool) apply_filters('give_is_test_mode', $ret);
 }
 
 /**
@@ -37,9 +37,9 @@ 
  */
 function give_get_currency() {
 	global $give_options;
-	$currency = isset( $give_options['currency'] ) ? $give_options['currency'] : 'USD';
+	$currency = isset($give_options['currency']) ? $give_options['currency'] : 'USD';
 
-	return apply_filters( 'give_currency', $currency );
+	return apply_filters('give_currency', $currency);
 }
 
 /**
@@ -51,9 +51,9 @@ 
  */
 function give_get_currency_position() {
 	global $give_options;
-	$currency_pos = isset( $give_options['currency_position'] ) ? $give_options['currency_position'] : 'before';
+	$currency_pos = isset($give_options['currency_position']) ? $give_options['currency_position'] : 'before';
 
-	return apply_filters( 'give_currency_position', $currency_pos );
+	return apply_filters('give_currency_position', $currency_pos);
 }
 
 
@@ -65,36 +65,36 @@ 
  */
 function give_get_currencies() {
 	$currencies = array(
-		'USD'  => __( 'US Dollars ($)', 'give' ),
-		'EUR'  => __( 'Euros (€)', 'give' ),
-		'GBP'  => __( 'Pounds Sterling (£)', 'give' ),
-		'AUD'  => __( 'Australian Dollars ($)', 'give' ),
-		'BRL'  => __( 'Brazilian Real (R$)', 'give' ),
-		'CAD'  => __( 'Canadian Dollars ($)', 'give' ),
-		'CZK'  => __( 'Czech Koruna (Kč)', 'give' ),
-		'DKK'  => __( 'Danish Krone (kr)', 'give' ),
-		'HKD'  => __( 'Hong Kong Dollar ($)', 'give' ),
-		'HUF'  => __( 'Hungarian Forint (Ft)', 'give' ),
-		'ILS'  => __( 'Israeli Shekel (₪)', 'give' ),
-		'JPY'  => __( 'Japanese Yen (¥)', 'give' ),
-		'MYR'  => __( 'Malaysian Ringgits (RM)', 'give' ),
-		'MXN'  => __( 'Mexican Peso ($)', 'give' ),
-		'NZD'  => __( 'New Zealand Dollar ($)', 'give' ),
-		'NOK'  => __( 'Norwegian Krone (Kr.)', 'give' ),
-		'PHP'  => __( 'Philippine Pesos (₱)', 'give' ),
-		'PLN'  => __( 'Polish Zloty (zł)', 'give' ),
-		'SGD'  => __( 'Singapore Dollar ($)', 'give' ),
-		'SEK'  => __( 'Swedish Krona (kr)', 'give' ),
-		'CHF'  => __( 'Swiss Franc (CHF)', 'give' ),
-		'TWD'  => __( 'Taiwan New Dollars (NT$)', 'give' ),
-		'THB'  => __( 'Thai Baht (฿)', 'give' ),
-		'INR'  => __( 'Indian Rupee (₹)', 'give' ),
-		'TRY'  => __( 'Turkish Lira (₺)', 'give' ),
-		'RIAL' => __( 'Iranian Rial (﷼)', 'give' ),
-		'RUB'  => __( 'Russian Rubles (руб)', 'give' )
+		'USD'  => __('US Dollars ($)', 'give'),
+		'EUR'  => __('Euros (€)', 'give'),
+		'GBP'  => __('Pounds Sterling (£)', 'give'),
+		'AUD'  => __('Australian Dollars ($)', 'give'),
+		'BRL'  => __('Brazilian Real (R$)', 'give'),
+		'CAD'  => __('Canadian Dollars ($)', 'give'),
+		'CZK'  => __('Czech Koruna (Kč)', 'give'),
+		'DKK'  => __('Danish Krone (kr)', 'give'),
+		'HKD'  => __('Hong Kong Dollar ($)', 'give'),
+		'HUF'  => __('Hungarian Forint (Ft)', 'give'),
+		'ILS'  => __('Israeli Shekel (₪)', 'give'),
+		'JPY'  => __('Japanese Yen (¥)', 'give'),
+		'MYR'  => __('Malaysian Ringgits (RM)', 'give'),
+		'MXN'  => __('Mexican Peso ($)', 'give'),
+		'NZD'  => __('New Zealand Dollar ($)', 'give'),
+		'NOK'  => __('Norwegian Krone (Kr.)', 'give'),
+		'PHP'  => __('Philippine Pesos (₱)', 'give'),
+		'PLN'  => __('Polish Zloty (zł)', 'give'),
+		'SGD'  => __('Singapore Dollar ($)', 'give'),
+		'SEK'  => __('Swedish Krona (kr)', 'give'),
+		'CHF'  => __('Swiss Franc (CHF)', 'give'),
+		'TWD'  => __('Taiwan New Dollars (NT$)', 'give'),
+		'THB'  => __('Thai Baht (฿)', 'give'),
+		'INR'  => __('Indian Rupee (₹)', 'give'),
+		'TRY'  => __('Turkish Lira (₺)', 'give'),
+		'RIAL' => __('Iranian Rial (﷼)', 'give'),
+		'RUB'  => __('Russian Rubles (руб)', 'give')
 	);
 
-	return apply_filters( 'give_currencies', $currencies );
+	return apply_filters('give_currencies', $currencies);
 }
 
 
@@ -109,12 +109,12 @@ 
  *
  * @return string           The symbol to use for the currency
  */
-function give_currency_symbol( $currency = '' ) {
+function give_currency_symbol($currency = '') {
 
-	if ( empty( $currency ) ) {
+	if (empty($currency)) {
 		$currency = give_get_currency();
 	}
-	switch ( $currency ) :
+	switch ($currency) :
 		case 'GBP' :
 			$symbol = '£';
 			break;
@@ -183,7 +183,7 @@ 
 			break;
 	endswitch;
 
-	return apply_filters( 'give_currency_symbol', $symbol, $currency );
+	return apply_filters('give_currency_symbol', $symbol, $currency);
 }
 
 
@@ -195,13 +195,13 @@ 
  */
 function give_get_current_page_url() {
 
-	if ( is_front_page() ) {
-		$current_url = home_url( '/' );
+	if (is_front_page()) {
+		$current_url = home_url('/');
 	} else {
-		$current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+		$current_url = (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
 	}
 
-	return apply_filters( 'give_get_current_page_url', esc_url( $current_url ) );
+	return apply_filters('give_get_current_page_url', esc_url($current_url));
 }
 
 
@@ -222,15 +222,15 @@ 
 	 */
 	$gateways = give_get_enabled_payment_gateways();
 
-	if ( count( $gateways ) == 1 && ! isset( $gateways['paypal'] ) && ! isset( $gateways['manual'] ) ) {
+	if (count($gateways) == 1 && ! isset($gateways['paypal']) && ! isset($gateways['manual'])) {
 		$ret = true;
-	} else if ( count( $gateways ) == 1 ) {
+	} else if (count($gateways) == 1) {
 		$ret = false;
-	} else if ( count( $gateways ) == 2 && isset( $gateways['paypal'] ) && isset( $gateways['manual'] ) ) {
+	} else if (count($gateways) == 2 && isset($gateways['paypal']) && isset($gateways['manual'])) {
 		$ret = false;
 	}
 
-	return (bool) apply_filters( 'give_verify_credit_cards', $ret );
+	return (bool) apply_filters('give_verify_credit_cards', $ret);
 }
 
 
@@ -245,9 +245,9 @@ 
 
 	global $give_options;
 
-	$ret = ! empty( $give_options['logged_in_only'] );
+	$ret = ! empty($give_options['logged_in_only']);
 
-	return (bool) apply_filters( 'give_logged_in_only', $ret );
+	return (bool) apply_filters('give_logged_in_only', $ret);
 
 }
 
@@ -261,26 +261,26 @@ 
 function give_get_timezone_id() {
 
 	// if site timezone string exists, return it
-	if ( $timezone = get_option( 'timezone_string' ) ) {
+	if ($timezone = get_option('timezone_string')) {
 		return $timezone;
 	}
 
 	// get UTC offset, if it isn't set return UTC
-	if ( ! ( $utc_offset = 3600 * get_option( 'gmt_offset', 0 ) ) ) {
+	if ( ! ($utc_offset = 3600 * get_option('gmt_offset', 0))) {
 		return 'UTC';
 	}
 
 	// attempt to guess the timezone string from the UTC offset
-	$timezone = timezone_name_from_abbr( '', $utc_offset );
+	$timezone = timezone_name_from_abbr('', $utc_offset);
 
 	// last try, guess timezone string manually
-	if ( $timezone === false ) {
+	if ($timezone === false) {
 
-		$is_dst = date( 'I' );
+		$is_dst = date('I');
 
-		foreach ( timezone_abbreviations_list() as $abbr ) {
-			foreach ( $abbr as $city ) {
-				if ( $city['dst'] == $is_dst && $city['offset'] == $utc_offset ) {
+		foreach (timezone_abbreviations_list() as $abbr) {
+			foreach ($abbr as $city) {
+				if ($city['dst'] == $is_dst && $city['offset'] == $utc_offset) {
 					return $city['timezone_id'];
 				}
 			}
@@ -304,17 +304,17 @@ 
 
 	$ip = '127.0.0.1';
 
-	if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
+	if ( ! empty($_SERVER['HTTP_CLIENT_IP'])) {
 		//check ip from share internet
 		$ip = $_SERVER['HTTP_CLIENT_IP'];
-	} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
+	} elseif ( ! empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
 		//to check ip is pass from proxy
 		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-	} elseif ( ! empty( $_SERVER['REMOTE_ADDR'] ) ) {
+	} elseif ( ! empty($_SERVER['REMOTE_ADDR'])) {
 		$ip = $_SERVER['REMOTE_ADDR'];
 	}
 
-	return apply_filters( 'give_get_ip', $ip );
+	return apply_filters('give_get_ip', $ip);
 }
 
 
@@ -329,8 +329,8 @@ 
  *
  * @uses  Give()->session->set()
  */
-function give_set_purchase_session( $purchase_data = array() ) {
-	Give()->session->set( 'give_purchase', $purchase_data );
+function give_set_purchase_session($purchase_data = array()) {
+	Give()->session->set('give_purchase', $purchase_data);
 }
 
 /**
@@ -344,7 +344,7 @@ 
  * @return mixed array | false
  */
 function give_get_purchase_session() {
-	return Give()->session->get( 'give_purchase' );
+	return Give()->session->get('give_purchase');
 }
 
 /**
@@ -359,14 +359,14 @@ 
  *
  * @return string
  */
-function give_get_purchase_summary( $purchase_data, $email = true ) {
+function give_get_purchase_summary($purchase_data, $email = true) {
 	$summary = '';
 
-	if ( $email ) {
-		$summary .= $purchase_data['user_email'] . ' - ';
+	if ($email) {
+		$summary .= $purchase_data['user_email'].' - ';
 	}
 
-	$summary .= get_the_title( $purchase_data['post_data']['give-form-id'] );
+	$summary .= get_the_title($purchase_data['post_data']['give-form-id']);
 
 	return $summary;
 }
@@ -383,31 +383,31 @@ 
 function give_get_host() {
 	$host = false;
 
-	if ( defined( 'WPE_APIKEY' ) ) {
+	if (defined('WPE_APIKEY')) {
 		$host = 'WP Engine';
-	} elseif ( defined( 'PAGELYBIN' ) ) {
+	} elseif (defined('PAGELYBIN')) {
 		$host = 'Pagely';
-	} elseif ( DB_HOST == 'localhost:/tmp/mysql5.sock' ) {
+	} elseif (DB_HOST == 'localhost:/tmp/mysql5.sock') {
 		$host = 'ICDSoft';
-	} elseif ( DB_HOST == 'mysqlv5' ) {
+	} elseif (DB_HOST == 'mysqlv5') {
 		$host = 'NetworkSolutions';
-	} elseif ( strpos( DB_HOST, 'ipagemysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipagemysql.com') !== false) {
 		$host = 'iPage';
-	} elseif ( strpos( DB_HOST, 'ipowermysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipowermysql.com') !== false) {
 		$host = 'IPower';
-	} elseif ( strpos( DB_HOST, '.gridserver.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.gridserver.com') !== false) {
 		$host = 'MediaTemple Grid';
-	} elseif ( strpos( DB_HOST, '.pair.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.pair.com') !== false) {
 		$host = 'pair Networks';
-	} elseif ( strpos( DB_HOST, '.stabletransit.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.stabletransit.com') !== false) {
 		$host = 'Rackspace Cloud';
-	} elseif ( strpos( DB_HOST, '.sysfix.eu' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.sysfix.eu') !== false) {
 		$host = 'SysFix.eu Power Hosting';
-	} elseif ( strpos( $_SERVER['SERVER_NAME'], 'Flywheel' ) !== false ) {
+	} elseif (strpos($_SERVER['SERVER_NAME'], 'Flywheel') !== false) {
 		$host = 'Flywheel';
 	} else {
 		// Adding a general fallback for data gathering
-		$host = 'DBH: ' . DB_HOST . ', SRV: ' . $_SERVER['SERVER_NAME'];
+		$host = 'DBH: '.DB_HOST.', SRV: '.$_SERVER['SERVER_NAME'];
 	}
 
 	return $host;
@@ -423,67 +423,67 @@ 
  *
  * @return bool true if host matches, false if not
  */
-function give_is_host( $host = false ) {
+function give_is_host($host = false) {
 
 	$return = false;
 
-	if ( $host ) {
-		$host = str_replace( ' ', '', strtolower( $host ) );
+	if ($host) {
+		$host = str_replace(' ', '', strtolower($host));
 
-		switch ( $host ) {
+		switch ($host) {
 			case 'wpengine':
-				if ( defined( 'WPE_APIKEY' ) ) {
+				if (defined('WPE_APIKEY')) {
 					$return = true;
 				}
 				break;
 			case 'pagely':
-				if ( defined( 'PAGELYBIN' ) ) {
+				if (defined('PAGELYBIN')) {
 					$return = true;
 				}
 				break;
 			case 'icdsoft':
-				if ( DB_HOST == 'localhost:/tmp/mysql5.sock' ) {
+				if (DB_HOST == 'localhost:/tmp/mysql5.sock') {
 					$return = true;
 				}
 				break;
 			case 'networksolutions':
-				if ( DB_HOST == 'mysqlv5' ) {
+				if (DB_HOST == 'mysqlv5') {
 					$return = true;
 				}
 				break;
 			case 'ipage':
-				if ( strpos( DB_HOST, 'ipagemysql.com' ) !== false ) {
+				if (strpos(DB_HOST, 'ipagemysql.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'ipower':
-				if ( strpos( DB_HOST, 'ipowermysql.com' ) !== false ) {
+				if (strpos(DB_HOST, 'ipowermysql.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'mediatemplegrid':
-				if ( strpos( DB_HOST, '.gridserver.com' ) !== false ) {
+				if (strpos(DB_HOST, '.gridserver.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'pairnetworks':
-				if ( strpos( DB_HOST, '.pair.com' ) !== false ) {
+				if (strpos(DB_HOST, '.pair.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'rackspacecloud':
-				if ( strpos( DB_HOST, '.stabletransit.com' ) !== false ) {
+				if (strpos(DB_HOST, '.stabletransit.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'sysfix.eu':
 			case 'sysfix.eupowerhosting':
-				if ( strpos( DB_HOST, '.sysfix.eu' ) !== false ) {
+				if (strpos(DB_HOST, '.sysfix.eu') !== false) {
 					$return = true;
 				}
 				break;
 			case 'flywheel':
-				if ( strpos( $_SERVER['SERVER_NAME'], 'Flywheel' ) !== false ) {
+				if (strpos($_SERVER['SERVER_NAME'], 'Flywheel') !== false) {
 					$return = true;
 				}
 				break;
@@ -504,8 +504,8 @@ 
  * @return string $post_id
  */
 function give_get_admin_post_id() {
-	$post_id = isset( $_GET['post'] ) ? $_GET['post'] : null;
-	if ( ! $post_id && isset( $_POST['post_id'] ) ) {
+	$post_id = isset($_GET['post']) ? $_GET['post'] : null;
+	if ( ! $post_id && isset($_POST['post_id'])) {
 		$post_id = $_POST['post_id'];
 	}
 
@@ -523,11 +523,11 @@ 
  *
  * @return bool $ret True if guest checkout is enabled, false otherwise
  */
-function give_no_guest_checkout( $form_id ) {
+function give_no_guest_checkout($form_id) {
 
-	$ret = get_post_meta( $form_id, '_give_logged_in_only', true );
+	$ret = get_post_meta($form_id, '_give_logged_in_only', true);
 
-	return (bool) apply_filters( 'give_no_guest_checkout', $ret );
+	return (bool) apply_filters('give_no_guest_checkout', $ret);
 }
 
 
@@ -538,7 +538,7 @@ 
  * @return string Arg separator output
  */
 function give_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
 
@@ -553,10 +553,10 @@ 
  *
  * @return string Short month name
  */
-function give_month_num_to_name( $n ) {
-	$timestamp = mktime( 0, 0, 0, $n, 1, 2005 );
+function give_month_num_to_name($n) {
+	$timestamp = mktime(0, 0, 0, $n, 1, 2005);
 
-	return date_i18n( "M", $timestamp );
+	return date_i18n("M", $timestamp);
 }
 
 
@@ -569,10 +569,10 @@ 
  *
  * @return bool Whether or not function is disabled.
  */
-function give_is_func_disabled( $function ) {
-	$disabled = explode( ',', ini_get( 'disable_functions' ) );
+function give_is_func_disabled($function) {
+	$disabled = explode(',', ini_get('disable_functions'));
 
-	return in_array( $function, $disabled );
+	return in_array($function, $disabled);
 }
 
 
@@ -587,7 +587,7 @@ 
 
 		<form action="//givewp.us3.list-manage.com/subscribe/post?u=3ccb75d68bda4381e2f45794c&amp;id=12a081aa13" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
 			<div class="give-newsletter-confirmation">
-				<p><?php _e( 'Thanks for Subscribing!', 'give' ); ?> :)</p>
+				<p><?php _e('Thanks for Subscribing!', 'give'); ?> :)</p>
 			</div>
 
 			<table class="form-table give-newsletter-form">
@@ -683,7 +683,7 @@ 
  *
  * @return mixed
  */
-function give_svg_icons( $icon ) {
+function give_svg_icons($icon) {
 
 	// Store your SVGs in an associative array
 	$svgs = array(
@@ -695,7 +695,7 @@ 
 	);
 
 	// Return the chosen icon's SVG string
-	return $svgs[ $icon ];
+	return $svgs[$icon];
 }
 
 /**
@@ -707,15 +707,15 @@ 
  *
  * @return mixed
  */
-function modify_nav_menu_meta_box_object( $post_type ) {
-	if ( isset( $post_type->name ) && $post_type->name == 'give_forms' ) {
+function modify_nav_menu_meta_box_object($post_type) {
+	if (isset($post_type->name) && $post_type->name == 'give_forms') {
 		$post_type->labels->name = 'Donation Forms';
 	}
 
 	return $post_type;
 }
 
-add_filter( 'nav_menu_meta_box_object', 'modify_nav_menu_meta_box_object' );
+add_filter('nav_menu_meta_box_object', 'modify_nav_menu_meta_box_object');
 
 
 /**
@@ -728,7 +728,7 @@ 
  * @license    http://opensource.org/licenses/MIT MIT
  */
 
-if ( ! function_exists( 'array_column' ) ) {
+if ( ! function_exists('array_column')) {
 	/**
 	 * Returns the values from a single column of the input array, identified by
 	 * the $columnKey.
@@ -747,56 +747,56 @@ 
 	 *
 	 * @return array
 	 */
-	function array_column( $input = null, $columnKey = null, $indexKey = null ) {
+	function array_column($input = null, $columnKey = null, $indexKey = null) {
 		// Using func_get_args() in order to check for proper number of
 		// parameters and trigger errors exactly as the built-in array_column()
 		// does in PHP 5.5.
 		$argc   = func_num_args();
 		$params = func_get_args();
 
-		if ( $argc < 2 ) {
-			trigger_error( "array_column() expects at least 2 parameters, {$argc} given", E_USER_WARNING );
+		if ($argc < 2) {
+			trigger_error("array_column() expects at least 2 parameters, {$argc} given", E_USER_WARNING);
 
 			return null;
 		}
 
-		if ( ! is_array( $params[0] ) ) {
+		if ( ! is_array($params[0])) {
 			trigger_error(
-				'array_column() expects parameter 1 to be array, ' . gettype( $params[0] ) . ' given',
+				'array_column() expects parameter 1 to be array, '.gettype($params[0]).' given',
 				E_USER_WARNING
 			);
 
 			return null;
 		}
 
-		if ( ! is_int( $params[1] )
-		     && ! is_float( $params[1] )
-		     && ! is_string( $params[1] )
+		if ( ! is_int($params[1])
+		     && ! is_float($params[1])
+		     && ! is_string($params[1])
 		     && $params[1] !== null
-		     && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
+		     && ! (is_object($params[1]) && method_exists($params[1], '__toString'))
 		) {
-			trigger_error( 'array_column(): The column key should be either a string or an integer', E_USER_WARNING );
+			trigger_error('array_column(): The column key should be either a string or an integer', E_USER_WARNING);
 
 			return false;
 		}
 
-		if ( isset( $params[2] )
-		     && ! is_int( $params[2] )
-		     && ! is_float( $params[2] )
-		     && ! is_string( $params[2] )
-		     && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
+		if (isset($params[2])
+		     && ! is_int($params[2])
+		     && ! is_float($params[2])
+		     && ! is_string($params[2])
+		     && ! (is_object($params[2]) && method_exists($params[2], '__toString'))
 		) {
-			trigger_error( 'array_column(): The index key should be either a string or an integer', E_USER_WARNING );
+			trigger_error('array_column(): The index key should be either a string or an integer', E_USER_WARNING);
 
 			return false;
 		}
 
 		$paramsInput     = $params[0];
-		$paramsColumnKey = ( $params[1] !== null ) ? (string) $params[1] : null;
+		$paramsColumnKey = ($params[1] !== null) ? (string) $params[1] : null;
 
 		$paramsIndexKey = null;
-		if ( isset( $params[2] ) ) {
-			if ( is_float( $params[2] ) || is_int( $params[2] ) ) {
+		if (isset($params[2])) {
+			if (is_float($params[2]) || is_int($params[2])) {
 				$paramsIndexKey = (int) $params[2];
 			} else {
 				$paramsIndexKey = (string) $params[2];
@@ -805,26 +805,26 @@ 
 
 		$resultArray = array();
 
-		foreach ( $paramsInput as $row ) {
+		foreach ($paramsInput as $row) {
 			$key    = $value = null;
 			$keySet = $valueSet = false;
 
-			if ( $paramsIndexKey !== null && array_key_exists( $paramsIndexKey, $row ) ) {
+			if ($paramsIndexKey !== null && array_key_exists($paramsIndexKey, $row)) {
 				$keySet = true;
-				$key    = (string) $row[ $paramsIndexKey ];
+				$key    = (string) $row[$paramsIndexKey];
 			}
 
-			if ( $paramsColumnKey === null ) {
+			if ($paramsColumnKey === null) {
 				$valueSet = true;
 				$value    = $row;
-			} elseif ( is_array( $row ) && array_key_exists( $paramsColumnKey, $row ) ) {
+			} elseif (is_array($row) && array_key_exists($paramsColumnKey, $row)) {
 				$valueSet = true;
-				$value    = $row[ $paramsColumnKey ];
+				$value    = $row[$paramsColumnKey];
 			}
 
-			if ( $valueSet ) {
-				if ( $keySet ) {
-					$resultArray[ $key ] = $value;
+			if ($valueSet) {
+				if ($keySet) {
+					$resultArray[$key] = $value;
 				} else {
 					$resultArray[] = $value;
 				}
@@ -846,39 +846,39 @@ 
  *
  * @return bool Whether the receipt is visible or not.
  */
-function give_can_view_receipt( $payment_key = '' ) {
+function give_can_view_receipt($payment_key = '') {
 
 	$return = false;
 
-	if ( empty( $payment_key ) ) {
+	if (empty($payment_key)) {
 		return $return;
 	}
 
 	global $give_receipt_args;
 
-	$give_receipt_args['id'] = give_get_purchase_id_by_key( $payment_key );
+	$give_receipt_args['id'] = give_get_purchase_id_by_key($payment_key);
 
-	$user_id = (int) give_get_payment_user_id( $give_receipt_args['id'] );
+	$user_id = (int) give_get_payment_user_id($give_receipt_args['id']);
 
-	$payment_meta = give_get_payment_meta( $give_receipt_args['id'] );
+	$payment_meta = give_get_payment_meta($give_receipt_args['id']);
 
-	if ( is_user_logged_in() ) {
-		if ( $user_id === (int) get_current_user_id() ) {
+	if (is_user_logged_in()) {
+		if ($user_id === (int) get_current_user_id()) {
 			$return = true;
-		} elseif ( wp_get_current_user()->user_email === give_get_payment_user_email( $give_receipt_args['id'] ) ) {
+		} elseif (wp_get_current_user()->user_email === give_get_payment_user_email($give_receipt_args['id'])) {
 			$return = true;
-		} elseif ( current_user_can( 'view_give_sensitive_data' ) ) {
+		} elseif (current_user_can('view_give_sensitive_data')) {
 			$return = true;
 		}
 	}
 
 	$session = give_get_purchase_session();
-	if ( ! empty( $session ) && ! is_user_logged_in() ) {
-		if ( $session['purchase_key'] === $payment_meta['key'] ) {
+	if ( ! empty($session) && ! is_user_logged_in()) {
+		if ($session['purchase_key'] === $payment_meta['key']) {
 			$return = true;
 		}
 	}
 
-	return (bool) apply_filters( 'give_can_view_receipt', $return, $payment_key );
+	return (bool) apply_filters('give_can_view_receipt', $return, $payment_key);
 
 }
\ No newline at end of file

includes/admin/upgrades/upgrade-functions.php

Spacing +57 added lines, -57 removed lines

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

includes/install.php

Spacing +40 added lines, -40 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,25 +32,25 @@ 
 	give_setup_post_types();
 
 	// Clear the permalinks
-	flush_rewrite_rules( false );
+	flush_rewrite_rules(false);
 
 	// Add Upgraded From Option
-	$current_version = get_option( 'give_version' );
-	if ( $current_version ) {
-		update_option( 'give_version_upgraded_from', $current_version );
+	$current_version = get_option('give_version');
+	if ($current_version) {
+		update_option('give_version_upgraded_from', $current_version);
 	}
 
 	// Setup some default options
 	$options = array();
 
 	// Checks if the Success Page option exists AND that the page exists
-	if ( ! get_post( give_get_option( 'success_page' ) ) ) {
+	if ( ! get_post(give_get_option('success_page'))) {
 
 		// Purchase Confirmation (Success) Page
 		$success = wp_insert_post(
 			array(
-				'post_title'     => __( 'Donation Confirmation', 'give' ),
-				'post_content'   => __( 'Thank you for your donation! [give_receipt]', 'give' ),
+				'post_title'     => __('Donation Confirmation', 'give'),
+				'post_content'   => __('Thank you for your donation! [give_receipt]', 'give'),
 				'post_status'    => 'publish',
 				'post_author'    => 1,
 				'post_type'      => 'page',
@@ -63,13 +63,13 @@ 
 	}
 
 	// Checks if the Failure Page option exists AND that the page exists
-	if ( ! get_post( give_get_option( 'failure_page' ) ) ) {
+	if ( ! get_post(give_get_option('failure_page'))) {
 
 		// Failed Purchase Page
 		$failed = wp_insert_post(
 			array(
-				'post_title'     => __( 'Transaction Failed', 'give' ),
-				'post_content'   => __( 'Your transaction failed, please try again or contact site support.', 'give' ),
+				'post_title'     => __('Transaction Failed', 'give'),
+				'post_content'   => __('Your transaction failed, please try again or contact site support.', 'give'),
 				'post_status'    => 'publish',
 				'post_author'    => 1,
 				'post_type'      => 'page',
@@ -81,11 +81,11 @@ 
 	}
 
 	// Checks if the History Page option exists AND that the page exists
-	if ( ! get_post( give_get_option( 'history_page' ) ) ) {
+	if ( ! get_post(give_get_option('history_page'))) {
 		// Purchase History (History) Page
 		$history = wp_insert_post(
 			array(
-				'post_title'     => __( 'Donation History', 'give' ),
+				'post_title'     => __('Donation History', 'give'),
 				'post_content'   => '[donation_history]',
 				'post_status'    => 'publish',
 				'post_author'    => 1,
@@ -98,7 +98,7 @@ 
 	}
 
 	//Fresh Install? Setup Test Mode, Base Country (US), Test Gateway, Currency
-	if ( empty( $current_version ) ) {
+	if (empty($current_version)) {
 		$options['base_country']       = 'US';
 		$options['test_mode']          = 1;
 		$options['currency']           = 'USD';
@@ -115,12 +115,12 @@ 
 	}
 
 	// Populate some default values
-	update_option( 'give_settings', array_merge( $give_options, $options ) );
-	update_option( 'give_version', GIVE_VERSION );
+	update_option('give_settings', array_merge($give_options, $options));
+	update_option('give_version', GIVE_VERSION);
 
 	//Update Version Number
-	if ( $current_version ) {
-		update_option( 'give_version_upgraded_from', $current_version );
+	if ($current_version) {
+		update_option('give_version_upgraded_from', $current_version);
 	}
 
 	// Create Give roles
@@ -129,7 +129,7 @@ 
 	$roles->add_caps();
 
 	$api = new Give_API();
-	update_option( 'give_default_api_version', 'v' . $api->get_version() );
+	update_option('give_default_api_version', 'v'.$api->get_version());
 
 	// Create the customers database
 	@Give()->customers->create_table();
@@ -138,11 +138,11 @@ 
 	Give()->session->use_php_sessions();
 
 	// Add a temporary option to note that Give pages have been created
-	set_transient( '_give_installed', $options, 30 );
+	set_transient('_give_installed', $options, 30);
 
 
-	if ( ! $current_version ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/upgrades/upgrade-functions.php';
+	if ( ! $current_version) {
+		require_once GIVE_PLUGIN_DIR.'includes/admin/upgrades/upgrade-functions.php';
 
 		// When new upgrade routines are added, mark them as complete on fresh install
 		$upgrade_routines = array(
@@ -150,20 +150,20 @@ 
 			'upgrade_give_offline_status'
 		);
 
-		foreach ( $upgrade_routines as $upgrade ) {
-			give_set_upgrade_complete( $upgrade );
+		foreach ($upgrade_routines as $upgrade) {
+			give_set_upgrade_complete($upgrade);
 		}
 	}
 	// Bail if activating from network, or bulk
-	if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+	if (is_network_admin() || isset($_GET['activate-multi'])) {
 		return;
 	}
 	// Add the transient to redirect
-	set_transient( '_give_activation_redirect', true, 30 );
+	set_transient('_give_activation_redirect', true, 30);
 
 }
 
-register_activation_hook( GIVE_PLUGIN_FILE, 'give_install' );
+register_activation_hook(GIVE_PLUGIN_FILE, 'give_install');
 
 /**
  * Post-installation
@@ -175,14 +175,14 @@ 
  */
 function give_after_install() {
 
-	if ( ! is_admin() ) {
+	if ( ! is_admin()) {
 		return;
 	}
 
-	$give_options = get_transient( '_give_installed' );
+	$give_options = get_transient('_give_installed');
 
 	// Exit if not in admin or the transient doesn't exist
-	if ( false === $give_options ) {
+	if (false === $give_options) {
 		return;
 	}
 
@@ -190,13 +190,13 @@ 
 	@Give()->customers->create_table();
 
 	// Delete the transient
-	delete_transient( '_give_installed' );
+	delete_transient('_give_installed');
 
-	do_action( 'give_after_install', $give_options );
+	do_action('give_after_install', $give_options);
 
 }
 
-add_action( 'admin_init', 'give_after_install' );
+add_action('admin_init', 'give_after_install');
 
 
 /**
@@ -211,11 +211,11 @@ 
 
 	global $wp_roles;
 
-	if ( ! is_object( $wp_roles ) ) {
+	if ( ! is_object($wp_roles)) {
 		return;
 	}
 
-	if ( ! array_key_exists( 'give_manager', $wp_roles->roles ) ) {
+	if ( ! array_key_exists('give_manager', $wp_roles->roles)) {
 
 		// Create Give shop roles
 		$roles = new Give_Roles;
@@ -226,7 +226,7 @@ 
 
 }
 
-add_action( 'admin_init', 'give_install_roles_on_network' );
+add_action('admin_init', 'give_install_roles_on_network');
 
 /**
  * Network Activated New Site Setup
@@ -242,12 +242,12 @@ 
  * @param $site_id
  * @param $meta
  */
-function on_create_blog( $blog_id, $user_id, $domain, $path, $site_id, $meta ) {
-	if ( is_plugin_active_for_network( GIVE_PLUGIN_BASENAME ) ) {
-		switch_to_blog( $blog_id );
+function on_create_blog($blog_id, $user_id, $domain, $path, $site_id, $meta) {
+	if (is_plugin_active_for_network(GIVE_PLUGIN_BASENAME)) {
+		switch_to_blog($blog_id);
 		give_install();
 		restore_current_blog();
 	}
 }
 
-add_action( 'wpmu_new_blog', 'on_create_blog', 10, 6 );
\ No newline at end of file
+add_action('wpmu_new_blog', 'on_create_blog', 10, 6);
\ No newline at end of file

includes/gateways/paypal-standard.php

Spacing +157 added lines, -157 removed lines

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

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

Indentation +8 added lines, -8 removed lines

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

Spacing +33 added lines, -33 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -45,11 +45,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
 	}
 
@@ -64,10 +64,10 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -80,11 +80,11 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'label'           => esc_attr__( 'Gateway', 'give' ),
-			'complete_sales'  => esc_attr__( 'Complete Transactions', 'give' ),
-			'pending_sales'   => esc_attr__( 'Pending / Failed Transactions', 'give' ),
-			'total_sales'     => esc_attr__( 'Total Transactions', 'give' ),
-			'total_donations' => esc_attr__( 'Total Donations', 'give' )
+			'label'           => esc_attr__('Gateway', 'give'),
+			'complete_sales'  => esc_attr__('Complete Transactions', 'give'),
+			'pending_sales'   => esc_attr__('Pending / Failed Transactions', 'give'),
+			'total_sales'     => esc_attr__('Total Transactions', 'give'),
+			'total_donations' => esc_attr__('Total Donations', 'give')
 		);
 
 		return $columns;
@@ -99,7 +99,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 
@@ -110,7 +110,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		// These aren't really bulk actions but this outputs the markup in the right place
 		give_report_views();
 	}
@@ -123,23 +123,23 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' == $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' == $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav gateways-report-tablenav give-clearfix <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav gateways-report-tablenav give-clearfix <?php echo esc_attr($which); ?>">
 
-			<h3 class="alignleft reports-earnings-title"><span><?php _e( 'Payment Methods Report', 'give' ); ?></span></h3>
+			<h3 class="alignleft reports-earnings-title"><span><?php _e('Payment Methods Report', 'give'); ?></span></h3>
 
 			<div class="alignright tablenav-right">
 				<div class="actions bulkactions">
-					<?php $this->bulk_actions( $which ); ?>
+					<?php $this->bulk_actions($which); ?>
 				</div>
 				<?php
-				$this->extra_tablenav( $which );
-				$this->pagination( $which );
+				$this->extra_tablenav($which);
+				$this->pagination($which);
 				?>
 			</div>
 
@@ -164,18 +164,18 @@ 
 		$gateways     = give_get_payment_gateways();
 		$stats        = new Give_Payment_Stats();
 
-		foreach ( $gateways as $gateway_id => $gateway ) {
+		foreach ($gateways as $gateway_id => $gateway) {
 
-			$complete_count = give_count_sales_by_gateway( $gateway_id, 'publish' );
-			$pending_count  = give_count_sales_by_gateway( $gateway_id, array( 'pending', 'failed' ) );
+			$complete_count = give_count_sales_by_gateway($gateway_id, 'publish');
+			$pending_count  = give_count_sales_by_gateway($gateway_id, array('pending', 'failed'));
 
 			$reports_data[] = array(
 				'ID'              => $gateway_id,
 				'label'           => $gateway['admin_label'],
-				'complete_sales'  => give_format_amount( $complete_count, false ),
-				'pending_sales'   => give_format_amount( $pending_count, false ),
-				'total_sales'     => give_format_amount( $complete_count + $pending_count, false ),
-				'total_donations' => give_currency_filter( give_format_amount( $stats->get_earnings( 0, 0, 0, $gateway_id ) ) )
+				'complete_sales'  => give_format_amount($complete_count, false),
+				'pending_sales'   => give_format_amount($pending_count, false),
+				'total_sales'     => give_format_amount($complete_count + $pending_count, false),
+				'total_donations' => give_currency_filter(give_format_amount($stats->get_earnings(0, 0, 0, $gateway_id)))
 			);
 		}
 
@@ -197,7 +197,7 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->reports_data();
 
 	}

includes/payments/class-payment-stats.php

Spacing +46 added lines, -46 removed lines

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

includes/class-give-session.php

Doc Comments +4 added lines, -5 removed lines

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

Spacing +49 added lines, -49 removed lines

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

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 +89 added lines, -89 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -51,9 +51,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
@@ -68,8 +68,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]);
 	}
 
 	/**
@@ -81,8 +81,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);
 	}
 
 	/**
@@ -106,16 +106,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;
 
@@ -131,17 +131,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);
 	}
 
 }
@@ -155,8 +155,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);
 }
 
 /**
@@ -166,8 +166,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);
 }
 
 /**
@@ -179,8 +179,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);
 }
 
 /**
@@ -209,13 +209,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/>';
 
 		}
 
@@ -235,13 +235,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;
@@ -253,10 +253,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
@@ -269,82 +269,82 @@ 
 	$email_tags = array(
 		array(
 			'tag'         => 'donation',
-			'description' => __( 'The name of completed donation form', 'give' ),
+			'description' => __('The name of completed donation form', 'give'),
 			'function'    => 'give_email_tag_donation'
 		),
 		array(
 			'tag'         => 'name',
-			'description' => __( 'The donor\'s first name', 'give' ),
+			'description' => __('The donor\'s first name', 'give'),
 			'function'    => 'give_email_tag_first_name'
 		),
 		array(
 			'tag'         => 'fullname',
-			'description' => __( 'The donor\'s full name, first and last', 'give' ),
+			'description' => __('The donor\'s full name, first and last', 'give'),
 			'function'    => 'give_email_tag_fullname'
 		),
 		array(
 			'tag'         => 'username',
-			'description' => __( 'The donor\'s user name on the site, if they registered an account', 'give' ),
+			'description' => __('The donor\'s user name on the site, if they registered an account', 'give'),
 			'function'    => 'give_email_tag_username'
 		),
 		array(
 			'tag'         => 'user_email',
-			'description' => __( 'The donor\'s email address', 'give' ),
+			'description' => __('The donor\'s email address', 'give'),
 			'function'    => 'give_email_tag_user_email'
 		),
 		array(
 			'tag'         => 'billing_address',
-			'description' => __( 'The donor\'s billing address', 'give' ),
+			'description' => __('The donor\'s billing address', 'give'),
 			'function'    => 'give_email_tag_billing_address'
 		),
 		array(
 			'tag'         => 'date',
-			'description' => __( 'The date of the donation', 'give' ),
+			'description' => __('The date of the donation', 'give'),
 			'function'    => 'give_email_tag_date'
 		),
 		array(
 			'tag'         => 'price',
-			'description' => __( 'The total price of the donation', 'give' ),
+			'description' => __('The total price of the donation', 'give'),
 			'function'    => 'give_email_tag_price'
 		),
 		array(
 			'tag'         => 'payment_id',
-			'description' => __( 'The unique ID number for this donation', 'give' ),
+			'description' => __('The unique ID number for this donation', 'give'),
 			'function'    => 'give_email_tag_payment_id'
 		),
 		array(
 			'tag'         => 'receipt_id',
-			'description' => __( 'The unique ID number for this donation receipt', 'give' ),
+			'description' => __('The unique ID number for this donation receipt', 'give'),
 			'function'    => 'give_email_tag_receipt_id'
 		),
 		array(
 			'tag'         => 'payment_method',
-			'description' => __( 'The method of payment used for this donation', 'give' ),
+			'description' => __('The method of payment used for this donation', 'give'),
 			'function'    => 'give_email_tag_payment_method'
 		),
 		array(
 			'tag'         => 'sitename',
-			'description' => __( 'Your site name', 'give' ),
+			'description' => __('Your site name', 'give'),
 			'function'    => 'give_email_tag_sitename'
 		),
 		array(
 			'tag'         => 'receipt_link',
-			'description' => __( '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' => __('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');
 
 
 /**
@@ -355,12 +355,12 @@ 
  *
  * @return string name
  */
-function give_email_tag_first_name( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_first_name($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['name'];
 }
@@ -373,12 +373,12 @@ 
  *
  * @return string fullname
  */
-function give_email_tag_fullname( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_fullname($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['fullname'];
 }
@@ -391,12 +391,12 @@ 
  *
  * @return string username
  */
-function give_email_tag_username( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_username($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['username'];
 }
@@ -409,8 +409,8 @@ 
  *
  * @return string user_email
  */
-function give_email_tag_user_email( $payment_id ) {
-	return give_get_payment_user_email( $payment_id );
+function give_email_tag_user_email($payment_id) {
+	return give_get_payment_user_email($payment_id);
 }
 
 /**
@@ -421,10 +421,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'    => '',
@@ -433,11 +433,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;
@@ -451,10 +451,10 @@ 
  *
  * @return string date
  */
-function give_email_tag_date( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
+function give_email_tag_date($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
 
-	return date_i18n( get_option( 'date_format' ), strtotime( $payment_data['date'] ) );
+	return date_i18n(get_option('date_format'), strtotime($payment_data['date']));
 }
 
 /**
@@ -465,10 +465,10 @@ 
  *
  * @return string price
  */
-function give_email_tag_price( $payment_id ) {
-	$price = give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ), give_get_payment_currency_code( $payment_id ) );
+function give_email_tag_price($payment_id) {
+	$price = give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)), give_get_payment_currency_code($payment_id));
 
-	return html_entity_decode( $price, ENT_COMPAT, 'UTF-8' );
+	return html_entity_decode($price, ENT_COMPAT, 'UTF-8');
 }
 
 /**
@@ -479,8 +479,8 @@ 
  *
  * @return int payment_id
  */
-function give_email_tag_payment_id( $payment_id ) {
-	return give_get_payment_number( $payment_id );
+function give_email_tag_payment_id($payment_id) {
+	return give_get_payment_number($payment_id);
 }
 
 /**
@@ -491,8 +491,8 @@ 
  *
  * @return string receipt_id
  */
-function give_email_tag_receipt_id( $payment_id ) {
-	return give_get_payment_key( $payment_id );
+function give_email_tag_receipt_id($payment_id) {
+	return give_get_payment_key($payment_id);
 }
 
 /**
@@ -503,9 +503,9 @@ 
  *
  * @return string $form_title
  */
-function give_email_tag_donation( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	$form_title   = ( ! empty( $payment_data['form_title'] ) ? $payment_data['form_title'] : __( 'There was an error retrieving this donation title', 'give' ) );
+function give_email_tag_donation($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	$form_title   = ( ! empty($payment_data['form_title']) ? $payment_data['form_title'] : __('There was an error retrieving this donation title', 'give'));
 
 	return $form_title;
 }
@@ -518,8 +518,8 @@ 
  *
  * @return string gateway
  */
-function give_email_tag_payment_method( $payment_id ) {
-	return give_get_gateway_checkout_label( give_get_payment_gateway( $payment_id ) );
+function give_email_tag_payment_method($payment_id) {
+	return give_get_gateway_checkout_label(give_get_payment_gateway($payment_id));
 }
 
 /**
@@ -530,8 +530,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);
 }
 
 /**
@@ -543,15 +543,15 @@ 
  *
  * @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( __( '%1$sView it in your browser.%2$s', 'give' ), '<a href="' . $receipt_url . '">', '</a>' );
+	), home_url()));
+	$formatted = sprintf(__('%1$sView it in your browser.%2$s', 'give'), '<a href="'.$receipt_url.'">', '</a>');
 
-	if(give_get_option('email_template') !== 'none') {
+	if (give_get_option('email_template') !== 'none') {
 		return $formatted;
 	} else {
 		return $receipt_url;

includes/gateways/offline-donations.php

Spacing +117 added lines, -117 removed lines

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