WordImpress / Give

includes/admin/upgrades/upgrade-functions.php

Spacing +68 added lines, -68 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,35 +229,35 @@ 
 	$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');
 
 
 /**
@@ -269,17 +269,17 @@ 
  */
 function give_v152_cleanup_users() {
 
-	$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);
 
 	//v1.5.2 Upgrades
-	if ( version_compare( $give_version, '1.5.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_user_caps_cleanup' ) ) {
+	if (version_compare($give_version, '1.5.2', '<') || ! give_has_upgrade_completed('upgrade_give_user_caps_cleanup')) {
 
 		//Delete all caps with "ss"
 		//Also delete all unused "campaign" roles
@@ -326,9 +326,9 @@ 
 		);
 	
 		global $wp_roles;
-		foreach ( $delete_caps as $cap ) {
-			foreach ( array_keys( $wp_roles->roles ) as $role ) {
-				$wp_roles->remove_cap( $role, $cap );
+		foreach ($delete_caps as $cap) {
+			foreach (array_keys($wp_roles->roles) as $role) {
+				$wp_roles->remove_cap($role, $cap);
 			}
 		}
 	
@@ -338,12 +338,12 @@ 
 		$roles->add_caps();
 		
 		//The Update Ran
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-		give_set_upgrade_complete( 'upgrade_give_user_caps_cleanup' );
-		delete_option( 'give_doing_upgrade' );
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+		give_set_upgrade_complete('upgrade_give_user_caps_cleanup');
+		delete_option('give_doing_upgrade');
 
 	}
 
 }
 
-add_action( 'admin_init', 'give_v152_cleanup_users' );
\ No newline at end of file
+add_action('admin_init', 'give_v152_cleanup_users');
\ No newline at end of file

includes/emails/actions.php

Spacing +18 added lines, -18 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,17 +23,17 @@ 
  *
  * @return void
  */
-function give_trigger_donation_receipt( $payment_id ) {
+function give_trigger_donation_receipt($payment_id) {
 	// Make sure we don't send a purchase receipt while editing a payment
-	if ( isset( $_POST['give-action'] ) && 'edit_payment' == $_POST['give-action'] ) {
+	if (isset($_POST['give-action']) && 'edit_payment' == $_POST['give-action']) {
 		return;
 	}
 
 	// Send email
-	give_email_donation_receipt( $payment_id );
+	give_email_donation_receipt($payment_id);
 }
 
-add_action( 'give_complete_purchase', 'give_trigger_donation_receipt', 999, 1 );
+add_action('give_complete_purchase', 'give_trigger_donation_receipt', 999, 1);
 
 /**
  * Resend the Email Purchase Receipt. (This can be done from the Payment History page)
@@ -44,29 +44,29 @@ 
  *
  * @return void
  */
-function give_resend_donation_receipt( $data ) {
+function give_resend_donation_receipt($data) {
 
-	$purchase_id = absint( $data['purchase_id'] );
+	$purchase_id = absint($data['purchase_id']);
 
-	if ( empty( $purchase_id ) ) {
+	if (empty($purchase_id)) {
 		return;
 	}
 
-	if ( ! current_user_can( 'edit_give_payments', $purchase_id ) ) {
-		wp_die( __( 'You do not have permission to edit payment records.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $purchase_id)) {
+		wp_die(__('You do not have permission to edit payment records.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	give_email_donation_receipt( $purchase_id, false );
+	give_email_donation_receipt($purchase_id, false);
 
-	wp_redirect( add_query_arg( array(
+	wp_redirect(add_query_arg(array(
 		'give-message' => 'email_sent',
 		'give-action'  => false,
 		'purchase_id'  => false
-	) ) );
+	)));
 	exit;
 }
 
-add_action( 'give_email_links', 'give_resend_donation_receipt' );
+add_action('give_email_links', 'give_resend_donation_receipt');
 
 /**
  * Trigger the sending of a Test Email
@@ -77,8 +77,8 @@ 
  *
  * @return void
  */
-function give_send_test_email( $data ) {
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give-test-email' ) ) {
+function give_send_test_email($data) {
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give-test-email')) {
 		return;
 	}
 
@@ -86,8 +86,8 @@ 
 	give_email_test_donation_receipt();
 
 	// Remove the test email query arg
-	wp_redirect( remove_query_arg( 'give_action' ) );
+	wp_redirect(remove_query_arg('give_action'));
 	exit;
 }
 
-add_action( 'give_send_test_email', 'give_send_test_email' );
+add_action('give_send_test_email', 'give_send_test_email');

includes/class-give-customer.php

Spacing +128 added lines, -128 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -97,29 +97,29 @@ 
 	 * @param bool $_id_or_email
 	 * @param bool $by_user_id
 	 */
-	public function __construct( $_id_or_email = false, $by_user_id = false ) {
+	public function __construct($_id_or_email = false, $by_user_id = false) {
 
 		$this->db = new Give_DB_Customers;
 
-		if ( false === $_id_or_email || ( is_numeric( $_id_or_email ) && (int) $_id_or_email !== absint( $_id_or_email ) ) ) {
+		if (false === $_id_or_email || (is_numeric($_id_or_email) && (int) $_id_or_email !== absint($_id_or_email))) {
 			return false;
 		}
 
-		$by_user_id = is_bool( $by_user_id ) ? $by_user_id : false;
+		$by_user_id = is_bool($by_user_id) ? $by_user_id : false;
 
-		if ( is_numeric( $_id_or_email ) ) {
+		if (is_numeric($_id_or_email)) {
 			$field = $by_user_id ? 'user_id' : 'id';
 		} else {
 			$field = 'email';
 		}
 
-		$customer = $this->db->get_customer_by( $field, $_id_or_email );
+		$customer = $this->db->get_customer_by($field, $_id_or_email);
 
-		if ( empty( $customer ) || ! is_object( $customer ) ) {
+		if (empty($customer) || ! is_object($customer)) {
 			return false;
 		}
 
-		$this->setup_customer( $customer );
+		$this->setup_customer($customer);
 
 	}
 
@@ -132,15 +132,15 @@ 
 	 *
 	 * @return bool             If the setup was successful or not
 	 */
-	private function setup_customer( $customer ) {
+	private function setup_customer($customer) {
 
-		if ( ! is_object( $customer ) ) {
+		if ( ! is_object($customer)) {
 			return false;
 		}
 
-		foreach ( $customer as $key => $value ) {
+		foreach ($customer as $key => $value) {
 
-			switch ( $key ) {
+			switch ($key) {
 
 				case 'notes':
 					$this->$key = $this->get_notes();
@@ -155,7 +155,7 @@ 
 		}
 
 		// Customer ID and email are the only things that are necessary, make sure they exist
-		if ( ! empty( $this->id ) && ! empty( $this->email ) ) {
+		if ( ! empty($this->id) && ! empty($this->email)) {
 			return true;
 		}
 
@@ -168,15 +168,15 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if ( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_'.$key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_'.$key));
 
 		} else {
 
-			return new WP_Error( 'give-customer-invalid-property', sprintf( __( 'Can\'t get property %s.', 'give' ), $key ) );
+			return new WP_Error('give-customer-invalid-property', sprintf(__('Can\'t get property %s.', 'give'), $key));
 
 		}
 
@@ -191,9 +191,9 @@ 
 	 *
 	 * @return mixed        False if not a valid creation, Customer ID if user is found or valid creation
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
-		if ( $this->id != 0 || empty( $data ) ) {
+		if ($this->id != 0 || empty($data)) {
 			return false;
 		}
 
@@ -201,34 +201,34 @@ 
 			'payment_ids' => ''
 		);
 
-		$args = wp_parse_args( $data, $defaults );
-		$args = $this->sanitize_columns( $args );
+		$args = wp_parse_args($data, $defaults);
+		$args = $this->sanitize_columns($args);
 
-		if ( empty( $args['email'] ) || ! is_email( $args['email'] ) ) {
+		if (empty($args['email']) || ! is_email($args['email'])) {
 			return false;
 		}
 
-		if ( ! empty( $args['payment_ids'] ) && is_array( $args['payment_ids'] ) ) {
-			$args['payment_ids'] = implode( ',', array_unique( array_values( $args['payment_ids'] ) ) );
+		if ( ! empty($args['payment_ids']) && is_array($args['payment_ids'])) {
+			$args['payment_ids'] = implode(',', array_unique(array_values($args['payment_ids'])));
 		}
 
-		do_action( 'give_customer_pre_create', $args );
+		do_action('give_customer_pre_create', $args);
 
 		$created = false;
 
 		// The DB class 'add' implies an update if the customer being asked to be created already exists
-		if ( $this->db->add( $data ) ) {
+		if ($this->db->add($data)) {
 
 			// We've successfully added/updated the customer, reset the class vars with the new data
-			$customer = $this->db->get_customer_by( 'email', $args['email'] );
+			$customer = $this->db->get_customer_by('email', $args['email']);
 
 			// Setup the customer data with the values from DB
-			$this->setup_customer( $customer );
+			$this->setup_customer($customer);
 
 			$created = $this->id;
 		}
 
-		do_action( 'give_customer_post_create', $created, $args );
+		do_action('give_customer_post_create', $created, $args);
 
 		return $created;
 
@@ -243,27 +243,27 @@ 
 	 *
 	 * @return bool         If the update was successful or not
 	 */
-	public function update( $data = array() ) {
+	public function update($data = array()) {
 
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			return false;
 		}
 
-		$data = $this->sanitize_columns( $data );
+		$data = $this->sanitize_columns($data);
 
-		do_action( 'give_customer_pre_update', $this->id, $data );
+		do_action('give_customer_pre_update', $this->id, $data);
 
 		$updated = false;
 
-		if ( $this->db->update( $this->id, $data ) ) {
+		if ($this->db->update($this->id, $data)) {
 
-			$customer = $this->db->get_customer_by( 'id', $this->id );
-			$this->setup_customer( $customer );
+			$customer = $this->db->get_customer_by('id', $this->id);
+			$this->setup_customer($customer);
 
 			$updated = true;
 		}
 
-		do_action( 'give_customer_post_update', $updated, $this->id, $data );
+		do_action('give_customer_post_update', $updated, $this->id, $data);
 
 		return $updated;
 	}
@@ -279,44 +279,44 @@ 
 	 *
 	 * @return bool            If the attachment was successfuly
 	 */
-	public function attach_payment( $payment_id = 0, $update_stats = true ) {
+	public function attach_payment($payment_id = 0, $update_stats = true) {
 
-		if ( empty( $payment_id ) ) {
+		if (empty($payment_id)) {
 			return false;
 		}
 
-		if ( empty( $this->payment_ids ) ) {
+		if (empty($this->payment_ids)) {
 
 			$new_payment_ids = $payment_id;
 
 		} else {
 
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
 
-			if ( in_array( $payment_id, $payment_ids ) ) {
+			if (in_array($payment_id, $payment_ids)) {
 				$update_stats = false;
 			}
 
 			$payment_ids[] = $payment_id;
 
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 		}
 
-		do_action( 'give_customer_pre_attach_payment', $payment_id, $this->id );
+		do_action('give_customer_pre_attach_payment', $payment_id, $this->id);
 
-		$payment_added = $this->update( array( 'payment_ids' => $new_payment_ids ) );
+		$payment_added = $this->update(array('payment_ids' => $new_payment_ids));
 
-		if ( $payment_added ) {
+		if ($payment_added) {
 
 			$this->payment_ids = $new_payment_ids;
 
 			// We added this payment successfully, increment the stats
-			if ( $update_stats ) {
-				$payment_amount = give_get_payment_amount( $payment_id );
+			if ($update_stats) {
+				$payment_amount = give_get_payment_amount($payment_id);
 
-				if ( ! empty( $payment_amount ) ) {
-					$this->increase_value( $payment_amount );
+				if ( ! empty($payment_amount)) {
+					$this->increase_value($payment_amount);
 				}
 
 				$this->increase_purchase_count();
@@ -324,7 +324,7 @@ 
 
 		}
 
-		do_action( 'give_customer_post_attach_payment', $payment_added, $payment_id, $this->id );
+		do_action('give_customer_post_attach_payment', $payment_added, $payment_id, $this->id);
 
 		return $payment_added;
 	}
@@ -340,50 +340,50 @@ 
 	 *
 	 * @return boolean             If the removal was successful
 	 */
-	public function remove_payment( $payment_id = 0, $update_stats = true ) {
+	public function remove_payment($payment_id = 0, $update_stats = true) {
 
-		if ( empty( $payment_id ) ) {
+		if (empty($payment_id)) {
 			return false;
 		}
 
-		$payment = new Give_Payment( $payment_id );
+		$payment = new Give_Payment($payment_id);
 
-		if ( 'publish' !== $payment->status && 'revoked' !== $payment->status ) {
+		if ('publish' !== $payment->status && 'revoked' !== $payment->status) {
 			$update_stats = false;
 		}
 
 		$new_payment_ids = '';
 
-		if ( ! empty( $this->payment_ids ) ) {
+		if ( ! empty($this->payment_ids)) {
 
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
 
-			$pos = array_search( $payment_id, $payment_ids );
-			if ( false === $pos ) {
+			$pos = array_search($payment_id, $payment_ids);
+			if (false === $pos) {
 				return false;
 			}
 
-			unset( $payment_ids[ $pos ] );
-			$payment_ids = array_filter( $payment_ids );
+			unset($payment_ids[$pos]);
+			$payment_ids = array_filter($payment_ids);
 
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 		}
 
-		do_action( 'give_customer_pre_remove_payment', $payment_id, $this->id );
+		do_action('give_customer_pre_remove_payment', $payment_id, $this->id);
 
-		$payment_removed = $this->update( array( 'payment_ids' => $new_payment_ids ) );
+		$payment_removed = $this->update(array('payment_ids' => $new_payment_ids));
 
-		if ( $payment_removed ) {
+		if ($payment_removed) {
 
 			$this->payment_ids = $new_payment_ids;
 
-			if ( $update_stats ) {
+			if ($update_stats) {
 				// We removed this payment successfully, decrement the stats
-				$payment_amount = give_get_payment_amount( $payment_id );
+				$payment_amount = give_get_payment_amount($payment_id);
 
-				if ( ! empty( $payment_amount ) ) {
-					$this->decrease_value( $payment_amount );
+				if ( ! empty($payment_amount)) {
+					$this->decrease_value($payment_amount);
 				}
 
 				$this->decrease_purchase_count();
@@ -391,7 +391,7 @@ 
 
 		}
 
-		do_action( 'give_customer_post_remove_payment', $payment_removed, $payment_id, $this->id );
+		do_action('give_customer_post_remove_payment', $payment_removed, $payment_id, $this->id);
 
 		return $payment_removed;
 
@@ -406,22 +406,22 @@ 
 	 *
 	 * @return int            The purchase count
 	 */
-	public function increase_purchase_count( $count = 1 ) {
+	public function increase_purchase_count($count = 1) {
 
 		// Make sure it's numeric and not negative
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
+		if ( ! is_numeric($count) || $count != absint($count)) {
 			return false;
 		}
 
 		$new_total = (int) $this->purchase_count + (int) $count;
 
-		do_action( 'give_customer_pre_increase_purchase_count', $count, $this->id );
+		do_action('give_customer_pre_increase_purchase_count', $count, $this->id);
 
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
+		if ($this->update(array('purchase_count' => $new_total))) {
 			$this->purchase_count = $new_total;
 		}
 
-		do_action( 'give_customer_post_increase_purchase_count', $this->purchase_count, $count, $this->id );
+		do_action('give_customer_post_increase_purchase_count', $this->purchase_count, $count, $this->id);
 
 		return $this->purchase_count;
 	}
@@ -435,26 +435,26 @@ 
 	 *
 	 * @return mixed          If successful, the new count, otherwise false
 	 */
-	public function decrease_purchase_count( $count = 1 ) {
+	public function decrease_purchase_count($count = 1) {
 
 		// Make sure it's numeric and not negative
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
+		if ( ! is_numeric($count) || $count != absint($count)) {
 			return false;
 		}
 
 		$new_total = (int) $this->purchase_count - (int) $count;
 
-		if ( $new_total < 0 ) {
+		if ($new_total < 0) {
 			$new_total = 0;
 		}
 
-		do_action( 'give_customer_pre_decrease_purchase_count', $count, $this->id );
+		do_action('give_customer_pre_decrease_purchase_count', $count, $this->id);
 
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
+		if ($this->update(array('purchase_count' => $new_total))) {
 			$this->purchase_count = $new_total;
 		}
 
-		do_action( 'give_customer_post_decrease_purchase_count', $this->purchase_count, $count, $this->id );
+		do_action('give_customer_post_decrease_purchase_count', $this->purchase_count, $count, $this->id);
 
 		return $this->purchase_count;
 	}
@@ -468,17 +468,17 @@ 
 	 *
 	 * @return mixed         If successful, the new value, otherwise false
 	 */
-	public function increase_value( $value = 0.00 ) {
+	public function increase_value($value = 0.00) {
 
-		$new_value = floatval( $this->purchase_value ) + $value;
+		$new_value = floatval($this->purchase_value) + $value;
 
-		do_action( 'give_customer_pre_increase_value', $value, $this->id );
+		do_action('give_customer_pre_increase_value', $value, $this->id);
 
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
+		if ($this->update(array('purchase_value' => $new_value))) {
 			$this->purchase_value = $new_value;
 		}
 
-		do_action( 'give_customer_post_increase_value', $this->purchase_value, $value, $this->id );
+		do_action('give_customer_post_increase_value', $this->purchase_value, $value, $this->id);
 
 		return $this->purchase_value;
 	}
@@ -492,21 +492,21 @@ 
 	 *
 	 * @return mixed         If successful, the new value, otherwise false
 	 */
-	public function decrease_value( $value = 0.00 ) {
+	public function decrease_value($value = 0.00) {
 
-		$new_value = floatval( $this->purchase_value ) - $value;
+		$new_value = floatval($this->purchase_value) - $value;
 
-		if ( $new_value < 0 ) {
+		if ($new_value < 0) {
 			$new_value = 0.00;
 		}
 
-		do_action( 'give_customer_pre_decrease_value', $value, $this->id );
+		do_action('give_customer_pre_decrease_value', $value, $this->id);
 
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
+		if ($this->update(array('purchase_value' => $new_value))) {
 			$this->purchase_value = $new_value;
 		}
 
-		do_action( 'give_customer_post_decrease_value', $this->purchase_value, $value, $this->id );
+		do_action('give_customer_post_decrease_value', $this->purchase_value, $value, $this->id);
 
 		return $this->purchase_value;
 	}
@@ -521,15 +521,15 @@ 
 	 *
 	 * @return array           The notes requsted
 	 */
-	public function get_notes( $length = 20, $paged = 1 ) {
+	public function get_notes($length = 20, $paged = 1) {
 
-		$length = is_numeric( $length ) ? $length : 20;
-		$offset = is_numeric( $paged ) && $paged != 1 ? ( ( absint( $paged ) - 1 ) * $length ) : 0;
+		$length = is_numeric($length) ? $length : 20;
+		$offset = is_numeric($paged) && $paged != 1 ? ((absint($paged) - 1) * $length) : 0;
 
 		$all_notes   = $this->get_raw_notes();
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
 
-		$desired_notes = array_slice( $notes_array, $offset, $length );
+		$desired_notes = array_slice($notes_array, $offset, $length);
 
 		return $desired_notes;
 
@@ -544,9 +544,9 @@ 
 	public function get_notes_count() {
 
 		$all_notes   = $this->get_raw_notes();
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
 
-		return count( $notes_array );
+		return count($notes_array);
 
 	}
 
@@ -559,32 +559,32 @@ 
 	 *
 	 * @return string|boolean The new note if added succesfully, false otherwise
 	 */
-	public function add_note( $note = '' ) {
+	public function add_note($note = '') {
 
-		$note = trim( $note );
-		if ( empty( $note ) ) {
+		$note = trim($note);
+		if (empty($note)) {
 			return false;
 		}
 
 		$notes = $this->get_raw_notes();
 
-		if ( empty( $notes ) ) {
+		if (empty($notes)) {
 			$notes = '';
 		}
 
-		$note_string = date_i18n( 'F j, Y H:i:s', current_time( 'timestamp' ) ) . ' - ' . $note;
-		$new_note    = apply_filters( 'give_customer_add_note_string', $note_string );
-		$notes .= "\n\n" . $new_note;
+		$note_string = date_i18n('F j, Y H:i:s', current_time('timestamp')).' - '.$note;
+		$new_note    = apply_filters('give_customer_add_note_string', $note_string);
+		$notes .= "\n\n".$new_note;
 
-		do_action( 'give_customer_pre_add_note', $new_note, $this->id );
+		do_action('give_customer_pre_add_note', $new_note, $this->id);
 
-		$updated = $this->update( array( 'notes' => $notes ) );
+		$updated = $this->update(array('notes' => $notes));
 
-		if ( $updated ) {
+		if ($updated) {
 			$this->notes = $this->get_notes();
 		}
 
-		do_action( 'give_customer_post_add_note', $this->notes, $new_note, $this->id );
+		do_action('give_customer_post_add_note', $this->notes, $new_note, $this->id);
 
 		// Return the formatted note, so we can test, as well as update any displays
 		return $new_note;
@@ -599,7 +599,7 @@ 
 	 */
 	private function get_raw_notes() {
 
-		$all_notes = $this->db->get_column( 'notes', $this->id );
+		$all_notes = $this->db->get_column('notes', $this->id);
 
 		return $all_notes;
 
@@ -614,51 +614,51 @@ 
 	 *
 	 * @return array       The sanitized data, based off column defaults
 	 */
-	private function sanitize_columns( $data ) {
+	private function sanitize_columns($data) {
 
 		$columns        = $this->db->get_columns();
 		$default_values = $this->db->get_column_defaults();
 
-		foreach ( $columns as $key => $type ) {
+		foreach ($columns as $key => $type) {
 
 			// Only sanitize data that we were provided
-			if ( ! array_key_exists( $key, $data ) ) {
+			if ( ! array_key_exists($key, $data)) {
 				continue;
 			}
 
-			switch ( $type ) {
+			switch ($type) {
 
 				case '%s':
-					if ( 'email' == $key ) {
-						$data[ $key ] = sanitize_email( $data[ $key ] );
-					} elseif ( 'notes' == $key ) {
-						$data[ $key ] = strip_tags( $data[ $key ] );
+					if ('email' == $key) {
+						$data[$key] = sanitize_email($data[$key]);
+					} elseif ('notes' == $key) {
+						$data[$key] = strip_tags($data[$key]);
 					} else {
-						$data[ $key ] = sanitize_text_field( $data[ $key ] );
+						$data[$key] = sanitize_text_field($data[$key]);
 					}
 					break;
 
 				case '%d':
-					if ( ! is_numeric( $data[ $key ] ) || (int) $data[ $key ] !== absint( $data[ $key ] ) ) {
-						$data[ $key ] = $default_values[ $key ];
+					if ( ! is_numeric($data[$key]) || (int) $data[$key] !== absint($data[$key])) {
+						$data[$key] = $default_values[$key];
 					} else {
-						$data[ $key ] = absint( $data[ $key ] );
+						$data[$key] = absint($data[$key]);
 					}
 					break;
 
 				case '%f':
 					// Convert what was given to a float
-					$value = floatval( $data[ $key ] );
+					$value = floatval($data[$key]);
 
-					if ( ! is_float( $value ) ) {
-						$data[ $key ] = $default_values[ $key ];
+					if ( ! is_float($value)) {
+						$data[$key] = $default_values[$key];
 					} else {
-						$data[ $key ] = $value;
+						$data[$key] = $value;
 					}
 					break;
 
 				default:
-					$data[ $key ] = sanitize_text_field( $data[ $key ] );
+					$data[$key] = sanitize_text_field($data[$key]);
 					break;
 
 			}

includes/scripts.php

Spacing +138 added lines, -138 removed lines

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

includes/gateways/paypal-standard.php

Spacing +163 added lines, -163 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']);
 	$price_id = isset($purchase_data['post_data']['give-price-id']) ? $purchase_data['post_data']['give-price-id'] : '';
 	
 	// Collect payment data
@@ -57,59 +57,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'],
@@ -120,25 +120,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',
 			);
@@ -148,23 +148,23 @@ 
 			);
 		}
 
-		$paypal_args = array_merge( $paypal_extra_args, $paypal_args );
-		$paypal_args = apply_filters( 'give_paypal_redirect_args', $paypal_args, $purchase_data );
+		$paypal_args = array_merge($paypal_extra_args, $paypal_args);
+		$paypal_args = apply_filters('give_paypal_redirect_args', $paypal_args, $purchase_data);
 
 		// Build query
-		$paypal_redirect .= http_build_query( $paypal_args );
+		$paypal_redirect .= http_build_query($paypal_args);
 
 		// Fix for some sites that encode the entities
-		$paypal_redirect = str_replace( '&', '&', $paypal_redirect );
+		$paypal_redirect = str_replace('&', '&', $paypal_redirect);
 
 		// Redirect to PayPal
-		wp_redirect( $paypal_redirect );
+		wp_redirect($paypal_redirect);
 		exit;
 	}
 
 }
 
-add_action( 'give_gateway_paypal', 'give_process_paypal_purchase' );
+add_action('give_gateway_paypal', 'give_process_paypal_purchase');
 
 /**
  * Listens for a PayPal IPN requests and then sends to the processing function
@@ -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,40 +211,40 @@ 
 	$arg_separator = give_get_php_arg_separator_output();
 
 	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
+	if ($post_data || strlen($post_data) > 0) {
 		// Append the data
-		$encoded_data .= $arg_separator . $post_data;
+		$encoded_data .= $arg_separator.$post_data;
 	} else {
 		// Check if POST is empty
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			// Nothing to do
 			return;
 		} else {
 			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
+			foreach ($_POST as $key => $value) {
 				// Encode the value and append the data
-				$encoded_data .= $arg_separator . "$key=" . urlencode( $value );
+				$encoded_data .= $arg_separator."$key=".urlencode($value);
 			}
 		}
 	}
 
 	// Convert collected post data to an array
-	parse_str( $encoded_data, $encoded_data_array );
+	parse_str($encoded_data, $encoded_data_array);
 
-	foreach ( $encoded_data_array as $key => $value ) {
+	foreach ($encoded_data_array as $key => $value) {
 
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
+		if (false !== strpos($key, 'amp;')) {
+			$new_key = str_replace('&', '&', $key);
+			$new_key = str_replace('amp;', '&', $new_key);
 
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
+			unset($encoded_data_array[$key]);
+			$encoded_data_array[$new_key] = $value;
 		}
 
 	}
 	
 	//Validate IPN request w/ PayPal if user hasn't disabled this security measure
-	if ( ! give_get_option( 'disable_paypal_verification' ) ) {
+	if ( ! give_get_option('disable_paypal_verification')) {
 
 		$remote_post_vars = array(
 			'method'      => 'POST',
@@ -264,22 +264,22 @@ 
 		);
 
 		// Validate the IPN
-		$api_response = wp_remote_post( give_get_paypal_redirect(), $remote_post_vars );
+		$api_response = wp_remote_post(give_get_paypal_redirect(), $remote_post_vars);
 
-		if ( is_wp_error( $api_response ) ) {
-			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
 		}
 
 	}
 
 	// 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;
 	}
 
@@ -288,21 +288,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
@@ -313,185 +313,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
@@ -502,32 +502,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');
 }
 
 /**
@@ -539,24 +539,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);
 }
 
 /**
@@ -566,8 +566,8 @@ 
  * @return string
  */
 function give_get_paypal_page_style() {
-	$page_style = trim( give_get_option( 'paypal_page_style', 'PayPal' ) );
-	return apply_filters( 'give_paypal_page_style', $page_style );
+	$page_style = trim(give_get_option('paypal_page_style', 'PayPal'));
+	return apply_filters('give_paypal_page_style', $page_style);
 }
 
 /**
@@ -582,27 +582,27 @@ 
  * @return string
  *
  */
-function give_paypal_success_page_content( $content ) {
+function give_paypal_success_page_content($content) {
 
-	if ( ! isset( $_GET['payment-id'] ) && ! give_get_purchase_session() ) {
+	if ( ! isset($_GET['payment-id']) && ! give_get_purchase_session()) {
 		return $content;
 	}
 
-	$payment_id = isset( $_GET['payment-id'] ) ? absint( $_GET['payment-id'] ) : false;
+	$payment_id = isset($_GET['payment-id']) ? absint($_GET['payment-id']) : false;
 
-	if ( ! $payment_id ) {
+	if ( ! $payment_id) {
 		$session    = give_get_purchase_session();
-		$payment_id = give_get_purchase_id_by_key( $session['purchase_key'] );
+		$payment_id = give_get_purchase_id_by_key($session['purchase_key']);
 	}
 
-	$payment = get_post( $payment_id );
+	$payment = get_post($payment_id);
 
-	if ( $payment && 'pending' == $payment->post_status ) {
+	if ($payment && 'pending' == $payment->post_status) {
 
 		// Payment is still pending so show processing indicator to fix the Race Condition
 		ob_start();
 
-		give_get_template_part( 'payment', 'processing' );
+		give_get_template_part('payment', 'processing');
 
 		$content = ob_get_clean();
 
@@ -612,7 +612,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
@@ -623,22 +623,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
@@ -650,13 +650,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/gateways/actions.php

Spacing +13 added lines, -13 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,14 +21,14 @@ 
  *
  * @param $data
  */
-function give_process_gateway_select( $data ) {
-	if ( isset( $_POST['gateway_submit'] ) ) {
-		wp_redirect( esc_url( add_query_arg( 'payment-mode', $_POST['payment-mode'] ) ) );
+function give_process_gateway_select($data) {
+	if (isset($_POST['gateway_submit'])) {
+		wp_redirect(esc_url(add_query_arg('payment-mode', $_POST['payment-mode'])));
 		exit;
 	}
 }
 
-add_action( 'give_gateway_select', 'give_process_gateway_select' );
+add_action('give_gateway_select', 'give_process_gateway_select');
 
 /**
  * Loads a payment gateway via AJAX
@@ -37,14 +37,14 @@ 
  * @return void
  */
 function give_load_ajax_gateway() {
-	if ( isset( $_POST['give_payment_mode'] ) ) {
-		do_action( 'give_purchase_form', $_POST['give_form_id'] );
+	if (isset($_POST['give_payment_mode'])) {
+		do_action('give_purchase_form', $_POST['give_form_id']);
 		exit();
 	}
 }
 
-add_action( 'wp_ajax_give_load_gateway', 'give_load_ajax_gateway' );
-add_action( 'wp_ajax_nopriv_give_load_gateway', 'give_load_ajax_gateway' );
+add_action('wp_ajax_give_load_gateway', 'give_load_ajax_gateway');
+add_action('wp_ajax_nopriv_give_load_gateway', 'give_load_ajax_gateway');
 
 /**
  * Sets an error on checkout if no gateways are enabled
@@ -55,11 +55,11 @@ 
 function give_no_gateway_error() {
 	$gateways = give_get_enabled_payment_gateways();
 
-	if ( empty( $gateways ) ) {
-		give_set_error( 'no_gateways', __( 'You must enable a payment gateway to use Give.', 'give' ) );
+	if (empty($gateways)) {
+		give_set_error('no_gateways', __('You must enable a payment gateway to use Give.', 'give'));
 	} else {
-		give_unset_error( 'no_gateways' );
+		give_unset_error('no_gateways');
 	}
 }
 
-add_action( 'init', 'give_no_gateway_error' );
\ No newline at end of file
+add_action('init', 'give_no_gateway_error');
\ No newline at end of file

includes/class-give-license-handler.php

Spacing +62 added lines, -62 removed lines

@@ -8,11 +8,11 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'Give_License' ) ) :
+if ( ! class_exists('Give_License')) :
 
 	/**
 	 * Give_License Class
@@ -38,16 +38,16 @@ 
 		 * @param string  $_optname
 		 * @param string  $_api_url
 		 */
-		public function __construct( $_file, $_item_name, $_version, $_author, $_optname = null, $_api_url = null ) {
+		public function __construct($_file, $_item_name, $_version, $_author, $_optname = null, $_api_url = null) {
 			global $give_options;
 
 			$this->file           = $_file;
 			$this->item_name      = $_item_name;
-			$this->item_shortname = 'give_' . preg_replace( '/[^a-zA-Z0-9_\s]/', '', str_replace( ' ', '_', strtolower( $this->item_name ) ) );
+			$this->item_shortname = 'give_'.preg_replace('/[^a-zA-Z0-9_\s]/', '', str_replace(' ', '_', strtolower($this->item_name)));
 			$this->version        = $_version;
-			$this->license        = isset( $give_options[ $this->item_shortname . '_license_key' ] ) ? trim( $give_options[ $this->item_shortname . '_license_key' ] ) : '';
+			$this->license        = isset($give_options[$this->item_shortname.'_license_key']) ? trim($give_options[$this->item_shortname.'_license_key']) : '';
 			$this->author         = $_author;
-			$this->api_url        = is_null( $_api_url ) ? $this->api_url : $_api_url;
+			$this->api_url        = is_null($_api_url) ? $this->api_url : $_api_url;
 
 
 			// Setup hooks
@@ -63,7 +63,7 @@ 
 		 * @return  void
 		 */
 		private function includes() {
-			if ( ! class_exists( 'EDD_SL_Plugin_Updater' ) ) {
+			if ( ! class_exists('EDD_SL_Plugin_Updater')) {
 				require_once 'admin/EDD_SL_Plugin_Updater.php';
 			}
 		}
@@ -77,18 +77,18 @@ 
 		private function hooks() {
 
 			// Register settings
-			add_filter( 'give_settings_licenses', array( $this, 'settings' ), 1 );
+			add_filter('give_settings_licenses', array($this, 'settings'), 1);
 
 			// Activate license key on settings save
-			add_action( 'admin_init', array( $this, 'activate_license' ) );
+			add_action('admin_init', array($this, 'activate_license'));
 
 			// Deactivate license key
-			add_action( 'admin_init', array( $this, 'deactivate_license' ) );
+			add_action('admin_init', array($this, 'deactivate_license'));
 
 			// Updater
-			add_action( 'admin_init', array( $this, 'auto_updater' ), 0 );
+			add_action('admin_init', array($this, 'auto_updater'), 0);
 
-			add_action( 'admin_notices', array( $this, 'notices' ) );
+			add_action('admin_notices', array($this, 'notices'));
 		}
 
 		/**
@@ -100,7 +100,7 @@ 
 		 */
 		public function auto_updater() {
 
-			if ( 'valid' !== get_option( $this->item_shortname . '_license_active' ) ) {
+			if ('valid' !== get_option($this->item_shortname.'_license_active')) {
 				return;
 			}
 
@@ -127,20 +127,20 @@ 
 		 *
 		 * @return  array
 		 */
-		public function settings( $settings ) {
+		public function settings($settings) {
 
 			$give_license_settings = array(
 				array(
 					'name'    => $this->item_name,
-					'id'      => $this->item_shortname . '_license_key',
+					'id'      => $this->item_shortname.'_license_key',
 					'desc'    => '',
 					'type'    => 'license_key',
-					'options' => array( 'is_valid_license_option' => $this->item_shortname . '_license_active' ),
+					'options' => array('is_valid_license_option' => $this->item_shortname.'_license_active'),
 					'size'    => 'regular'
 				)
 			);
 
-			return array_merge( $settings, $give_license_settings );
+			return array_merge($settings, $give_license_settings);
 		}
 
 		/**
@@ -152,18 +152,18 @@ 
 		 *
 		 * @return  array
 		 */
-		public function license_settings_content( $settings ) {
+		public function license_settings_content($settings) {
 
 			$give_license_settings = array(
 				array(
-					'name' => __( 'Add-on Licenses', 'give' ),
+					'name' => __('Add-on Licenses', 'give'),
 					'desc' => '<hr>',
 					'type' => 'give_title',
 					'id'   => 'give_title'
 				),
 			);
 
-			return array_merge( $settings, $give_license_settings );
+			return array_merge($settings, $give_license_settings);
 		}
 
 
@@ -175,34 +175,34 @@ 
 		 */
 		public function activate_license() {
 
-			if ( ! isset( $_POST[ $this->item_shortname . '_license_key' ] ) ) {
+			if ( ! isset($_POST[$this->item_shortname.'_license_key'])) {
 				return;
 			}
 
-			foreach ( $_POST as $key => $value ) {
-				if ( false !== strpos( $key, 'license_key_deactivate' ) ) {
+			foreach ($_POST as $key => $value) {
+				if (false !== strpos($key, 'license_key_deactivate')) {
 					// Don't activate a key when deactivating a different key
 					return;
 				}
 			}
 
-			if ( ! wp_verify_nonce( $_REQUEST[ $this->item_shortname . '_license_key-nonce' ], $this->item_shortname . '_license_key-nonce' ) ) {
+			if ( ! wp_verify_nonce($_REQUEST[$this->item_shortname.'_license_key-nonce'], $this->item_shortname.'_license_key-nonce')) {
 
-				wp_die( __( 'Nonce verification failed.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+				wp_die(__('Nonce verification failed.', 'give'), __('Error', 'give'), array('response' => 403));
 
 			}
 
-			if ( ! current_user_can( 'manage_give_settings' ) ) {
+			if ( ! current_user_can('manage_give_settings')) {
 				return;
 			}
 
-			if ( 'valid' === get_option( $this->item_shortname . '_license_active' ) ) {
+			if ('valid' === get_option($this->item_shortname.'_license_active')) {
 				return;
 			}
 
-			$license = sanitize_text_field( $_POST[ $this->item_shortname . '_license_key' ] );
+			$license = sanitize_text_field($_POST[$this->item_shortname.'_license_key']);
 
-			if ( empty( $license ) ) {
+			if (empty($license)) {
 				return;
 			}
 
@@ -210,7 +210,7 @@ 
 			$api_params = array(
 				'edd_action' => 'activate_license', //never change from "edd_" to "give_"!
 				'license'    => $license,
-				'item_name'  => urlencode( $this->item_name ),
+				'item_name'  => urlencode($this->item_name),
 				'url'        => home_url()
 			);
 
@@ -225,22 +225,22 @@ 
 			);
 
 			// Make sure there are no errors
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return;
 			}
 
 			// Tell WordPress to look for updates
-			set_site_transient( 'update_plugins', null );
+			set_site_transient('update_plugins', null);
 
 			// Decode license data
-			$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+			$license_data = json_decode(wp_remote_retrieve_body($response));
 
-			update_option( $this->item_shortname . '_license_active', $license_data->license );
+			update_option($this->item_shortname.'_license_active', $license_data->license);
 
-			if ( ! (bool) $license_data->success ) {
-				set_transient( 'give_license_error', $license_data, 1000 );
+			if ( ! (bool) $license_data->success) {
+				set_transient('give_license_error', $license_data, 1000);
 			} else {
-				delete_transient( 'give_license_error' );
+				delete_transient('give_license_error');
 			}
 		}
 
@@ -253,28 +253,28 @@ 
 		 */
 		public function deactivate_license() {
 
-			if ( ! isset( $_POST[ $this->item_shortname . '_license_key' ] ) ) {
+			if ( ! isset($_POST[$this->item_shortname.'_license_key'])) {
 				return;
 			}
 
-			if ( ! wp_verify_nonce( $_REQUEST[ $this->item_shortname . '_license_key-nonce' ], $this->item_shortname . '_license_key-nonce' ) ) {
+			if ( ! wp_verify_nonce($_REQUEST[$this->item_shortname.'_license_key-nonce'], $this->item_shortname.'_license_key-nonce')) {
 
-				wp_die( __( 'Nonce verification failed.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+				wp_die(__('Nonce verification failed.', 'give'), __('Error', 'give'), array('response' => 403));
 
 			}
 
-			if ( ! current_user_can( 'manage_give_settings' ) ) {
+			if ( ! current_user_can('manage_give_settings')) {
 				return;
 			}
 
 			// Run on deactivate button press
-			if ( isset( $_POST[ $this->item_shortname . '_license_key_deactivate' ] ) ) {
+			if (isset($_POST[$this->item_shortname.'_license_key_deactivate'])) {
 
 				// Data to send to the API
 				$api_params = array(
 					'edd_action' => 'deactivate_license', //never change from "edd_" to "give_"!
 					'license'    => $this->license,
-					'item_name'  => urlencode( $this->item_name ),
+					'item_name'  => urlencode($this->item_name),
 					'url'        => home_url()
 				);
 
@@ -290,19 +290,19 @@ 
 
 
 				// Make sure there are no errors
-				if ( is_wp_error( $response ) ) {
+				if (is_wp_error($response)) {
 					return;
 				}
 
 				// Decode the license data
-				$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+				$license_data = json_decode(wp_remote_retrieve_body($response));
 
-				delete_option( $this->item_shortname . '_license_active' );
+				delete_option($this->item_shortname.'_license_active');
 
-				if ( ! (bool) $license_data->success ) {
-					set_transient( 'give_license_error', $license_data, 1000 );
+				if ( ! (bool) $license_data->success) {
+					set_transient('give_license_error', $license_data, 1000);
 				} else {
-					delete_transient( 'give_license_error' );
+					delete_transient('give_license_error');
 				}
 			}
 		}
@@ -316,57 +316,57 @@ 
 		 */
 		public function notices() {
 
-			if ( ! isset( $_GET['page'] ) || 'give-settings' !== $_GET['page'] ) {
+			if ( ! isset($_GET['page']) || 'give-settings' !== $_GET['page']) {
 				return;
 			}
 
-			if ( ! isset( $_GET['tab'] ) || 'licenses' !== $_GET['tab'] ) {
+			if ( ! isset($_GET['tab']) || 'licenses' !== $_GET['tab']) {
 				return;
 			}
 
-			$license_error = get_transient( 'give_license_error' );
+			$license_error = get_transient('give_license_error');
 
-			if ( false === $license_error ) {
+			if (false === $license_error) {
 				return;
 			}
 
-			if ( ! empty( $license_error->error ) ) {
+			if ( ! empty($license_error->error)) {
 
-				switch ( $license_error->error ) {
+				switch ($license_error->error) {
 
 					case 'item_name_mismatch' :
 
-						$message = __( 'This license does not belong to the product you have entered it for.', 'give' );
+						$message = __('This license does not belong to the product you have entered it for.', 'give');
 						break;
 
 					case 'no_activations_left' :
 
-						$message = __( 'This license does not have any activations left.', 'give' );
+						$message = __('This license does not have any activations left.', 'give');
 						break;
 
 					case 'expired' :
 
-						$message = __( 'This license key is expired. Please renew it.', 'give' );
+						$message = __('This license key is expired. Please renew it.', 'give');
 						break;
 
 					default :
 
-						$message = sprintf( __( 'There was a problem activating your license key, please try again or contact support. Error code: %s', 'give' ), $license_error->error );
+						$message = sprintf(__('There was a problem activating your license key, please try again or contact support. Error code: %s', 'give'), $license_error->error);
 						break;
 
 				}
 
 			}
 
-			if ( ! empty( $message ) ) {
+			if ( ! empty($message)) {
 
 				echo '<div class="error">';
-				echo '<p>' . $message . '</p>';
+				echo '<p>'.$message.'</p>';
 				echo '</div>';
 
 			}
 
-			delete_transient( 'give_license_error' );
+			delete_transient('give_license_error');
 
 		}
 	}

includes/login-register.php

Spacing +59 added lines, -59 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,10 +25,10 @@ 
  *
  * @return string Login form
  */
-function give_login_form( $redirect = '' ) {
+function give_login_form($redirect = '') {
 	global $give_login_redirect;
 
-	if ( empty( $redirect ) ) {
+	if (empty($redirect)) {
 		$redirect = add_query_arg('give-login-success', 'true', give_get_current_page_url());
 	}
 
@@ -36,9 +36,9 @@ 
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'login' );
+	give_get_template_part('shortcode', 'login');
 
-	return apply_filters( 'give_login_form', ob_get_clean() );
+	return apply_filters('give_login_form', ob_get_clean());
 }
 
 /**
@@ -52,10 +52,10 @@ 
  *
  * @return string Register form
  */
-function give_register_form( $redirect = '' ) {
+function give_register_form($redirect = '') {
 	global $give_options, $give_register_redirect;
 
-	if ( empty( $redirect ) ) {
+	if (empty($redirect)) {
 		$redirect = give_get_current_page_url();
 	}
 
@@ -63,11 +63,11 @@ 
 
 	ob_start();
 
-	if ( ! is_user_logged_in() ) {
-		give_get_template_part( 'shortcode', 'register' );
+	if ( ! is_user_logged_in()) {
+		give_get_template_part('shortcode', 'register');
 	}
 
-	return apply_filters( 'give_register_form', ob_get_clean() );
+	return apply_filters('give_register_form', ob_get_clean());
 }
 
 /**
@@ -79,34 +79,34 @@ 
  *
  * @return void
  */
-function give_process_login_form( $data ) {
-	if ( wp_verify_nonce( $data['give_login_nonce'], 'give-login-nonce' ) ) {
-		$user_data = get_user_by( 'login', $data['give_user_login'] );
-		if ( ! $user_data ) {
-			$user_data = get_user_by( 'email', $data['give_user_login'] );
+function give_process_login_form($data) {
+	if (wp_verify_nonce($data['give_login_nonce'], 'give-login-nonce')) {
+		$user_data = get_user_by('login', $data['give_user_login']);
+		if ( ! $user_data) {
+			$user_data = get_user_by('email', $data['give_user_login']);
 		}
-		if ( $user_data ) {
+		if ($user_data) {
 			$user_ID    = $user_data->ID;
 			$user_email = $user_data->user_email;
-			if ( wp_check_password( $data['give_user_pass'], $user_data->user_pass, $user_data->ID ) ) {
-				give_log_user_in( $user_data->ID, $data['give_user_login'], $data['give_user_pass'] );
+			if (wp_check_password($data['give_user_pass'], $user_data->user_pass, $user_data->ID)) {
+				give_log_user_in($user_data->ID, $data['give_user_login'], $data['give_user_pass']);
 			} else {
-				give_set_error( 'password_incorrect', __( 'The password you entered is incorrect.', 'give' ) );
+				give_set_error('password_incorrect', __('The password you entered is incorrect.', 'give'));
 			}
 		} else {
-			give_set_error( 'username_incorrect', __( 'The username you entered does not exist.', 'give' ) );
+			give_set_error('username_incorrect', __('The username you entered does not exist.', 'give'));
 		}
 		// Check for errors and redirect if none present
 		$errors = give_get_errors();
-		if ( ! $errors ) {
-			$redirect = apply_filters( 'give_login_redirect', $data['give_redirect'], $user_ID );
-			wp_redirect( $redirect );
+		if ( ! $errors) {
+			$redirect = apply_filters('give_login_redirect', $data['give_redirect'], $user_ID);
+			wp_redirect($redirect);
 			give_die();
 		}
 	}
 }
 
-add_action( 'give_user_login', 'give_process_login_form' );
+add_action('give_user_login', 'give_process_login_form');
 
 /**
  * Log User In
@@ -119,15 +119,15 @@ 
  *
  * @return void
  */
-function give_log_user_in( $user_id, $user_login, $user_pass ) {
-	if ( $user_id < 1 ) {
+function give_log_user_in($user_id, $user_login, $user_pass) {
+	if ($user_id < 1) {
 		return;
 	}
 
-	wp_set_auth_cookie( $user_id );
-	wp_set_current_user( $user_id, $user_login );
-	do_action( 'wp_login', $user_login, get_userdata( $user_id ) );
-	do_action( 'give_log_user_in', $user_id, $user_login, $user_pass );
+	wp_set_auth_cookie($user_id);
+	wp_set_current_user($user_id, $user_login);
+	do_action('wp_login', $user_login, get_userdata($user_id));
+	do_action('give_log_user_in', $user_id, $user_login, $user_pass);
 }
 
 
@@ -140,70 +140,70 @@ 
  *
  * @return void
  */
-function give_process_register_form( $data ) {
+function give_process_register_form($data) {
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		return;
 	}
 
-	if ( empty( $_POST['give_register_submit'] ) ) {
+	if (empty($_POST['give_register_submit'])) {
 		return;
 	}
 
-	do_action( 'give_pre_process_register_form' );
+	do_action('give_pre_process_register_form');
 
-	if ( empty( $data['give_user_login'] ) ) {
-		give_set_error( 'empty_username', __( 'Invalid username.', 'give' ) );
+	if (empty($data['give_user_login'])) {
+		give_set_error('empty_username', __('Invalid username.', 'give'));
 	}
 
-	if ( username_exists( $data['give_user_login'] ) ) {
-		give_set_error( 'username_unavailable', __( 'Username already taken.', 'give' ) );
+	if (username_exists($data['give_user_login'])) {
+		give_set_error('username_unavailable', __('Username already taken.', 'give'));
 	}
 
-	if ( ! validate_username( $data['give_user_login'] ) ) {
-		give_set_error( 'username_invalid', __( 'Invalid username.', 'give' ) );
+	if ( ! validate_username($data['give_user_login'])) {
+		give_set_error('username_invalid', __('Invalid username.', 'give'));
 	}
 
-	if ( email_exists( $data['give_user_email'] ) ) {
-		give_set_error( 'email_unavailable', __( 'Email address already taken.', 'give' ) );
+	if (email_exists($data['give_user_email'])) {
+		give_set_error('email_unavailable', __('Email address already taken.', 'give'));
 	}
 
-	if ( empty( $data['give_user_email'] ) || ! is_email( $data['give_user_email'] ) ) {
-		give_set_error( 'email_invalid', __( 'Invalid email.', 'give' ) );
+	if (empty($data['give_user_email']) || ! is_email($data['give_user_email'])) {
+		give_set_error('email_invalid', __('Invalid email.', 'give'));
 	}
 
-	if ( ! empty( $data['give_payment_email'] ) && $data['give_payment_email'] != $data['give_user_email'] && ! is_email( $data['give_payment_email'] ) ) {
-		give_set_error( 'payment_email_invalid', __( 'Invalid payment email.', 'give' ) );
+	if ( ! empty($data['give_payment_email']) && $data['give_payment_email'] != $data['give_user_email'] && ! is_email($data['give_payment_email'])) {
+		give_set_error('payment_email_invalid', __('Invalid payment email.', 'give'));
 	}
 
-	if ( empty( $_POST['give_user_pass'] ) ) {
-		give_set_error( 'empty_password', __( 'Please enter a password.', 'give' ) );
+	if (empty($_POST['give_user_pass'])) {
+		give_set_error('empty_password', __('Please enter a password.', 'give'));
 	}
 
-	if ( ( ! empty( $_POST['give_user_pass'] ) && empty( $_POST['give_user_pass2'] ) ) || ( $_POST['give_user_pass'] !== $_POST['give_user_pass2'] ) ) {
-		give_set_error( 'password_mismatch', __( 'Passwords don\'t match.', 'give' ) );
+	if (( ! empty($_POST['give_user_pass']) && empty($_POST['give_user_pass2'])) || ($_POST['give_user_pass'] !== $_POST['give_user_pass2'])) {
+		give_set_error('password_mismatch', __('Passwords don\'t match.', 'give'));
 	}
 
-	do_action( 'give_process_register_form' );
+	do_action('give_process_register_form');
 
 	// Check for errors and redirect if none present
 	$errors = give_get_errors();
 
-	if ( empty( $errors ) ) {
+	if (empty($errors)) {
 
-		$redirect = apply_filters( 'give_register_redirect', $data['give_redirect'] );
+		$redirect = apply_filters('give_register_redirect', $data['give_redirect']);
 
-		give_register_and_login_new_user( array(
+		give_register_and_login_new_user(array(
 			'user_login'      => $data['give_user_login'],
 			'user_pass'       => $data['give_user_pass'],
 			'user_email'      => $data['give_user_email'],
-			'user_registered' => date( 'Y-m-d H:i:s' ),
-			'role'            => get_option( 'default_role' )
-		) );
+			'user_registered' => date('Y-m-d H:i:s'),
+			'role'            => get_option('default_role')
+		));
 
-		wp_redirect( $redirect );
+		wp_redirect($redirect);
 		give_die();
 	}
 }
 
-add_action( 'give_user_register', 'give_process_register_form' );
\ No newline at end of file
+add_action('give_user_register', 'give_process_register_form');
\ No newline at end of file

includes/admin/customers/customer-actions.php

Spacing +128 added lines, -128 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,15 +23,15 @@ 
  *
  * @return array $output Response messages
  */
-function give_edit_customer( $args ) {
+function give_edit_customer($args) {
 	
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
@@ -39,12 +39,12 @@ 
 	$customer_id   = (int) $args['customerinfo']['id'];
 	$nonce         = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-customer' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
@@ -54,23 +54,23 @@ 
 		'user_id' => 0
 	);
 
-	$customer_info = wp_parse_args( $customer_info, $defaults );
+	$customer_info = wp_parse_args($customer_info, $defaults);
 
-	if ( ! is_email( $customer_info['email'] ) ) {
-		give_set_error( 'give-invalid-email', __( 'Please enter a valid email address.', 'give' ) );
+	if ( ! is_email($customer_info['email'])) {
+		give_set_error('give-invalid-email', __('Please enter a valid email address.', 'give'));
 	}
 
-	if ( (int) $customer_info['user_id'] != (int) $customer->user_id ) {
+	if ((int) $customer_info['user_id'] != (int) $customer->user_id) {
 
 		// Make sure we don't already have this user attached to a customer
-		if ( ! empty( $customer_info['user_id'] ) && false !== Give()->customers->get_customer_by( 'user_id', $customer_info['user_id'] ) ) {
-			give_set_error( 'give-invalid-customer-user_id', sprintf( __( 'The User ID %d is already associated with a different donor.', 'give' ), $customer_info['user_id'] ) );
+		if ( ! empty($customer_info['user_id']) && false !== Give()->customers->get_customer_by('user_id', $customer_info['user_id'])) {
+			give_set_error('give-invalid-customer-user_id', sprintf(__('The User ID %d is already associated with a different donor.', 'give'), $customer_info['user_id']));
 		}
 
 		// Make sure it's actually a user
-		$user = get_user_by( 'id', $customer_info['user_id'] );
-		if ( ! empty( $customer_info['user_id'] ) && false === $user ) {
-			give_set_error( 'give-invalid-user_id', sprintf( __( 'The User ID %d does not exist. Please assign an existing user.', 'give' ), $customer_info['user_id'] ) );
+		$user = get_user_by('id', $customer_info['user_id']);
+		if ( ! empty($customer_info['user_id']) && false === $user) {
+			give_set_error('give-invalid-user_id', sprintf(__('The User ID %d does not exist. Please assign an existing user.', 'give'), $customer_info['user_id']));
 		}
 
 	}
@@ -78,82 +78,82 @@ 
 	// Record this for later
 	$previous_user_id = $customer->user_id;
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return;
 	}
 
 	// Setup the customer address, if present
 	$address = array();
-	if ( intval( $customer_info['user_id'] ) > 0 ) {
+	if (intval($customer_info['user_id']) > 0) {
 
-		$current_address = get_user_meta( $customer_info['user_id'], '_give_user_address', true );
+		$current_address = get_user_meta($customer_info['user_id'], '_give_user_address', true);
 
-		if ( false === $current_address ) {
-			$address['line1']   = isset( $customer_info['line1'] ) ? $customer_info['line1'] : '';
-			$address['line2']   = isset( $customer_info['line2'] ) ? $customer_info['line2'] : '';
-			$address['city']    = isset( $customer_info['city'] ) ? $customer_info['city'] : '';
-			$address['country'] = isset( $customer_info['country'] ) ? $customer_info['country'] : '';
-			$address['zip']     = isset( $customer_info['zip'] ) ? $customer_info['zip'] : '';
-			$address['state']   = isset( $customer_info['state'] ) ? $customer_info['state'] : '';
+		if (false === $current_address) {
+			$address['line1']   = isset($customer_info['line1']) ? $customer_info['line1'] : '';
+			$address['line2']   = isset($customer_info['line2']) ? $customer_info['line2'] : '';
+			$address['city']    = isset($customer_info['city']) ? $customer_info['city'] : '';
+			$address['country'] = isset($customer_info['country']) ? $customer_info['country'] : '';
+			$address['zip']     = isset($customer_info['zip']) ? $customer_info['zip'] : '';
+			$address['state']   = isset($customer_info['state']) ? $customer_info['state'] : '';
 		} else {
-			$current_address    = wp_parse_args( $current_address, array(
+			$current_address    = wp_parse_args($current_address, array(
 				'line1',
 				'line2',
 				'city',
 				'zip',
 				'state',
 				'country'
-			) );
-			$address['line1']   = isset( $customer_info['line1'] ) ? $customer_info['line1'] : $current_address['line1'];
-			$address['line2']   = isset( $customer_info['line2'] ) ? $customer_info['line2'] : $current_address['line2'];
-			$address['city']    = isset( $customer_info['city'] ) ? $customer_info['city'] : $current_address['city'];
-			$address['country'] = isset( $customer_info['country'] ) ? $customer_info['country'] : $current_address['country'];
-			$address['zip']     = isset( $customer_info['zip'] ) ? $customer_info['zip'] : $current_address['zip'];
-			$address['state']   = isset( $customer_info['state'] ) ? $customer_info['state'] : $current_address['state'];
+			));
+			$address['line1']   = isset($customer_info['line1']) ? $customer_info['line1'] : $current_address['line1'];
+			$address['line2']   = isset($customer_info['line2']) ? $customer_info['line2'] : $current_address['line2'];
+			$address['city']    = isset($customer_info['city']) ? $customer_info['city'] : $current_address['city'];
+			$address['country'] = isset($customer_info['country']) ? $customer_info['country'] : $current_address['country'];
+			$address['zip']     = isset($customer_info['zip']) ? $customer_info['zip'] : $current_address['zip'];
+			$address['state']   = isset($customer_info['state']) ? $customer_info['state'] : $current_address['state'];
 		}
 
 	}
 
 	// Sanitize the inputs
 	$customer_data            = array();
-	$customer_data['name']    = strip_tags( stripslashes( $customer_info['name'] ) );
+	$customer_data['name']    = strip_tags(stripslashes($customer_info['name']));
 	$customer_data['email']   = $customer_info['email'];
 	$customer_data['user_id'] = $customer_info['user_id'];
 
-	$customer_data = apply_filters( 'give_edit_customer_info', $customer_data, $customer_id );
-	$address       = apply_filters( 'give_edit_customer_address', $address, $customer_id );
+	$customer_data = apply_filters('give_edit_customer_info', $customer_data, $customer_id);
+	$address       = apply_filters('give_edit_customer_address', $address, $customer_id);
 
-	$customer_data = array_map( 'sanitize_text_field', $customer_data );
-	$address       = array_map( 'sanitize_text_field', $address );
+	$customer_data = array_map('sanitize_text_field', $customer_data);
+	$address       = array_map('sanitize_text_field', $address);
 
-	do_action( 'give_pre_edit_customer', $customer_id, $customer_data, $address );
+	do_action('give_pre_edit_customer', $customer_id, $customer_data, $address);
 
 	$output         = array();
 	$previous_email = $customer->email;
 
-	if ( $customer->update( $customer_data ) ) {
+	if ($customer->update($customer_data)) {
 
-		if ( ! empty( $customer->user_id ) && $customer->user_id > 0 ) {
-			update_user_meta( $customer->user_id, '_give_user_address', $address );
+		if ( ! empty($customer->user_id) && $customer->user_id > 0) {
+			update_user_meta($customer->user_id, '_give_user_address', $address);
 		}
 
 		// Update some payment meta if we need to
-		$payments_array = explode( ',', $customer->payment_ids );
+		$payments_array = explode(',', $customer->payment_ids);
 
-		if ( $customer->email != $previous_email ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, 'email', $customer->email );
+		if ($customer->email != $previous_email) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, 'email', $customer->email);
 			}
 		}
 
-		if ( $customer->user_id != $previous_user_id ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, '_give_payment_user_id', $customer->user_id );
+		if ($customer->user_id != $previous_user_id) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, '_give_payment_user_id', $customer->user_id);
 			}
 		}
 
 		$output['success']       = true;
-		$customer_data           = array_merge( $customer_data, $address );
+		$customer_data           = array_merge($customer_data, $address);
 		$output['customer_info'] = $customer_data;
 
 	} else {
@@ -162,11 +162,11 @@ 
 
 	}
 
-	do_action( 'give_post_edit_customer', $customer_id, $customer_data );
+	do_action('give_post_edit_customer', $customer_id, $customer_data);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -174,7 +174,7 @@ 
 
 }
 
-add_action( 'give_edit-customer', 'give_edit_customer', 10, 1 );
+add_action('give_edit-customer', 'give_edit_customer', 10, 1);
 
 /**
  * Save a customer note being added
@@ -185,53 +185,53 @@ 
  *
  * @return int         The Note ID that was saved, or 0 if nothing was saved
  */
-function give_customer_save_note( $args ) {
+function give_customer_save_note($args) {
 
-	$customer_view_role = apply_filters( 'give_view_customers_role', 'view_give_reports' );
+	$customer_view_role = apply_filters('give_view_customers_role', 'view_give_reports');
 
-	if ( ! is_admin() || ! current_user_can( $customer_view_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_view_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
-	$customer_note = trim( sanitize_text_field( $args['customer_note'] ) );
+	$customer_note = trim(sanitize_text_field($args['customer_note']));
 	$customer_id   = (int) $args['customer_id'];
 	$nonce         = $args['add_customer_note_nonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'add-customer-note' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'add-customer-note')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	if ( empty( $customer_note ) ) {
-		give_set_error( 'empty-customer-note', __( 'A note is required.', 'give' ) );
+	if (empty($customer_note)) {
+		give_set_error('empty-customer-note', __('A note is required.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return;
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	$new_note = $customer->add_note( $customer_note );
+	$customer = new Give_Customer($customer_id);
+	$new_note = $customer->add_note($customer_note);
 
-	do_action( 'give_pre_insert_customer_note', $customer_id, $new_note );
+	do_action('give_pre_insert_customer_note', $customer_id, $new_note);
 
-	if ( ! empty( $new_note ) && ! empty( $customer->id ) ) {
+	if ( ! empty($new_note) && ! empty($customer->id)) {
 
 		ob_start();
 		?>
 		<div class="customer-note-wrapper dashboard-comment-wrap comment-item">
 			<span class="note-content-wrap">
-				<?php echo stripslashes( $new_note ); ?>
+				<?php echo stripslashes($new_note); ?>
 			</span>
 		</div>
 		<?php
 		$output = ob_get_contents();
 		ob_end_clean();
 
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			echo $output;
 			exit;
 		}
@@ -244,7 +244,7 @@ 
 
 }
 
-add_action( 'give_add-customer-note', 'give_customer_save_note', 10, 1 );
+add_action('give_add-customer-note', 'give_customer_save_note', 10, 1);
 
 /**
  * Delete a customer
@@ -255,87 +255,87 @@ 
  *
  * @return int Whether it was a successful deletion
  */
-function give_customer_delete( $args ) {
+function give_customer_delete($args) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( __( 'You do not have permission to delete donors.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(__('You do not have permission to delete donors.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
 	$customer_id = (int) $args['customer_id'];
-	$confirm     = ! empty( $args['give-customer-delete-confirm'] ) ? true : false;
-	$remove_data = ! empty( $args['give-customer-delete-records'] ) ? true : false;
+	$confirm     = ! empty($args['give-customer-delete-confirm']) ? true : false;
+	$remove_data = ! empty($args['give-customer-delete-records']) ? true : false;
 	$nonce       = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'delete-customer' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'delete-customer')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	if ( ! $confirm ) {
-		give_set_error( 'customer-delete-no-confirm', __( 'Please confirm you want to delete this donor.', 'give' ) );
+	if ( ! $confirm) {
+		give_set_error('customer-delete-no-confirm', __('Please confirm you want to delete this donor.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
-		wp_redirect( admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer_id ) );
+	if (give_get_errors()) {
+		wp_redirect(admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer_id));
 		exit;
 	}
 
-	$customer = new Give_Customer( $customer_id );
+	$customer = new Give_Customer($customer_id);
 
-	do_action( 'give_pre_delete_customer', $customer_id, $confirm, $remove_data );
+	do_action('give_pre_delete_customer', $customer_id, $confirm, $remove_data);
 
 	$success = false;
 
-	if ( $customer->id > 0 ) {
+	if ($customer->id > 0) {
 
-		$payments_array = explode( ',', $customer->payment_ids );
-		$success        = Give()->customers->delete( $customer->id );
+		$payments_array = explode(',', $customer->payment_ids);
+		$success        = Give()->customers->delete($customer->id);
 
-		if ( $success ) {
+		if ($success) {
 
-			if ( $remove_data ) {
+			if ($remove_data) {
 
 				// Remove all payments, logs, etc
-				foreach ( $payments_array as $payment_id ) {
-					give_delete_purchase( $payment_id );
+				foreach ($payments_array as $payment_id) {
+					give_delete_purchase($payment_id);
 				}
 
 			} else {
 
 				// Just set the payments to customer_id of 0
-				foreach ( $payments_array as $payment_id ) {
-					give_update_payment_meta( $payment_id, '_give_payment_customer_id', 0 );
+				foreach ($payments_array as $payment_id) {
+					give_update_payment_meta($payment_id, '_give_payment_customer_id', 0);
 				}
 
 			}
 
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&give-message=customer-deleted' );
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&give-message=customer-deleted');
 
 		} else {
 
-			give_set_error( 'give-donor-delete-failed', __( 'Error deleting donor.', 'give' ) );
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $customer_id );
+			give_set_error('give-donor-delete-failed', __('Error deleting donor.', 'give'));
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$customer_id);
 
 		}
 
 	} else {
 
-		give_set_error( 'give-customer-delete-invalid-id', __( 'Invalid Donor ID.', 'give' ) );
-		$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors' );
+		give_set_error('give-customer-delete-invalid-id', __('Invalid Donor ID.', 'give'));
+		$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors');
 
 	}
 
-	wp_redirect( $redirect );
+	wp_redirect($redirect);
 	exit;
 
 }
 
-add_action( 'give_delete-customer', 'give_customer_delete', 10, 1 );
+add_action('give_delete-customer', 'give_customer_delete', 10, 1);
 
 /**
  * Disconnect a user ID from a donor
@@ -346,39 +346,39 @@ 
  *
  * @return bool        If the disconnect was successful
  */
-function give_disconnect_customer_user_id( $args ) {
+function give_disconnect_customer_user_id($args) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
 	$customer_id = (int) $args['customer_id'];
 	$nonce       = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-customer' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
-	do_action( 'give_pre_customer_disconnect_user_id', $customer_id, $customer->user_id );
+	do_action('give_pre_customer_disconnect_user_id', $customer_id, $customer->user_id);
 
-	$customer_args = array( 'user_id' => 0 );
+	$customer_args = array('user_id' => 0);
 
-	if ( $customer->update( $customer_args ) ) {
+	if ($customer->update($customer_args)) {
 		global $wpdb;
 
-		if ( ! empty( $customer->payment_ids ) ) {
-			$wpdb->query( "UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $customer->payment_ids )" );
+		if ( ! empty($customer->payment_ids)) {
+			$wpdb->query("UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $customer->payment_ids )");
 		}
 
 		$output['success'] = true;
@@ -386,14 +386,14 @@ 
 	} else {
 
 		$output['success'] = false;
-		give_set_error( 'give-disconnect-user-fail', __( 'Failed to disconnect user from donor.', 'give' ) );
+		give_set_error('give-disconnect-user-fail', __('Failed to disconnect user from donor.', 'give'));
 	}
 
-	do_action( 'give_post_customer_disconnect_user_id', $customer_id );
+	do_action('give_post_customer_disconnect_user_id', $customer_id);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -401,4 +401,4 @@ 
 
 }
 
-add_action( 'give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1 );
+add_action('give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1);