WordImpress / Give

includes/admin/upgrades/upgrade-functions.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 		case version_compare( $give_version, '1.7', '<' ) :
 			give_v17_upgrades();
 			$did_upgrade = true;
-            break;
+			break;
 
 		case version_compare( $give_version, '1.8', '<' ) :
 			give_v18_upgrades();

Spacing +162 added lines, -162 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,37 +25,37 @@ 
  */
 function give_do_automatic_upgrades() {
 	$did_upgrade  = false;
-	$give_version = preg_replace( '/[^0-9.].*/', '', get_option( 'give_version' ) );
+	$give_version = preg_replace('/[^0-9.].*/', '', 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';
 	}
 
-	switch ( true ) {
+	switch (true) {
 
-		case version_compare( $give_version, '1.6', '<' ) :
+		case version_compare($give_version, '1.6', '<') :
 			give_v16_upgrades();
 			$did_upgrade = true;
 			break;
 
-		case version_compare( $give_version, '1.7', '<' ) :
+		case version_compare($give_version, '1.7', '<') :
 			give_v17_upgrades();
 			$did_upgrade = true;
             break;
 
-		case version_compare( $give_version, '1.8', '<' ) :
+		case version_compare($give_version, '1.8', '<') :
 			give_v18_upgrades();
 			$did_upgrade = true;
 	}
 
-	if ( $did_upgrade ) {
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
+	if ($did_upgrade) {
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
 	}
 }
 
-add_action( 'admin_init', 'give_do_automatic_upgrades' );
-add_action( 'give_upgrades', 'give_do_automatic_upgrades' );
+add_action('admin_init', 'give_do_automatic_upgrades');
+add_action('give_upgrades', 'give_do_automatic_upgrades');
 
 /**
  * Display Upgrade Notices
@@ -65,18 +65,18 @@ 
  */
 function give_show_upgrade_notices() {
 	// Don't show notices on the upgrades page.
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-upgrades' ) {
+	if (isset($_GET['page']) && $_GET['page'] == 'give-upgrades') {
 		return;
 	}
 
-	$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:
@@ -87,31 +87,31 @@ 
 	 */
 
 	// 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(
 			/* translators: %s: upgrade URL */
-			'<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(
 			/* translators: %s: upgrade URL */
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the donations 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 donations 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'))
 		);
 	}
 
 	// Check if we have a stalled upgrade.
 	$resume_upgrade = give_maybe_resume_upgrade();
-	if ( ! empty( $resume_upgrade ) ) {
-		$resume_url = add_query_arg( $resume_upgrade, admin_url( 'index.php' ) );
+	if ( ! empty($resume_upgrade)) {
+		$resume_url = add_query_arg($resume_upgrade, admin_url('index.php'));
 		echo Give_Notices::notice_html(
 			sprintf(
-				__( 'Give needs to complete a database upgrade that was previously started, click <a href="%s">here</a> to resume the upgrade.', 'give' ),
-				esc_url( $resume_url )
+				__('Give needs to complete a database upgrade that was previously started, click <a href="%s">here</a> to resume the upgrade.', 'give'),
+				esc_url($resume_url)
 			)
 		);
 
@@ -119,11 +119,11 @@ 
 	}
 
 	// v1.8 form metadata upgrades.
-	if ( version_compare( $give_version, '1.8', '<' ) || ! give_has_upgrade_completed( 'v18_upgrades_form_metadata' ) ) {
+	if (version_compare($give_version, '1.8', '<') || ! give_has_upgrade_completed('v18_upgrades_form_metadata')) {
 		echo Give_Notices::notice_html(
 			sprintf(
-				esc_html__( 'Give needs to upgrade the form database, click %1$shere%2$s to start the upgrade.', 'give' ),
-				'<a class="give-upgrade-link" href="' . esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=give_v18_upgrades_form_metadata' ) ) . '">',
+				esc_html__('Give needs to upgrade the form database, click %1$shere%2$s to start the upgrade.', 'give'),
+				'<a class="give-upgrade-link" href="'.esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=give_v18_upgrades_form_metadata')).'">',
 				'</a>'
 			)
 		);
@@ -151,7 +151,7 @@ 
 	<?php
 }
 
-add_action( 'admin_notices', 'give_show_upgrade_notices' );
+add_action('admin_notices', 'give_show_upgrade_notices');
 
 /**
  * Triggers all upgrade functions
@@ -163,29 +163,29 @@ 
  */
 function give_trigger_upgrades() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array(
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('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 );
-	delete_option( 'give_doing_upgrade' );
+	update_option('give_version', GIVE_VERSION);
+	delete_option('give_doing_upgrade');
 
-	if ( DOING_AJAX ) {
-		die( 'complete' );
+	if (DOING_AJAX) {
+		die('complete');
 	} // End if().
 }
 
-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
@@ -196,15 +196,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);
 
 }
 
@@ -216,8 +216,8 @@ 
  * @return mixed   When nothing to resume returns false, otherwise starts the upgrade where it left off
  */
 function give_maybe_resume_upgrade() {
-	$doing_upgrade = get_option( 'give_doing_upgrade', false );
-	if ( empty( $doing_upgrade ) ) {
+	$doing_upgrade = get_option('give_doing_upgrade', false);
+	if (empty($doing_upgrade)) {
 		return false;
 	}
 
@@ -233,9 +233,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;
 	}
 
@@ -243,9 +243,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);
 }
 
 /**
@@ -256,9 +256,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();
 	}
 
@@ -275,31 +275,31 @@ 
  */
 function give_v132_upgrade_give_payment_customer_id() {
 	global $wpdb;
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array(
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('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
@@ -312,16 +312,16 @@ 
 
 	global $wpdb;
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array(
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('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.
@@ -331,31 +331,31 @@ 
 	$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');
 
 /**
  * Cleanup User Roles
@@ -366,17 +366,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.
@@ -423,9 +423,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);
 			}
 		}
 
@@ -435,15 +435,15 @@ 
 		$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');
 
 	}// End if().
 
 }
 
-add_action( 'admin_init', 'give_v152_cleanup_users' );
+add_action('admin_init', 'give_v152_cleanup_users');
 
 /**
  * 1.6 Upgrade routine to create the customer meta table.
@@ -483,53 +483,53 @@ 
 
 	// Get addons license key.
 	$addons = array();
-	foreach ( $give_options as $key => $value ) {
-		if ( false !== strpos( $key, '_license_key' ) ) {
-			$addons[ $key ] = $value;
+	foreach ($give_options as $key => $value) {
+		if (false !== strpos($key, '_license_key')) {
+			$addons[$key] = $value;
 		}
 	}
 
 	// Bailout: We do not have any addon license data to upgrade.
-	if ( empty( $addons ) ) {
+	if (empty($addons)) {
 		return false;
 	}
 
-	foreach ( $addons as $key => $addon_license ) {
+	foreach ($addons as $key => $addon_license) {
 
 		// Get addon shortname.
-		$shortname = str_replace( '_license_key', '', $key );
+		$shortname = str_replace('_license_key', '', $key);
 
 		// Addon license option name.
-		$addon_license_option_name = $shortname . '_license_active';
+		$addon_license_option_name = $shortname.'_license_active';
 
 		// bailout if license is empty.
-		if ( empty( $addon_license ) ) {
-			delete_option( $addon_license_option_name );
+		if (empty($addon_license)) {
+			delete_option($addon_license_option_name);
 			continue;
 		}
 
 		// Get addon name.
 		$addon_name       = array();
-		$addon_name_parts = explode( '_', str_replace( 'give_', '', $shortname ) );
-		foreach ( $addon_name_parts as $name_part ) {
+		$addon_name_parts = explode('_', str_replace('give_', '', $shortname));
+		foreach ($addon_name_parts as $name_part) {
 
 			// Fix addon name
-			switch ( $name_part ) {
+			switch ($name_part) {
 				case 'authorizenet' :
 					$name_part = 'authorize.net';
 					break;
 			}
 
-			$addon_name[] = ucfirst( $name_part );
+			$addon_name[] = ucfirst($name_part);
 		}
 
-		$addon_name = implode( ' ', $addon_name );
+		$addon_name = implode(' ', $addon_name);
 
 		// Data to send to the API
 		$api_params = array(
 			'edd_action' => 'activate_license', // never change from "edd_" to "give_"!
 			'license'    => $addon_license,
-			'item_name'  => urlencode( $addon_name ),
+			'item_name'  => urlencode($addon_name),
 			'url'        => home_url(),
 		);
 
@@ -544,17 +544,17 @@ 
 		);
 
 		// Make sure there are no errors.
-		if ( is_wp_error( $response ) ) {
-			delete_option( $addon_license_option_name );
+		if (is_wp_error($response)) {
+			delete_option($addon_license_option_name);
 			continue;
 		}
 
 		// 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 ) );
-		update_option( $addon_license_option_name, $license_data );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
+		update_option($addon_license_option_name, $license_data);
 	}// End foreach().
 }
 
@@ -584,9 +584,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);
 		}
 	}
 
@@ -620,7 +620,7 @@ 
 function give_v18_upgrades_core_setting() {
 	// Core settings which changes from checkbox to radio.
 	$core_setting_names = array_merge(
-		array_keys( give_v18_renamed_core_settings() ),
+		array_keys(give_v18_renamed_core_settings()),
 		array(
 			'uninstall_on_delete',
 			'scripts_footer',
@@ -632,48 +632,48 @@ 
 	);
 
 	// Bailout: If not any setting define.
-	if ( $give_settings = get_option( 'give_settings' ) ) {
+	if ($give_settings = get_option('give_settings')) {
 
 		$setting_changed = false;
 
 		// Loop: check each setting field.
-		foreach ( $core_setting_names as $setting_name ) {
+		foreach ($core_setting_names as $setting_name) {
 			// New setting name.
-			$new_setting_name = preg_replace( '/^(enable_|disable_)/', '', $setting_name );
+			$new_setting_name = preg_replace('/^(enable_|disable_)/', '', $setting_name);
 
 			// Continue: If setting already set.
 			if (
-				array_key_exists( $new_setting_name, $give_settings )
-				&& in_array( $give_settings[ $new_setting_name ], array( 'enabled', 'disabled' ) )
+				array_key_exists($new_setting_name, $give_settings)
+				&& in_array($give_settings[$new_setting_name], array('enabled', 'disabled'))
 			) {
 				continue;
 			}
 
 			// Set checkbox value to radio value.
-			$give_settings[ $setting_name ] = ( ! empty( $give_settings[ $setting_name ] ) && 'on' === $give_settings[ $setting_name ] ? 'enabled' : 'disabled' );
+			$give_settings[$setting_name] = ( ! empty($give_settings[$setting_name]) && 'on' === $give_settings[$setting_name] ? 'enabled' : 'disabled');
 
 			// @see https://github.com/WordImpress/Give/issues/1063
-			if ( false !== strpos( $setting_name, 'disable_' ) ) {
+			if (false !== strpos($setting_name, 'disable_')) {
 
-				$give_settings[ $new_setting_name ] = ( give_is_setting_enabled( $give_settings[ $setting_name ] ) ? 'disabled' : 'enabled' );
-			} elseif ( false !== strpos( $setting_name, 'enable_' ) ) {
+				$give_settings[$new_setting_name] = (give_is_setting_enabled($give_settings[$setting_name]) ? 'disabled' : 'enabled');
+			} elseif (false !== strpos($setting_name, 'enable_')) {
 
-				$give_settings[ $new_setting_name ] = ( give_is_setting_enabled( $give_settings[ $setting_name ] ) ? 'enabled' : 'disabled' );
+				$give_settings[$new_setting_name] = (give_is_setting_enabled($give_settings[$setting_name]) ? 'enabled' : 'disabled');
 			}
 
 			// Tell bot to update core setting to db.
-			if ( ! $setting_changed ) {
+			if ( ! $setting_changed) {
 				$setting_changed = true;
 			}
 		}
 
 		// Update setting only if they changed.
-		if ( $setting_changed ) {
-			update_option( 'give_settings', $give_settings );
+		if ($setting_changed) {
+			update_option('give_settings', $give_settings);
 		}
 	}// End if().
 
-	give_set_upgrade_complete( 'v18_upgrades_core_setting' );
+	give_set_upgrade_complete('v18_upgrades_core_setting');
 }
 
 /**
@@ -683,22 +683,22 @@ 
  * @return void
  */
 function give_v18_upgrades_form_metadata() {
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array(
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('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);
 	}
 
-	$step = isset( $_GET['step'] ) ? absint( $_GET['step'] ) : 1;
+	$step = isset($_GET['step']) ? absint($_GET['step']) : 1;
 
 	// form query
-	$forms = new WP_Query( array(
+	$forms = new WP_Query(array(
 			'paged'          => $step,
 			'status'         => 'any',
 			'order'          => 'ASC',
@@ -708,27 +708,27 @@ 
 	);
 
 
-	if ( $forms->have_posts() ) {
-		while ( $forms->have_posts() ) {
+	if ($forms->have_posts()) {
+		while ($forms->have_posts()) {
 			$forms->the_post();
 
 			// Form content.
 			// Note in version 1.8 display content setting split into display content and content placement setting.
 			// You can delete _give_content_option in future
-			$show_content = get_post_meta( get_the_ID(), '_give_content_option', true );
-			if ( $show_content && ! get_post_meta( get_the_ID(), '_give_display_content', true ) ) {
-				$field_value = ( 'none' !== $show_content ? 'enabled' : 'disabled' );
-				update_post_meta( get_the_ID(), '_give_display_content', $field_value );
+			$show_content = get_post_meta(get_the_ID(), '_give_content_option', true);
+			if ($show_content && ! get_post_meta(get_the_ID(), '_give_display_content', true)) {
+				$field_value = ('none' !== $show_content ? 'enabled' : 'disabled');
+				update_post_meta(get_the_ID(), '_give_display_content', $field_value);
 
-				$field_value = ( 'none' !== $show_content ? $show_content : 'give_pre_form' );
-				update_post_meta( get_the_ID(), '_give_content_placement', $field_value );
+				$field_value = ('none' !== $show_content ? $show_content : 'give_pre_form');
+				update_post_meta(get_the_ID(), '_give_content_placement', $field_value);
 			}
             
 			// "Disable" Guest Donation. Checkbox
 			// See: https://github.com/WordImpress/Give/issues/1470
-			$guest_donation = get_post_meta( get_the_ID(), '_give_logged_in_only', true );
-			$guest_donation_newval = ( in_array( $guest_donation, array( 'yes', 'on' ) ) ? 'disabled' : 'enabled' );
-			update_post_meta( get_the_ID(), '_give_logged_in_only', $guest_donation_newval );
+			$guest_donation = get_post_meta(get_the_ID(), '_give_logged_in_only', true);
+			$guest_donation_newval = (in_array($guest_donation, array('yes', 'on')) ? 'disabled' : 'enabled');
+			update_post_meta(get_the_ID(), '_give_logged_in_only', $guest_donation_newval);
 
 			// Convert yes/no setting field to enabled/disabled.
 			$form_radio_settings = array(
@@ -751,15 +751,15 @@ 
 				'_give_offline_donation_enable_billing_fields_single',
 			);
 
-			foreach ( $form_radio_settings as $meta_key ) {
+			foreach ($form_radio_settings as $meta_key) {
 				// Get value.
-				$field_value = get_post_meta( get_the_ID(), $meta_key, true );
+				$field_value = get_post_meta(get_the_ID(), $meta_key, true);
 
 				// Convert meta value only if it is in yes/no/none.
-				if ( in_array( $field_value, array( 'yes', 'on', 'no', 'none' ) ) ) {
+				if (in_array($field_value, array('yes', 'on', 'no', 'none'))) {
 
-					$field_value = ( in_array( $field_value, array( 'yes', 'on' ) ) ? 'enabled' : 'disabled' );
-					update_post_meta( get_the_ID(), $meta_key, $field_value );
+					$field_value = (in_array($field_value, array('yes', 'on')) ? 'enabled' : 'disabled');
+					update_post_meta(get_the_ID(), $meta_key, $field_value);
 				}
 			}
 		}// End while().
@@ -767,28 +767,28 @@ 
 		wp_reset_postdata();
 
 		// Forms found so upgrade them
-		$step ++;
-		$redirect = add_query_arg( array(
+		$step++;
+		$redirect = add_query_arg(array(
 			'page'         => 'give-upgrades',
 			'give-upgrade' => 'give_v18_upgrades_form_metadata',
 			'step'         => $step,
-		), admin_url( 'index.php' ) );
-		wp_redirect( $redirect );
+		), admin_url('index.php'));
+		wp_redirect($redirect);
 		exit();
 
 	} else {
 		// No more forms found, finish up.
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-		delete_option( 'give_doing_upgrade' );
-		give_set_upgrade_complete( 'v18_upgrades_form_metadata' );
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+		delete_option('give_doing_upgrade');
+		give_set_upgrade_complete('v18_upgrades_form_metadata');
 
 
-		wp_redirect( admin_url() );
+		wp_redirect(admin_url());
 		exit;
 	}
 }
 
-add_action( 'give_give_v18_upgrades_form_metadata', 'give_v18_upgrades_form_metadata' );
+add_action('give_give_v18_upgrades_form_metadata', 'give_v18_upgrades_form_metadata');
 
 /**
  * Get list of core setting renamed in version 1.8.

includes/admin/reporting/class-gateway-error-logs-list-table.php

Spacing +50 added lines, -50 removed lines

@@ -9,13 +9,13 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded.
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -44,11 +44,11 @@ 
 	 */
 	public function __construct() {
 		// Set parent defaults.
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records.
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records.
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records.
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records.
 			'ajax'     => false                        // Does this table support ajax?.
-		) );
+		));
 	}
 
 	/**
@@ -62,19 +62,19 @@ 
 	 *
 	 * @return string Column Name.
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'ID' :
 				return $item['ID_label'];
 			case 'payment_id' :
-				return empty( $item['payment_id'] ) ? esc_html__( 'n/a', 'give' ) : sprintf( "<a href=\"%s\" target=\"_blank\">{$item['payment_id']}</a>", get_edit_post_link( $item['payment_id'] ) );
+				return empty($item['payment_id']) ? esc_html__('n/a', 'give') : sprintf("<a href=\"%s\" target=\"_blank\">{$item['payment_id']}</a>", get_edit_post_link($item['payment_id']));
 			case 'gateway' :
-				return empty( $item['gateway'] ) ? esc_html__( 'n/a', 'give' ) : $item['gateway'];
+				return empty($item['gateway']) ? esc_html__('n/a', 'give') : $item['gateway'];
 			case 'error' :
-				return get_the_title( $item['ID'] ) ? get_the_title( $item['ID'] ) : esc_html__( 'Payment Error', 'give' );
+				return get_the_title($item['ID']) ? get_the_title($item['ID']) : esc_html__('Payment Error', 'give');
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -88,27 +88,27 @@ 
 	 *
 	 * @return void
 	 */
-	public function column_message( $item ) { ?>
-		<a href="#TB_inline?width=640&amp;inlineId=log-message-<?php echo $item['ID']; ?>" class="thickbox give-error-log-details-link button button-small" data-tooltip="<?php esc_attr_e( 'View Log Message', 'give' ); ?>"><span class="dashicons dashicons-visibility"></span></a>
+	public function column_message($item) { ?>
+		<a href="#TB_inline?width=640&amp;inlineId=log-message-<?php echo $item['ID']; ?>" class="thickbox give-error-log-details-link button button-small" data-tooltip="<?php esc_attr_e('View Log Message', 'give'); ?>"><span class="dashicons dashicons-visibility"></span></a>
 		<div id="log-message-<?php echo $item['ID']; ?>" style="display:none;">
 			<?php
 
-			$log_message = get_post_field( 'post_content', $item['ID'] );
+			$log_message = get_post_field('post_content', $item['ID']);
 
-			$serialized = strpos( $log_message, '{"' );
+			$serialized = strpos($log_message, '{"');
 
 			// Check to see if the log message contains serialized information
-			if ( $serialized !== false ) {
-				$length = strlen( $log_message ) - $serialized;
-				$intro  = substr( $log_message, 0, - $length );
-				$data   = substr( $log_message, $serialized, strlen( $log_message ) - 1 );
+			if ($serialized !== false) {
+				$length = strlen($log_message) - $serialized;
+				$intro  = substr($log_message, 0, - $length);
+				$data   = substr($log_message, $serialized, strlen($log_message) - 1);
 
-				echo wpautop( $intro );
-				echo wpautop( '<strong>' . esc_html__( 'Log data:', 'give' ) . '</strong>' );
-				echo '<div style="word-wrap: break-word;">' . wpautop( $data ) . '</div>';
+				echo wpautop($intro);
+				echo wpautop('<strong>'.esc_html__('Log data:', 'give').'</strong>');
+				echo '<div style="word-wrap: break-word;">'.wpautop($data).'</div>';
 			} else {
 				// No serialized data found
-				echo wpautop( $log_message );
+				echo wpautop($log_message);
 			}
 			?>
 		</div>
@@ -124,12 +124,12 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'ID'         => esc_html__( 'Log ID', 'give' ),
-			'error'      => esc_html__( 'Error', 'give' ),
-			'gateway'    => esc_html__( 'Gateway', 'give' ),
-			'payment_id' => esc_html__( 'Donation ID', 'give' ),
-			'date'       => esc_html__( 'Date', 'give' ),
-			'message'    => esc_html__( 'Details', 'give' )
+			'ID'         => esc_html__('Log ID', 'give'),
+			'error'      => esc_html__('Error', 'give'),
+			'gateway'    => esc_html__('Gateway', 'give'),
+			'payment_id' => esc_html__('Donation ID', 'give'),
+			'date'       => esc_html__('Date', 'give'),
+			'message'    => esc_html__('Details', 'give')
 		);
 
 		return $columns;
@@ -143,7 +143,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		give_log_views();
 	}
 
@@ -171,7 +171,7 @@ 
 
 		// Prevent the queries from getting cached.
 		// Without this there are occasional memory issues for some installs.
-		wp_suspend_cache_addition( true );
+		wp_suspend_cache_addition(true);
 
 		$logs_data = array();
 		$paged     = $this->get_paged();
@@ -180,17 +180,17 @@ 
 			'paged'    => $paged
 		);
 
-		$logs = $give_logs->get_connected_logs( $log_query );
+		$logs = $give_logs->get_connected_logs($log_query);
 
-		if ( $logs ) {
-			foreach ( $logs as $log ) {
+		if ($logs) {
+			foreach ($logs as $log) {
 
 				$logs_data[] = array(
 					'ID'         => $log->ID,
-					'ID_label'   => '<span class=\'give-item-label give-item-label-gray\'>' . $log->ID . '</span>',
+					'ID_label'   => '<span class=\'give-item-label give-item-label-gray\'>'.$log->ID.'</span>',
 					'payment_id' => $log->post_parent,
 					'error'      => 'error',
-					'gateway'    => give_get_payment_gateway( $log->post_parent ),
+					'gateway'    => give_get_payment_gateway($log->post_parent),
 					'date'       => $log->post_date
 				);
 			}
@@ -212,19 +212,19 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+	protected function display_tablenav($which) {
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav <?php echo esc_attr($which); ?>">
 
 			<div class="alignleft actions bulkactions">
-				<?php $this->bulk_actions( $which ); ?>
+				<?php $this->bulk_actions($which); ?>
 			</div>
 			<?php
-			$this->extra_tablenav( $which );
-			$this->pagination( $which );
+			$this->extra_tablenav($which);
+			$this->pagination($which);
 			?>
 
 			<br class="clear"/>
@@ -251,14 +251,14 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->get_logs();
-		$total_items           = $give_logs->get_log_count( 0, 'gateway_error' );
+		$total_items           = $give_logs->get_log_count(0, 'gateway_error');
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $total_items / $this->per_page )
+				'total_pages' => ceil($total_items / $this->per_page)
 			)
 		);
 	}

includes/scripts.php

Spacing +152 added lines, -152 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,25 +25,25 @@ 
  */
 function give_load_scripts() {
 
-	$js_dir         = GIVE_PLUGIN_URL . 'assets/js/frontend/';
-	$js_plugins     = GIVE_PLUGIN_URL . 'assets/js/plugins/';
-	$scripts_footer = ( give_is_setting_enabled( give_get_option( 'scripts_footer' ) ) ) ? true : false;
+	$js_dir         = GIVE_PLUGIN_URL.'assets/js/frontend/';
+	$js_plugins     = GIVE_PLUGIN_URL.'assets/js/plugins/';
+	$scripts_footer = (give_is_setting_enabled(give_get_option('scripts_footer'))) ? 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_vars = apply_filters( 'give_global_script_vars', array(
+	$localize_give_vars = apply_filters('give_global_script_vars', array(
 		'ajaxurl'             => give_get_ajax_url(),
-		'checkout_nonce'      => wp_create_nonce( 'give_checkout_nonce' ),
-		'currency_sign'       => give_currency_filter( '' ),
+		'checkout_nonce'      => wp_create_nonce('give_checkout_nonce'),
+		'currency_sign'       => give_currency_filter(''),
 		'currency_pos'        => give_get_currency_position(),
 		'thousands_separator' => give_get_price_thousand_separator(),
 		'decimal_separator'   => give_get_price_decimal_separator(),
-		'no_gateway'          => __( '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' ),
+		'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'     => give_get_price_decimals(),
 		'give_version'        => GIVE_VERSION,
 		'magnific_options'    => apply_filters(
@@ -57,81 +57,81 @@ 
 			'give_form_translation_js',
 			array(
 				// Field name               Validation message.
-				'payment-mode'           => __( 'Please select payment mode.', 'give' ),
-				'give_first'             => __( 'Please enter your first name.', 'give' ),
-				'give_email'             => __( 'Please enter a valid email address.', 'give' ),
-				'give_user_login'        => __( 'Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give' ),
-				'give_user_pass'         => __( 'Enter a password.', 'give' ),
-				'give_user_pass_confirm' => __( 'Enter the password confirmation.', 'give' ),
-				'give_agree_to_terms'    => __( 'You must agree to the terms and conditions.', 'give' ),
+				'payment-mode'           => __('Please select payment mode.', 'give'),
+				'give_first'             => __('Please enter your first name.', 'give'),
+				'give_email'             => __('Please enter a valid email address.', 'give'),
+				'give_user_login'        => __('Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give'),
+				'give_user_pass'         => __('Enter a password.', 'give'),
+				'give_user_pass_confirm' => __('Enter the password confirmation.', 'give'),
+				'give_agree_to_terms'    => __('You must agree to the terms and conditions.', 'give'),
 			)
 		),
-	) );
+	));
 
-	$localize_give_ajax = apply_filters( 'give_global_ajax_vars', array(
+	$localize_give_ajax = apply_filters('give_global_ajax_vars', array(
 		'ajaxurl'         => give_get_ajax_url(),
-		'loading'         => __( '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-donation option enabled.
-		'default_gateway' => give_get_default_gateway( null ),
-		'permalinks'      => get_option( 'permalink_structure' ) ? '1' : '0',
+		'default_gateway' => give_get_default_gateway(null),
+		'permalinks'      => get_option('permalink_structure') ? '1' : '0',
 		'number_decimals' => give_get_price_decimals(),
-	) );
+	));
 
 	// DEBUG is On.
-	if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+	if (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) {
 
-		if ( give_is_cc_verify_enabled() ) {
-			wp_register_script( 'give-cc-validator', $js_plugins . 'jquery.payment' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-			wp_enqueue_script( 'give-cc-validator' );
+		if (give_is_cc_verify_enabled()) {
+			wp_register_script('give-cc-validator', $js_plugins.'jquery.payment'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+			wp_enqueue_script('give-cc-validator');
 		}
 
-		wp_register_script( 'give-float-labels', $js_plugins . 'float-labels' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-float-labels' );
+		wp_register_script('give-float-labels', $js_plugins.'float-labels'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-float-labels');
 
-		wp_register_script( 'give-blockui', $js_plugins . 'jquery.blockUI' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-blockui' );
+		wp_register_script('give-blockui', $js_plugins.'jquery.blockUI'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-blockui');
 
-		wp_register_script( 'give-qtip', $js_plugins . 'jquery.qtip' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-qtip' );
+		wp_register_script('give-qtip', $js_plugins.'jquery.qtip'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-qtip');
 
-		wp_register_script( 'give-accounting', $js_plugins . 'accounting' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-accounting' );
+		wp_register_script('give-accounting', $js_plugins.'accounting'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-accounting');
 
-		wp_register_script( 'give-magnific', $js_plugins . 'jquery.magnific-popup' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-magnific' );
+		wp_register_script('give-magnific', $js_plugins.'jquery.magnific-popup'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-magnific');
 
-		wp_register_script( 'give-checkout-global', $js_dir . 'give-checkout-global' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-checkout-global' );
+		wp_register_script('give-checkout-global', $js_dir.'give-checkout-global'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-checkout-global');
 
 		// General scripts.
-		wp_register_script( 'give-scripts', $js_dir . 'give' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-scripts' );
+		wp_register_script('give-scripts', $js_dir.'give'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-scripts');
 
 		// Load AJAX scripts, if enabled.
-		wp_register_script( 'give-ajax', $js_dir . 'give-ajax' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-ajax' );
+		wp_register_script('give-ajax', $js_dir.'give-ajax'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-ajax');
 
 		// Localize / Pass AJAX vars from PHP,
-		wp_localize_script( 'give-checkout-global', 'give_global_vars', $localize_give_vars );
-		wp_localize_script( 'give-ajax', 'give_scripts', $localize_give_ajax );
+		wp_localize_script('give-checkout-global', 'give_global_vars', $localize_give_vars);
+		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_vars );
-		wp_localize_script( 'give', 'give_scripts', $localize_give_ajax );
+		wp_localize_script('give', 'give_global_vars', $localize_give_vars);
+		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.
@@ -144,16 +144,16 @@ 
  */
 function give_register_styles() {
 
-	if ( ! give_is_setting_enabled( give_get_option( 'css' ) ) ) {
+	if ( ! give_is_setting_enabled(give_get_option('css'))) {
 		return;
 	}
 
-	wp_register_style( 'give-styles', give_get_stylesheet_uri(), array(), GIVE_VERSION, 'all' );
-	wp_enqueue_style( 'give-styles' );
+	wp_register_style('give-styles', give_get_stylesheet_uri(), array(), GIVE_VERSION, 'all');
+	wp_enqueue_style('give-styles');
 
 }
 
-add_action( 'wp_enqueue_scripts', 'give_register_styles' );
+add_action('wp_enqueue_scripts', 'give_register_styles');
 
 
 /**
@@ -166,19 +166,19 @@ 
 function give_get_stylesheet_uri() {
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off.
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// LTR or RTL files.
-	$direction = ( is_rtl() ) ? '-rtl' : '';
+	$direction = (is_rtl()) ? '-rtl' : '';
 
-	$file          = 'give' . $direction . $suffix . '.css';
+	$file          = 'give'.$direction.$suffix.'.css';
 	$templates_dir = give_get_theme_template_dir_name();
 
-	$child_theme_style_sheet    = trailingslashit( get_stylesheet_directory() ) . $templates_dir . $file;
-	$child_theme_style_sheet_2  = trailingslashit( get_stylesheet_directory() ) . $templates_dir . 'give' . $direction . '.css';
-	$parent_theme_style_sheet   = trailingslashit( get_template_directory() ) . $templates_dir . $file;
-	$parent_theme_style_sheet_2 = trailingslashit( get_template_directory() ) . $templates_dir . 'give' . $direction . '.css';
-	$give_plugin_style_sheet    = trailingslashit( give_get_templates_dir() ) . $file;
+	$child_theme_style_sheet    = trailingslashit(get_stylesheet_directory()).$templates_dir.$file;
+	$child_theme_style_sheet_2  = trailingslashit(get_stylesheet_directory()).$templates_dir.'give'.$direction.'.css';
+	$parent_theme_style_sheet   = trailingslashit(get_template_directory()).$templates_dir.$file;
+	$parent_theme_style_sheet_2 = trailingslashit(get_template_directory()).$templates_dir.'give'.$direction.'.css';
+	$give_plugin_style_sheet    = trailingslashit(give_get_templates_dir()).$file;
 
 	$uri = false;
 
@@ -188,23 +188,23 @@ 
 	 * followed by non minified version, even if SCRIPT_DEBUG is not enabled.
 	 * This allows users to copy just give.css to their theme.
 	 */
-	if ( file_exists( $child_theme_style_sheet ) || ( ! empty( $suffix ) && ( $nonmin = file_exists( $child_theme_style_sheet_2 ) ) ) ) {
-		if ( ! empty( $nonmin ) ) {
-			$uri = trailingslashit( get_stylesheet_directory_uri() ) . $templates_dir . 'give' . $direction . '.css';
+	if (file_exists($child_theme_style_sheet) || ( ! empty($suffix) && ($nonmin = file_exists($child_theme_style_sheet_2)))) {
+		if ( ! empty($nonmin)) {
+			$uri = trailingslashit(get_stylesheet_directory_uri()).$templates_dir.'give'.$direction.'.css';
 		} else {
-			$uri = trailingslashit( get_stylesheet_directory_uri() ) . $templates_dir . $file;
+			$uri = trailingslashit(get_stylesheet_directory_uri()).$templates_dir.$file;
 		}
-	} elseif ( file_exists( $parent_theme_style_sheet ) || ( ! empty( $suffix ) && ( $nonmin = file_exists( $parent_theme_style_sheet_2 ) ) ) ) {
-		if ( ! empty( $nonmin ) ) {
-			$uri = trailingslashit( get_template_directory_uri() ) . $templates_dir . 'give' . $direction . '.css';
+	} elseif (file_exists($parent_theme_style_sheet) || ( ! empty($suffix) && ($nonmin = file_exists($parent_theme_style_sheet_2)))) {
+		if ( ! empty($nonmin)) {
+			$uri = trailingslashit(get_template_directory_uri()).$templates_dir.'give'.$direction.'.css';
 		} else {
-			$uri = trailingslashit( get_template_directory_uri() ) . $templates_dir . $file;
+			$uri = trailingslashit(get_template_directory_uri()).$templates_dir.$file;
 		}
-	} elseif ( file_exists( $give_plugin_style_sheet ) || file_exists( $give_plugin_style_sheet ) ) {
-		$uri = trailingslashit( give_get_templates_url() ) . $file;
+	} elseif (file_exists($give_plugin_style_sheet) || file_exists($give_plugin_style_sheet)) {
+		$uri = trailingslashit(give_get_templates_url()).$file;
 	}
 
-	return apply_filters( 'give_get_stylesheet_uri', $uri );
+	return apply_filters('give_get_stylesheet_uri', $uri);
 
 }
 
@@ -221,73 +221,73 @@ 
  *
  * @return void
  */
-function give_load_admin_scripts( $hook ) {
+function give_load_admin_scripts($hook) {
 
 	global $post, $post_type;
 
 	$give_options = give_get_settings();
 
 	// Directories of assets.
-	$js_dir     = GIVE_PLUGIN_URL . 'assets/js/admin/';
-	$js_plugins = GIVE_PLUGIN_URL . 'assets/js/plugins/';
-	$css_dir    = GIVE_PLUGIN_URL . 'assets/css/';
+	$js_dir     = GIVE_PLUGIN_URL.'assets/js/admin/';
+	$js_plugins = GIVE_PLUGIN_URL.'assets/js/plugins/';
+	$css_dir    = GIVE_PLUGIN_URL.'assets/css/';
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off.
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// LTR or RTL files.
-	$direction = ( is_rtl() ) ? '-rtl' : '';
+	$direction = (is_rtl()) ? '-rtl' : '';
 
 	// Global Admin.
-	wp_register_style( 'give-admin-bar-notification', $css_dir . 'adminbar-style.css' );
-	wp_enqueue_style( 'give-admin-bar-notification' );
+	wp_register_style('give-admin-bar-notification', $css_dir.'adminbar-style.css');
+	wp_enqueue_style('give-admin-bar-notification');
 
 	// Give Admin Only.
-	if ( ! apply_filters( 'give_load_admin_scripts', give_is_admin_page(), $hook ) ) {
+	if ( ! apply_filters('give_load_admin_scripts', give_is_admin_page(), $hook)) {
 		return;
 	}
 
 	// CSS.
-	wp_register_style( 'jquery-ui-css', $css_dir . 'jquery-ui-fresh' . $suffix . '.css' );
-	wp_enqueue_style( 'jquery-ui-css' );
-	wp_register_style( 'give-admin', $css_dir . 'give-admin' . $direction . $suffix . '.css', array(), GIVE_VERSION );
-	wp_enqueue_style( 'give-admin' );
-	wp_register_style( 'jquery-chosen', $css_dir . 'chosen' . $suffix . '.css', array(), GIVE_VERSION );
-	wp_enqueue_style( 'jquery-chosen' );
-	wp_enqueue_style( 'thickbox' );
+	wp_register_style('jquery-ui-css', $css_dir.'jquery-ui-fresh'.$suffix.'.css');
+	wp_enqueue_style('jquery-ui-css');
+	wp_register_style('give-admin', $css_dir.'give-admin'.$direction.$suffix.'.css', array(), GIVE_VERSION);
+	wp_enqueue_style('give-admin');
+	wp_register_style('jquery-chosen', $css_dir.'chosen'.$suffix.'.css', array(), GIVE_VERSION);
+	wp_enqueue_style('jquery-chosen');
+	wp_enqueue_style('thickbox');
 
 	// JS.
-	wp_register_script( 'jquery-chosen', $js_plugins . 'chosen.jquery' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION );
-	wp_enqueue_script( 'jquery-chosen' );
+	wp_register_script('jquery-chosen', $js_plugins.'chosen.jquery'.$suffix.'.js', array('jquery'), GIVE_VERSION);
+	wp_enqueue_script('jquery-chosen');
 
-	wp_register_script( 'give-accounting', $js_plugins . 'accounting' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-accounting' );
+	wp_register_script('give-accounting', $js_plugins.'accounting'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-accounting');
 
-	wp_register_script( 'give-admin-scripts', $js_dir . 'admin-scripts' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-admin-scripts' );
+	wp_register_script('give-admin-scripts', $js_dir.'admin-scripts'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-admin-scripts');
 
-	wp_register_script( 'jquery-flot', $js_plugins . 'jquery.flot' . $suffix . '.js' );
-	wp_enqueue_script( 'jquery-flot' );
+	wp_register_script('jquery-flot', $js_plugins.'jquery.flot'.$suffix.'.js');
+	wp_enqueue_script('jquery-flot');
 
-	wp_register_script( 'give-qtip', $js_plugins . 'jquery.qtip' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-qtip' );
+	wp_register_script('give-qtip', $js_plugins.'jquery.qtip'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-qtip');
 
-	wp_register_script( 'give-repeatable-fields', $js_plugins . 'repeatable-fields' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-repeatable-fields' );
+	wp_register_script('give-repeatable-fields', $js_plugins.'repeatable-fields'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-repeatable-fields');
 
-	wp_enqueue_script( 'jquery-ui-datepicker' );
-	wp_enqueue_script( 'thickbox' );
+	wp_enqueue_script('jquery-ui-datepicker');
+	wp_enqueue_script('thickbox');
 
 	// Forms CPT Script.
-	if ( $post_type === 'give_forms' ) {
-		wp_register_script( 'give-admin-forms-scripts', $js_dir . 'admin-forms' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-		wp_enqueue_script( 'give-admin-forms-scripts' );
+	if ($post_type === 'give_forms') {
+		wp_register_script('give-admin-forms-scripts', $js_dir.'admin-forms'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+		wp_enqueue_script('give-admin-forms-scripts');
 	}
 
 	// Settings Scripts.
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-settings' ) {
-		wp_register_script( 'give-admin-settings-scripts', $js_dir . 'admin-settings' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-		wp_enqueue_script( 'give-admin-settings-scripts' );
+	if (isset($_GET['page']) && $_GET['page'] == 'give-settings') {
+		wp_register_script('give-admin-settings-scripts', $js_dir.'admin-settings'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+		wp_enqueue_script('give-admin-settings-scripts');
 	}
 
 	// Price Separators.
@@ -295,60 +295,60 @@ 
 	$decimal_separator  = give_get_price_decimal_separator();
 
 	// Localize strings & variables for JS.
-	wp_localize_script( 'give-admin-scripts', 'give_vars', array(
-		'post_id'                        => isset( $post->ID ) ? $post->ID : null,
+	wp_localize_script('give-admin-scripts', 'give_vars', array(
+		'post_id'                        => isset($post->ID) ? $post->ID : null,
 		'give_version'                   => GIVE_VERSION,
 		'thousands_separator'            => $thousand_separator,
 		'decimal_separator'              => $decimal_separator,
-		'quick_edit_warning'             => __( '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' ),
-		'logo'                           => __( 'Logo', 'give' ),
-		'use_this_image'                 => __( 'Use this image', 'give' ),
-		'one_option'                     => __( 'Choose a form', 'give' ),
-		'one_or_more_option'             => __( 'Choose one or more forms', 'give' ),
-		'currency_sign'                  => give_currency_filter( '' ),
-		'currency_pos'                   => isset( $give_options['currency_position'] ) ? $give_options['currency_position'] : 'before',
-		'currency_decimals'              => give_currency_decimal_filter( give_get_price_decimals() ),
-		'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' ),
-		'price_format_guide'             => sprintf( __( 'Please enter amount in monetary decimal ( %1$s ) format without thousand separator ( %2$s ) .', 'give' ), $decimal_separator, $thousand_separator ),
+		'quick_edit_warning'             => __('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'),
+		'logo'                           => __('Logo', 'give'),
+		'use_this_image'                 => __('Use this image', 'give'),
+		'one_option'                     => __('Choose a form', 'give'),
+		'one_or_more_option'             => __('Choose one or more forms', 'give'),
+		'currency_sign'                  => give_currency_filter(''),
+		'currency_pos'                   => isset($give_options['currency_position']) ? $give_options['currency_position'] : 'before',
+		'currency_decimals'              => give_currency_decimal_filter(give_get_price_decimals()),
+		'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'),
+		'price_format_guide'             => sprintf(__('Please enter amount in monetary decimal ( %1$s ) format without thousand separator ( %2$s ) .', 'give'), $decimal_separator, $thousand_separator),
 		/* translators : %s: Donation form options metabox */
-		'confirm_before_remove_row_text' => __( 'Do you want to delete this level?', 'give' ),
-		'matched_success_failure_page'   => __( 'You cannot set the success and failed pages to the same page', 'give' ),
-		'dismiss_notice_text'            => __( 'Dismiss this notice.', 'give' ),
+		'confirm_before_remove_row_text' => __('Do you want to delete this level?', 'give'),
+		'matched_success_failure_page'   => __('You cannot set the success and failed pages to the same page', 'give'),
+		'dismiss_notice_text'            => __('Dismiss this notice.', 'give'),
 		'bulk_action' => array(
 			'delete'         => array(
-				'zero_payment_selected' => __( 'You must choose at least one or more payments to delete.', 'give' ),
-				'delete_payment'        => __( 'Are you sure you want to permanently delete this donation?', 'give' ),
-				'delete_payments'       => __( 'Are you sure you want to permanently delete the selected {payment_count} donations?', 'give' ),
+				'zero_payment_selected' => __('You must choose at least one or more payments to delete.', 'give'),
+				'delete_payment'        => __('Are you sure you want to permanently delete this donation?', 'give'),
+				'delete_payments'       => __('Are you sure you want to permanently delete the selected {payment_count} donations?', 'give'),
 			),
 			'resend_receipt' => array(
-				'zero_recipient_selected' => __( 'You must choose at least one or more recipients to resend the email receipt.', 'give' ),
-				'resend_receipt'          => __( 'Are you sure you want to resend the email receipt to this recipient?', 'give' ),
-				'resend_receipts'         => __( 'Are you sure you want to resend the emails receipt to {payment_count} recipients?', 'give' ),
+				'zero_recipient_selected' => __('You must choose at least one or more recipients to resend the email receipt.', 'give'),
+				'resend_receipt'          => __('Are you sure you want to resend the email receipt to this recipient?', 'give'),
+				'resend_receipts'         => __('Are you sure you want to resend the emails receipt to {payment_count} recipients?', 'give'),
 			),
 		),
-		'upgrade_confirmation' => __( 'Please make sure to create a database backup before initiating the upgrade.', 'give' ),
+		'upgrade_confirmation' => __('Please make sure to create a database backup before initiating the upgrade.', 'give'),
 		'metabox_fields' => array(
 			'media' => array(
-				'button_title' => esc_html__( 'Choose Attachment', 'give' ),
+				'button_title' => esc_html__('Choose Attachment', 'give'),
 			)
 		)
-	) );
+	));
 
-	if ( function_exists( 'wp_enqueue_media' ) && version_compare( get_bloginfo( 'version' ), '3.5', '>=' ) ) {
+	if (function_exists('wp_enqueue_media') && version_compare(get_bloginfo('version'), '3.5', '>=')) {
 		// call for new media manager.
 		wp_enqueue_media();
 	}
 
 }
 
-add_action( 'admin_enqueue_scripts', 'give_load_admin_scripts', 100 );
+add_action('admin_enqueue_scripts', 'give_load_admin_scripts', 100);
 
 /**
  * Admin Give Icon
@@ -363,13 +363,13 @@ 
 	?>
     <style type="text/css" media="screen">
 
-        <?php if ( version_compare( get_bloginfo( 'version' ), '3.8-RC', '>=' ) || version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) ) { ?>
+        <?php if (version_compare(get_bloginfo('version'), '3.8-RC', '>=') || version_compare(get_bloginfo('version'), '3.8', '>=')) { ?>
         @font-face {
             font-family: 'give-icomoon';
-            src: url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.eot?ngjl88'; ?>');
-            src: url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.eot?#iefixngjl88'?>') 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.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?#iefixngjl88'?>') 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.svg?ngjl88#icomoon'; ?>') format('svg');
             font-weight: normal;
             font-style: normal;
         }
@@ -388,7 +388,7 @@ 
 	<?php
 }
 
-add_action( 'admin_head', 'give_admin_icon' );
+add_action('admin_head', 'give_admin_icon');
 
 /**
  * Admin js code
@@ -418,4 +418,4 @@ 
 	<?php
 }
 
-add_action( 'admin_head', 'give_admin_hide_notice_shortly_js' );
+add_action('admin_head', 'give_admin_hide_notice_shortly_js');

includes/class-give-email-access.php

Doc Comments +1 added lines, -1 removed lines

@@ -232,7 +232,7 @@
 	 * @since  1.0
 	 * @access public
 	 *
-	 * @return bool
+	 * @return null|boolean
 	 */
 	public function check_for_token() {
 

Spacing +61 added lines, -61 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -96,7 +96,7 @@ 
 	public function __construct() {
 
 		// get it started
-		add_action( 'init', array( $this, 'init' ) );
+		add_action('init', array($this, 'init'));
 	}
 
 	/**
@@ -120,29 +120,29 @@ 
 		 */
 		if (
 			is_user_logged_in()
-			|| ! give_is_setting_enabled( give_get_option( 'email_access' ) )
+			|| ! give_is_setting_enabled(give_get_option('email_access'))
 			|| is_admin()
 		) {
 			return;
 		}
 
 		// Are db columns setup?
-		$is_setup = give_get_option( 'email_access_installed' );
-		if ( empty( $is_setup ) ) {
+		$is_setup = give_get_option('email_access_installed');
+		if (empty($is_setup)) {
 			$this->create_columns();
 		}
 
 		// Timeouts.
-		$this->verify_throttle  = apply_filters( 'give_nl_verify_throttle', 300 );
-		$this->token_expiration = apply_filters( 'give_nl_token_expiration', 7200 );
+		$this->verify_throttle  = apply_filters('give_nl_verify_throttle', 300);
+		$this->token_expiration = apply_filters('give_nl_token_expiration', 7200);
 
 		// Setup login.
 		$this->check_for_token();
 
-		if ( $this->token_exists ) {
-			add_filter( 'give_can_view_receipt', '__return_true' );
-			add_filter( 'give_user_pending_verification', '__return_false' );
-			add_filter( 'give_get_users_donations_args', array( $this, 'users_donations_args' ) );
+		if ($this->token_exists) {
+			add_filter('give_can_view_receipt', '__return_true');
+			add_filter('give_user_pending_verification', '__return_false');
+			add_filter('give_get_users_donations_args', array($this, 'users_donations_args'));
 		}
 
 	}
@@ -157,25 +157,25 @@ 
 	 *
 	 * @return bool
 	 */
-	public function can_send_email( $customer_id ) {
+	public function can_send_email($customer_id) {
 		/* @var WPDB $wpdb */
 		global $wpdb;
 
 		// Prevent multiple emails within X minutes
-		$throttle = date( 'Y-m-d H:i:s', time() - $this->verify_throttle );
+		$throttle = date('Y-m-d H:i:s', time() - $this->verify_throttle);
 
 		// Does a user row exist?
 		$exists = (int) $wpdb->get_var(
-			$wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->prefix}give_customers WHERE id = %d", $customer_id )
+			$wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}give_customers WHERE id = %d", $customer_id)
 		);
 
-		if ( 0 < $exists ) {
+		if (0 < $exists) {
 			$row_id = (int) $wpdb->get_var(
-				$wpdb->prepare( "SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d AND (verify_throttle < %s OR verify_key = '') LIMIT 1", $customer_id, $throttle )
+				$wpdb->prepare("SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d AND (verify_throttle < %s OR verify_key = '') LIMIT 1", $customer_id, $throttle)
 			);
 
-			if ( $row_id < 1 ) {
-				give_set_error( 'give_email_access_attempts_exhausted', __( 'Please wait a few minutes before requesting a new email access link.', 'give' ) );
+			if ($row_id < 1) {
+				give_set_error('give_email_access_attempts_exhausted', __('Please wait a few minutes before requesting a new email access link.', 'give'));
 
 				return false;
 			}
@@ -195,34 +195,34 @@ 
 	 *
 	 * @return void
 	 */
-	public function send_email( $customer_id, $email ) {
+	public function send_email($customer_id, $email) {
 
-		$verify_key = wp_generate_password( 20, false );
+		$verify_key = wp_generate_password(20, false);
 
 		// Generate a new verify key
-		$this->set_verify_key( $customer_id, $email, $verify_key );
+		$this->set_verify_key($customer_id, $email, $verify_key);
 
 		// Get the donation history page
-		$page_id = give_get_option( 'history_page' );
+		$page_id = give_get_option('history_page');
 
-		$access_url = add_query_arg( array(
+		$access_url = add_query_arg(array(
 			'give_nl' => $verify_key,
-		), get_permalink( $page_id ) );
+		), get_permalink($page_id));
 
 		// Nice subject and message.
-		$subject = apply_filters( 'give_email_access_token_subject', sprintf( __( 'Your Access Link to %s', 'give' ), get_bloginfo( 'name' ) ) );
+		$subject = apply_filters('give_email_access_token_subject', sprintf(__('Your Access Link to %s', 'give'), get_bloginfo('name')));
 
-		$message = __( 'You or someone in your organization requested an access link be sent to this email address. This is a temporary access link for you to view your donation information. Click on the link below to view:', 'give' ) . "\n\n";
-		$message .= '<a href="' . esc_url( $access_url ) . '" target="_blank">' . __( 'Access Donation Details &raquo;', 'give' ) . '</a>' . "\n\n";
+		$message = __('You or someone in your organization requested an access link be sent to this email address. This is a temporary access link for you to view your donation information. Click on the link below to view:', 'give')."\n\n";
+		$message .= '<a href="'.esc_url($access_url).'" target="_blank">'.__('Access Donation Details &raquo;', 'give').'</a>'."\n\n";
 		$message .= "\n\n";
-		$message .= __( 'Sincerely,', 'give' ) . "\n";
-		$message .= get_bloginfo( 'name' ) . "\n";
+		$message .= __('Sincerely,', 'give')."\n";
+		$message .= get_bloginfo('name')."\n";
 
-		$message = apply_filters( 'give_email_access_token_message', $message );
+		$message = apply_filters('give_email_access_token_message', $message);
 
 		// Send the email.
-		Give()->emails->__set( 'heading', apply_filters( 'give_email_access_token_heading', __( 'Your Access Link', 'give' ) ) );
-		Give()->emails->send( $email, $subject, $message );
+		Give()->emails->__set('heading', apply_filters('give_email_access_token_heading', __('Your Access Link', 'give')));
+		Give()->emails->send($email, $subject, $message);
 
 	}
 
@@ -236,26 +236,26 @@ 
 	 */
 	public function check_for_token() {
 
-		$token = isset( $_GET['give_nl'] ) ? $_GET['give_nl'] : '';
+		$token = isset($_GET['give_nl']) ? $_GET['give_nl'] : '';
 
 		// Check for cookie.
-		if ( empty( $token ) ) {
-			$token = isset( $_COOKIE['give_nl'] ) ? $_COOKIE['give_nl'] : '';
+		if (empty($token)) {
+			$token = isset($_COOKIE['give_nl']) ? $_COOKIE['give_nl'] : '';
 		}
 
 		// Must have a token.
-		if ( ! empty( $token ) ) {
+		if ( ! empty($token)) {
 
-			if ( ! $this->is_valid_token( $token ) ) {
-				if ( ! $this->is_valid_verify_key( $token ) ) {
+			if ( ! $this->is_valid_token($token)) {
+				if ( ! $this->is_valid_verify_key($token)) {
 					return;
 				}
 			}
 
 			$this->token_exists = true;
 			// Set cookie.
-			$lifetime = current_time( 'timestamp' ) + Give()->session->set_expiration_time();
-			@setcookie( 'give_nl', $token, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false );
+			$lifetime = current_time('timestamp') + Give()->session->set_expiration_time();
+			@setcookie('give_nl', $token, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false);
 
 			return true;
 		}
@@ -271,26 +271,26 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_valid_token( $token ) {
+	public function is_valid_token($token) {
 
 		global $wpdb;
 
 		// Make sure token isn't expired.
-		$expires = date( 'Y-m-d H:i:s', time() - $this->token_expiration );
+		$expires = date('Y-m-d H:i:s', time() - $this->token_expiration);
 
 		$email = $wpdb->get_var(
-			$wpdb->prepare( "SELECT email FROM {$wpdb->prefix}give_customers WHERE token = %s AND verify_throttle >= %s LIMIT 1", $token, $expires )
+			$wpdb->prepare("SELECT email FROM {$wpdb->prefix}give_customers WHERE token = %s AND verify_throttle >= %s LIMIT 1", $token, $expires)
 		);
 
-		if ( ! empty( $email ) ) {
+		if ( ! empty($email)) {
 			$this->token_email = $email;
 			$this->token       = $token;
 			return true;
 		}
 
 		// Set error only if email access form isn't being submitted
-		if ( ! isset( $_POST['give_email'] ) && ! isset( $_POST['_wpnonce'] ) ) {
-			give_set_error( 'give_email_token_expired', apply_filters( 'give_email_token_expired_message', __( 'Your access token has expired. Please request a new one below:', 'give' ) ) );
+		if ( ! isset($_POST['give_email']) && ! isset($_POST['_wpnonce'])) {
+			give_set_error('give_email_token_expired', apply_filters('give_email_token_expired_message', __('Your access token has expired. Please request a new one below:', 'give')));
 		}
 
 		return false;
@@ -309,25 +309,25 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_verify_key( $customer_id, $email, $verify_key ) {
+	public function set_verify_key($customer_id, $email, $verify_key) {
 		global $wpdb;
 
-		$now = date( 'Y-m-d H:i:s' );
+		$now = date('Y-m-d H:i:s');
 
 		// Insert or update?
 		$row_id = (int) $wpdb->get_var(
-			$wpdb->prepare( "SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d LIMIT 1", $customer_id )
+			$wpdb->prepare("SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d LIMIT 1", $customer_id)
 		);
 
 		// Update.
-		if ( ! empty( $row_id ) ) {
+		if ( ! empty($row_id)) {
 			$wpdb->query(
-				$wpdb->prepare( "UPDATE {$wpdb->prefix}give_customers SET verify_key = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $verify_key, $now, $row_id )
+				$wpdb->prepare("UPDATE {$wpdb->prefix}give_customers SET verify_key = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $verify_key, $now, $row_id)
 			);
 		} // Insert.
 		else {
 			$wpdb->query(
-				$wpdb->prepare( "INSERT INTO {$wpdb->prefix}give_customers ( verify_key, verify_throttle) VALUES (%s, %s)", $verify_key, $now )
+				$wpdb->prepare("INSERT INTO {$wpdb->prefix}give_customers ( verify_key, verify_throttle) VALUES (%s, %s)", $verify_key, $now)
 			);
 		}
 	}
@@ -342,21 +342,21 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_valid_verify_key( $token ) {
+	public function is_valid_verify_key($token) {
 		/* @var WPDB $wpdb */
 		global $wpdb;
 
 		// See if the verify_key exists.
 		$row = $wpdb->get_row(
-			$wpdb->prepare( "SELECT id, email FROM {$wpdb->prefix}give_customers WHERE verify_key = %s LIMIT 1", $token )
+			$wpdb->prepare("SELECT id, email FROM {$wpdb->prefix}give_customers WHERE verify_key = %s LIMIT 1", $token)
 		);
 
-		$now = date( 'Y-m-d H:i:s' );
+		$now = date('Y-m-d H:i:s');
 
 		// Set token and remove verify key.
-		if ( ! empty( $row ) ) {
+		if ( ! empty($row)) {
 			$wpdb->query(
-				$wpdb->prepare( "UPDATE {$wpdb->prefix}give_customers SET verify_key = '', token = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $token, $now, $row->id )
+				$wpdb->prepare("UPDATE {$wpdb->prefix}give_customers SET verify_key = '', token = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $token, $now, $row->id)
 			);
 
 			$this->token_email = $row->email;
@@ -380,7 +380,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function users_donations_args( $args ) {
+	public function users_donations_args($args) {
 		$args['user'] = $this->token_email;
 
 		return $args;
@@ -401,11 +401,11 @@ 
 		global $wpdb;
 
 		// Create columns in customers table
-		$query = $wpdb->query( "ALTER TABLE {$wpdb->prefix}give_customers ADD `token` VARCHAR(255) CHARACTER SET utf8 NOT NULL, ADD `verify_key` VARCHAR(255) CHARACTER SET utf8 NOT NULL AFTER `token`, ADD `verify_throttle` DATETIME NOT NULL AFTER `verify_key`" );
+		$query = $wpdb->query("ALTER TABLE {$wpdb->prefix}give_customers ADD `token` VARCHAR(255) CHARACTER SET utf8 NOT NULL, ADD `verify_key` VARCHAR(255) CHARACTER SET utf8 NOT NULL AFTER `token`, ADD `verify_throttle` DATETIME NOT NULL AFTER `verify_key`");
 
 		// Columns added properly
-		if ( $query ) {
-			give_update_option( 'email_access_installed', 1 );
+		if ($query) {
+			give_update_option('email_access_installed', 1);
 		}
 
 	}

includes/shortcodes.php

Spacing +102 added lines, -102 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,15 +26,15 @@ 
 function give_donation_history() {
 
 	// If payment_key query arg exists, return receipt instead of donation history.
-	if ( isset( $_GET['payment_key'] ) ) {
+	if (isset($_GET['payment_key'])) {
 		ob_start();
-		echo give_receipt_shortcode( array() );
-		echo '<a href="' . esc_url( give_get_history_page_uri() ) . '">&laquo; ' . esc_html__( 'Return to All Donations', 'give' ) . '</a>';
+		echo give_receipt_shortcode(array());
+		echo '<a href="'.esc_url(give_get_history_page_uri()).'">&laquo; '.esc_html__('Return to All Donations', 'give').'</a>';
 
 		return ob_get_clean();
 	}
 
-	$email_access = give_get_option( 'email_access' );
+	$email_access = give_get_option('email_access');
 
 	/**
 	 * Determine access
@@ -44,28 +44,28 @@ 
 	 */
 	if (
 		is_user_logged_in() || false !== Give()->session->get_session_expiration()
-		|| ( give_is_setting_enabled( $email_access ) && Give()->email_access->token_exists )
+		|| (give_is_setting_enabled($email_access) && Give()->email_access->token_exists)
 	) {
 		ob_start();
-		give_get_template_part( 'history', 'donations' );
+		give_get_template_part('history', 'donations');
 
 		return ob_get_clean();
 
-	} elseif ( give_is_setting_enabled( $email_access ) ) {
+	} elseif (give_is_setting_enabled($email_access)) {
 		//Is Email-based access enabled?
 		ob_start();
-		give_get_template_part( 'email', 'login-form' );
+		give_get_template_part('email', 'login-form');
 
 		return ob_get_clean();
 	} else {
 
-		echo apply_filters( 'give_donation_history_nonuser_message', give_output_error( __( 'You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give' ), false ) );
-		echo do_shortcode( '[give_login]' );
+		echo apply_filters('give_donation_history_nonuser_message', give_output_error(__('You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give'), false));
+		echo do_shortcode('[give_login]');
 		
 	}
 }
 
-add_shortcode( 'donation_history', 'give_donation_history' );
+add_shortcode('donation_history', 'give_donation_history');
 
 /**
  * Donation Form Shortcode
@@ -78,29 +78,29 @@ 
  *
  * @return string
  */
-function give_form_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_form_shortcode($atts) {
+	$atts = shortcode_atts(array(
 		'id'            => '',
 		'show_title'    => true,
 		'show_goal'     => true,
 		'show_content'  => '',
 		'float_labels'  => '',
 		'display_style' => '',
-	), $atts, 'give_form' );
+	), $atts, 'give_form');
 
 	// Convert string to bool.
-	$atts['show_title'] = filter_var( $atts['show_title'], FILTER_VALIDATE_BOOLEAN );
-	$atts['show_goal']  = filter_var( $atts['show_goal'], FILTER_VALIDATE_BOOLEAN );
+	$atts['show_title'] = filter_var($atts['show_title'], FILTER_VALIDATE_BOOLEAN);
+	$atts['show_goal']  = filter_var($atts['show_goal'], FILTER_VALIDATE_BOOLEAN);
 
 	//get the Give Form
 	ob_start();
-	give_get_donation_form( $atts );
+	give_get_donation_form($atts);
 	$final_output = ob_get_clean();
 
-	return apply_filters( 'give_donate_form', $final_output, $atts );
+	return apply_filters('give_donate_form', $final_output, $atts);
 }
 
-add_shortcode( 'give_form', 'give_form_shortcode' );
+add_shortcode('give_form', 'give_form_shortcode');
 
 /**
  * Donation Form Goal Shortcode.
@@ -113,37 +113,37 @@ 
  *
  * @return string
  */
-function give_goal_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_goal_shortcode($atts) {
+	$atts = shortcode_atts(array(
 		'id'        => '',
 		'show_text' => true,
 		'show_bar'  => true,
-	), $atts, 'give_goal' );
+	), $atts, 'give_goal');
 
 
 	//get the Give Form.
 	ob_start();
 
 	//Sanity check 1: ensure there is an ID Provided.
-	if ( empty( $atts['id'] ) ) {
-		give_output_error( esc_html__( 'The shortcode is missing Donation Form ID attribute.', 'give' ), true );
+	if (empty($atts['id'])) {
+		give_output_error(esc_html__('The shortcode is missing Donation Form ID attribute.', 'give'), true);
 	}
 
 	//Sanity check 2: Check the form even has Goals enabled.
-	if ( ! give_is_setting_enabled( get_post_meta( $atts['id'], '_give_goal_option', true ) ) ) {
+	if ( ! give_is_setting_enabled(get_post_meta($atts['id'], '_give_goal_option', true))) {
 
-		give_output_error( esc_html__( 'The form does not have Goals enabled.', 'give' ), true );
+		give_output_error(esc_html__('The form does not have Goals enabled.', 'give'), true);
 	} else {
 		//Passed all sanity checks: output Goal.
-		give_show_goal_progress( $atts['id'], $atts );
+		give_show_goal_progress($atts['id'], $atts);
 	}
 
 	$final_output = ob_get_clean();
 
-	return apply_filters( 'give_goal_shortcode_output', $final_output, $atts );
+	return apply_filters('give_goal_shortcode_output', $final_output, $atts);
 }
 
-add_shortcode( 'give_goal', 'give_goal_shortcode' );
+add_shortcode('give_goal', 'give_goal_shortcode');
 
 
 /**
@@ -160,22 +160,22 @@ 
  *
  * @return string
  */
-function give_login_form_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_login_form_shortcode($atts) {
+	$atts = shortcode_atts(array(
 		// Add backward compatibility for redirect attribute.
 		'redirect' => '',
 
 		'login-redirect'  => '',
 		'logout-redirect' => '',
-	), $atts, 'give_login' );
+	), $atts, 'give_login');
 
 	// Check login-redirect attribute first, if it empty or not found then check for redirect attribute and add value of this to login-redirect attribute.
-	$atts['login-redirect'] = ! empty( $atts['login-redirect'] ) ? $atts['login-redirect'] : ( ! empty( $atts['redirect'] ) ? $atts['redirect'] : '' );
+	$atts['login-redirect'] = ! empty($atts['login-redirect']) ? $atts['login-redirect'] : ( ! empty($atts['redirect']) ? $atts['redirect'] : '');
 
-	return give_login_form( $atts['login-redirect'], $atts['logout-redirect'] );
+	return give_login_form($atts['login-redirect'], $atts['logout-redirect']);
 }
 
-add_shortcode( 'give_login', 'give_login_form_shortcode' );
+add_shortcode('give_login', 'give_login_form_shortcode');
 
 /**
  * Register Shortcode.
@@ -190,15 +190,15 @@ 
  *
  * @return string
  */
-function give_register_form_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_register_form_shortcode($atts) {
+	$atts = shortcode_atts(array(
 		'redirect' => '',
-	), $atts, 'give_register' );
+	), $atts, 'give_register');
 
-	return give_register_form( $atts['redirect'] );
+	return give_register_form($atts['redirect']);
 }
 
-add_shortcode( 'give_register', 'give_register_form_shortcode' );
+add_shortcode('give_register', 'give_register_form_shortcode');
 
 /**
  * Receipt Shortcode.
@@ -211,12 +211,12 @@ 
  *
  * @return string
  */
-function give_receipt_shortcode( $atts ) {
+function give_receipt_shortcode($atts) {
 
 	global $give_receipt_args, $payment;
 
-	$give_receipt_args = shortcode_atts( array(
-		'error'          => esc_html__( 'You are missing the payment key to view this donation receipt.', 'give' ),
+	$give_receipt_args = shortcode_atts(array(
+		'error'          => esc_html__('You are missing the payment key to view this donation receipt.', 'give'),
 		'price'          => true,
 		'donor'          => true,
 		'date'           => true,
@@ -225,50 +225,50 @@ 
 		'payment_id'     => true,
 		'payment_status' => false,
 		'status_notice'  => true,
-	), $atts, 'give_receipt' );
+	), $atts, 'give_receipt');
 
 	//set $session var
 	$session = give_get_purchase_session();
 
 	//set payment key var
-	if ( isset( $_GET['payment_key'] ) ) {
-		$payment_key = urldecode( $_GET['payment_key'] );
-	} elseif ( $session ) {
+	if (isset($_GET['payment_key'])) {
+		$payment_key = urldecode($_GET['payment_key']);
+	} elseif ($session) {
 		$payment_key = $session['purchase_key'];
-	} elseif ( $give_receipt_args['payment_key'] ) {
+	} elseif ($give_receipt_args['payment_key']) {
 		$payment_key = $give_receipt_args['payment_key'];
 	}
 
-	$email_access = give_get_option( 'email_access' );
+	$email_access = give_get_option('email_access');
 
 	// No payment_key found & Email Access is Turned on:
-	if ( ! isset( $payment_key ) && give_is_setting_enabled( $email_access ) && ! Give()->email_access->token_exists ) {
+	if ( ! isset($payment_key) && give_is_setting_enabled($email_access) && ! Give()->email_access->token_exists) {
 
 		ob_start();
 
-		give_get_template_part( 'email-login-form' );
+		give_get_template_part('email-login-form');
 
 		return ob_get_clean();
 
-	} elseif ( ! isset( $payment_key ) ) {
+	} elseif ( ! isset($payment_key)) {
 
-		return give_output_error( $give_receipt_args['error'], false, 'error' );
+		return give_output_error($give_receipt_args['error'], false, 'error');
 
 	}
 
-	$payment_id    = give_get_purchase_id_by_key( $payment_key );
-	$user_can_view = give_can_view_receipt( $payment_key );
+	$payment_id    = give_get_purchase_id_by_key($payment_key);
+	$user_can_view = give_can_view_receipt($payment_key);
 
 	// Key was provided, but user is logged out. Offer them the ability to login and view the receipt.
-	if ( ! $user_can_view && give_is_setting_enabled( $email_access ) && ! Give()->email_access->token_exists ) {
+	if ( ! $user_can_view && give_is_setting_enabled($email_access) && ! Give()->email_access->token_exists) {
 
 		ob_start();
 
-		give_get_template_part( 'email-login-form' );
+		give_get_template_part('email-login-form');
 
 		return ob_get_clean();
 
-	} elseif ( ! $user_can_view ) {
+	} elseif ( ! $user_can_view) {
 
 		global $give_login_redirect;
 
@@ -276,9 +276,9 @@ 
 
 		ob_start();
 
-		give_output_error( apply_filters( 'give_must_be_logged_in_error_message', esc_html__( 'You must be logged in to view this donation receipt.', 'give' ) ) );
+		give_output_error(apply_filters('give_must_be_logged_in_error_message', esc_html__('You must be logged in to view this donation receipt.', 'give')));
 
-		give_get_template_part( 'shortcode', 'login' );
+		give_get_template_part('shortcode', 'login');
 
 		$login_form = ob_get_clean();
 
@@ -293,20 +293,20 @@ 
 	 * or if user is logged in and the user can view sensitive shop data.
 	 *
 	 */
-	if ( ! apply_filters( 'give_user_can_view_receipt', $user_can_view, $give_receipt_args ) ) {
-		return give_output_error( $give_receipt_args['error'], false, 'error' );
+	if ( ! apply_filters('give_user_can_view_receipt', $user_can_view, $give_receipt_args)) {
+		return give_output_error($give_receipt_args['error'], false, 'error');
 	}
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'receipt' );
+	give_get_template_part('shortcode', 'receipt');
 
 	$display = ob_get_clean();
 
 	return $display;
 }
 
-add_shortcode( 'give_receipt', 'give_receipt_shortcode' );
+add_shortcode('give_receipt', 'give_receipt_shortcode');
 
 /**
  * Profile Editor Shortcode.
@@ -325,18 +325,18 @@ 
  *
  * @return string Output generated from the profile editor
  */
-function give_profile_editor_shortcode( $atts ) {
+function give_profile_editor_shortcode($atts) {
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'profile-editor' );
+	give_get_template_part('shortcode', 'profile-editor');
 
 	$display = ob_get_clean();
 
 	return $display;
 }
 
-add_shortcode( 'give_profile_editor', 'give_profile_editor_shortcode' );
+add_shortcode('give_profile_editor', 'give_profile_editor_shortcode');
 
 /**
  * Process Profile Updater Form.
@@ -349,30 +349,30 @@ 
  *
  * @return bool
  */
-function give_process_profile_editor_updates( $data ) {
+function give_process_profile_editor_updates($data) {
 	// Profile field change request
-	if ( empty( $_POST['give_profile_editor_submit'] ) && ! is_user_logged_in() ) {
+	if (empty($_POST['give_profile_editor_submit']) && ! is_user_logged_in()) {
 		return false;
 	}
 
 	// Nonce security
-	if ( ! wp_verify_nonce( $data['give_profile_editor_nonce'], 'give-profile-editor-nonce' ) ) {
+	if ( ! wp_verify_nonce($data['give_profile_editor_nonce'], 'give-profile-editor-nonce')) {
 		return false;
 	}
 
 	$user_id       = get_current_user_id();
-	$old_user_data = get_userdata( $user_id );
-
-	$display_name = isset( $data['give_display_name'] ) ? sanitize_text_field( $data['give_display_name'] ) : $old_user_data->display_name;
-	$first_name   = isset( $data['give_first_name'] ) ? sanitize_text_field( $data['give_first_name'] ) : $old_user_data->first_name;
-	$last_name    = isset( $data['give_last_name'] ) ? sanitize_text_field( $data['give_last_name'] ) : $old_user_data->last_name;
-	$email        = isset( $data['give_email'] ) ? sanitize_email( $data['give_email'] ) : $old_user_data->user_email;
-	$line1        = ( isset( $data['give_address_line1'] ) ? sanitize_text_field( $data['give_address_line1'] ) : '' );
-	$line2        = ( isset( $data['give_address_line2'] ) ? sanitize_text_field( $data['give_address_line2'] ) : '' );
-	$city         = ( isset( $data['give_address_city'] ) ? sanitize_text_field( $data['give_address_city'] ) : '' );
-	$state        = ( isset( $data['give_address_state'] ) ? sanitize_text_field( $data['give_address_state'] ) : '' );
-	$zip          = ( isset( $data['give_address_zip'] ) ? sanitize_text_field( $data['give_address_zip'] ) : '' );
-	$country      = ( isset( $data['give_address_country'] ) ? sanitize_text_field( $data['give_address_country'] ) : '' );
+	$old_user_data = get_userdata($user_id);
+
+	$display_name = isset($data['give_display_name']) ? sanitize_text_field($data['give_display_name']) : $old_user_data->display_name;
+	$first_name   = isset($data['give_first_name']) ? sanitize_text_field($data['give_first_name']) : $old_user_data->first_name;
+	$last_name    = isset($data['give_last_name']) ? sanitize_text_field($data['give_last_name']) : $old_user_data->last_name;
+	$email        = isset($data['give_email']) ? sanitize_email($data['give_email']) : $old_user_data->user_email;
+	$line1        = (isset($data['give_address_line1']) ? sanitize_text_field($data['give_address_line1']) : '');
+	$line2        = (isset($data['give_address_line2']) ? sanitize_text_field($data['give_address_line2']) : '');
+	$city         = (isset($data['give_address_city']) ? sanitize_text_field($data['give_address_city']) : '');
+	$state        = (isset($data['give_address_state']) ? sanitize_text_field($data['give_address_state']) : '');
+	$zip          = (isset($data['give_address_zip']) ? sanitize_text_field($data['give_address_zip']) : '');
+	$country      = (isset($data['give_address_country']) ? sanitize_text_field($data['give_address_country']) : '');
 
 	$userdata = array(
 		'ID'           => $user_id,
@@ -400,46 +400,46 @@ 
 	 * @param int   $user_id  The ID of the user.
 	 * @param array $userdata User info, including ID, first name, last name, display name and email.
 	 */
-	do_action( 'give_pre_update_user_profile', $user_id, $userdata );
+	do_action('give_pre_update_user_profile', $user_id, $userdata);
 
 	// New password
-	if ( ! empty( $data['give_new_user_pass1'] ) ) {
-		if ( $data['give_new_user_pass1'] !== $data['give_new_user_pass2'] ) {
-			give_set_error( 'password_mismatch', esc_html__( 'The passwords you entered do not match. Please try again.', 'give' ) );
+	if ( ! empty($data['give_new_user_pass1'])) {
+		if ($data['give_new_user_pass1'] !== $data['give_new_user_pass2']) {
+			give_set_error('password_mismatch', esc_html__('The passwords you entered do not match. Please try again.', 'give'));
 		} else {
 			$userdata['user_pass'] = $data['give_new_user_pass1'];
 		}
 	}
 
-	if ( empty( $email ) ) {
+	if (empty($email)) {
 		// Make sure email should not be empty.
-		give_set_error( 'email_empty', esc_html__( 'The email you entered is empty.', 'give' ) );
+		give_set_error('email_empty', esc_html__('The email you entered is empty.', 'give'));
 
-	} else if ( ! is_email( $email ) ) {
+	} else if ( ! is_email($email)) {
 		// Make sure email should be valid.
-		give_set_error( 'email_not_valid', esc_html__( 'The email you entered is not valid. Please use another', 'give' ) );
+		give_set_error('email_not_valid', esc_html__('The email you entered is not valid. Please use another', 'give'));
 
-	} else if ( $email != $old_user_data->user_email ) {
+	} else if ($email != $old_user_data->user_email) {
 		// Make sure the new email doesn't belong to another user
-		if ( email_exists( $email ) ) {
-			give_set_error( 'email_exists', esc_html__( 'The email you entered belongs to another user. Please use another.', 'give' ) );
+		if (email_exists($email)) {
+			give_set_error('email_exists', esc_html__('The email you entered belongs to another user. Please use another.', 'give'));
 		}
 	}
 
 	// Check for errors
 	$errors = give_get_errors();
 
-	if ( $errors ) {
+	if ($errors) {
 		// Send back to the profile editor if there are errors
-		wp_redirect( $data['give_redirect'] );
+		wp_redirect($data['give_redirect']);
 		give_die();
 	}
 
 	// Update the user
-	$meta    = update_user_meta( $user_id, '_give_user_address', $address );
-	$updated = wp_update_user( $userdata );
+	$meta    = update_user_meta($user_id, '_give_user_address', $address);
+	$updated = wp_update_user($userdata);
 
-	if ( $updated ) {
+	if ($updated) {
 
 		/**
 		 * Fires after updating user profile.
@@ -449,12 +449,12 @@ 
 		 * @param int   $user_id  The ID of the user.
 		 * @param array $userdata User info, including ID, first name, last name, display name and email.
 		 */
-		do_action( 'give_user_profile_updated', $user_id, $userdata );
-		wp_redirect( add_query_arg( 'updated', 'true', $data['give_redirect'] ) );
+		do_action('give_user_profile_updated', $user_id, $userdata);
+		wp_redirect(add_query_arg('updated', 'true', $data['give_redirect']));
 		give_die();
 	}
 
 	return false;
 }
 
-add_action( 'give_edit_user_profile', 'give_process_profile_editor_updates' );
+add_action('give_edit_user_profile', 'give_process_profile_editor_updates');