WordImpress / Give

includes/class-give-cron.php

Spacing +37 added lines, -37 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -51,7 +51,7 @@ 
 	 * @return static
 	 */
 	public static function get_instance() {
-		if ( null === static::$instance ) {
+		if (null === static::$instance) {
 			self::$instance = new static();
 			self::$instance->setup();
 		}
@@ -66,12 +66,12 @@ 
 	 * @since 1.8.13
 	 */
 	private function setup() {
-		add_filter( 'cron_schedules', array( self::$instance, '__add_schedules' ) );
-		add_action( 'wp', array( self::$instance, '__schedule_events' ) );
+		add_filter('cron_schedules', array(self::$instance, '__add_schedules'));
+		add_action('wp', array(self::$instance, '__schedule_events'));
 
 		// Load async event only when cron is running.
-		if( defined( 'DOING_CRON' ) && DOING_CRON ) {
-			add_action( 'init', array( self::$instance, '__load_async_events' ) );
+		if (defined('DOING_CRON') && DOING_CRON) {
+			add_action('init', array(self::$instance, '__load_async_events'));
 		}
 	}
 
@@ -82,23 +82,23 @@ 
 	 * @since 1.8.13
 	 */
 	public function __load_async_events() {
-		$async_events = get_option( 'give_async_events', array() );
+		$async_events = get_option('give_async_events', array());
 
 		// Bailout.
-		if ( empty( $async_events ) ) {
+		if (empty($async_events)) {
 			return;
 		}
 
-		foreach ( $async_events as $index => $event ) {
+		foreach ($async_events as $index => $event) {
 			// Set cron name.
 			$cron_name = "give_async_scheduled_events_{$index}";
 
 			// Setup cron.
-			wp_schedule_single_event( current_time( 'timestamp', 1 ), $cron_name, $event['params'] );
+			wp_schedule_single_event(current_time('timestamp', 1), $cron_name, $event['params']);
 
 			// Add cron action.
-			add_action( $cron_name, $event['callback'], 10, count( $event['params'] ) );
-			add_action( $cron_name, array( $this, '__delete_async_events' ), 9999, 0 );
+			add_action($cron_name, $event['callback'], 10, count($event['params']));
+			add_action($cron_name, array($this, '__delete_async_events'), 9999, 0);
 		}
 	}
 
@@ -108,13 +108,13 @@ 
 	 * @since 1.8.13
 	 */
 	public function __delete_async_events() {
-		$async_events    = get_option( 'give_async_events', array() );
-		$cron_name_parts = explode( '_', current_action() );
-		$cron_id         = end( $cron_name_parts );
+		$async_events    = get_option('give_async_events', array());
+		$cron_name_parts = explode('_', current_action());
+		$cron_id         = end($cron_name_parts);
 
-		if ( ! empty( $async_events[ $cron_id ] ) ) {
-			unset( $async_events[ $cron_id ] );
-			update_option( 'give_async_events', $async_events );
+		if ( ! empty($async_events[$cron_id])) {
+			unset($async_events[$cron_id]);
+			update_option('give_async_events', $async_events);
 		}
 	}
 
@@ -128,11 +128,11 @@ 
 	 *
 	 * @return array            An array of non-default cron schedules.
 	 */
-	public function __add_schedules( $schedules = array() ) {
+	public function __add_schedules($schedules = array()) {
 		// Adds once weekly to the existing schedules.
 		$schedules['weekly'] = array(
 			'interval' => 604800,
-			'display'  => __( 'Once Weekly', 'give' ),
+			'display'  => __('Once Weekly', 'give'),
 		);
 
 		return $schedules;
@@ -160,8 +160,8 @@ 
 	 * @return void
 	 */
 	private function weekly_events() {
-		if ( ! wp_next_scheduled( 'give_weekly_scheduled_events' ) ) {
-			wp_schedule_event( current_time( 'timestamp' ), 'weekly', 'give_weekly_scheduled_events' );
+		if ( ! wp_next_scheduled('give_weekly_scheduled_events')) {
+			wp_schedule_event(current_time('timestamp'), 'weekly', 'give_weekly_scheduled_events');
 		}
 	}
 
@@ -174,8 +174,8 @@ 
 	 * @return void
 	 */
 	private function daily_events() {
-		if ( ! wp_next_scheduled( 'give_daily_scheduled_events' ) ) {
-			wp_schedule_event( current_time( 'timestamp' ), 'daily', 'give_daily_scheduled_events' );
+		if ( ! wp_next_scheduled('give_daily_scheduled_events')) {
+			wp_schedule_event(current_time('timestamp'), 'daily', 'give_daily_scheduled_events');
 		}
 	}
 
@@ -189,8 +189,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_cron_action( $type = 'weekly' ) {
-		switch ( $type ) {
+	public static function get_cron_action($type = 'weekly') {
+		switch ($type) {
 			case 'daily':
 				$cron_action = 'give_daily_scheduled_events';
 				break;
@@ -212,9 +212,9 @@ 
 	 * @param        $action
 	 * @param string $type
 	 */
-	private static function add_event( $action, $type = 'weekly' ) {
-		$cron_event = self::get_cron_action( $type );
-		add_action( $cron_event, $action );
+	private static function add_event($action, $type = 'weekly') {
+		$cron_event = self::get_cron_action($type);
+		add_action($cron_event, $action);
 	}
 
 	/**
@@ -225,8 +225,8 @@ 
 	 *
 	 * @param $action
 	 */
-	public static function add_weekly_event( $action ) {
-		self::add_event( $action, 'weekly' );
+	public static function add_weekly_event($action) {
+		self::add_event($action, 'weekly');
 	}
 
 	/**
@@ -237,8 +237,8 @@ 
 	 *
 	 * @param $action
 	 */
-	public static function add_daily_event( $action ) {
-		self::add_event( $action, 'daily' );
+	public static function add_daily_event($action) {
+		self::add_event($action, 'daily');
 	}
 
 	/**
@@ -251,17 +251,17 @@ 
 	 * @param string $action
 	 * @param array  $args
 	 */
-	public static function add_async_event( $action, $args = array() ) {
+	public static function add_async_event($action, $args = array()) {
 
 		// Cache async events.
-		$async_events             = get_option( 'give_async_events', array() );
-		$async_events[ uniqid() ] = array(
+		$async_events             = get_option('give_async_events', array());
+		$async_events[uniqid()] = array(
 			'callback' => $action,
 			'params'   => $args,
 		);
 
 
-		update_option( 'give_async_events', $async_events );
+		update_option('give_async_events', $async_events);
 	}
 }
 

includes/class-give-cache.php

Spacing +51 added lines, -51 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -43,7 +43,7 @@ 
 	 * @return static
 	 */
 	public static function get_instance() {
-		if ( ! isset( self::$instance ) && ! ( self::$instance instanceof Give_Cache ) ) {
+		if ( ! isset(self::$instance) && ! (self::$instance instanceof Give_Cache)) {
 			self::$instance = new Give_Cache();
 		}
 
@@ -58,7 +58,7 @@ 
 	 */
 	public function setup_hooks() {
 		// weekly delete all expired cache.
-		Give_Cron::add_weekly_event( array( $this, 'delete_all_expired' ) );
+		Give_Cron::add_weekly_event(array($this, 'delete_all_expired'));
 	}
 
 	/**
@@ -72,12 +72,12 @@ 
 	 * @return string
 	 */
 
-	public static function get_key( $action, $query_args = null ) {
+	public static function get_key($action, $query_args = null) {
 		$cache_key = "give_cache_{$action}";
 
 		// Bailout.
-		if ( ! empty( $query_args ) ) {
-			$cache_key = "{$cache_key}_" . substr( md5( serialize( $query_args ) ), 0, 15 );
+		if ( ! empty($query_args)) {
+			$cache_key = "{$cache_key}_".substr(md5(serialize($query_args)), 0, 15);
 		}
 
 		return $cache_key;
@@ -95,26 +95,26 @@ 
 	 * @return mixed
 	 */
 
-	public static function get( $cache_key, $custom_key = false, $query_args = array() ) {
-		if ( ! self::is_valid_cache_key( $cache_key ) ) {
-			if ( ! $custom_key ) {
-				return new WP_Error( 'give_invalid_cache_key', __( 'Cache key format should be give_cache_*', 'give' ) );
+	public static function get($cache_key, $custom_key = false, $query_args = array()) {
+		if ( ! self::is_valid_cache_key($cache_key)) {
+			if ( ! $custom_key) {
+				return new WP_Error('give_invalid_cache_key', __('Cache key format should be give_cache_*', 'give'));
 			}
 
-			$cache_key = self::get_key( $cache_key, $query_args );
+			$cache_key = self::get_key($cache_key, $query_args);
 		}
 
-		$option = get_option( $cache_key );
+		$option = get_option($cache_key);
 
 		// Backward compatibility (<1.8.7).
-		if ( ! is_array( $option ) || empty( $option ) || ! array_key_exists( 'expiration', $option ) ) {
+		if ( ! is_array($option) || empty($option) || ! array_key_exists('expiration', $option)) {
 			return $option;
 		}
 
 		// Get current time.
-		$current_time = current_time( 'timestamp', 1 );
+		$current_time = current_time('timestamp', 1);
 
-		if ( empty( $option['expiration'] ) || ( $current_time < $option['expiration'] ) ) {
+		if (empty($option['expiration']) || ($current_time < $option['expiration'])) {
 			$option = $option['data'];
 		} else {
 			$option = false;
@@ -137,23 +137,23 @@ 
 	 * @return mixed
 	 */
 
-	public static function set( $cache_key, $data, $expiration = null, $custom_key = false, $query_args = array() ) {
-		if ( ! self::is_valid_cache_key( $cache_key ) ) {
-			if ( ! $custom_key ) {
-				return new WP_Error( 'give_invalid_cache_key', __( 'Cache key format should be give_cache_*', 'give' ) );
+	public static function set($cache_key, $data, $expiration = null, $custom_key = false, $query_args = array()) {
+		if ( ! self::is_valid_cache_key($cache_key)) {
+			if ( ! $custom_key) {
+				return new WP_Error('give_invalid_cache_key', __('Cache key format should be give_cache_*', 'give'));
 			}
 
-			$cache_key = self::get_key( $cache_key, $query_args );
+			$cache_key = self::get_key($cache_key, $query_args);
 		}
 
 		$option_value = array(
 			'data'       => $data,
-			'expiration' => ! is_null( $expiration )
-				? ( $expiration + current_time( 'timestamp', 1 ) )
+			'expiration' => ! is_null($expiration)
+				? ($expiration + current_time('timestamp', 1))
 				: null,
 		);
 
-		$result = update_option( $cache_key, $option_value, 'no' );
+		$result = update_option($cache_key, $option_value, 'no');
 
 		return $result;
 	}
@@ -168,27 +168,27 @@ 
 	 * @return bool|WP_Error
 	 */
 
-	public static function delete( $cache_keys ) {
+	public static function delete($cache_keys) {
 		$result = true;
 		$invalid_keys = array();
 
-		if ( ! empty( $cache_keys ) ) {
-			$cache_keys = is_array( $cache_keys ) ? $cache_keys : array( $cache_keys );
+		if ( ! empty($cache_keys)) {
+			$cache_keys = is_array($cache_keys) ? $cache_keys : array($cache_keys);
 
-			foreach ( $cache_keys as $cache_key ) {
-				if ( ! self::is_valid_cache_key( $cache_key ) ) {
+			foreach ($cache_keys as $cache_key) {
+				if ( ! self::is_valid_cache_key($cache_key)) {
 					$invalid_keys[] = $cache_key;
 					$result = false;
 				}
 
-				delete_option( $cache_key );
+				delete_option($cache_key);
 			}
 		}
 
-		if( ! $result ) {
+		if ( ! $result) {
 			$result = new WP_Error(
 				'give_invalid_cache_key',
-					__( 'Cache key format should be give_cache_*', 'give' ),
+					__('Cache key format should be give_cache_*', 'give'),
 					$invalid_keys
 			);
 		}
@@ -207,7 +207,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function delete_all_expired( $force = false ) {
+	public static function delete_all_expired($force = false) {
 		global $wpdb;
 		$options = $wpdb->get_results(
 			$wpdb->prepare(
@@ -221,30 +221,30 @@ 
 		);
 
 		// Bailout.
-		if ( empty( $options ) ) {
+		if (empty($options)) {
 			return false;
 		}
 
-		$current_time = current_time( 'timestamp', 1 );
+		$current_time = current_time('timestamp', 1);
 
 		// Delete log cache.
-		foreach ( $options as $option ) {
-			$option['option_value'] = maybe_unserialize( $option['option_value'] );
+		foreach ($options as $option) {
+			$option['option_value'] = maybe_unserialize($option['option_value']);
 
 			if (
 				(
-					! self::is_valid_cache_key( $option['option_name'] )
-					|| ! is_array( $option['option_value'] ) // Backward compatibility (<1.8.7).
-					|| ! array_key_exists( 'expiration', $option['option_value'] ) // Backward compatibility (<1.8.7).
-					|| empty( $option['option_value']['expiration'] )
-					|| ( $current_time < $option['option_value']['expiration'] )
+					! self::is_valid_cache_key($option['option_name'])
+					|| ! is_array($option['option_value']) // Backward compatibility (<1.8.7).
+					|| ! array_key_exists('expiration', $option['option_value']) // Backward compatibility (<1.8.7).
+					|| empty($option['option_value']['expiration'])
+					|| ($current_time < $option['option_value']['expiration'])
 				)
 				&& ! $force
 			) {
 				continue;
 			}
 
-			self::delete( $option['option_name'] );
+			self::delete($option['option_name']);
 		}
 	}
 
@@ -260,16 +260,16 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_options_like( $option_name, $fields = false ) {
+	public static function get_options_like($option_name, $fields = false) {
 		global $wpdb;
 
-		if ( empty( $option_name ) ) {
+		if (empty($option_name)) {
 			return array();
 		}
 
 		$field_names = $fields ? 'option_name, option_value' : 'option_name';
 
-		if ( $fields ) {
+		if ($fields) {
 			$options = $wpdb->get_results(
 				$wpdb->prepare(
 					"SELECT {$field_names }
@@ -293,10 +293,10 @@ 
 			);
 		}
 
-		if ( ! empty( $options ) && $fields ) {
-			foreach ( $options as $index => $option ) {
-				$option['option_value'] = maybe_unserialize( $option['option_value'] );
-				$options[ $index ]      = $option;
+		if ( ! empty($options) && $fields) {
+			foreach ($options as $index => $option) {
+				$option['option_value'] = maybe_unserialize($option['option_value']);
+				$options[$index]      = $option;
 			}
 		}
 
@@ -313,8 +313,8 @@ 
 	 *
 	 * @return bool|int
 	 */
-	public static function is_valid_cache_key( $cache_key ) {
-		return ( false !== strpos( $cache_key, 'give_cache_' ) );
+	public static function is_valid_cache_key($cache_key) {
+		return (false !== strpos($cache_key, 'give_cache_'));
 	}
 }
 

includes/install.php

Spacing +61 added lines, -61 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,15 +26,15 @@ 
  * @global     $wpdb
  * @return void
  */
-function give_install( $network_wide = false ) {
+function give_install($network_wide = false) {
 
 	global $wpdb;
 
-	if ( is_multisite() && $network_wide ) {
+	if (is_multisite() && $network_wide) {
 
-		foreach ( $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs LIMIT 100" ) as $blog_id ) {
+		foreach ($wpdb->get_col("SELECT blog_id FROM $wpdb->blogs LIMIT 100") as $blog_id) {
 
-			switch_to_blog( $blog_id );
+			switch_to_blog($blog_id);
 			give_run_install();
 			restore_current_blog();
 
@@ -61,31 +61,31 @@ 
 	give_setup_post_types();
 
 	// Add Upgraded From Option.
-	$current_version = get_option( 'give_version' );
-	if ( $current_version ) {
-		update_option( 'give_version_upgraded_from', $current_version );
+	$current_version = get_option('give_version');
+	if ($current_version) {
+		update_option('give_version_upgraded_from', $current_version);
 	}
 
 	// Setup some default options.
 	$options = array();
 
 	//Fresh Install? Setup Test Mode, Base Country (US), Test Gateway, Currency.
-	if ( empty( $current_version ) ) {
-		$options = array_merge( $options, give_get_default_settings() );
+	if (empty($current_version)) {
+		$options = array_merge($options, give_get_default_settings());
 	}
 
 	// Populate the default values.
-	update_option( 'give_settings', array_merge( $give_options, $options ) );
+	update_option('give_settings', array_merge($give_options, $options));
 
 	/**
 	 * Run plugin upgrades.
 	 *
 	 * @since 1.8
 	 */
-	do_action( 'give_upgrades' );
+	do_action('give_upgrades');
 
-	if ( GIVE_VERSION !== get_option( 'give_version' ) ) {
-		update_option( 'give_version', GIVE_VERSION );
+	if (GIVE_VERSION !== get_option('give_version')) {
+		update_option('give_version', GIVE_VERSION);
 	}
 
 	// Create Give roles.
@@ -96,7 +96,7 @@ 
 	// Set api version, end point and refresh permalink.
 	$api = new Give_API();
 	$api->add_endpoint();
-	update_option( 'give_default_api_version', 'v' . $api->get_version() );
+	update_option('give_default_api_version', 'v'.$api->get_version());
 
 	flush_rewrite_rules();
 
@@ -105,11 +105,11 @@ 
 	$give_sessions->use_php_sessions();
 
 	// Add a temporary option to note that Give pages have been created.
-	Give_Cache::set( '_give_installed', $options, 30, true );
+	Give_Cache::set('_give_installed', $options, 30, true);
 
-	if ( ! $current_version ) {
+	if ( ! $current_version) {
 
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/upgrades/upgrade-functions.php';
+		require_once GIVE_PLUGIN_DIR.'includes/admin/upgrades/upgrade-functions.php';
 
 		// When new upgrade routines are added, mark them as complete on fresh install.
 		$upgrade_routines = array(
@@ -125,18 +125,18 @@ 
 			'v1813_update_donor_user_roles'
 		);
 
-		foreach ( $upgrade_routines as $upgrade ) {
-			give_set_upgrade_complete( $upgrade );
+		foreach ($upgrade_routines as $upgrade) {
+			give_set_upgrade_complete($upgrade);
 		}
 	}
 
 	// Bail if activating from network, or bulk.
-	if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+	if (is_network_admin() || isset($_GET['activate-multi'])) {
 		return;
 	}
 
 	// Add the transient to redirect.
-	Give_Cache::set( '_give_activation_redirect', true, 30, true );
+	Give_Cache::set('_give_activation_redirect', true, 30, true);
 
 	// Set 'Donation Form' meta box enabled by default.
 	give_nav_donation_metabox_enabled();
@@ -156,11 +156,11 @@ 
  * @param  int $site_id The Site ID.
  * @param  array $meta Blog Meta.
  */
-function give_on_create_blog( $blog_id, $user_id, $domain, $path, $site_id, $meta ) {
+function give_on_create_blog($blog_id, $user_id, $domain, $path, $site_id, $meta) {
 
-	if ( is_plugin_active_for_network( GIVE_PLUGIN_BASENAME ) ) {
+	if (is_plugin_active_for_network(GIVE_PLUGIN_BASENAME)) {
 
-		switch_to_blog( $blog_id );
+		switch_to_blog($blog_id);
 		give_install();
 		restore_current_blog();
 
@@ -168,7 +168,7 @@ 
 
 }
 
-add_action( 'wpmu_new_blog', 'give_on_create_blog', 10, 6 );
+add_action('wpmu_new_blog', 'give_on_create_blog', 10, 6);
 
 
 /**
@@ -181,13 +181,13 @@ 
  *
  * @return array          The tables to drop.
  */
-function give_wpmu_drop_tables( $tables, $blog_id ) {
+function give_wpmu_drop_tables($tables, $blog_id) {
 
-	switch_to_blog( $blog_id );
+	switch_to_blog($blog_id);
 	$donors_db     = new Give_DB_Donors();
 	$donor_meta_db = new Give_DB_Donor_Meta();
 
-	if ( $donors_db->installed() ) {
+	if ($donors_db->installed()) {
 		$tables[] = $donors_db->table_name;
 		$tables[] = $donor_meta_db->table_name;
 	}
@@ -197,7 +197,7 @@ 
 
 }
 
-add_filter( 'wpmu_drop_tables', 'give_wpmu_drop_tables', 10, 2 );
+add_filter('wpmu_drop_tables', 'give_wpmu_drop_tables', 10, 2);
 
 /**
  * Post-installation
@@ -209,16 +209,16 @@ 
  */
 function give_after_install() {
 
-	if ( ! is_admin() ) {
+	if ( ! is_admin()) {
 		return;
 	}
 
-	$give_options     = Give_Cache::get( '_give_installed', true );
-	$give_table_check = get_option( '_give_table_check', false );
+	$give_options     = Give_Cache::get('_give_installed', true);
+	$give_table_check = get_option('_give_table_check', false);
 
-	if ( false === $give_table_check || current_time( 'timestamp' ) > $give_table_check ) {
+	if (false === $give_table_check || current_time('timestamp') > $give_table_check) {
 
-		if ( ! @Give()->donor_meta->installed() ) {
+		if ( ! @Give()->donor_meta->installed()) {
 
 			// Create the donor meta database.
 			// (this ensures it creates it on multisite instances where it is network activated).
@@ -226,7 +226,7 @@ 
 
 		}
 
-		if ( ! @Give()->donors->installed() ) {
+		if ( ! @Give()->donors->installed()) {
 			// Create the donor database.
 			// (this ensures it creates it on multisite instances where it is network activated).
 			@Give()->donors->create_table();
@@ -238,22 +238,22 @@ 
 			 *
 			 * @param array $give_options Give plugin options.
 			 */
-			do_action( 'give_after_install', $give_options );
+			do_action('give_after_install', $give_options);
 		}
 
-		update_option( '_give_table_check', ( current_time( 'timestamp' ) + WEEK_IN_SECONDS ) );
+		update_option('_give_table_check', (current_time('timestamp') + WEEK_IN_SECONDS));
 
 	}
 
 	// Delete the transient
-	if ( false !== $give_options ) {
-		Give_Cache::delete( Give_Cache::get_key( '_give_installed' ) );
+	if (false !== $give_options) {
+		Give_Cache::delete(Give_Cache::get_key('_give_installed'));
 	}
 
 
 }
 
-add_action( 'admin_init', 'give_after_install' );
+add_action('admin_init', 'give_after_install');
 
 
 /**
@@ -268,11 +268,11 @@ 
 
 	global $wp_roles;
 
-	if ( ! is_object( $wp_roles ) ) {
+	if ( ! is_object($wp_roles)) {
 		return;
 	}
 
-	if ( ! array_key_exists( 'give_manager', $wp_roles->roles ) ) {
+	if ( ! array_key_exists('give_manager', $wp_roles->roles)) {
 
 		// Create Give plugin roles
 		$roles = new Give_Roles();
@@ -283,7 +283,7 @@ 
 
 }
 
-add_action( 'admin_init', 'give_install_roles_on_network' );
+add_action('admin_init', 'give_install_roles_on_network');
 
 /**
  * Default core setting values.
@@ -321,14 +321,14 @@ 
 		'uninstall_on_delete'                         => 'disabled',
 		'the_content_filter'                          => 'enabled',
 		'scripts_footer'                              => 'disabled',
-		'agree_to_terms_label'                        => __( 'Agree to Terms?', 'give' ),
+		'agree_to_terms_label'                        => __('Agree to Terms?', 'give'),
 		'agreement_text'                              => give_get_default_agreement_text(),
 
 		// Paypal IPN verification.
 		'paypal_verification'                         => 'enabled',
 
 		// Default is manual gateway.
-		'gateways'                                    => array( 'manual' => 1, 'offline' => 1 ),
+		'gateways'                                    => array('manual' => 1, 'offline' => 1),
 		'default_gateway'                             => 'manual',
 
 		// Offline gateway setup.
@@ -356,7 +356,7 @@ 
  */
 function give_get_default_agreement_text() {
 
-	$org_name = get_bloginfo( 'name' );
+	$org_name = get_bloginfo('name');
 
 	$agreement = sprintf(
 		'<p>Acceptance of any contribution, gift or grant is at the discretion of the %1$s. The  %1$s will not accept any gift unless it can be used or expended consistently with the purpose and mission of the  %1$s.</p>
@@ -370,7 +370,7 @@ 
 		$org_name
 	);
 
-	return apply_filters( 'give_get_default_agreement_text', $agreement, $org_name );
+	return apply_filters('give_get_default_agreement_text', $agreement, $org_name);
 }
 
 
@@ -379,22 +379,22 @@ 
  *
  * @since 1.8.11
  */
-function give_create_pages(){
+function give_create_pages() {
 
 	// Bailout if pages already created.
-	if( get_option( 'give_install_pages_created') ) {
+	if (get_option('give_install_pages_created')) {
 		return false;
 	}
 
 	$options = array();
 
 	// Checks if the Success Page option exists AND that the page exists.
-	if ( ! get_post( give_get_option( 'success_page' ) ) ) {
+	if ( ! get_post(give_get_option('success_page'))) {
 
 		// Donation Confirmation (Success) Page
 		$success = wp_insert_post(
 			array(
-				'post_title'     => esc_html__( 'Donation Confirmation', 'give' ),
+				'post_title'     => esc_html__('Donation Confirmation', 'give'),
 				'post_content'   => '[give_receipt]',
 				'post_status'    => 'publish',
 				'post_author'    => 1,
@@ -408,13 +408,13 @@ 
 	}
 
 	// Checks if the Failure Page option exists AND that the page exists.
-	if ( ! get_post( give_get_option( 'failure_page' ) ) ) {
+	if ( ! get_post(give_get_option('failure_page'))) {
 
 		// Failed Donation Page
 		$failed = wp_insert_post(
 			array(
-				'post_title'     => esc_html__( 'Donation Failed', 'give' ),
-				'post_content'   => esc_html__( 'We\'re sorry, your donation failed to process. Please try again or contact site support.', 'give' ),
+				'post_title'     => esc_html__('Donation Failed', 'give'),
+				'post_content'   => esc_html__('We\'re sorry, your donation failed to process. Please try again or contact site support.', 'give'),
 				'post_status'    => 'publish',
 				'post_author'    => 1,
 				'post_type'      => 'page',
@@ -426,11 +426,11 @@ 
 	}
 
 	// Checks if the History Page option exists AND that the page exists.
-	if ( ! get_post( give_get_option( 'history_page' ) ) ) {
+	if ( ! get_post(give_get_option('history_page'))) {
 		// Donation History Page
 		$history = wp_insert_post(
 			array(
-				'post_title'     => esc_html__( 'Donation History', 'give' ),
+				'post_title'     => esc_html__('Donation History', 'give'),
 				'post_content'   => '[donation_history]',
 				'post_status'    => 'publish',
 				'post_author'    => 1,
@@ -442,10 +442,10 @@ 
 		$options['history_page'] = $history;
 	}
 
-	if( ! empty( $options ) ) {
-		update_option( 'give_settings', array_merge( give_get_settings(), $options ) );
+	if ( ! empty($options)) {
+		update_option('give_settings', array_merge(give_get_settings(), $options));
 	}
 
-	add_option( 'give_install_pages_created', 1, '', 'no' );
+	add_option('give_install_pages_created', 1, '', 'no');
 }
-add_action( 'admin_init', 'give_create_pages', -1 );
+add_action('admin_init', 'give_create_pages', -1);

includes/gateways/offline-donations.php

Spacing +153 added lines, -153 removed lines

@@ -18,17 +18,17 @@ 
  *
  * @return array
  */
-function give_offline_register_gateway( $gateways ) {
+function give_offline_register_gateway($gateways) {
 	// Format: ID => Name
 	$gateways['offline'] = array(
-		'admin_label'    => esc_attr__( 'Offline Donation', 'give' ),
-		'checkout_label' => esc_attr__( 'Offline Donation', 'give' )
+		'admin_label'    => esc_attr__('Offline Donation', 'give'),
+		'checkout_label' => esc_attr__('Offline Donation', 'give')
 	);
 
 	return $gateways;
 }
 
-add_filter( 'give_payment_gateways', 'give_offline_register_gateway', 1 );
+add_filter('give_payment_gateways', 'give_offline_register_gateway', 1);
 
 
 /**
@@ -40,9 +40,9 @@ 
  *
  * @return void
  */
-function give_offline_payment_cc_form( $form_id ) {
+function give_offline_payment_cc_form($form_id) {
 	// Get offline payment instruction.
-	$offline_instructions = give_get_offline_payment_instruction( $form_id, true );
+	$offline_instructions = give_get_offline_payment_instruction($form_id, true);
 
 	ob_start();
 
@@ -53,10 +53,10 @@ 
 	 *
 	 * @param int $form_id Give form id.
 	 */
-	do_action( 'give_before_offline_info_fields', $form_id );
+	do_action('give_before_offline_info_fields', $form_id);
 	?>
     <fieldset id="give_offline_payment_info">
-		<?php echo stripslashes( $offline_instructions ); ?>
+		<?php echo stripslashes($offline_instructions); ?>
     </fieldset>
 	<?php
 	/**
@@ -66,35 +66,35 @@ 
 	 *
 	 * @param int $form_id Give form id.
 	 */
-	do_action( 'give_after_offline_info_fields', $form_id );
+	do_action('give_after_offline_info_fields', $form_id);
 
 	echo ob_get_clean();
 }
 
-add_action( 'give_offline_cc_form', 'give_offline_payment_cc_form' );
+add_action('give_offline_cc_form', 'give_offline_payment_cc_form');
 
 /**
  * Give Offline Billing Field
  *
  * @param $form_id
  */
-function give_offline_billing_fields( $form_id ) {
+function give_offline_billing_fields($form_id) {
 	//Enable Default CC fields (billing info)
-	$post_offline_cc_fields        = give_get_meta( $form_id, '_give_offline_donation_enable_billing_fields_single', true );
-	$post_offline_customize_option = give_get_meta( $form_id, '_give_customize_offline_donations', true );
+	$post_offline_cc_fields        = give_get_meta($form_id, '_give_offline_donation_enable_billing_fields_single', true);
+	$post_offline_customize_option = give_get_meta($form_id, '_give_customize_offline_donations', true);
 
-	$global_offline_cc_fields = give_get_option( 'give_offline_donation_enable_billing_fields' );
+	$global_offline_cc_fields = give_get_option('give_offline_donation_enable_billing_fields');
 
 	//Output CC Address fields if global option is on and user hasn't elected to customize this form's offline donation options
 	if (
-		( give_is_setting_enabled( $post_offline_customize_option, 'global' ) && give_is_setting_enabled( $global_offline_cc_fields ) )
-		|| ( give_is_setting_enabled( $post_offline_customize_option, 'enabled' ) && give_is_setting_enabled( $post_offline_cc_fields ) )
+		(give_is_setting_enabled($post_offline_customize_option, 'global') && give_is_setting_enabled($global_offline_cc_fields))
+		|| (give_is_setting_enabled($post_offline_customize_option, 'enabled') && give_is_setting_enabled($post_offline_cc_fields))
 	) {
-		give_default_cc_address_fields( $form_id );
+		give_default_cc_address_fields($form_id);
 	}
 }
 
-add_action( 'give_before_offline_info_fields', 'give_offline_billing_fields', 10, 1 );
+add_action('give_before_offline_info_fields', 'give_offline_billing_fields', 10, 1);
 
 /**
  * Process the payment
@@ -105,14 +105,14 @@ 
  *
  * @return void
  */
-function give_offline_process_payment( $purchase_data ) {
+function give_offline_process_payment($purchase_data) {
 
 	// Setup the payment details.
 	$payment_data = array(
 		'price'           => $purchase_data['price'],
 		'give_form_title' => $purchase_data['post_data']['give-form-title'],
-		'give_form_id'    => intval( $purchase_data['post_data']['give-form-id'] ),
-		'give_price_id'   => isset( $purchase_data['post_data']['give-price-id'] ) ? $purchase_data['post_data']['give-price-id'] : '',
+		'give_form_id'    => intval($purchase_data['post_data']['give-form-id']),
+		'give_price_id'   => isset($purchase_data['post_data']['give-price-id']) ? $purchase_data['post_data']['give-price-id'] : '',
 		'date'            => $purchase_data['date'],
 		'user_email'      => $purchase_data['user_email'],
 		'purchase_key'    => $purchase_data['purchase_key'],
@@ -124,20 +124,20 @@ 
 
 
 	// record the pending payment
-	$payment = give_insert_payment( $payment_data );
+	$payment = give_insert_payment($payment_data);
 
-	if ( $payment ) {
-		give_offline_send_admin_notice( $payment );
-		give_offline_send_donor_instructions( $payment );
+	if ($payment) {
+		give_offline_send_admin_notice($payment);
+		give_offline_send_donor_instructions($payment);
 		give_send_to_success_page();
 	} else {
 		// if errors are present, send the user back to the donation form so they can be corrected
-		give_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['give-gateway'] );
+		give_send_back_to_checkout('?payment-mode='.$purchase_data['post_data']['give-gateway']);
 	}
 
 }
 
-add_action( 'give_gateway_offline', 'give_offline_process_payment' );
+add_action('give_gateway_offline', 'give_offline_process_payment');
 
 
 /**
@@ -150,59 +150,59 @@ 
  * @since       1.0
  * @return void
  */
-function give_offline_send_donor_instructions( $payment_id = 0 ) {
+function give_offline_send_donor_instructions($payment_id = 0) {
 
-	$payment_data                      = give_get_payment_meta( $payment_id );
-	$post_offline_customization_option = give_get_meta( $payment_data['form_id'], '_give_customize_offline_donations', true );
+	$payment_data                      = give_get_payment_meta($payment_id);
+	$post_offline_customization_option = give_get_meta($payment_data['form_id'], '_give_customize_offline_donations', true);
 
 	//Customize email content depending on whether the single form has been customized
-	$email_content = give_get_option( 'global_offline_donation_email' );
+	$email_content = give_get_option('global_offline_donation_email');
 
-	if ( give_is_setting_enabled( $post_offline_customization_option, 'enabled' ) ) {
-		$email_content = give_get_meta( $payment_data['form_id'], '_give_offline_donation_email', true );
+	if (give_is_setting_enabled($post_offline_customization_option, 'enabled')) {
+		$email_content = give_get_meta($payment_data['form_id'], '_give_offline_donation_email', true);
 	}
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
 
 	/**
 	 * Filters the from name.
 	 *
 	 * @since 1.7
 	 */
-	$from_name = apply_filters( 'give_donation_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = apply_filters('give_donation_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
 
 	/**
 	 * Filters the from email.
 	 *
 	 * @since 1.7
 	 */
-	$from_email = apply_filters( 'give_donation_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = apply_filters('give_donation_from_address', $from_email, $payment_id, $payment_data);
 
-	$to_email = give_get_payment_user_email( $payment_id );
+	$to_email = give_get_payment_user_email($payment_id);
 
-	$subject = give_get_option( 'offline_donation_subject', __( 'Offline Donation Instructions', 'give' ) );
-	if ( give_is_setting_enabled( $post_offline_customization_option, 'enabled' ) ) {
-		$subject = give_get_meta( $payment_data['form_id'], '_give_offline_donation_subject', true );
+	$subject = give_get_option('offline_donation_subject', __('Offline Donation Instructions', 'give'));
+	if (give_is_setting_enabled($post_offline_customization_option, 'enabled')) {
+		$subject = give_get_meta($payment_data['form_id'], '_give_offline_donation_subject', true);
 	}
 
-	$subject = apply_filters( 'give_offline_donation_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = apply_filters('give_offline_donation_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$attachments = apply_filters( 'give_offline_donation_attachments', array(), $payment_id, $payment_data );
-	$message     = give_do_email_tags( $email_content, $payment_id );
+	$attachments = apply_filters('give_offline_donation_attachments', array(), $payment_id, $payment_data);
+	$message     = give_do_email_tags($email_content, $payment_id);
 
 	$emails = Give()->emails;
 
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', __( 'Offline Donation Instructions', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', __('Offline Donation Instructions', 'give'));
 
-	$headers = apply_filters( 'give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data );
-	$emails->__set( 'headers', $headers );
+	$headers = apply_filters('give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data);
+	$emails->__set('headers', $headers);
 
-	$emails->send( $to_email, $subject, $message, $attachments );
+	$emails->send($to_email, $subject, $message, $attachments);
 
 }
 
@@ -219,54 +219,54 @@ 
  * @return void
  *
  */
-function give_offline_send_admin_notice( $payment_id = 0 ) {
+function give_offline_send_admin_notice($payment_id = 0) {
 
 	/* Send an email notification to the admin */
 	$admin_email = give_get_admin_notice_emails();
-	$user_info   = give_get_payment_meta_user_info( $payment_id );
+	$user_info   = give_get_payment_meta_user_info($payment_id);
 
-	if ( isset( $user_info['id'] ) && $user_info['id'] > 0 ) {
-		$user_data = get_userdata( $user_info['id'] );
+	if (isset($user_info['id']) && $user_info['id'] > 0) {
+		$user_data = get_userdata($user_info['id']);
 		$name      = $user_data->display_name;
-	} elseif ( isset( $user_info['first_name'] ) && isset( $user_info['last_name'] ) ) {
-		$name = $user_info['first_name'] . ' ' . $user_info['last_name'];
+	} elseif (isset($user_info['first_name']) && isset($user_info['last_name'])) {
+		$name = $user_info['first_name'].' '.$user_info['last_name'];
 	} else {
 		$name = $user_info['email'];
 	}
 
-	$amount = give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ), array( 'sanitize' => false ) ) );
+	$amount = give_currency_filter(give_format_amount(give_get_payment_amount($payment_id), array('sanitize' => false)));
 
-	$admin_subject = apply_filters( 'give_offline_admin_donation_notification_subject', __( 'New Pending Donation', 'give' ), $payment_id );
+	$admin_subject = apply_filters('give_offline_admin_donation_notification_subject', __('New Pending Donation', 'give'), $payment_id);
 
-	$admin_message = __( 'Dear Admin,', 'give' ) . "\n\n";
-	$admin_message .= sprintf(__( 'A new offline donation has been made on your website for %s.', 'give' ), $amount) . "\n\n";
-	$admin_message .= __( 'The donation is in a pending status and is awaiting payment. Donation instructions have been emailed to the donor. Once you receive payment, be sure to mark the donation as complete using the link below.', 'give' ) . "\n\n";
+	$admin_message = __('Dear Admin,', 'give')."\n\n";
+	$admin_message .= sprintf(__('A new offline donation has been made on your website for %s.', 'give'), $amount)."\n\n";
+	$admin_message .= __('The donation is in a pending status and is awaiting payment. Donation instructions have been emailed to the donor. Once you receive payment, be sure to mark the donation as complete using the link below.', 'give')."\n\n";
 
 
-	$admin_message .= '<strong>' . __( 'Donor:', 'give' ) . '</strong> {fullname}' . "\n";
-	$admin_message .= '<strong>' . __( 'Amount:', 'give' ) . '</strong> {amount}' . "\n\n";
+	$admin_message .= '<strong>'.__('Donor:', 'give').'</strong> {fullname}'."\n";
+	$admin_message .= '<strong>'.__('Amount:', 'give').'</strong> {amount}'."\n\n";
 
 	$admin_message .= sprintf(
 		                  '<a href="%1$s">%2$s</a>',
-		                  admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id=' . $payment_id ),
-		                  __( 'View Donation Details &raquo;', 'give' )
-	                  ) . "\n\n";
+		                  admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id='.$payment_id),
+		                  __('View Donation Details &raquo;', 'give')
+	                  )."\n\n";
 
-	$admin_message = apply_filters( 'give_offline_admin_donation_notification', $admin_message, $payment_id );
-	$admin_message = give_do_email_tags( $admin_message, $payment_id );
+	$admin_message = apply_filters('give_offline_admin_donation_notification', $admin_message, $payment_id);
+	$admin_message = give_do_email_tags($admin_message, $payment_id);
 
-	$attachments   = apply_filters( 'give_offline_admin_donation_notification_attachments', array(), $payment_id );
-	$admin_headers = apply_filters( 'give_offline_admin_donation_notification_headers', array(), $payment_id );
+	$attachments   = apply_filters('give_offline_admin_donation_notification_attachments', array(), $payment_id);
+	$admin_headers = apply_filters('give_offline_admin_donation_notification_headers', array(), $payment_id);
 
 	//Send Email
 	$emails = Give()->emails;
-	$emails->__set( 'heading', __( 'New Offline Donation', 'give' ) );
+	$emails->__set('heading', __('New Offline Donation', 'give'));
 
-	if ( ! empty( $admin_headers ) ) {
-		$emails->__set( 'headers', $admin_headers );
+	if ( ! empty($admin_headers)) {
+		$emails->__set('headers', $admin_headers);
 	}
 
-	$emails->send( $admin_email, $admin_subject, $admin_message, $attachments );
+	$emails->send($admin_email, $admin_subject, $admin_message, $attachments);
 
 }
 
@@ -278,20 +278,20 @@ 
  *
  * @return array
  */
-function give_offline_add_settings( $settings ) {
+function give_offline_add_settings($settings) {
 
 	// Bailout: Do not show offline gateways setting in to metabox if its disabled globally.
-	if ( in_array( 'offline', give_get_option( 'gateways' ) ) ) {
+	if (in_array('offline', give_get_option('gateways'))) {
 		return $settings;
 	}
 
 	//Vars
 	$prefix = '_give_';
 
-	$is_gateway_active = give_is_gateway_active( 'offline' );
+	$is_gateway_active = give_is_gateway_active('offline');
 
 	//this gateway isn't active
-	if ( ! $is_gateway_active ) {
+	if ( ! $is_gateway_active) {
 		//return settings and bounce
 		return $settings;
 	}
@@ -300,34 +300,34 @@ 
 	$check_settings = array(
 
 		array(
-			'name'    => __( 'Offline Donations', 'give' ),
-			'desc'    => __( 'Do you want to customize the donation instructions for this form?', 'give' ),
-			'id'      => $prefix . 'customize_offline_donations',
+			'name'    => __('Offline Donations', 'give'),
+			'desc'    => __('Do you want to customize the donation instructions for this form?', 'give'),
+			'id'      => $prefix.'customize_offline_donations',
 			'type'    => 'radio_inline',
 			'default' => 'global',
-			'options' => apply_filters( 'give_forms_content_options_select', array(
-					'global'   => __( 'Global Option', 'give' ),
-					'enabled'  => __( 'Customize', 'give' ),
-					'disabled' => __( 'Disable', 'give' ),
+			'options' => apply_filters('give_forms_content_options_select', array(
+					'global'   => __('Global Option', 'give'),
+					'enabled'  => __('Customize', 'give'),
+					'disabled' => __('Disable', 'give'),
 				)
 			),
 		),
 		array(
-			'name'        => __( 'Billing Fields', 'give' ),
-			'desc'        => __( 'This option will enable the billing details section for this form\'s offline donation payment gateway. The fieldset will appear above the offline donation instructions.', 'give' ),
-			'id'          => $prefix . 'offline_donation_enable_billing_fields_single',
+			'name'        => __('Billing Fields', 'give'),
+			'desc'        => __('This option will enable the billing details section for this form\'s offline donation payment gateway. The fieldset will appear above the offline donation instructions.', 'give'),
+			'id'          => $prefix.'offline_donation_enable_billing_fields_single',
 			'row_classes' => 'give-subfield give-hidden',
 			'type'        => 'radio_inline',
 			'default'     => 'disabled',
 			'options'     => array(
-				'enabled'  => __( 'Enabled', 'give' ),
-				'disabled' => __( 'Disabled', 'give' ),
+				'enabled'  => __('Enabled', 'give'),
+				'disabled' => __('Disabled', 'give'),
 			),
 		),
 		array(
-			'id'          => $prefix . 'offline_checkout_notes',
-			'name'        => __( 'Donation Instructions', 'give' ),
-			'desc'        => __( 'Enter the instructions you want to display to the donor during the donation process. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ),
+			'id'          => $prefix.'offline_checkout_notes',
+			'name'        => __('Donation Instructions', 'give'),
+			'desc'        => __('Enter the instructions you want to display to the donor during the donation process. Most likely this would include important information like mailing address and who to make the check out to.', 'give'),
 			'default'     => give_get_default_offline_donation_content(),
 			'type'        => 'wysiwyg',
 			'row_classes' => 'give-subfield give-hidden',
@@ -336,17 +336,17 @@ 
 			),
 		),
 		array(
-			'id'          => $prefix . 'offline_donation_subject',
-			'name'        => __( 'Email Subject', 'give' ),
-			'desc'        => __( 'Enter the subject line for the donation receipt email.', 'give' ),
-			'default'     => __( '{form_title} - Offline Donation Instructions', 'give' ),
+			'id'          => $prefix.'offline_donation_subject',
+			'name'        => __('Email Subject', 'give'),
+			'desc'        => __('Enter the subject line for the donation receipt email.', 'give'),
+			'default'     => __('{form_title} - Offline Donation Instructions', 'give'),
 			'row_classes' => 'give-subfield give-hidden',
 			'type'        => 'text',
 		),
 		array(
-			'id'          => $prefix . 'offline_donation_email',
-			'name'        => __( 'Email Instructions', 'give' ),
-			'desc'        => __( 'Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ) . ' ' . __( 'Available template tags:', 'give' ) . give_get_emails_tags_list(),
+			'id'          => $prefix.'offline_donation_email',
+			'name'        => __('Email Instructions', 'give'),
+			'desc'        => __('Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give').' '.__('Available template tags:', 'give').give_get_emails_tags_list(),
 			'default'     => give_get_default_offline_donation_email_content(),
 			'type'        => 'wysiwyg',
 			'row_classes' => 'give-subfield give-hidden',
@@ -358,14 +358,14 @@ 
 			'name'  => 'offline_docs',
 			'type'  => 'docs_link',
 			'url'   => 'http://docs.givewp.com/settings-gateway-offline-donations',
-			'title' => __( 'Offline Donations', 'give' ),
+			'title' => __('Offline Donations', 'give'),
 		),
 	);
 
-	return array_merge( $settings, $check_settings );
+	return array_merge($settings, $check_settings);
 }
 
-add_filter( 'give_forms_offline_donations_metabox_fields', 'give_offline_add_settings' );
+add_filter('give_forms_offline_donations_metabox_fields', 'give_offline_add_settings');
 
 
 /**
@@ -377,32 +377,32 @@ 
  */
 function give_get_default_offline_donation_content() {
 
-	$sitename = get_bloginfo( 'sitename' );
+	$sitename = get_bloginfo('sitename');
 
-	$default_text = '<p>' . __( 'In order to make an offline donation we ask that you please follow these instructions', 'give' ) . ': </p>';
+	$default_text = '<p>'.__('In order to make an offline donation we ask that you please follow these instructions', 'give').': </p>';
 	$default_text .= '<ol>';
 	$default_text .= '<li>';
 	$default_text .= sprintf(
 	/* translators: %s: site name */
-		__( 'Make a check payable to "%s"', 'give' ),
+		__('Make a check payable to "%s"', 'give'),
 		$sitename
 	);
 	$default_text .= '</li>';
 	$default_text .= '<li>';
 	$default_text .= sprintf(
 	/* translators: %s: site name */
-		__( 'On the memo line of the check, please indicate that the donation is for "%s"', 'give' ),
+		__('On the memo line of the check, please indicate that the donation is for "%s"', 'give'),
 		$sitename
 	);
 	$default_text .= '</li>';
-	$default_text .= '<li>' . __( 'Please mail your check to:', 'give' ) . '</li>';
+	$default_text .= '<li>'.__('Please mail your check to:', 'give').'</li>';
 	$default_text .= '</ol>';
-	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>' . $sitename . '</em><br>';
+	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>'.$sitename.'</em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>111 Not A Real St.</em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>Anytown, CA 12345 </em><br>';
-	$default_text .= '<p>' . __( 'All contributions will be gratefully acknowledged and are tax deductible.', 'give' ) . '</p>';
+	$default_text .= '<p>'.__('All contributions will be gratefully acknowledged and are tax deductible.', 'give').'</p>';
 
-	return apply_filters( 'give_default_offline_donation_content', $default_text );
+	return apply_filters('give_default_offline_donation_content', $default_text);
 
 }
 
@@ -415,34 +415,34 @@ 
  */
 function give_get_default_offline_donation_email_content() {
 
-	$sitename     = get_bloginfo( 'sitename' );
-	$default_text = '<p>' . __( 'Dear {name},', 'give' ) . '</p>';
-	$default_text .= '<p>' . __( 'Thank you for your offline donation request! Your generosity is greatly appreciated. In order to make an offline donation we ask that you please follow these instructions:', 'give' ) . '</p>';
+	$sitename     = get_bloginfo('sitename');
+	$default_text = '<p>'.__('Dear {name},', 'give').'</p>';
+	$default_text .= '<p>'.__('Thank you for your offline donation request! Your generosity is greatly appreciated. In order to make an offline donation we ask that you please follow these instructions:', 'give').'</p>';
 	$default_text .= '<ol>';
 	$default_text .= '<li>';
 	$default_text .= sprintf(
 	/* translators: %s: site name */
-		__( 'Make a check payable to "%s"', 'give' ),
+		__('Make a check payable to "%s"', 'give'),
 		$sitename
 	);
 	$default_text .= '</li>';
 	$default_text .= '<li>';
 	$default_text .= sprintf(
 	/* translators: %s: site name */
-		__( 'On the memo line of the check, please indicate that the donation is for "%s"', 'give' ),
+		__('On the memo line of the check, please indicate that the donation is for "%s"', 'give'),
 		$sitename
 	);
 	$default_text .= '</li>';
-	$default_text .= '<li>' . __( 'Please mail your check to:', 'give' ) . '</li>';
+	$default_text .= '<li>'.__('Please mail your check to:', 'give').'</li>';
 	$default_text .= '</ol>';
-	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>' . $sitename . '</em><br>';
+	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>'.$sitename.'</em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>111 Not A Real St.</em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>Anytown, CA 12345 </em><br>';
-	$default_text .= '<p>' . __( 'Once your donation has been received we will mark it as complete and you will receive an email receipt for your records. Please contact us with any questions you may have!', 'give' ) . '</p>';
-	$default_text .= '<p>' . __( 'Sincerely,', 'give' ) . '</p>';
-	$default_text .= '<p>' . $sitename . '</p>';
+	$default_text .= '<p>'.__('Once your donation has been received we will mark it as complete and you will receive an email receipt for your records. Please contact us with any questions you may have!', 'give').'</p>';
+	$default_text .= '<p>'.__('Sincerely,', 'give').'</p>';
+	$default_text .= '<p>'.$sitename.'</p>';
 
-	return apply_filters( 'give_default_offline_donation_content', $default_text );
+	return apply_filters('give_default_offline_donation_content', $default_text);
 
 }
 
@@ -456,17 +456,17 @@ 
  *
  * @return string
  */
-function give_offline_donation_receipt_status_notice( $notice, $id ) {
-	$payment = new Give_Payment( $id );
+function give_offline_donation_receipt_status_notice($notice, $id) {
+	$payment = new Give_Payment($id);
 
-	if ( 'offline' !== $payment->gateway || $payment->is_completed() ) {
+	if ('offline' !== $payment->gateway || $payment->is_completed()) {
 		return $notice;
 	}
 
-	return Give()->notices->print_frontend_notice( __( 'Payment Pending: Please follow the instructions below to complete your donation.', 'give' ), false, 'warning' );
+	return Give()->notices->print_frontend_notice(__('Payment Pending: Please follow the instructions below to complete your donation.', 'give'), false, 'warning');
 }
 
-add_filter( 'give_receipt_status_notice', 'give_offline_donation_receipt_status_notice', 10, 2 );
+add_filter('give_receipt_status_notice', 'give_offline_donation_receipt_status_notice', 10, 2);
 
 /**
  * Add offline payment instruction on payment receipt.
@@ -477,26 +477,26 @@ 
  *
  * @return mixed
  */
-function give_offline_payment_receipt_after( $payment ) {
+function give_offline_payment_receipt_after($payment) {
 	// Get payment object.
-	$payment = new Give_Payment( $payment->ID );
+	$payment = new Give_Payment($payment->ID);
 
 	// Bailout.
-	if ( 'offline' !== $payment->gateway ) {
+	if ('offline' !== $payment->gateway) {
 		return false;
 	}
 
 	?>
     <tr>
-        <td scope="row"><strong><?php esc_html_e( 'Offline Donations Instructions', 'give' ); ?></strong></td>
+        <td scope="row"><strong><?php esc_html_e('Offline Donations Instructions', 'give'); ?></strong></td>
         <td>
-			<?php echo give_get_offline_payment_instruction( $payment->form_id, true ); ?>
+			<?php echo give_get_offline_payment_instruction($payment->form_id, true); ?>
         </td>
     </tr>
 	<?php
 }
 
-add_filter( 'give_payment_receipt_after', 'give_offline_payment_receipt_after' );
+add_filter('give_payment_receipt_after', 'give_offline_payment_receipt_after');
 
 /**
  * Get offline payment instructions.
@@ -508,27 +508,27 @@ 
  *
  * @return string
  */
-function give_get_offline_payment_instruction( $form_id, $wpautop = false ) {
+function give_get_offline_payment_instruction($form_id, $wpautop = false) {
 	// Bailout.
-	if ( ! $form_id ) {
+	if ( ! $form_id) {
 		return '';
 	}
 
-	$post_offline_customization_option = give_get_meta( $form_id, '_give_customize_offline_donations', true );
-	$post_offline_instructions         = give_get_meta( $form_id, '_give_offline_checkout_notes', true );
-	$global_offline_instruction        = give_get_option( 'global_offline_donation_content' );
+	$post_offline_customization_option = give_get_meta($form_id, '_give_customize_offline_donations', true);
+	$post_offline_instructions         = give_get_meta($form_id, '_give_offline_checkout_notes', true);
+	$global_offline_instruction        = give_get_option('global_offline_donation_content');
 	$offline_instructions              = $global_offline_instruction;
 
-	if ( give_is_setting_enabled( $post_offline_customization_option ) ) {
+	if (give_is_setting_enabled($post_offline_customization_option)) {
 		$offline_instructions = $post_offline_instructions;
 	}
 
-	$settings_url = admin_url( 'post.php?post=' . $form_id . '&action=edit&message=1' );
+	$settings_url = admin_url('post.php?post='.$form_id.'&action=edit&message=1');
 
 	/* translators: %s: form settings url */
-	$offline_instructions = ! empty( $offline_instructions ) ? $offline_instructions : sprintf( __( 'Please enter offline donation instructions in <a href="%s">this form\'s settings</a>.', 'give' ), $settings_url );
+	$offline_instructions = ! empty($offline_instructions) ? $offline_instructions : sprintf(__('Please enter offline donation instructions in <a href="%s">this form\'s settings</a>.', 'give'), $settings_url);
 
-	return ( $wpautop ? wpautop( $offline_instructions ) : $offline_instructions );
+	return ($wpautop ? wpautop($offline_instructions) : $offline_instructions);
 }
 
 
@@ -542,24 +542,24 @@ 
  *
  * @return array
  */
-function give_filter_offline_gateway( $gateway_list, $form_id ) {
+function give_filter_offline_gateway($gateway_list, $form_id) {
 	if (
 		// Show offline payment gateway if enable for new donation form.
-		( false === strpos( $_SERVER['REQUEST_URI'], '/wp-admin/post-new.php?post_type=give_forms' ) )
+		(false === strpos($_SERVER['REQUEST_URI'], '/wp-admin/post-new.php?post_type=give_forms'))
 		&& $form_id
-		&& ! give_is_setting_enabled( give_get_meta( $form_id, '_give_customize_offline_donations', true ), array(
+		&& ! give_is_setting_enabled(give_get_meta($form_id, '_give_customize_offline_donations', true), array(
 			'enabled',
 			'global',
-		) )
+		))
 	) {
-		unset( $gateway_list['offline'] );
+		unset($gateway_list['offline']);
 	}
 
 	// Output.
 	return $gateway_list;
 }
 
-add_filter( 'give_enabled_payment_gateways', 'give_filter_offline_gateway', 10, 2 );
+add_filter('give_enabled_payment_gateways', 'give_filter_offline_gateway', 10, 2);
 
 /**
  * Set default gateway to global default payment gateway
@@ -573,10 +573,10 @@ 
  *
  * @return void
  */
-function _give_customize_offline_donations_on_save_callback( $meta_key, $meta_value, $postid ) {
-	if ( ! give_is_setting_enabled( $meta_value ) && ( 'offline' === give_get_meta( $postid, '_give_default_gateway', true ) ) ) {
-		give_update_meta( $postid, '_give_default_gateway', 'global' );
+function _give_customize_offline_donations_on_save_callback($meta_key, $meta_value, $postid) {
+	if ( ! give_is_setting_enabled($meta_value) && ('offline' === give_get_meta($postid, '_give_default_gateway', true))) {
+		give_update_meta($postid, '_give_default_gateway', 'global');
 	}
 }
 
-add_filter( 'give_save__give_customize_offline_donations', '_give_customize_offline_donations_on_save_callback', 10, 3 );
+add_filter('give_save__give_customize_offline_donations', '_give_customize_offline_donations_on_save_callback', 10, 3);

includes/filters.php

Spacing +13 added lines, -13 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,34 +26,34 @@ 
  *
  * @return void
  */
-function give_set_settings_with_disable_prefix( $old_settings, $settings ) {
+function give_set_settings_with_disable_prefix($old_settings, $settings) {
 	// Bailout.
-	if( ! function_exists( 'give_v18_renamed_core_settings' ) ) {
+	if ( ! function_exists('give_v18_renamed_core_settings')) {
 		return;
 	}
 
 	// Get old setting names.
-	$old_settings   = array_flip( give_v18_renamed_core_settings() );
+	$old_settings   = array_flip(give_v18_renamed_core_settings());
 	$update_setting = false;
 
-	foreach ( $settings as $key => $value ) {
+	foreach ($settings as $key => $value) {
 
 		// Check 1. Check if new option is really updated or not.
 		// Check 2. Continue if key is not renamed.
-		if ( ! isset( $old_settings[ $key ] ) ) {
+		if ( ! isset($old_settings[$key])) {
 			continue;
 		}
 
 		// Set old setting.
-		$settings[ $old_settings[ $key ] ] = 'on';
+		$settings[$old_settings[$key]] = 'on';
 
 		// Do not need to set old setting if new setting is not set.
 		if (
-			( give_is_setting_enabled( $value ) && ( false !== strpos( $old_settings[ $key ], 'disable_' ) ) )
-			|| ( ! give_is_setting_enabled( $value ) && ( false !== strpos( $old_settings[ $key ], 'enable_' ) ) )
+			(give_is_setting_enabled($value) && (false !== strpos($old_settings[$key], 'disable_')))
+			|| ( ! give_is_setting_enabled($value) && (false !== strpos($old_settings[$key], 'enable_')))
 
 		) {
-			unset( $settings[ $old_settings[ $key ] ] );
+			unset($settings[$old_settings[$key]]);
 		}
 
 		// Tell bot to update setting.
@@ -61,8 +61,8 @@ 
 	}
 
 	// Update setting if any old setting set.
-	if ( $update_setting ) {
-		update_option( 'give_settings', $settings );
+	if ($update_setting) {
+		update_option('give_settings', $settings);
 	}
 }
-add_action( 'update_option_give_settings', 'give_set_settings_with_disable_prefix', 10, 2 );
+add_action('update_option_give_settings', 'give_set_settings_with_disable_prefix', 10, 2);

includes/api/class-give-api.php

Spacing +511 added lines, -511 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -141,27 +141,27 @@ 
 			'v1' => 'GIVE_API_V1',
 		);
 
-		foreach ( $this->get_versions() as $version => $class ) {
-			require_once GIVE_PLUGIN_DIR . 'includes/api/class-give-api-' . $version . '.php';
+		foreach ($this->get_versions() as $version => $class) {
+			require_once GIVE_PLUGIN_DIR.'includes/api/class-give-api-'.$version.'.php';
 		}
 
-		add_action( 'init', array( $this, 'add_endpoint' ) );
-		add_action( 'wp', array( $this, 'process_query' ), - 1 );
-		add_filter( 'query_vars', array( $this, 'query_vars' ) );
-		add_action( 'show_user_profile', array( $this, 'user_key_field' ) );
-		add_action( 'edit_user_profile', array( $this, 'user_key_field' ) );
-		add_action( 'personal_options_update', array( $this, 'generate_api_key' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'generate_api_key' ) );
-		add_action( 'give_process_api_key', array( $this, 'process_api_key' ) );
+		add_action('init', array($this, 'add_endpoint'));
+		add_action('wp', array($this, 'process_query'), - 1);
+		add_filter('query_vars', array($this, 'query_vars'));
+		add_action('show_user_profile', array($this, 'user_key_field'));
+		add_action('edit_user_profile', array($this, 'user_key_field'));
+		add_action('personal_options_update', array($this, 'generate_api_key'));
+		add_action('edit_user_profile_update', array($this, 'generate_api_key'));
+		add_action('give_process_api_key', array($this, 'process_api_key'));
 
 		// Setup a backwards compatibility check for user API Keys
-		add_filter( 'get_user_metadata', array( $this, 'api_key_backwards_compat' ), 10, 4 );
+		add_filter('get_user_metadata', array($this, 'api_key_backwards_compat'), 10, 4);
 
 		// Determine if JSON_PRETTY_PRINT is available
-		$this->pretty_print = defined( 'JSON_PRETTY_PRINT' ) ? JSON_PRETTY_PRINT : null;
+		$this->pretty_print = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : null;
 
 		// Allow API request logging to be turned off
-		$this->log_requests = apply_filters( 'give_api_log_requests', $this->log_requests );
+		$this->log_requests = apply_filters('give_api_log_requests', $this->log_requests);
 
 		// Setup Give_Payment_Stats instance
 		$this->stats = new Give_Payment_Stats();
@@ -176,7 +176,7 @@ 
 	 * @since  1.1
 	 */
 	public function add_endpoint() {
-		add_rewrite_endpoint( 'give-api', EP_ALL );
+		add_rewrite_endpoint('give-api', EP_ALL);
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 *
 	 * @return string[] $vars New query vars
 	 */
-	public function query_vars( $vars ) {
+	public function query_vars($vars) {
 
 		$vars[] = 'token';
 		$vars[] = 'key';
@@ -240,11 +240,11 @@ 
 	 */
 	public function get_default_version() {
 
-		$version = get_option( 'give_default_api_version' );
+		$version = get_option('give_default_api_version');
 
-		if ( defined( 'GIVE_API_VERSION' ) ) {
+		if (defined('GIVE_API_VERSION')) {
 			$version = GIVE_API_VERSION;
-		} elseif ( ! $version ) {
+		} elseif ( ! $version) {
 			$version = 'v1';
 		}
 
@@ -265,14 +265,14 @@ 
 
 		$version = $wp_query->query_vars['give-api'];
 
-		if ( strpos( $version, '/' ) ) {
+		if (strpos($version, '/')) {
 
-			$version = explode( '/', $version );
-			$version = strtolower( $version[0] );
+			$version = explode('/', $version);
+			$version = strtolower($version[0]);
 
-			$wp_query->query_vars['give-api'] = str_replace( $version . '/', '', $wp_query->query_vars['give-api'] );
+			$wp_query->query_vars['give-api'] = str_replace($version.'/', '', $wp_query->query_vars['give-api']);
 
-			if ( array_key_exists( $version, $this->versions ) ) {
+			if (array_key_exists($version, $this->versions)) {
 
 				$this->queried_version = $version;
 
@@ -308,16 +308,16 @@ 
 		$this->override = false;
 
 		// Make sure we have both user and api key
-		if ( ! empty( $wp_query->query_vars['give-api'] ) && ( $wp_query->query_vars['give-api'] !== 'forms' || ! empty( $wp_query->query_vars['token'] ) ) ) {
+		if ( ! empty($wp_query->query_vars['give-api']) && ($wp_query->query_vars['give-api'] !== 'forms' || ! empty($wp_query->query_vars['token']))) {
 
-			if ( empty( $wp_query->query_vars['token'] ) || empty( $wp_query->query_vars['key'] ) ) {
+			if (empty($wp_query->query_vars['token']) || empty($wp_query->query_vars['key'])) {
 				$this->missing_auth();
 
 				return false;
 			}
 
 			// Retrieve the user by public API key and ensure they exist
-			if ( ! ( $user = $this->get_user( $wp_query->query_vars['key'] ) ) ) {
+			if ( ! ($user = $this->get_user($wp_query->query_vars['key']))) {
 
 				$this->invalid_key();
 
@@ -325,11 +325,11 @@ 
 
 			} else {
 
-				$token  = urldecode( $wp_query->query_vars['token'] );
-				$secret = $this->get_user_secret_key( $user );
-				$public = urldecode( $wp_query->query_vars['key'] );
+				$token  = urldecode($wp_query->query_vars['token']);
+				$secret = $this->get_user_secret_key($user);
+				$public = urldecode($wp_query->query_vars['key']);
 
-				if ( hash_equals( md5( $secret . $public ), $token ) ) {
+				if (hash_equals(md5($secret.$public), $token)) {
 					$this->is_valid_request = true;
 				} else {
 					$this->invalid_auth();
@@ -338,9 +338,9 @@ 
 				}
 
 			}
-		} elseif ( ! empty( $wp_query->query_vars['give-api'] ) && $wp_query->query_vars['give-api'] === 'forms' ) {
+		} elseif ( ! empty($wp_query->query_vars['give-api']) && $wp_query->query_vars['give-api'] === 'forms') {
 			$this->is_valid_request = true;
-			$wp_query->set( 'key', 'public' );
+			$wp_query->set('key', 'public');
 		}
 	}
 
@@ -356,25 +356,25 @@ 
 	 *
 	 * @return bool if user ID is found, false otherwise
 	 */
-	public function get_user( $key = '' ) {
+	public function get_user($key = '') {
 		global $wpdb, $wp_query;
 
-		if ( empty( $key ) ) {
-			$key = urldecode( $wp_query->query_vars['key'] );
+		if (empty($key)) {
+			$key = urldecode($wp_query->query_vars['key']);
 		}
 
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		$user = Give_Cache::get( md5( 'give_api_user_' . $key ), true );
+		$user = Give_Cache::get(md5('give_api_user_'.$key), true);
 
-		if ( false === $user ) {
-			$user = $wpdb->get_var( $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s LIMIT 1", $key ) );
-			Give_Cache::set( md5( 'give_api_user_' . $key ), $user, DAY_IN_SECONDS, true );
+		if (false === $user) {
+			$user = $wpdb->get_var($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s LIMIT 1", $key));
+			Give_Cache::set(md5('give_api_user_'.$key), $user, DAY_IN_SECONDS, true);
 		}
 
-		if ( $user != null ) {
+		if ($user != null) {
 			$this->user_id = $user;
 
 			return $user;
@@ -390,19 +390,19 @@ 
 	 *
 	 * @return mixed|null|string
 	 */
-	public function get_user_public_key( $user_id = 0 ) {
+	public function get_user_public_key($user_id = 0) {
 		global $wpdb;
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return '';
 		}
 
-		$cache_key       = md5( 'give_api_user_public_key' . $user_id );
-		$user_public_key = Give_Cache::get( $cache_key, true );
+		$cache_key       = md5('give_api_user_public_key'.$user_id);
+		$user_public_key = Give_Cache::get($cache_key, true);
 
-		if ( empty( $user_public_key ) ) {
-			$user_public_key = $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_public_key' AND user_id = %d", $user_id ) );
-			Give_Cache::set( $cache_key, $user_public_key, HOUR_IN_SECONDS, true );
+		if (empty($user_public_key)) {
+			$user_public_key = $wpdb->get_var($wpdb->prepare("SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_public_key' AND user_id = %d", $user_id));
+			Give_Cache::set($cache_key, $user_public_key, HOUR_IN_SECONDS, true);
 		}
 
 		return $user_public_key;
@@ -415,19 +415,19 @@ 
 	 *
 	 * @return mixed|null|string
 	 */
-	public function get_user_secret_key( $user_id = 0 ) {
+	public function get_user_secret_key($user_id = 0) {
 		global $wpdb;
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return '';
 		}
 
-		$cache_key       = md5( 'give_api_user_secret_key' . $user_id );
-		$user_secret_key = Give_Cache::get( $cache_key, true );
+		$cache_key       = md5('give_api_user_secret_key'.$user_id);
+		$user_secret_key = Give_Cache::get($cache_key, true);
 
-		if ( empty( $user_secret_key ) ) {
-			$user_secret_key = $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_secret_key' AND user_id = %d", $user_id ) );
-			Give_Cache::set( $cache_key, $user_secret_key, HOUR_IN_SECONDS, true );
+		if (empty($user_secret_key)) {
+			$user_secret_key = $wpdb->get_var($wpdb->prepare("SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_secret_key' AND user_id = %d", $user_id));
+			Give_Cache::set($cache_key, $user_secret_key, HOUR_IN_SECONDS, true);
 		}
 
 		return $user_secret_key;
@@ -443,10 +443,10 @@ 
 	 */
 	private function missing_auth() {
 		$error          = array();
-		$error['error'] = __( 'You must specify both a token and API key.', 'give' );
+		$error['error'] = __('You must specify both a token and API key.', 'give');
 
 		$this->data = $error;
-		$this->output( 401 );
+		$this->output(401);
 	}
 
 	/**
@@ -460,10 +460,10 @@ 
 	 */
 	private function invalid_auth() {
 		$error          = array();
-		$error['error'] = __( 'Your request could not be authenticated.', 'give' );
+		$error['error'] = __('Your request could not be authenticated.', 'give');
 
 		$this->data = $error;
-		$this->output( 403 );
+		$this->output(403);
 	}
 
 	/**
@@ -477,10 +477,10 @@ 
 	 */
 	private function invalid_key() {
 		$error          = array();
-		$error['error'] = __( 'Invalid API key.', 'give' );
+		$error['error'] = __('Invalid API key.', 'give');
 
 		$this->data = $error;
-		$this->output( 403 );
+		$this->output(403);
 	}
 
 	/**
@@ -493,10 +493,10 @@ 
 	 */
 	private function invalid_version() {
 		$error          = array();
-		$error['error'] = __( 'Invalid API version.', 'give' );
+		$error['error'] = __('Invalid API version.', 'give');
 
 		$this->data = $error;
-		$this->output( 404 );
+		$this->output(404);
 	}
 
 	/**
@@ -512,10 +512,10 @@ 
 		global $wp_query;
 
 		// Start logging how long the request takes for logging
-		$before = microtime( true );
+		$before = microtime(true);
 
 		// Check for give-api var. Get out if not present
-		if ( empty( $wp_query->query_vars['give-api'] ) ) {
+		if (empty($wp_query->query_vars['give-api'])) {
 			return;
 		}
 
@@ -529,45 +529,45 @@ 
 		$this->validate_request();
 
 		// Only proceed if no errors have been noted
-		if ( ! $this->is_valid_request ) {
+		if ( ! $this->is_valid_request) {
 			return;
 		}
 
-		if ( ! defined( 'GIVE_DOING_API' ) ) {
-			define( 'GIVE_DOING_API', true );
+		if ( ! defined('GIVE_DOING_API')) {
+			define('GIVE_DOING_API', true);
 		}
 
 		$data         = array();
 		$this->routes = new $this->versions[$this->get_queried_version()];
 		$this->routes->validate_request();
 
-		switch ( $this->endpoint ) :
+		switch ($this->endpoint) :
 
 			case 'stats' :
 
-				$data = $this->routes->get_stats( array(
-					'type'      => isset( $wp_query->query_vars['type'] ) ? $wp_query->query_vars['type'] : null,
-					'form'      => isset( $wp_query->query_vars['form'] ) ? $wp_query->query_vars['form'] : null,
-					'date'      => isset( $wp_query->query_vars['date'] ) ? $wp_query->query_vars['date'] : null,
-					'startdate' => isset( $wp_query->query_vars['startdate'] ) ? $wp_query->query_vars['startdate'] : null,
-					'enddate'   => isset( $wp_query->query_vars['enddate'] ) ? $wp_query->query_vars['enddate'] : null,
-				) );
+				$data = $this->routes->get_stats(array(
+					'type'      => isset($wp_query->query_vars['type']) ? $wp_query->query_vars['type'] : null,
+					'form'      => isset($wp_query->query_vars['form']) ? $wp_query->query_vars['form'] : null,
+					'date'      => isset($wp_query->query_vars['date']) ? $wp_query->query_vars['date'] : null,
+					'startdate' => isset($wp_query->query_vars['startdate']) ? $wp_query->query_vars['startdate'] : null,
+					'enddate'   => isset($wp_query->query_vars['enddate']) ? $wp_query->query_vars['enddate'] : null,
+				));
 
 				break;
 
 			case 'forms' :
 
-				$form = isset( $wp_query->query_vars['form'] ) ? $wp_query->query_vars['form'] : null;
+				$form = isset($wp_query->query_vars['form']) ? $wp_query->query_vars['form'] : null;
 
-				$data = $this->routes->get_forms( $form );
+				$data = $this->routes->get_forms($form);
 
 				break;
 
 			case 'donors' :
 
-				$donor = isset( $wp_query->query_vars['donor'] ) ? $wp_query->query_vars['donor'] : null;
+				$donor = isset($wp_query->query_vars['donor']) ? $wp_query->query_vars['donor'] : null;
 
-				$data = $this->routes->get_donors( $donor );
+				$data = $this->routes->get_donors($donor);
 
 				break;
 
@@ -580,26 +580,26 @@ 
 				 * @params date startdate | required when date = range and format to be YYYYMMDD (i.e. 20170524)
 				 * @params date enddate | required when date = range and format to be YYYYMMDD (i.e. 20170524)
 				 */
-				$data = $this->routes->get_recent_donations( array(
-					'id'        => isset( $wp_query->query_vars['id'] ) ? $wp_query->query_vars['id'] : null,
-					'date'      => isset( $wp_query->query_vars['date'] ) ? $wp_query->query_vars['date'] : null,
-					'startdate' => isset( $wp_query->query_vars['startdate'] ) ? $wp_query->query_vars['startdate'] : null,
-					'enddate'   => isset( $wp_query->query_vars['enddate'] ) ? $wp_query->query_vars['enddate'] : null,
-				) );
+				$data = $this->routes->get_recent_donations(array(
+					'id'        => isset($wp_query->query_vars['id']) ? $wp_query->query_vars['id'] : null,
+					'date'      => isset($wp_query->query_vars['date']) ? $wp_query->query_vars['date'] : null,
+					'startdate' => isset($wp_query->query_vars['startdate']) ? $wp_query->query_vars['startdate'] : null,
+					'enddate'   => isset($wp_query->query_vars['enddate']) ? $wp_query->query_vars['enddate'] : null,
+				));
 
 				break;
 
 		endswitch;
 
 		// Allow extensions to setup their own return data
-		$this->data = apply_filters( 'give_api_output_data', $data, $this->endpoint, $this );
+		$this->data = apply_filters('give_api_output_data', $data, $this->endpoint, $this);
 
-		$after                       = microtime( true );
-		$request_time                = ( $after - $before );
+		$after                       = microtime(true);
+		$request_time                = ($after - $before);
 		$this->data['request_speed'] = $request_time;
 
 		// Log this API request, if enabled. We log it here because we have access to errors.
-		$this->log_request( $this->data );
+		$this->log_request($this->data);
 
 		// Send out data to the output function
 		$this->output();
@@ -629,25 +629,25 @@ 
 		global $wp_query;
 
 		// Whitelist our query options
-		$accepted = apply_filters( 'give_api_valid_query_modes', array(
+		$accepted = apply_filters('give_api_valid_query_modes', array(
 			'stats',
 			'forms',
 			'donors',
 			'donations',
-		) );
+		));
 
-		$query = isset( $wp_query->query_vars['give-api'] ) ? $wp_query->query_vars['give-api'] : null;
-		$query = str_replace( $this->queried_version . '/', '', $query );
+		$query = isset($wp_query->query_vars['give-api']) ? $wp_query->query_vars['give-api'] : null;
+		$query = str_replace($this->queried_version.'/', '', $query);
 
 		$error = array();
 
 		// Make sure our query is valid
-		if ( ! in_array( $query, $accepted ) ) {
-			$error['error'] = __( 'Invalid query.', 'give' );
+		if ( ! in_array($query, $accepted)) {
+			$error['error'] = __('Invalid query.', 'give');
 
 			$this->data = $error;
 			// 400 is Bad Request
-			$this->output( 400 );
+			$this->output(400);
 		}
 
 		$this->endpoint = $query;
@@ -664,7 +664,7 @@ 
 	public function get_paged() {
 		global $wp_query;
 
-		return isset( $wp_query->query_vars['page'] ) ? $wp_query->query_vars['page'] : 1;
+		return isset($wp_query->query_vars['page']) ? $wp_query->query_vars['page'] : 1;
 	}
 
 
@@ -679,13 +679,13 @@ 
 	public function per_page() {
 		global $wp_query;
 
-		$per_page = isset( $wp_query->query_vars['number'] ) ? $wp_query->query_vars['number'] : 10;
+		$per_page = isset($wp_query->query_vars['number']) ? $wp_query->query_vars['number'] : 10;
 
-		if ( $per_page < 0 && $this->get_query_mode() == 'donors' ) {
+		if ($per_page < 0 && $this->get_query_mode() == 'donors') {
 			$per_page = 99999999;
 		} // End if().
 
-		return apply_filters( 'give_api_results_per_page', $per_page );
+		return apply_filters('give_api_results_per_page', $per_page);
 	}
 
 	/**
@@ -698,7 +698,7 @@ 
 	 *
 	 * @return array $dates
 	 */
-	public function get_dates( $args = array() ) {
+	public function get_dates($args = array()) {
 		$dates = array();
 
 		$defaults = array(
@@ -709,60 +709,60 @@ 
 			'enddate'   => null,
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$current_time = current_time( 'timestamp' );
+		$current_time = current_time('timestamp');
 
-		if ( 'range' === $args['date'] ) {
-			$startdate          = strtotime( $args['startdate'] );
-			$enddate            = strtotime( $args['enddate'] );
-			$dates['day_start'] = date( 'd', $startdate );
-			$dates['day_end']   = date( 'd', $enddate );
-			$dates['m_start']   = date( 'n', $startdate );
-			$dates['m_end']     = date( 'n', $enddate );
-			$dates['year']      = date( 'Y', $startdate );
-			$dates['year_end']  = date( 'Y', $enddate );
+		if ('range' === $args['date']) {
+			$startdate          = strtotime($args['startdate']);
+			$enddate            = strtotime($args['enddate']);
+			$dates['day_start'] = date('d', $startdate);
+			$dates['day_end']   = date('d', $enddate);
+			$dates['m_start']   = date('n', $startdate);
+			$dates['m_end']     = date('n', $enddate);
+			$dates['year']      = date('Y', $startdate);
+			$dates['year_end']  = date('Y', $enddate);
 		} else {
 			// Modify dates based on predefined ranges
-			switch ( $args['date'] ) :
+			switch ($args['date']) :
 
 				case 'this_month' :
 					$dates['day']     = null;
-					$dates['m_start'] = date( 'n', $current_time );
-					$dates['m_end']   = date( 'n', $current_time );
-					$dates['year']    = date( 'Y', $current_time );
+					$dates['m_start'] = date('n', $current_time);
+					$dates['m_end']   = date('n', $current_time);
+					$dates['year']    = date('Y', $current_time);
 					break;
 
 				case 'last_month' :
 					$dates['day']     = null;
-					$dates['m_start'] = date( 'n', $current_time ) == 1 ? 12 : date( 'n', $current_time ) - 1;
+					$dates['m_start'] = date('n', $current_time) == 1 ? 12 : date('n', $current_time) - 1;
 					$dates['m_end']   = $dates['m_start'];
-					$dates['year']    = date( 'n', $current_time ) == 1 ? date( 'Y', $current_time ) - 1 : date( 'Y', $current_time );
+					$dates['year']    = date('n', $current_time) == 1 ? date('Y', $current_time) - 1 : date('Y', $current_time);
 					break;
 
 				case 'today' :
-					$dates['day']     = date( 'd', $current_time );
-					$dates['m_start'] = date( 'n', $current_time );
-					$dates['m_end']   = date( 'n', $current_time );
-					$dates['year']    = date( 'Y', $current_time );
+					$dates['day']     = date('d', $current_time);
+					$dates['m_start'] = date('n', $current_time);
+					$dates['m_end']   = date('n', $current_time);
+					$dates['year']    = date('Y', $current_time);
 					break;
 
 				case 'yesterday' :
 
-					$year  = date( 'Y', $current_time );
-					$month = date( 'n', $current_time );
-					$day   = date( 'd', $current_time );
+					$year  = date('Y', $current_time);
+					$month = date('n', $current_time);
+					$day   = date('d', $current_time);
 
-					if ( $month == 1 && $day == 1 ) {
+					if ($month == 1 && $day == 1) {
 
-						$year  -= 1;
+						$year -= 1;
 						$month = 12;
-						$day   = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+						$day   = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
-					} elseif ( $month > 1 && $day == 1 ) {
+					} elseif ($month > 1 && $day == 1) {
 
 						$month -= 1;
-						$day   = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+						$day = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
 					} else {
 
@@ -778,65 +778,65 @@ 
 					break;
 
 				case 'this_quarter' :
-					$month_now = date( 'n', $current_time );
+					$month_now = date('n', $current_time);
 
 					$dates['day'] = null;
 
-					if ( $month_now <= 3 ) {
+					if ($month_now <= 3) {
 
 						$dates['m_start'] = 1;
 						$dates['m_end']   = 3;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
-					} elseif ( $month_now <= 6 ) {
+					} elseif ($month_now <= 6) {
 
 						$dates['m_start'] = 4;
 						$dates['m_end']   = 6;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
-					} elseif ( $month_now <= 9 ) {
+					} elseif ($month_now <= 9) {
 
 						$dates['m_start'] = 7;
 						$dates['m_end']   = 9;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					} else {
 
 						$dates['m_start'] = 10;
 						$dates['m_end']   = 12;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					}
 					break;
 
 				case 'last_quarter' :
-					$month_now = date( 'n', $current_time );
+					$month_now = date('n', $current_time);
 
 					$dates['day'] = null;
 
-					if ( $month_now <= 3 ) {
+					if ($month_now <= 3) {
 
 						$dates['m_start'] = 10;
 						$dates['m_end']   = 12;
-						$dates['year']    = date( 'Y', $current_time ) - 1; // Previous year
+						$dates['year']    = date('Y', $current_time) - 1; // Previous year
 
-					} elseif ( $month_now <= 6 ) {
+					} elseif ($month_now <= 6) {
 
 						$dates['m_start'] = 1;
 						$dates['m_end']   = 3;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
-					} elseif ( $month_now <= 9 ) {
+					} elseif ($month_now <= 9) {
 
 						$dates['m_start'] = 4;
 						$dates['m_end']   = 6;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					} else {
 
 						$dates['m_start'] = 7;
 						$dates['m_end']   = 9;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					}
 					break;
@@ -845,14 +845,14 @@ 
 					$dates['day']     = null;
 					$dates['m_start'] = null;
 					$dates['m_end']   = null;
-					$dates['year']    = date( 'Y', $current_time );
+					$dates['year']    = date('Y', $current_time);
 					break;
 
 				case 'last_year' :
 					$dates['day']     = null;
 					$dates['m_start'] = null;
 					$dates['m_end']   = null;
-					$dates['year']    = date( 'Y', $current_time ) - 1;
+					$dates['year']    = date('Y', $current_time) - 1;
 					break;
 
 			endswitch;
@@ -865,7 +865,7 @@ 
 		 *
 		 * @param array $dates The dates used for retrieving earnings.
 		 */
-		return apply_filters( 'give_api_stat_dates', $dates );
+		return apply_filters('give_api_stat_dates', $dates);
 	}
 
 	/**
@@ -879,78 +879,78 @@ 
 	 *
 	 * @return array $donors Multidimensional array of the donors.
 	 */
-	public function get_donors( $donor = null ) {
+	public function get_donors($donor = null) {
 
 		$donors = array();
 		$error  = array();
-		if ( ! user_can( $this->user_id, 'view_give_sensitive_data' ) && ! $this->override ) {
+		if ( ! user_can($this->user_id, 'view_give_sensitive_data') && ! $this->override) {
 			return $donors;
 		}
 
 		$paged    = $this->get_paged();
 		$per_page = $this->per_page();
-		$offset   = $per_page * ( $paged - 1 );
+		$offset   = $per_page * ($paged - 1);
 
-		if ( is_numeric( $donor ) ) {
+		if (is_numeric($donor)) {
 			$field = 'id';
 		} else {
 			$field = 'email';
 		}
 
-		$donor_query = Give()->donors->get_donors( array(
+		$donor_query = Give()->donors->get_donors(array(
 			'number' => $per_page,
 			'offset' => $offset,
 			$field   => $donor,
-		) );
+		));
 		$donor_count = 0;
 
-		if ( $donor_query ) {
+		if ($donor_query) {
 
-			foreach ( $donor_query as $donor_obj ) {
+			foreach ($donor_query as $donor_obj) {
 
-				$names      = explode( ' ', $donor_obj->name );
-				$first_name = ! empty( $names[0] ) ? $names[0] : '';
+				$names      = explode(' ', $donor_obj->name);
+				$first_name = ! empty($names[0]) ? $names[0] : '';
 				$last_name  = '';
-				if ( ! empty( $names[1] ) ) {
-					unset( $names[0] );
-					$last_name = implode( ' ', $names );
+				if ( ! empty($names[1])) {
+					unset($names[0]);
+					$last_name = implode(' ', $names);
 				}
 
-				$donors['donors'][ $donor_count ]['info']['user_id']      = '';
-				$donors['donors'][ $donor_count ]['info']['username']     = '';
-				$donors['donors'][ $donor_count ]['info']['display_name'] = '';
-				$donors['donors'][ $donor_count ]['info']['donor_id']     = $donor_obj->id;
-				$donors['donors'][ $donor_count ]['info']['first_name']   = $first_name;
-				$donors['donors'][ $donor_count ]['info']['last_name']    = $last_name;
-				$donors['donors'][ $donor_count ]['info']['email']        = $donor_obj->email;
+				$donors['donors'][$donor_count]['info']['user_id']      = '';
+				$donors['donors'][$donor_count]['info']['username']     = '';
+				$donors['donors'][$donor_count]['info']['display_name'] = '';
+				$donors['donors'][$donor_count]['info']['donor_id']     = $donor_obj->id;
+				$donors['donors'][$donor_count]['info']['first_name']   = $first_name;
+				$donors['donors'][$donor_count]['info']['last_name']    = $last_name;
+				$donors['donors'][$donor_count]['info']['email']        = $donor_obj->email;
 
-				if ( ! empty( $donor_obj->user_id ) ) {
+				if ( ! empty($donor_obj->user_id)) {
 
-					$user_data = get_userdata( $donor_obj->user_id );
+					$user_data = get_userdata($donor_obj->user_id);
 
 					// Donor with registered account.
-					$donors['donors'][ $donor_count ]['info']['user_id']      = $donor_obj->user_id;
-					$donors['donors'][ $donor_count ]['info']['username']     = $user_data->user_login;
-					$donors['donors'][ $donor_count ]['info']['display_name'] = $user_data->display_name;
+					$donors['donors'][$donor_count]['info']['user_id']      = $donor_obj->user_id;
+					$donors['donors'][$donor_count]['info']['username']     = $user_data->user_login;
+					$donors['donors'][$donor_count]['info']['display_name'] = $user_data->display_name;
 
 				}
 
-				$donors['donors'][ $donor_count ]['stats']['total_donations'] = $donor_obj->purchase_count;
-				$donors['donors'][ $donor_count ]['stats']['total_spent']     = $donor_obj->purchase_value;
+				$donors['donors'][$donor_count]['stats']['total_donations'] = $donor_obj->purchase_count;
+				$donors['donors'][$donor_count]['stats']['total_spent']     = $donor_obj->purchase_value;
 
-				$donor_count ++;
+				$donor_count++;
 
 			}
-		} elseif ( $donor ) {
+		} elseif ($donor) {
 
 			$error['error'] = sprintf( /* translators: %s: donor */
-				__( 'Donor %s not found.', 'give' ), $donor );
+				__('Donor %s not found.', 'give'), $donor );
 
 			return $error;
 
 		} else {
 
-			$error['error'] = __( 'No donors found.', 'give' );
+			$error['error'] = __('No donors found.', 'give');
 
 			return $error;
 
@@ -969,37 +969,37 @@ 
 	 *
 	 * @return array $donors Multidimensional array of the forms.
 	 */
-	public function get_forms( $form = null ) {
+	public function get_forms($form = null) {
 
 		$forms = array();
 		$error = array();
 
-		if ( $form == null ) {
+		if ($form == null) {
 			$forms['forms'] = array();
 
-			$form_list = get_posts( array(
+			$form_list = get_posts(array(
 				'post_type'        => 'give_forms',
 				'posts_per_page'   => $this->per_page(),
 				'suppress_filters' => true,
 				'paged'            => $this->get_paged(),
-			) );
+			));
 
-			if ( $form_list ) {
+			if ($form_list) {
 				$i = 0;
-				foreach ( $form_list as $form_info ) {
-					$forms['forms'][ $i ] = $this->get_form_data( $form_info );
-					$i ++;
+				foreach ($form_list as $form_info) {
+					$forms['forms'][$i] = $this->get_form_data($form_info);
+					$i++;
 				}
 			}
 		} else {
-			if ( get_post_type( $form ) == 'give_forms' ) {
-				$form_info = get_post( $form );
+			if (get_post_type($form) == 'give_forms') {
+				$form_info = get_post($form);
 
-				$forms['forms'][0] = $this->get_form_data( $form_info );
+				$forms['forms'][0] = $this->get_form_data($form_info);
 
 			} else {
 				$error['error'] = sprintf( /* translators: %s: form */
-					__( 'Form %s not found.', 'give' ), $form );
+					__('Form %s not found.', 'give'), $form );
 
 				return $error;
 			}
@@ -1017,7 +1017,7 @@ 
 	 *
 	 * @return array                Array of post data to return back in the API.
 	 */
-	private function get_form_data( $form_info ) {
+	private function get_form_data($form_info) {
 
 		$form = array();
 
@@ -1027,60 +1027,60 @@ 
 		$form['info']['create_date']   = $form_info->post_date;
 		$form['info']['modified_date'] = $form_info->post_modified;
 		$form['info']['status']        = $form_info->post_status;
-		$form['info']['link']          = html_entity_decode( $form_info->guid );
-		$form['info']['content']       = give_get_meta( $form_info->ID, '_give_form_content', true );
-		$form['info']['thumbnail']     = wp_get_attachment_url( get_post_thumbnail_id( $form_info->ID ) );
+		$form['info']['link']          = html_entity_decode($form_info->guid);
+		$form['info']['content']       = give_get_meta($form_info->ID, '_give_form_content', true);
+		$form['info']['thumbnail']     = wp_get_attachment_url(get_post_thumbnail_id($form_info->ID));
 
-		if ( give_is_setting_enabled( give_get_option( 'categories', 'disabled' ) ) ) {
-			$form['info']['category'] = get_the_terms( $form_info, 'give_forms_category' );
-			$form['info']['tags']     = get_the_terms( $form_info, 'give_forms_tag' );
+		if (give_is_setting_enabled(give_get_option('categories', 'disabled'))) {
+			$form['info']['category'] = get_the_terms($form_info, 'give_forms_category');
+			$form['info']['tags']     = get_the_terms($form_info, 'give_forms_tag');
 		}
-		if ( give_is_setting_enabled( give_get_option( 'tags', 'disabled' ) ) ) {
-			$form['info']['tags'] = get_the_terms( $form_info, 'give_forms_tag' );
+		if (give_is_setting_enabled(give_get_option('tags', 'disabled'))) {
+			$form['info']['tags'] = get_the_terms($form_info, 'give_forms_tag');
 		}
 
 		// Check whether any goal is to be achieved for the donation form.
-		$goal_option = give_get_meta( $form_info->ID, '_give_goal_option', true );
-		$goal_amount = give_get_meta( $form_info->ID, '_give_set_goal', true );
-		if ( give_is_setting_enabled( $goal_option ) && $goal_amount ) {
-			$total_income                         = give_get_form_earnings_stats( $form_info->ID );
-			$goal_percentage_completed            = ( $total_income < $goal_amount ) ? round( ( $total_income / $goal_amount ) * 100, 2 ) : 100;
-			$form['goal']['amount']               = isset( $goal_amount ) ? $goal_amount : '';
-			$form['goal']['percentage_completed'] = isset( $goal_percentage_completed ) ? $goal_percentage_completed : '';
+		$goal_option = give_get_meta($form_info->ID, '_give_goal_option', true);
+		$goal_amount = give_get_meta($form_info->ID, '_give_set_goal', true);
+		if (give_is_setting_enabled($goal_option) && $goal_amount) {
+			$total_income                         = give_get_form_earnings_stats($form_info->ID);
+			$goal_percentage_completed            = ($total_income < $goal_amount) ? round(($total_income / $goal_amount) * 100, 2) : 100;
+			$form['goal']['amount']               = isset($goal_amount) ? $goal_amount : '';
+			$form['goal']['percentage_completed'] = isset($goal_percentage_completed) ? $goal_percentage_completed : '';
 		}
 
-		if ( user_can( $this->user_id, 'view_give_reports' ) || $this->override ) {
-			$form['stats']['total']['donations']           = give_get_form_sales_stats( $form_info->ID );
-			$form['stats']['total']['earnings']            = give_get_form_earnings_stats( $form_info->ID );
-			$form['stats']['monthly_average']['donations'] = give_get_average_monthly_form_sales( $form_info->ID );
-			$form['stats']['monthly_average']['earnings']  = give_get_average_monthly_form_earnings( $form_info->ID );
+		if (user_can($this->user_id, 'view_give_reports') || $this->override) {
+			$form['stats']['total']['donations']           = give_get_form_sales_stats($form_info->ID);
+			$form['stats']['total']['earnings']            = give_get_form_earnings_stats($form_info->ID);
+			$form['stats']['monthly_average']['donations'] = give_get_average_monthly_form_sales($form_info->ID);
+			$form['stats']['monthly_average']['earnings']  = give_get_average_monthly_form_earnings($form_info->ID);
 		}
 
 		$counter = 0;
-		if ( give_has_variable_prices( $form_info->ID ) ) {
-			foreach ( give_get_variable_prices( $form_info->ID ) as $price ) {
-				$counter ++;
+		if (give_has_variable_prices($form_info->ID)) {
+			foreach (give_get_variable_prices($form_info->ID) as $price) {
+				$counter++;
 				// multi-level item
-				$level                                     = isset( $price['_give_text'] ) ? $price['_give_text'] : 'level-' . $counter;
-				$form['pricing'][ sanitize_key( $level ) ] = $price['_give_amount'];
+				$level                                     = isset($price['_give_text']) ? $price['_give_text'] : 'level-'.$counter;
+				$form['pricing'][sanitize_key($level)] = $price['_give_amount'];
 
 			}
 		} else {
-			$form['pricing']['amount'] = give_get_form_price( $form_info->ID );
+			$form['pricing']['amount'] = give_get_form_price($form_info->ID);
 		}
 
-		if ( user_can( $this->user_id, 'view_give_sensitive_data' ) || $this->override ) {
+		if (user_can($this->user_id, 'view_give_sensitive_data') || $this->override) {
 
 			/**
 			 * Fires when generating API sensitive data.
 			 *
 			 * @since 1.1
 			 */
-			do_action( 'give_api_sensitive_data' );
+			do_action('give_api_sensitive_data');
 
 		}
 
-		return apply_filters( 'give_api_forms_form', $form );
+		return apply_filters('give_api_forms_form', $form);
 
 	}
 
@@ -1095,7 +1095,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_stats( $args = array() ) {
+	public function get_stats($args = array()) {
 		$defaults = array(
 			'type'      => null,
 			'form'      => null,
@@ -1104,9 +1104,9 @@ 
 			'enddate'   => null,
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$dates = $this->get_dates( $args );
+		$dates = $this->get_dates($args);
 
 		$stats     = array();
 		$earnings  = array(
@@ -1117,40 +1117,40 @@ 
 		);
 		$error     = array();
 
-		if ( ! user_can( $this->user_id, 'view_give_reports' ) && ! $this->override ) {
+		if ( ! user_can($this->user_id, 'view_give_reports') && ! $this->override) {
 			return $stats;
 		}
 
-		if ( $args['type'] == 'donations' ) {
+		if ($args['type'] == 'donations') {
 
-			if ( $args['form'] == null ) {
-				if ( $args['date'] == null ) {
+			if ($args['form'] == null) {
+				if ($args['date'] == null) {
 					$donations = $this->get_default_sales_stats();
-				} elseif ( $args['date'] === 'range' ) {
+				} elseif ($args['date'] === 'range') {
 					// Return donations for a date range.
 					// Ensure the end date is later than the start date.
-					if ( $args['enddate'] < $args['startdate'] ) {
-						$error['error'] = __( 'The end date must be later than the start date.', 'give' );
+					if ($args['enddate'] < $args['startdate']) {
+						$error['error'] = __('The end date must be later than the start date.', 'give');
 					}
 
 					// Ensure both the start and end date are specified
-					if ( empty( $args['startdate'] ) || empty( $args['enddate'] ) ) {
-						$error['error'] = __( 'Invalid or no date range specified.', 'give' );
+					if (empty($args['startdate']) || empty($args['enddate'])) {
+						$error['error'] = __('Invalid or no date range specified.', 'give');
 					}
 
 					$total = 0;
 
 					// Loop through the years
 					$y = $dates['year'];
-					while ( $y <= $dates['year_end'] ) :
+					while ($y <= $dates['year_end']) :
 
-						if ( $dates['year'] == $dates['year_end'] ) {
+						if ($dates['year'] == $dates['year_end']) {
 							$month_start = $dates['m_start'];
 							$month_end   = $dates['m_end'];
-						} elseif ( $y == $dates['year'] && $dates['year_end'] > $dates['year'] ) {
+						} elseif ($y == $dates['year'] && $dates['year_end'] > $dates['year']) {
 							$month_start = $dates['m_start'];
 							$month_end   = 12;
-						} elseif ( $y == $dates['year_end'] ) {
+						} elseif ($y == $dates['year_end']) {
 							$month_start = 1;
 							$month_end   = $dates['m_end'];
 						} else {
@@ -1159,116 +1159,116 @@ 
 						}
 
 						$i = $month_start;
-						while ( $i <= $month_end ) :
+						while ($i <= $month_end) :
 
-							if ( $i == $dates['m_start'] ) {
+							if ($i == $dates['m_start']) {
 								$d = $dates['day_start'];
 							} else {
 								$d = 1;
 							}
 
-							if ( $i == $dates['m_end'] ) {
+							if ($i == $dates['m_end']) {
 								$num_of_days = $dates['day_end'];
 							} else {
-								$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+								$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 							}
 
-							while ( $d <= $num_of_days ) :
-								$sale_count = give_get_sales_by_date( $d, $i, $y );
-								$date_key   = date( 'Ymd', strtotime( $y . '/' . $i . '/' . $d ) );
-								if ( ! isset( $donations['sales'][ $date_key ] ) ) {
-									$donations['sales'][ $date_key ] = 0;
+							while ($d <= $num_of_days) :
+								$sale_count = give_get_sales_by_date($d, $i, $y);
+								$date_key   = date('Ymd', strtotime($y.'/'.$i.'/'.$d));
+								if ( ! isset($donations['sales'][$date_key])) {
+									$donations['sales'][$date_key] = 0;
 								}
-								$donations['sales'][ $date_key ] += $sale_count;
+								$donations['sales'][$date_key] += $sale_count;
 								$total                           += $sale_count;
-								$d ++;
+								$d++;
 							endwhile;
-							$i ++;
+							$i++;
 						endwhile;
 
-						$y ++;
+						$y++;
 					endwhile;
 
 					$donations['totals'] = $total;
 				} else {
-					if ( $args['date'] == 'this_quarter' || $args['date'] == 'last_quarter' ) {
+					if ($args['date'] == 'this_quarter' || $args['date'] == 'last_quarter') {
 						$donations_count = 0;
 
 						// Loop through the months
 						$month = $dates['m_start'];
 
-						while ( $month <= $dates['m_end'] ) :
-							$donations_count += give_get_sales_by_date( null, $month, $dates['year'] );
-							$month ++;
+						while ($month <= $dates['m_end']) :
+							$donations_count += give_get_sales_by_date(null, $month, $dates['year']);
+							$month++;
 						endwhile;
 
-						$donations['donations'][ $args['date'] ] = $donations_count;
+						$donations['donations'][$args['date']] = $donations_count;
 					} else {
-						$donations['donations'][ $args['date'] ] = give_get_sales_by_date( $dates['day'], $dates['m_start'], $dates['year'] );
+						$donations['donations'][$args['date']] = give_get_sales_by_date($dates['day'], $dates['m_start'], $dates['year']);
 					}
 				}// End if().
-			} elseif ( $args['form'] == 'all' ) {
-				$forms = get_posts( array(
+			} elseif ($args['form'] == 'all') {
+				$forms = get_posts(array(
 					'post_type' => 'give_forms',
 					'nopaging'  => true,
-				) );
-				$i     = 0;
-				foreach ( $forms as $form_info ) {
-					$donations['donations'][ $i ] = array(
-						$form_info->post_name => give_get_form_sales_stats( $form_info->ID ),
+				));
+				$i = 0;
+				foreach ($forms as $form_info) {
+					$donations['donations'][$i] = array(
+						$form_info->post_name => give_get_form_sales_stats($form_info->ID),
 					);
-					$i ++;
+					$i++;
 				}
 			} else {
-				if ( get_post_type( $args['form'] ) == 'give_forms' ) {
-					$form_info                 = get_post( $args['form'] );
+				if (get_post_type($args['form']) == 'give_forms') {
+					$form_info                 = get_post($args['form']);
 					$donations['donations'][0] = array(
-						$form_info->post_name => give_get_form_sales_stats( $args['form'] ),
+						$form_info->post_name => give_get_form_sales_stats($args['form']),
 					);
 				} else {
 					$error['error'] = sprintf( /* translators: %s: form */
-						__( 'Form %s not found.', 'give' ), $args['form'] );
+						__('Form %s not found.', 'give'), $args['form'] );
 				}
 			}// End if().
 
-			if ( ! empty( $error ) ) {
+			if ( ! empty($error)) {
 				return $error;
 			}
 
 			return $donations;
 
-		} elseif ( $args['type'] == 'earnings' ) {
-			if ( $args['form'] == null ) {
-				if ( $args['date'] == null ) {
+		} elseif ($args['type'] == 'earnings') {
+			if ($args['form'] == null) {
+				if ($args['date'] == null) {
 					$earnings = $this->get_default_earnings_stats();
-				} elseif ( $args['date'] === 'range' ) {
+				} elseif ($args['date'] === 'range') {
 					// Return sales for a date range
 					// Ensure the end date is later than the start date
-					if ( $args['enddate'] < $args['startdate'] ) {
-						$error['error'] = __( 'The end date must be later than the start date.', 'give' );
+					if ($args['enddate'] < $args['startdate']) {
+						$error['error'] = __('The end date must be later than the start date.', 'give');
 					}
 
 					// Ensure both the start and end date are specified
-					if ( empty( $args['startdate'] ) || empty( $args['enddate'] ) ) {
-						$error['error'] = __( 'Invalid or no date range specified.', 'give' );
+					if (empty($args['startdate']) || empty($args['enddate'])) {
+						$error['error'] = __('Invalid or no date range specified.', 'give');
 					}
 
 					$total = (float) 0.00;
 
 					// Loop through the years
 					$y = $dates['year'];
-					if ( ! isset( $earnings['earnings'] ) ) {
+					if ( ! isset($earnings['earnings'])) {
 						$earnings['earnings'] = array();
 					}
-					while ( $y <= $dates['year_end'] ) :
+					while ($y <= $dates['year_end']) :
 
-						if ( $dates['year'] == $dates['year_end'] ) {
+						if ($dates['year'] == $dates['year_end']) {
 							$month_start = $dates['m_start'];
 							$month_end   = $dates['m_end'];
-						} elseif ( $y == $dates['year'] && $dates['year_end'] > $dates['year'] ) {
+						} elseif ($y == $dates['year'] && $dates['year_end'] > $dates['year']) {
 							$month_start = $dates['m_start'];
 							$month_end   = 12;
-						} elseif ( $y == $dates['year_end'] ) {
+						} elseif ($y == $dates['year_end']) {
 							$month_start = 1;
 							$month_end   = $dates['m_end'];
 						} else {
@@ -1277,94 +1277,94 @@ 
 						}
 
 						$i = $month_start;
-						while ( $i <= $month_end ) :
+						while ($i <= $month_end) :
 
-							if ( $i == $dates['m_start'] ) {
+							if ($i == $dates['m_start']) {
 								$d = $dates['day_start'];
 							} else {
 								$d = 1;
 							}
 
-							if ( $i == $dates['m_end'] ) {
+							if ($i == $dates['m_end']) {
 								$num_of_days = $dates['day_end'];
 							} else {
-								$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+								$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 							}
 
-							while ( $d <= $num_of_days ) :
-								$earnings_stat = give_get_earnings_by_date( $d, $i, $y );
-								$date_key      = date( 'Ymd', strtotime( $y . '/' . $i . '/' . $d ) );
-								if ( ! isset( $earnings['earnings'][ $date_key ] ) ) {
-									$earnings['earnings'][ $date_key ] = 0;
+							while ($d <= $num_of_days) :
+								$earnings_stat = give_get_earnings_by_date($d, $i, $y);
+								$date_key      = date('Ymd', strtotime($y.'/'.$i.'/'.$d));
+								if ( ! isset($earnings['earnings'][$date_key])) {
+									$earnings['earnings'][$date_key] = 0;
 								}
-								$earnings['earnings'][ $date_key ] += $earnings_stat;
+								$earnings['earnings'][$date_key] += $earnings_stat;
 								$total                             += $earnings_stat;
-								$d ++;
+								$d++;
 							endwhile;
 
-							$i ++;
+							$i++;
 						endwhile;
 
-						$y ++;
+						$y++;
 					endwhile;
 
 					$earnings['totals'] = $total;
 				} else {
-					if ( $args['date'] == 'this_quarter' || $args['date'] == 'last_quarter' ) {
+					if ($args['date'] == 'this_quarter' || $args['date'] == 'last_quarter') {
 						$earnings_count = (float) 0.00;
 
 						// Loop through the months
 						$month = $dates['m_start'];
 
-						while ( $month <= $dates['m_end'] ) :
-							$earnings_count += give_get_earnings_by_date( null, $month, $dates['year'] );
-							$month ++;
+						while ($month <= $dates['m_end']) :
+							$earnings_count += give_get_earnings_by_date(null, $month, $dates['year']);
+							$month++;
 						endwhile;
 
-						$earnings['earnings'][ $args['date'] ] = $earnings_count;
+						$earnings['earnings'][$args['date']] = $earnings_count;
 					} else {
-						$earnings['earnings'][ $args['date'] ] = give_get_earnings_by_date( $dates['day'], $dates['m_start'], $dates['year'] );
+						$earnings['earnings'][$args['date']] = give_get_earnings_by_date($dates['day'], $dates['m_start'], $dates['year']);
 					}
 				}// End if().
-			} elseif ( $args['form'] == 'all' ) {
-				$forms = get_posts( array(
+			} elseif ($args['form'] == 'all') {
+				$forms = get_posts(array(
 					'post_type' => 'give_forms',
 					'nopaging'  => true,
-				) );
+				));
 
 				$i = 0;
-				foreach ( $forms as $form_info ) {
-					$earnings['earnings'][ $i ] = array(
-						$form_info->post_name => give_get_form_earnings_stats( $form_info->ID ),
+				foreach ($forms as $form_info) {
+					$earnings['earnings'][$i] = array(
+						$form_info->post_name => give_get_form_earnings_stats($form_info->ID),
 					);
-					$i ++;
+					$i++;
 				}
 			} else {
-				if ( get_post_type( $args['form'] ) == 'give_forms' ) {
-					$form_info               = get_post( $args['form'] );
+				if (get_post_type($args['form']) == 'give_forms') {
+					$form_info               = get_post($args['form']);
 					$earnings['earnings'][0] = array(
-						$form_info->post_name => give_get_form_earnings_stats( $args['form'] ),
+						$form_info->post_name => give_get_form_earnings_stats($args['form']),
 					);
 				} else {
 					$error['error'] = sprintf( /* translators: %s: form */
-						__( 'Form %s not found.', 'give' ), $args['form'] );
+						__('Form %s not found.', 'give'), $args['form'] );
 				}
 			}// End if().
 
-			if ( ! empty( $error ) ) {
+			if ( ! empty($error)) {
 				return $error;
 			}
 
 			return $earnings;
-		} elseif ( $args['type'] == 'donors' ) {
+		} elseif ($args['type'] == 'donors') {
 			$donors                             = new Give_DB_Donors();
 			$stats['donations']['total_donors'] = $donors->count();
 
 			return $stats;
 
-		} elseif ( empty( $args['type'] ) ) {
-			$stats = array_merge( $stats, $this->get_default_sales_stats() );
-			$stats = array_merge( $stats, $this->get_default_earnings_stats() );
+		} elseif (empty($args['type'])) {
+			$stats = array_merge($stats, $this->get_default_sales_stats());
+			$stats = array_merge($stats, $this->get_default_earnings_stats());
 
 			return array(
 				'stats' => $stats,
@@ -1382,7 +1382,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_recent_donations( $args = array() ) {
+	public function get_recent_donations($args = array()) {
 		global $wp_query;
 
 		$defaults = array(
@@ -1392,33 +1392,33 @@ 
 			'enddate'   => null,
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$donations = array();
 
-		if ( ! user_can( $this->user_id, 'view_give_reports' ) && ! $this->override ) {
+		if ( ! user_can($this->user_id, 'view_give_reports') && ! $this->override) {
 			return $donations;
 		}
 
-		if ( isset( $wp_query->query_vars['id'] ) ) {
+		if (isset($wp_query->query_vars['id'])) {
 			$query   = array();
-			$query[] = new Give_Payment( $wp_query->query_vars['id'] );
-		} elseif ( isset( $wp_query->query_vars['purchasekey'] ) ) {
+			$query[] = new Give_Payment($wp_query->query_vars['id']);
+		} elseif (isset($wp_query->query_vars['purchasekey'])) {
 			$query   = array();
-			$query[] = give_get_payment_by( 'key', $wp_query->query_vars['purchasekey'] );
-		} elseif ( isset( $wp_query->query_vars['email'] ) ) {
-			$args  = array(
+			$query[] = give_get_payment_by('key', $wp_query->query_vars['purchasekey']);
+		} elseif (isset($wp_query->query_vars['email'])) {
+			$args = array(
 				'fields'     => 'ids',
 				'meta_key'   => '_give_payment_user_email',
 				'meta_value' => $wp_query->query_vars['email'],
 				'number'     => $this->per_page(),
 				'page'       => $this->get_paged(),
 			);
-			$query = give_get_payments( $args );
-		} elseif ( isset( $wp_query->query_vars['date'] ) ) {
+			$query = give_get_payments($args);
+		} elseif (isset($wp_query->query_vars['date'])) {
 
-			$current_time = current_time( 'timestamp' );
-			$dates        = $this->get_dates( $args );
+			$current_time = current_time('timestamp');
+			$dates        = $this->get_dates($args);
 			$start_date   = '';
 			$end_date     = '';
 
@@ -1431,27 +1431,27 @@ 
 			 * @params date startdate | required when date = range and format to be YYYYMMDD (i.e. 20170524)
 			 * @params date enddate | required when date = range and format to be YYYYMMDD (i.e. 20170524)
 			 */
-			switch ( $wp_query->query_vars['date'] ) {
+			switch ($wp_query->query_vars['date']) {
 
 				case 'today':
 
 					// Set and Format Start and End Date to be date of today.
-					$start_date = $end_date = date( 'Y/m/d', $current_time );
+					$start_date = $end_date = date('Y/m/d', $current_time);
 
 					break;
 
 				case 'yesterday':
 
 					// Set and Format Start and End Date to be date of yesterday.
-					$start_date = $end_date = date( 'Y/m', $current_time ) . '/' . ( date( 'd', $current_time ) - 1 );
+					$start_date = $end_date = date('Y/m', $current_time).'/'.(date('d', $current_time) - 1);
 
 					break;
 
 				case 'range':
 
 					// Format Start Date and End Date for filtering payment based on date range.
-					$start_date = $dates['year'] . '/' . $dates['m_start'] . '/' . $dates['day_start'];
-					$end_date   = $dates['year_end'] . '/' . $dates['m_end'] . '/' . $dates['day_end'];
+					$start_date = $dates['year'].'/'.$dates['m_start'].'/'.$dates['day_start'];
+					$end_date   = $dates['year_end'].'/'.$dates['m_end'].'/'.$dates['day_end'];
 
 					break;
 
@@ -1465,22 +1465,22 @@ 
 				'page'       => $this->get_paged(),
 			);
 
-			$query = give_get_payments( $args );
+			$query = give_get_payments($args);
 		} else {
 			$args  = array(
 				'fields' => 'ids',
 				'number' => $this->per_page(),
 				'page'   => $this->get_paged(),
 			);
-			$query = give_get_payments( $args );
+			$query = give_get_payments($args);
 		}// End if().
 
-		if ( $query ) {
+		if ($query) {
 			$i = 0;
-			foreach ( $query as $payment ) {
+			foreach ($query as $payment) {
 
-				if ( is_numeric( $payment ) ) {
-					$payment      = new Give_Payment( $payment );
+				if (is_numeric($payment)) {
+					$payment      = new Give_Payment($payment);
 					$payment_meta = $payment->get_meta();
 					$user_info    = $payment->user_info;
 				}
@@ -1488,41 +1488,41 @@ 
 				$payment_meta = $payment->get_meta();
 				$user_info    = $payment->user_info;
 
-				$first_name = isset( $user_info['first_name'] ) ? $user_info['first_name'] : '';
-				$last_name  = isset( $user_info['last_name'] ) ? $user_info['last_name'] : '';
-
-				$donations['donations'][ $i ]['ID']             = $payment->number;
-				$donations['donations'][ $i ]['transaction_id'] = $payment->transaction_id;
-				$donations['donations'][ $i ]['key']            = $payment->key;
-				$donations['donations'][ $i ]['total']          = $payment->total;
-				$donations['donations'][ $i ]['status']         = give_get_payment_status( $payment, true );
-				$donations['donations'][ $i ]['gateway']        = $payment->gateway;
-				$donations['donations'][ $i ]['name']           = $first_name . ' ' . $last_name;
-				$donations['donations'][ $i ]['fname']          = $first_name;
-				$donations['donations'][ $i ]['lname']          = $last_name;
-				$donations['donations'][ $i ]['email']          = $payment->email;
-				$donations['donations'][ $i ]['date']           = $payment->date;
-
-				$form_id  = isset( $payment_meta['form_id'] ) ? $payment_meta['form_id'] : $payment_meta;
-				$price    = isset( $payment_meta['form_id'] ) ? give_get_form_price( $payment_meta['form_id'] ) : false;
-				$price_id = isset( $payment_meta['price_id'] ) ? $payment_meta['price_id'] : null;
-
-				$donations['donations'][ $i ]['form']['id']    = $form_id;
-				$donations['donations'][ $i ]['form']['name']  = get_the_title( $payment_meta['form_id'] );
-				$donations['donations'][ $i ]['form']['price'] = $price;
-
-				if ( give_has_variable_prices( $form_id ) ) {
-					if ( isset( $payment_meta['price_id'] ) ) {
-						$price_name                                         = give_get_price_option_name( $form_id, $payment_meta['price_id'], $payment->ID );
-						$donations['donations'][ $i ]['form']['price_name'] = $price_name;
-						$donations['donations'][ $i ]['form']['price_id']   = $price_id;
-						$donations['donations'][ $i ]['form']['price']      = give_get_price_option_amount( $form_id, $price_id );
+				$first_name = isset($user_info['first_name']) ? $user_info['first_name'] : '';
+				$last_name  = isset($user_info['last_name']) ? $user_info['last_name'] : '';
+
+				$donations['donations'][$i]['ID']             = $payment->number;
+				$donations['donations'][$i]['transaction_id'] = $payment->transaction_id;
+				$donations['donations'][$i]['key']            = $payment->key;
+				$donations['donations'][$i]['total']          = $payment->total;
+				$donations['donations'][$i]['status']         = give_get_payment_status($payment, true);
+				$donations['donations'][$i]['gateway']        = $payment->gateway;
+				$donations['donations'][$i]['name']           = $first_name.' '.$last_name;
+				$donations['donations'][$i]['fname']          = $first_name;
+				$donations['donations'][$i]['lname']          = $last_name;
+				$donations['donations'][$i]['email']          = $payment->email;
+				$donations['donations'][$i]['date']           = $payment->date;
+
+				$form_id  = isset($payment_meta['form_id']) ? $payment_meta['form_id'] : $payment_meta;
+				$price    = isset($payment_meta['form_id']) ? give_get_form_price($payment_meta['form_id']) : false;
+				$price_id = isset($payment_meta['price_id']) ? $payment_meta['price_id'] : null;
+
+				$donations['donations'][$i]['form']['id']    = $form_id;
+				$donations['donations'][$i]['form']['name']  = get_the_title($payment_meta['form_id']);
+				$donations['donations'][$i]['form']['price'] = $price;
+
+				if (give_has_variable_prices($form_id)) {
+					if (isset($payment_meta['price_id'])) {
+						$price_name                                         = give_get_price_option_name($form_id, $payment_meta['price_id'], $payment->ID);
+						$donations['donations'][$i]['form']['price_name'] = $price_name;
+						$donations['donations'][$i]['form']['price_id']   = $price_id;
+						$donations['donations'][$i]['form']['price']      = give_get_price_option_amount($form_id, $price_id);
 
 					}
 				}
 
 				// Add custom meta to API
-				foreach ( $payment_meta as $meta_key => $meta_value ) {
+				foreach ($payment_meta as $meta_key => $meta_value) {
 
 					$exceptions = array(
 						'form_title',
@@ -1535,19 +1535,19 @@ 
 					);
 
 					// Don't clutter up results with dupes
-					if ( in_array( $meta_key, $exceptions ) ) {
+					if (in_array($meta_key, $exceptions)) {
 						continue;
 					}
 
-					$donations['donations'][ $i ]['payment_meta'][ $meta_key ] = $meta_value;
+					$donations['donations'][$i]['payment_meta'][$meta_key] = $meta_value;
 
 				}
 
-				$i ++;
+				$i++;
 			}// End foreach().
 		}// End if().
 
-		return apply_filters( 'give_api_donations_endpoint', $donations );
+		return apply_filters('give_api_donations_endpoint', $donations);
 	}
 
 	/**
@@ -1563,9 +1563,9 @@ 
 	public function get_output_format() {
 		global $wp_query;
 
-		$format = isset( $wp_query->query_vars['format'] ) ? $wp_query->query_vars['format'] : 'json';
+		$format = isset($wp_query->query_vars['format']) ? $wp_query->query_vars['format'] : 'json';
 
-		return apply_filters( 'give_api_output_format', $format );
+		return apply_filters('give_api_output_format', $format);
 	}
 
 
@@ -1582,8 +1582,8 @@ 
 	 *
 	 * @return void
 	 */
-	private function log_request( $data = array() ) {
-		if ( ! $this->log_requests ) {
+	private function log_request($data = array()) {
+		if ( ! $this->log_requests) {
 			return;
 		}
 
@@ -1599,36 +1599,36 @@ 
 
 		$query = array(
 			'give-api'    => $wp_query->query_vars['give-api'],
-			'key'         => isset( $wp_query->query_vars['key'] ) ? $wp_query->query_vars['key'] : null,
-			'token'       => isset( $wp_query->query_vars['token'] ) ? $wp_query->query_vars['token'] : null,
-			'query'       => isset( $wp_query->query_vars['query'] ) ? $wp_query->query_vars['query'] : null,
-			'type'        => isset( $wp_query->query_vars['type'] ) ? $wp_query->query_vars['type'] : null,
-			'form'        => isset( $wp_query->query_vars['form'] ) ? $wp_query->query_vars['form'] : null,
-			'donor'       => isset( $wp_query->query_vars['donor'] ) ? $wp_query->query_vars['donor'] : null,
-			'date'        => isset( $wp_query->query_vars['date'] ) ? $wp_query->query_vars['date'] : null,
-			'startdate'   => isset( $wp_query->query_vars['startdate'] ) ? $wp_query->query_vars['startdate'] : null,
-			'enddate'     => isset( $wp_query->query_vars['enddate'] ) ? $wp_query->query_vars['enddate'] : null,
-			'id'          => isset( $wp_query->query_vars['id'] ) ? $wp_query->query_vars['id'] : null,
-			'purchasekey' => isset( $wp_query->query_vars['purchasekey'] ) ? $wp_query->query_vars['purchasekey'] : null,
-			'email'       => isset( $wp_query->query_vars['email'] ) ? $wp_query->query_vars['email'] : null,
+			'key'         => isset($wp_query->query_vars['key']) ? $wp_query->query_vars['key'] : null,
+			'token'       => isset($wp_query->query_vars['token']) ? $wp_query->query_vars['token'] : null,
+			'query'       => isset($wp_query->query_vars['query']) ? $wp_query->query_vars['query'] : null,
+			'type'        => isset($wp_query->query_vars['type']) ? $wp_query->query_vars['type'] : null,
+			'form'        => isset($wp_query->query_vars['form']) ? $wp_query->query_vars['form'] : null,
+			'donor'       => isset($wp_query->query_vars['donor']) ? $wp_query->query_vars['donor'] : null,
+			'date'        => isset($wp_query->query_vars['date']) ? $wp_query->query_vars['date'] : null,
+			'startdate'   => isset($wp_query->query_vars['startdate']) ? $wp_query->query_vars['startdate'] : null,
+			'enddate'     => isset($wp_query->query_vars['enddate']) ? $wp_query->query_vars['enddate'] : null,
+			'id'          => isset($wp_query->query_vars['id']) ? $wp_query->query_vars['id'] : null,
+			'purchasekey' => isset($wp_query->query_vars['purchasekey']) ? $wp_query->query_vars['purchasekey'] : null,
+			'email'       => isset($wp_query->query_vars['email']) ? $wp_query->query_vars['email'] : null,
 		);
 
 		$log_data = array(
 			'log_type'     => 'api_request',
-			'post_excerpt' => http_build_query( $query ),
-			'post_content' => ! empty( $data['error'] ) ? $data['error'] : '',
+			'post_excerpt' => http_build_query($query),
+			'post_content' => ! empty($data['error']) ? $data['error'] : '',
 		);
 
 		$log_meta = array(
 			'request_ip' => give_get_ip(),
 			'user'       => $this->user_id,
-			'key'        => isset( $wp_query->query_vars['key'] ) ? $wp_query->query_vars['key'] : null,
-			'token'      => isset( $wp_query->query_vars['token'] ) ? $wp_query->query_vars['token'] : null,
+			'key'        => isset($wp_query->query_vars['key']) ? $wp_query->query_vars['key'] : null,
+			'token'      => isset($wp_query->query_vars['token']) ? $wp_query->query_vars['token'] : null,
 			'time'       => $data['request_speed'],
 			'version'    => $this->get_queried_version(),
 		);
 
-		$give_logs->insert_log( $log_data, $log_meta );
+		$give_logs->insert_log($log_data, $log_meta);
 	}
 
 
@@ -1652,11 +1652,11 @@ 
 	 *
 	 * @param int       $status_code
 	 */
-	public function output( $status_code = 200 ) {
+	public function output($status_code = 200) {
 
 		$format = $this->get_output_format();
 
-		status_header( $status_code );
+		status_header($status_code);
 
 		/**
 		 * Fires before outputting the API.
@@ -1667,25 +1667,25 @@ 
 		 * @param Give_API $this   The Give_API object.
 		 * @param string   $format Output format, XML or JSON. Default is JSON.
 		 */
-		do_action( 'give_api_output_before', $this->data, $this, $format );
+		do_action('give_api_output_before', $this->data, $this, $format);
 
-		switch ( $format ) :
+		switch ($format) :
 
 			case 'xml' :
 
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/array2xml.php';
-				$xml = Array2XML::createXML( 'give', $this->data );
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/array2xml.php';
+				$xml = Array2XML::createXML('give', $this->data);
 				echo $xml->saveXML();
 
 				break;
 
 			case 'json' :
 
-				header( 'Content-Type: application/json' );
-				if ( ! empty( $this->pretty_print ) ) {
-					echo json_encode( $this->data, $this->pretty_print );
+				header('Content-Type: application/json');
+				if ( ! empty($this->pretty_print)) {
+					echo json_encode($this->data, $this->pretty_print);
 				} else {
-					echo json_encode( $this->data );
+					echo json_encode($this->data);
 				}
 
 				break;
@@ -1700,7 +1700,7 @@ 
 				 * @param array    $data Response data to return.
 				 * @param Give_API $this The Give_API object.
 				 */
-				do_action( "give_api_output_{$format}", $this->data, $this );
+				do_action("give_api_output_{$format}", $this->data, $this);
 
 				break;
 
@@ -1715,7 +1715,7 @@ 
 		 * @param Give_API $this   The Give_API object.
 		 * @param string   $format Output format, XML or JSON. Default is JSON.
 		 */
-		do_action( 'give_api_output_after', $this->data, $this, $format );
+		do_action('give_api_output_after', $this->data, $this, $format);
 
 		give_die();
 	}
@@ -1732,41 +1732,41 @@ 
 	 *
 	 * @return void
 	 */
-	function user_key_field( $user ) {
+	function user_key_field($user) {
 
-		if ( ( give_get_option( 'api_allow_user_keys', false ) || current_user_can( 'manage_give_settings' ) ) && current_user_can( 'edit_user', $user->ID ) ) {
+		if ((give_get_option('api_allow_user_keys', false) || current_user_can('manage_give_settings')) && current_user_can('edit_user', $user->ID)) {
 
-			$user = get_userdata( $user->ID );
+			$user = get_userdata($user->ID);
 			?>
 			<table class="form-table">
 				<tbody>
 				<tr>
 					<th>
-						<?php _e( 'Give API Keys', 'give' ); ?>
+						<?php _e('Give API Keys', 'give'); ?>
 					</th>
 					<td>
 						<?php
-						$public_key = $this->get_user_public_key( $user->ID );
-						$secret_key = $this->get_user_secret_key( $user->ID );
+						$public_key = $this->get_user_public_key($user->ID);
+						$secret_key = $this->get_user_secret_key($user->ID);
 						?>
-						<?php if ( empty( $user->give_user_public_key ) ) { ?>
+						<?php if (empty($user->give_user_public_key)) { ?>
 							<input name="give_set_api_key" type="checkbox" id="give_set_api_key" />
-							<span class="description"><?php _e( 'Generate API Key', 'give' ); ?></span>
+							<span class="description"><?php _e('Generate API Key', 'give'); ?></span>
 						<?php } else { ?>
-							<strong style="display:inline-block; width: 125px;"><?php _e( 'Public key:', 'give' ); ?>
+							<strong style="display:inline-block; width: 125px;"><?php _e('Public key:', 'give'); ?>
 								&nbsp;</strong>
-							<input type="text" disabled="disabled" class="regular-text" id="publickey" value="<?php echo esc_attr( $public_key ); ?>" />
+							<input type="text" disabled="disabled" class="regular-text" id="publickey" value="<?php echo esc_attr($public_key); ?>" />
 							<br />
-							<strong style="display:inline-block; width: 125px;"><?php _e( 'Secret key:', 'give' ); ?>
+							<strong style="display:inline-block; width: 125px;"><?php _e('Secret key:', 'give'); ?>
 								&nbsp;</strong>
-							<input type="text" disabled="disabled" class="regular-text" id="privatekey" value="<?php echo esc_attr( $secret_key ); ?>" />
+							<input type="text" disabled="disabled" class="regular-text" id="privatekey" value="<?php echo esc_attr($secret_key); ?>" />
 							<br />
-							<strong style="display:inline-block; width: 125px;"><?php _e( 'Token:', 'give' ); ?>
+							<strong style="display:inline-block; width: 125px;"><?php _e('Token:', 'give'); ?>
 								&nbsp;</strong>
-							<input type="text" disabled="disabled" class="regular-text" id="token" value="<?php echo esc_attr( $this->get_token( $user->ID ) ); ?>" />
+							<input type="text" disabled="disabled" class="regular-text" id="token" value="<?php echo esc_attr($this->get_token($user->ID)); ?>" />
 							<br />
 							<input name="give_revoke_api_key" type="checkbox" id="give_revoke_api_key" />
-							<span class="description"><label for="give_revoke_api_key"><?php _e( 'Revoke API Keys', 'give' ); ?></label></span>
+							<span class="description"><label for="give_revoke_api_key"><?php _e('Revoke API Keys', 'give'); ?></label></span>
 						<?php } ?>
 					</td>
 				</tr>
@@ -1785,61 +1785,61 @@ 
 	 *
 	 * @return void
 	 */
-	public function process_api_key( $args ) {
+	public function process_api_key($args) {
 
-		if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'give-api-nonce' ) ) {
-			wp_die( __( 'Nonce verification failed.', 'give' ), __( 'Error', 'give' ), array(
+		if ( ! wp_verify_nonce($_REQUEST['_wpnonce'], 'give-api-nonce')) {
+			wp_die(__('Nonce verification failed.', 'give'), __('Error', 'give'), array(
 				'response' => 403,
-			) );
+			));
 		}
 
-		if ( empty( $args['user_id'] ) ) {
-			wp_die( __( 'User ID Required.', 'give' ), __( 'Error', 'give' ), array(
+		if (empty($args['user_id'])) {
+			wp_die(__('User ID Required.', 'give'), __('Error', 'give'), array(
 				'response' => 401,
-			) );
+			));
 		}
 
-		if ( is_numeric( $args['user_id'] ) ) {
-			$user_id = isset( $args['user_id'] ) ? absint( $args['user_id'] ) : get_current_user_id();
+		if (is_numeric($args['user_id'])) {
+			$user_id = isset($args['user_id']) ? absint($args['user_id']) : get_current_user_id();
 		} else {
-			$userdata = get_user_by( 'login', $args['user_id'] );
+			$userdata = get_user_by('login', $args['user_id']);
 			$user_id  = $userdata->ID;
 		}
-		$process = isset( $args['give_api_process'] ) ? strtolower( $args['give_api_process'] ) : false;
+		$process = isset($args['give_api_process']) ? strtolower($args['give_api_process']) : false;
 
-		if ( $user_id == get_current_user_id() && ! give_get_option( 'allow_user_api_keys' ) && ! current_user_can( 'manage_give_settings' ) ) {
-			wp_die( sprintf( /* translators: %s: process */
-				__( 'You do not have permission to %s API keys for this user.', 'give' ), $process ), __( 'Error', 'give' ), array(
+		if ($user_id == get_current_user_id() && ! give_get_option('allow_user_api_keys') && ! current_user_can('manage_give_settings')) {
+			wp_die(sprintf( /* translators: %s: process */
+				__('You do not have permission to %s API keys for this user.', 'give'), $process ), __('Error', 'give'), array(
 				'response' => 403,
-			) );
-		} elseif ( ! current_user_can( 'manage_give_settings' ) ) {
-			wp_die( sprintf( /* translators: %s: process */
-				__( 'You do not have permission to %s API keys for this user.', 'give' ), $process ), __( 'Error', 'give' ), array(
+			));
+		} elseif ( ! current_user_can('manage_give_settings')) {
+			wp_die(sprintf( /* translators: %s: process */
+				__('You do not have permission to %s API keys for this user.', 'give'), $process ), __('Error', 'give'), array(
 				'response' => 403,
-			) );
+			));
 		}
 
-		switch ( $process ) {
+		switch ($process) {
 			case 'generate':
-				if ( $this->generate_api_key( $user_id ) ) {
-					Give_Cache::delete( Give_Cache::get_key( 'give_total_api_keys' ) );
-					wp_redirect( add_query_arg( 'give-message', 'api-key-generated', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+				if ($this->generate_api_key($user_id)) {
+					Give_Cache::delete(Give_Cache::get_key('give_total_api_keys'));
+					wp_redirect(add_query_arg('give-message', 'api-key-generated', 'edit.php?post_type=give_forms&page=give-tools&tab=api'));
 					exit();
 				} else {
-					wp_redirect( add_query_arg( 'give-message', 'api-key-failed', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+					wp_redirect(add_query_arg('give-message', 'api-key-failed', 'edit.php?post_type=give_forms&page=give-tools&tab=api'));
 					exit();
 				}
 				break;
 			case 'regenerate':
-				$this->generate_api_key( $user_id, true );
-				Give_Cache::delete( Give_Cache::get_key( 'give_total_api_keys' ) );
-				wp_redirect( add_query_arg( 'give-message', 'api-key-regenerated', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+				$this->generate_api_key($user_id, true);
+				Give_Cache::delete(Give_Cache::get_key('give_total_api_keys'));
+				wp_redirect(add_query_arg('give-message', 'api-key-regenerated', 'edit.php?post_type=give_forms&page=give-tools&tab=api'));
 				exit();
 				break;
 			case 'revoke':
-				$this->revoke_api_key( $user_id );
-				Give_Cache::delete( Give_Cache::get_key( 'give_total_api_keys' ) );
-				wp_redirect( add_query_arg( 'give-message', 'api-key-revoked', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+				$this->revoke_api_key($user_id);
+				Give_Cache::delete(Give_Cache::get_key('give_total_api_keys'));
+				wp_redirect(add_query_arg('give-message', 'api-key-revoked', 'edit.php?post_type=give_forms&page=give-tools&tab=api'));
 				exit();
 				break;
 			default;
@@ -1858,59 +1858,59 @@ 
 	 *
 	 * @return boolean True if (re)generated successfully, false otherwise.
 	 */
-	public function generate_api_key( $user_id = 0, $regenerate = false ) {
+	public function generate_api_key($user_id = 0, $regenerate = false) {
 
 		// Bail out, if user doesn't exists.
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return false;
 		}
 
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
 		// Bail Out, if user object doesn't exists.
-		if ( ! $user ) {
+		if ( ! $user) {
 			return false;
 		}
 
 		$new_public_key = '';
 		$new_secret_key = '';
 
-		if( ! empty( $_POST['from'] ) && 'profile' === $_POST['from'] ) {
+		if ( ! empty($_POST['from']) && 'profile' === $_POST['from']) {
 			// For User Profile Page.
-			if( ! empty( $_POST['give_set_api_key'] ) ) {
+			if ( ! empty($_POST['give_set_api_key'])) {
 				// Generate API Key from User Profile page.
-				$new_public_key = $this->generate_public_key( $user->user_email );
-				$new_secret_key = $this->generate_private_key( $user->ID );
-			} elseif ( ! empty( $_POST['give_revoke_api_key'] ) ) {
+				$new_public_key = $this->generate_public_key($user->user_email);
+				$new_secret_key = $this->generate_private_key($user->ID);
+			} elseif ( ! empty($_POST['give_revoke_api_key'])) {
 				// Revoke API Key from User Profile page.
-				$this->revoke_api_key( $user->ID );
+				$this->revoke_api_key($user->ID);
 			} else {
 				return false;
 			}
 		} else {
 			// For Tools > API page.
-			$public_key = $this->get_user_public_key( $user_id );
+			$public_key = $this->get_user_public_key($user_id);
 
-			if ( empty( $public_key ) && ! $regenerate ) {
+			if (empty($public_key) && ! $regenerate) {
 				// Generating API for first time.
-				$new_public_key = $this->generate_public_key( $user->user_email );
-				$new_secret_key = $this->generate_private_key( $user->ID );
-			} elseif ( $public_key && $regenerate ) {
+				$new_public_key = $this->generate_public_key($user->user_email);
+				$new_secret_key = $this->generate_private_key($user->ID);
+			} elseif ($public_key && $regenerate) {
 				// API Key already exists and Regenerating API Key.
-				$this->revoke_api_key( $user->ID );
-				$new_public_key = $this->generate_public_key( $user->user_email );
-				$new_secret_key = $this->generate_private_key( $user->ID );
-			} elseif ( ! empty( $public_key ) && ! $regenerate ) {
+				$this->revoke_api_key($user->ID);
+				$new_public_key = $this->generate_public_key($user->user_email);
+				$new_secret_key = $this->generate_private_key($user->ID);
+			} elseif ( ! empty($public_key) && ! $regenerate) {
 				// Doing nothing, when API Key exists but still try to generate again instead of regenerating.
 				return false;
 			} else {
 				// Revoke API Key.
-				$this->revoke_api_key( $user->ID );
+				$this->revoke_api_key($user->ID);
 			}
 		}
 
-		update_user_meta( $user_id, $new_public_key, 'give_user_public_key' );
-		update_user_meta( $user_id, $new_secret_key, 'give_user_secret_key' );
+		update_user_meta($user_id, $new_public_key, 'give_user_public_key');
+		update_user_meta($user_id, $new_secret_key, 'give_user_secret_key');
 
 		return true;
 	}
@@ -1925,26 +1925,26 @@ 
 	 *
 	 * @return bool
 	 */
-	public function revoke_api_key( $user_id = 0 ) {
+	public function revoke_api_key($user_id = 0) {
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return false;
 		}
 
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-		if ( ! $user ) {
+		if ( ! $user) {
 			return false;
 		}
 
-		$public_key = $this->get_user_public_key( $user_id );
-		$secret_key = $this->get_user_secret_key( $user_id );
-		if ( ! empty( $public_key ) ) {
-			Give_Cache::delete( Give_Cache::get_key( md5( 'give_api_user_' . $public_key ) ) );
-			Give_Cache::delete( Give_Cache::get_key( md5( 'give_api_user_public_key' . $user_id ) ) );
-			Give_Cache::delete( Give_Cache::get_key( md5( 'give_api_user_secret_key' . $user_id ) ) );
-			delete_user_meta( $user_id, $public_key );
-			delete_user_meta( $user_id, $secret_key );
+		$public_key = $this->get_user_public_key($user_id);
+		$secret_key = $this->get_user_secret_key($user_id);
+		if ( ! empty($public_key)) {
+			Give_Cache::delete(Give_Cache::get_key(md5('give_api_user_'.$public_key)));
+			Give_Cache::delete(Give_Cache::get_key(md5('give_api_user_public_key'.$user_id)));
+			Give_Cache::delete(Give_Cache::get_key(md5('give_api_user_secret_key'.$user_id)));
+			delete_user_meta($user_id, $public_key);
+			delete_user_meta($user_id, $secret_key);
 		} else {
 			return false;
 		}
@@ -1966,9 +1966,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function generate_public_key( $user_email = '' ) {
-		$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-		$public   = hash( 'md5', $user_email . $auth_key . date( 'U' ) );
+	private function generate_public_key($user_email = '') {
+		$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+		$public   = hash('md5', $user_email.$auth_key.date('U'));
 
 		return $public;
 	}
@@ -1983,9 +1983,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function generate_private_key( $user_id = 0 ) {
-		$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-		$secret   = hash( 'md5', $user_id . $auth_key . date( 'U' ) );
+	private function generate_private_key($user_id = 0) {
+		$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+		$secret   = hash('md5', $user_id.$auth_key.date('U'));
 
 		return $secret;
 	}
@@ -2000,8 +2000,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_token( $user_id = 0 ) {
-		return hash( 'md5', $this->get_user_secret_key( $user_id ) . $this->get_user_public_key( $user_id ) );
+	public function get_token($user_id = 0) {
+		return hash('md5', $this->get_user_secret_key($user_id).$this->get_user_public_key($user_id));
 	}
 
 	/**
@@ -2015,9 +2015,9 @@ 
 
 		// Default sales return
 		$donations                               = array();
-		$donations['donations']['today']         = $this->stats->get_sales( 0, 'today' );
-		$donations['donations']['current_month'] = $this->stats->get_sales( 0, 'this_month' );
-		$donations['donations']['last_month']    = $this->stats->get_sales( 0, 'last_month' );
+		$donations['donations']['today']         = $this->stats->get_sales(0, 'today');
+		$donations['donations']['current_month'] = $this->stats->get_sales(0, 'this_month');
+		$donations['donations']['last_month']    = $this->stats->get_sales(0, 'last_month');
 		$donations['donations']['totals']        = give_get_total_donations();
 
 		return $donations;
@@ -2034,9 +2034,9 @@ 
 
 		// Default earnings return
 		$earnings                              = array();
-		$earnings['earnings']['today']         = $this->stats->get_earnings( 0, 'today' );
-		$earnings['earnings']['current_month'] = $this->stats->get_earnings( 0, 'this_month' );
-		$earnings['earnings']['last_month']    = $this->stats->get_earnings( 0, 'last_month' );
+		$earnings['earnings']['today']         = $this->stats->get_earnings(0, 'today');
+		$earnings['earnings']['current_month'] = $this->stats->get_earnings(0, 'this_month');
+		$earnings['earnings']['last_month']    = $this->stats->get_earnings(0, 'last_month');
 		$earnings['earnings']['totals']        = give_get_total_earnings();
 
 		return $earnings;
@@ -2056,25 +2056,25 @@ 
 	 *
 	 * @return string            The API key/secret for the user supplied
 	 */
-	public function api_key_backwards_compat( $check, $object_id, $meta_key, $single ) {
+	public function api_key_backwards_compat($check, $object_id, $meta_key, $single) {
 
-		if ( $meta_key !== 'give_user_public_key' && $meta_key !== 'give_user_secret_key' ) {
+		if ($meta_key !== 'give_user_public_key' && $meta_key !== 'give_user_secret_key') {
 			return $check;
 		}
 
 		$return = $check;
 
-		switch ( $meta_key ) {
+		switch ($meta_key) {
 			case 'give_user_public_key':
-				$return = Give()->api->get_user_public_key( $object_id );
+				$return = Give()->api->get_user_public_key($object_id);
 				break;
 			case 'give_user_secret_key':
-				$return = Give()->api->get_user_secret_key( $object_id );
+				$return = Give()->api->get_user_secret_key($object_id);
 				break;
 		}
 
-		if ( ! $single ) {
-			$return = array( $return );
+		if ( ! $single) {
+			$return = array($return);
 		}
 
 		return $return;

includes/class-give-gravatars.php

Spacing +94 added lines, -94 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -62,50 +62,50 @@ 
 	 *
 	 * @return bool If the gravatar exists or not
 	 */
-	public function validate_gravatar( $id_or_email ) {
+	public function validate_gravatar($id_or_email) {
 		//id or email code borrowed from wp-includes/pluggable.php
 		$email = '';
-		if ( is_numeric( $id_or_email ) ) {
+		if (is_numeric($id_or_email)) {
 			$id   = (int) $id_or_email;
-			$user = get_userdata( $id );
-			if ( $user ) {
+			$user = get_userdata($id);
+			if ($user) {
 				$email = $user->user_email;
 			}
-		} elseif ( is_object( $id_or_email ) ) {
+		} elseif (is_object($id_or_email)) {
 			// No avatar for pingbacks or trackbacks
-			$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-			if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+			$allowed_comment_types = apply_filters('get_avatar_comment_types', array('comment'));
+			if ( ! empty($id_or_email->comment_type) && ! in_array($id_or_email->comment_type, (array) $allowed_comment_types)) {
 				return false;
 			}
 
-			if ( ! empty( $id_or_email->user_id ) ) {
+			if ( ! empty($id_or_email->user_id)) {
 				$id   = (int) $id_or_email->user_id;
-				$user = get_userdata( $id );
-				if ( $user ) {
+				$user = get_userdata($id);
+				if ($user) {
 					$email = $user->user_email;
 				}
-			} elseif ( ! empty( $id_or_email->comment_author_email ) ) {
+			} elseif ( ! empty($id_or_email->comment_author_email)) {
 				$email = $id_or_email->comment_author_email;
 			}
 		} else {
 			$email = $id_or_email;
 		}
 
-		$hashkey = md5( strtolower( trim( $email ) ) );
-		$uri     = 'http://www.gravatar.com/avatar/' . $hashkey . '?d=404';
+		$hashkey = md5(strtolower(trim($email)));
+		$uri     = 'http://www.gravatar.com/avatar/'.$hashkey.'?d=404';
 
-		$data = wp_cache_get( $hashkey );
-		if ( false === $data ) {
-			$response = wp_remote_head( $uri );
-			if ( is_wp_error( $response ) ) {
+		$data = wp_cache_get($hashkey);
+		if (false === $data) {
+			$response = wp_remote_head($uri);
+			if (is_wp_error($response)) {
 				$data = 'not200';
 			} else {
 				$data = $response['response']['code'];
 			}
-			wp_cache_set( $hashkey, $data, $group = '', $expire = 60 * 5 );
+			wp_cache_set($hashkey, $data, $group = '', $expire = 60 * 5);
 
 		}
-		if ( $data == '200' ) {
+		if ($data == '200') {
 			return true;
 		} else {
 			return false;
@@ -122,19 +122,19 @@ 
 	 *
 	 * @return array        IDs if logs, false otherwise
 	 */
-	public function get_log_ids( $form_id = '' ) {
+	public function get_log_ids($form_id = '') {
 
 		// get Give_Logging class
 		global $give_logs;
 
 		// get log for this form
-		$logs = $give_logs->get_logs( $form_id );
+		$logs = $give_logs->get_logs($form_id);
 
-		if ( $logs ) {
+		if ($logs) {
 			$log_ids = array();
 
 			// make an array with all the donor IDs
-			foreach ( $logs as $log ) {
+			foreach ($logs as $log) {
 				$log_ids[] = $log->ID;
 			}
 
@@ -155,51 +155,51 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function get_payment_ids( $form_id = '' ) {
+	public function get_payment_ids($form_id = '') {
 
 		$give_options = give_get_settings();
 
-		$log_ids = $this->get_log_ids( $form_id );
+		$log_ids = $this->get_log_ids($form_id);
 
-		if ( $log_ids ) {
+		if ($log_ids) {
 
 			$payment_ids = array();
 
-			foreach ( $log_ids as $id ) {
+			foreach ($log_ids as $id) {
 				// get the payment ID for each corresponding log ID
-				$payment_ids[] = give_get_meta( $id, '_give_log_payment_id', true );
+				$payment_ids[] = give_get_meta($id, '_give_log_payment_id', true);
 			}
 
 			// remove donors who have donated more than once so we can have unique avatars
 			$unique_emails = array();
 
-			foreach ( $payment_ids as $key => $id ) {
+			foreach ($payment_ids as $key => $id) {
 
-				$email = give_get_meta( $id, '_give_payment_user_email', true );
+				$email = give_get_meta($id, '_give_payment_user_email', true);
 
-				if ( isset ( $give_options['give_donors_gravatars_has_gravatar_account'] ) ) {
-					if ( ! $this->validate_gravatar( $email ) ) {
+				if (isset ($give_options['give_donors_gravatars_has_gravatar_account'])) {
+					if ( ! $this->validate_gravatar($email)) {
 						continue;
 					}
 				}
 
-				$unique_emails[ $id ] = give_get_meta( $id, '_give_payment_user_email', true );
+				$unique_emails[$id] = give_get_meta($id, '_give_payment_user_email', true);
 
 			}
 
 			$unique_ids = array();
 
 			// strip duplicate emails
-			$unique_emails = array_unique( $unique_emails );
+			$unique_emails = array_unique($unique_emails);
 
 			// convert the unique IDs back into simple array
-			foreach ( $unique_emails as $id => $email ) {
+			foreach ($unique_emails as $id => $email) {
 				$unique_ids[] = $id;
 			}
 
 			// randomize the payment IDs if enabled
-			if ( isset( $give_options['give_donors_gravatars_random_gravatars'] ) ) {
-				shuffle( $unique_ids );
+			if (isset($give_options['give_donors_gravatars_random_gravatars'])) {
+				shuffle($unique_ids);
 			}
 
 			// return our unique IDs
@@ -220,22 +220,22 @@ 
 	 *
 	 * @return string
 	 */
-	public function gravatars( $form_id = false, $title = '' ) {
+	public function gravatars($form_id = false, $title = '') {
 
 		// unique $payment_ids 
-		$payment_ids = $this->get_payment_ids( $form_id );
+		$payment_ids = $this->get_payment_ids($form_id);
 
 		$give_options = give_get_settings();
 
 		// return if no ID
-		if ( ! $form_id ) {
+		if ( ! $form_id) {
 			return;
 		}
 
 		// minimum amount of donations before showing gravatars
 		// if the number of items in array is not greater or equal to the number specified, then exit
-		if ( isset( $give_options['give_donors_gravatars_min_purchases_required'] ) && '' != $give_options['give_donors_gravatars_min_purchases_required'] ) {
-			if ( ! ( count( $payment_ids ) >= $give_options['give_donors_gravatars_min_purchases_required'] ) ) {
+		if (isset($give_options['give_donors_gravatars_min_purchases_required']) && '' != $give_options['give_donors_gravatars_min_purchases_required']) {
+			if ( ! (count($payment_ids) >= $give_options['give_donors_gravatars_min_purchases_required'])) {
 				return;
 			}
 		}
@@ -246,28 +246,28 @@ 
 		echo '<div id="give-purchase-gravatars">';
 
 
-		if ( isset ( $title ) ) {
+		if (isset ($title)) {
 
-			if ( $title ) {
-				echo apply_filters( 'give_donors_gravatars_title', '<h3 class="give-gravatars-title">' . esc_attr( $title ) . '</h3>' );
-			} elseif ( isset( $give_options['give_donors_gravatars_heading'] ) ) {
-				echo apply_filters( 'give_donors_gravatars_title', '<h3 class="give-gravatars-title">' . esc_attr( $give_options['give_donors_gravatars_heading'] ) . '</h2>' );
+			if ($title) {
+				echo apply_filters('give_donors_gravatars_title', '<h3 class="give-gravatars-title">'.esc_attr($title).'</h3>');
+			} elseif (isset($give_options['give_donors_gravatars_heading'])) {
+				echo apply_filters('give_donors_gravatars_title', '<h3 class="give-gravatars-title">'.esc_attr($give_options['give_donors_gravatars_heading']).'</h2>');
 			}
 
 		}
 		echo '<ul class="give-purchase-gravatars-list">';
 		$i = 0;
 
-		if ( $payment_ids ) {
-			foreach ( $payment_ids as $id ) {
+		if ($payment_ids) {
+			foreach ($payment_ids as $id) {
 
 				// Give saves a blank option even when the control is turned off, hence the extra check
-				if ( isset( $give_options['give_donors_gravatars_maximum_number'] ) && '' != $give_options['give_donors_gravatars_maximum_number'] && $i == $give_options['give_donors_gravatars_maximum_number'] ) {
+				if (isset($give_options['give_donors_gravatars_maximum_number']) && '' != $give_options['give_donors_gravatars_maximum_number'] && $i == $give_options['give_donors_gravatars_maximum_number']) {
 					continue;
 				}
 
 				// get the payment meta
-				$payment_meta = give_get_meta( $id, '_give_payment_meta', true );
+				$payment_meta = give_get_meta($id, '_give_payment_meta', true);
 
 				$user_info = $payment_meta['user_info'];
 
@@ -275,21 +275,21 @@ 
 				$name = $user_info['first_name'];
 
 				// get donor's email
-				$email = give_get_meta( $id, '_give_payment_user_email', true );
+				$email = give_get_meta($id, '_give_payment_user_email', true);
 
 				// set gravatar size and provide filter
-				$size = isset( $give_options['give_donors_gravatars_gravatar_size'] ) ? apply_filters( 'give_donors_gravatars_gravatar_size', $give_options['give_donors_gravatars_gravatar_size'] ) : '';
+				$size = isset($give_options['give_donors_gravatars_gravatar_size']) ? apply_filters('give_donors_gravatars_gravatar_size', $give_options['give_donors_gravatars_gravatar_size']) : '';
 
 				// default image
-				$default_image = apply_filters( 'give_donors_gravatars_gravatar_default_image', false );
+				$default_image = apply_filters('give_donors_gravatars_gravatar_default_image', false);
 
 				// assemble output
 				$output .= '<li>';
 
-				$output .= get_avatar( $email, $size, $default_image, $name );
+				$output .= get_avatar($email, $size, $default_image, $name);
 				$output .= '</li>';
 
-				$i ++;
+				$i++;
 
 			} // end foreach
 		}
@@ -298,7 +298,7 @@ 
 		echo '</ul>';
 		echo '</div>';
 
-		return apply_filters( 'give_donors_gravatars', ob_get_clean() );
+		return apply_filters('give_donors_gravatars', ob_get_clean());
 	}
 
 	/**
@@ -310,7 +310,7 @@ 
 	 * @return void
 	 */
 	public function register_widget() {
-		register_widget( 'Give_Donors_Gravatars_Widget' );
+		register_widget('Give_Donors_Gravatars_Widget');
 	}
 
 	/**
@@ -324,19 +324,19 @@ 
 	 *
 	 * @return string
 	 */
-	public function shortcode( $atts, $content = null ) {
+	public function shortcode($atts, $content = null) {
 
-		$atts = shortcode_atts( array(
+		$atts = shortcode_atts(array(
 			'id'    => '',
 			'title' => ''
-		), $atts, 'give_donors_gravatars' );
+		), $atts, 'give_donors_gravatars');
 
 		// if no ID is passed on single give_forms pages, get the correct ID
-		if ( is_singular( 'give_forms' ) ) {
+		if (is_singular('give_forms')) {
 			$id = get_the_ID();
 		}
 
-		$content = $this->gravatars( $atts['id'], $atts['title'] );
+		$content = $this->gravatars($atts['id'], $atts['title']);
 
 		return $content;
 
@@ -352,56 +352,56 @@ 
 	 *
 	 * @return array           Gravatar settings.
 	 */
-	public function settings( $settings ) {
+	public function settings($settings) {
 
 		$give_gravatar_settings = array(
 			array(
-				'name' => esc_html__( 'Donator Gravatars', 'give' ),
+				'name' => esc_html__('Donator Gravatars', 'give'),
 				'desc' => '<hr>',
 				'id'   => 'give_title',
 				'type' => 'give_title'
 			),
 			array(
-				'name' => esc_html__( 'Heading', 'give' ),
-				'desc' => esc_html__( 'The heading to display above the Gravatars.', 'give' ),
+				'name' => esc_html__('Heading', 'give'),
+				'desc' => esc_html__('The heading to display above the Gravatars.', 'give'),
 				'type' => 'text',
 				'id'   => 'give_donors_gravatars_heading'
 			),
 			array(
-				'name'    => esc_html__( 'Gravatar Size', 'give' ),
-				'desc'    => esc_html__( 'The size of each Gravatar in pixels (512px maximum).', 'give' ),
+				'name'    => esc_html__('Gravatar Size', 'give'),
+				'desc'    => esc_html__('The size of each Gravatar in pixels (512px maximum).', 'give'),
 				'type'    => 'text_small',
 				'id'      => 'give_donors_gravatars_gravatar_size',
 				'default' => '64'
 			),
 			array(
-				'name' => esc_html__( 'Minimum Unique Donations Required', 'give' ),
-				'desc' => esc_html__( 'The minimum number of unique donations a form must have before the Gravatars are shown. Leave blank for no minimum.', 'give' ),
+				'name' => esc_html__('Minimum Unique Donations Required', 'give'),
+				'desc' => esc_html__('The minimum number of unique donations a form must have before the Gravatars are shown. Leave blank for no minimum.', 'give'),
 				'type' => 'text_small',
 				'id'   => 'give_donors_gravatars_min_purchases_required',
 			),
 			array(
-				'name'    => esc_html__( 'Maximum Gravatars To Show', 'give' ),
-				'desc'    => esc_html__( 'The maximum number of gravatars to show. Leave blank for no limit.', 'give' ),
+				'name'    => esc_html__('Maximum Gravatars To Show', 'give'),
+				'desc'    => esc_html__('The maximum number of gravatars to show. Leave blank for no limit.', 'give'),
 				'type'    => 'text',
 				'id'      => 'give_donors_gravatars_maximum_number',
 				'default' => '20',
 			),
 			array(
-				'name' => esc_html__( 'Gravatar Visibility', 'give' ),
-				'desc' => esc_html__( 'Show only donors with a Gravatar account.', 'give' ),
+				'name' => esc_html__('Gravatar Visibility', 'give'),
+				'desc' => esc_html__('Show only donors with a Gravatar account.', 'give'),
 				'id'   => 'give_donors_gravatars_has_gravatar_account',
 				'type' => 'checkbox',
 			),
 			array(
-				'name' => esc_html__( 'Randomize Gravatars', 'give' ),
-				'desc' => esc_html__( 'Randomize the Gravatars.', 'give' ),
+				'name' => esc_html__('Randomize Gravatars', 'give'),
+				'desc' => esc_html__('Randomize the Gravatars.', 'give'),
 				'id'   => 'give_donors_gravatars_random_gravatars',
 				'type' => 'checkbox',
 			),
 		);
 
-		return array_merge( $settings, $give_gravatar_settings );
+		return array_merge($settings, $give_gravatar_settings);
 	}
 
 }
@@ -427,7 +427,7 @@ 
 		// widget settings
 		$widget_ops = array(
 			'classname'   => 'give-donors-gravatars',
-			'description' => esc_html__( 'Displays gravatars of people who have donated using your your form. Will only show on the single form page.', 'give' ),
+			'description' => esc_html__('Displays gravatars of people who have donated using your your form. Will only show on the single form page.', 'give'),
 		);
 
 		// widget control settings
@@ -440,7 +440,7 @@ 
 		// create the widget
 		parent::__construct(
 			'give_donors_gravatars_widget',
-			esc_html__( 'Give Donors Gravatars', 'give' ),
+			esc_html__('Give Donors Gravatars', 'give'),
 			$widget_ops,
 			$control_ops
 		);
@@ -460,29 +460,29 @@ 
 	 *
 	 * @return void
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		//@TODO: Don't extract it!!!
-		extract( $args );
+		extract($args);
 
-		if ( ! is_singular( 'give_forms' ) ) {
+		if ( ! is_singular('give_forms')) {
 			return;
 		}
 
 		// Variables from widget settings
-		$title = apply_filters( 'widget_title', $instance['title'] );
+		$title = apply_filters('widget_title', $instance['title']);
 
 		// Used by themes. Opens the widget
 		echo $before_widget;
 
 		// Display the widget title
-		if ( $title ) {
-			echo $before_title . $title . $after_title;
+		if ($title) {
+			echo $before_title.$title.$after_title;
 		}
 
 		$gravatars = new Give_Donors_Gravatars();
 
-		echo $gravatars->gravatars( get_the_ID(), null ); // remove title
+		echo $gravatars->gravatars(get_the_ID(), null); // remove title
 
 		// Used by themes. Closes the widget
 		echo $after_widget;
@@ -502,11 +502,11 @@ 
 	 *
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 
 		$instance = $old_instance;
 
-		$instance['title'] = strip_tags( $new_instance['title'] );
+		$instance['title'] = strip_tags($new_instance['title']);
 
 		return $instance;
 
@@ -524,19 +524,19 @@ 
 	 *
 	 * @return void
 	 */
-	public function form( $instance ) {
+	public function form($instance) {
 
 		// Set up some default widget settings.
 		$defaults = array(
 			'title' => '',
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults ); ?>
+		$instance = wp_parse_args((array) $instance, $defaults); ?>
 
 		<!-- Title -->
 		<p>
-			<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php esc_html_e( 'Title:', 'give' ) ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $instance['title']; ?>" />
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php esc_html_e('Title:', 'give') ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $instance['title']; ?>" />
 		</p>
 
 		<?php

includes/class-give-roles.php

Spacing +60 added lines, -60 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -35,7 +35,7 @@ 
 	 * @access public
 	 */
 	public function __construct() {
-		add_filter( 'give_map_meta_cap', array( $this, 'meta_caps' ), 10, 4 );
+		add_filter('give_map_meta_cap', array($this, 'meta_caps'), 10, 4);
 	}
 
 	/**
@@ -49,7 +49,7 @@ 
 	 * @return void
 	 */
 	public function add_roles() {
-		add_role( 'give_manager', __( 'Give Manager', 'give' ), array(
+		add_role('give_manager', __('Give Manager', 'give'), array(
 			'read'                   => true,
 			'edit_posts'             => true,
 			'delete_posts'           => true,
@@ -78,25 +78,25 @@ 
 			'publish_posts'          => true,
 			'read_private_pages'     => true,
 			'read_private_posts'     => true,
-		) );
+		));
 
-		add_role( 'give_accountant', __( 'Give Accountant', 'give' ), array(
+		add_role('give_accountant', __('Give Accountant', 'give'), array(
 			'read'         => true,
 			'edit_posts'   => false,
 			'delete_posts' => false
-		) );
+		));
 
-		add_role( 'give_worker', __( 'Give Worker', 'give' ), array(
+		add_role('give_worker', __('Give Worker', 'give'), array(
 			'read'         => true,
 			'edit_posts'   => true,
 			'edit_pages'   => true,
 			'upload_files' => true,
 			'delete_posts' => false,
-		) );
+		));
 
-		add_role( 'give_donor', __( 'Give Donor', 'give' ), array(
+		add_role('give_donor', __('Give Donor', 'give'), array(
 			'read'         => true,
-		) );
+		));
 
 	}
 
@@ -115,38 +115,38 @@ 
 	public function add_caps() {
 		global $wp_roles;
 
-		if ( class_exists( 'WP_Roles' ) ) {
-			if ( ! isset( $wp_roles ) ) {
+		if (class_exists('WP_Roles')) {
+			if ( ! isset($wp_roles)) {
 				$wp_roles = new WP_Roles();
 			}
 		}
 
-		if ( is_object( $wp_roles ) ) {
-			$wp_roles->add_cap( 'give_manager', 'view_give_reports' );
-			$wp_roles->add_cap( 'give_manager', 'view_give_sensitive_data' );
-			$wp_roles->add_cap( 'give_manager', 'export_give_reports' );
-			$wp_roles->add_cap( 'give_manager', 'manage_give_settings' );
+		if (is_object($wp_roles)) {
+			$wp_roles->add_cap('give_manager', 'view_give_reports');
+			$wp_roles->add_cap('give_manager', 'view_give_sensitive_data');
+			$wp_roles->add_cap('give_manager', 'export_give_reports');
+			$wp_roles->add_cap('give_manager', 'manage_give_settings');
 
-			$wp_roles->add_cap( 'administrator', 'view_give_reports' );
-			$wp_roles->add_cap( 'administrator', 'view_give_sensitive_data' );
-			$wp_roles->add_cap( 'administrator', 'export_give_reports' );
-			$wp_roles->add_cap( 'administrator', 'manage_give_settings' );
+			$wp_roles->add_cap('administrator', 'view_give_reports');
+			$wp_roles->add_cap('administrator', 'view_give_sensitive_data');
+			$wp_roles->add_cap('administrator', 'export_give_reports');
+			$wp_roles->add_cap('administrator', 'manage_give_settings');
 
 			// Add the main post type capabilities.
 			$capabilities = $this->get_core_caps();
-			foreach ( $capabilities as $cap_group ) {
-				foreach ( $cap_group as $cap ) {
-					$wp_roles->add_cap( 'administrator', $cap );
-					$wp_roles->add_cap( 'give_manager', $cap );
-					$wp_roles->add_cap( 'give_worker', $cap );
+			foreach ($capabilities as $cap_group) {
+				foreach ($cap_group as $cap) {
+					$wp_roles->add_cap('administrator', $cap);
+					$wp_roles->add_cap('give_manager', $cap);
+					$wp_roles->add_cap('give_worker', $cap);
 				}
 			}
 
-			$wp_roles->add_cap( 'give_accountant', 'edit_give_forms' );
-			$wp_roles->add_cap( 'give_accountant', 'read_private_give_forms' );
-			$wp_roles->add_cap( 'give_accountant', 'view_give_reports' );
-			$wp_roles->add_cap( 'give_accountant', 'export_give_reports' );
-			$wp_roles->add_cap( 'give_accountant', 'edit_give_payments' );
+			$wp_roles->add_cap('give_accountant', 'edit_give_forms');
+			$wp_roles->add_cap('give_accountant', 'read_private_give_forms');
+			$wp_roles->add_cap('give_accountant', 'view_give_reports');
+			$wp_roles->add_cap('give_accountant', 'export_give_reports');
+			$wp_roles->add_cap('give_accountant', 'edit_give_payments');
 
 		}
 	}
@@ -164,10 +164,10 @@ 
 	public function get_core_caps() {
 		$capabilities = array();
 
-		$capability_types = array( 'give_form', 'give_payment' );
+		$capability_types = array('give_form', 'give_payment');
 
-		foreach ( $capability_types as $capability_type ) {
-			$capabilities[ $capability_type ] = array(
+		foreach ($capability_types as $capability_type) {
+			$capabilities[$capability_type] = array(
 				// Post type.
 				"edit_{$capability_type}",
 				"read_{$capability_type}",
@@ -213,22 +213,22 @@ 
 	 *
 	 * @return array  $caps    Meta capabilities.
 	 */
-	public function meta_caps( $caps, $cap, $user_id, $args ) {
+	public function meta_caps($caps, $cap, $user_id, $args) {
 
-		switch ( $cap ) {
+		switch ($cap) {
 
 			case 'view_give_form_stats' :
 
-				if ( empty( $args[0] ) ) {
+				if (empty($args[0])) {
 					break;
 				}
 
-				$form = get_post( $args[0] );
-				if ( empty( $form ) ) {
+				$form = get_post($args[0]);
+				if (empty($form)) {
 					break;
 				}
 
-				if ( user_can( $user_id, 'view_give_reports' ) || $user_id == $form->post_author ) {
+				if (user_can($user_id, 'view_give_reports') || $user_id == $form->post_author) {
 					$caps = array();
 				}
 
@@ -255,41 +255,41 @@ 
 
 		global $wp_roles;
 
-		if ( class_exists( 'WP_Roles' ) ) {
-			if ( ! isset( $wp_roles ) ) {
+		if (class_exists('WP_Roles')) {
+			if ( ! isset($wp_roles)) {
 				$wp_roles = new WP_Roles();
 			}
 		}
 
-		if ( is_object( $wp_roles ) ) {
+		if (is_object($wp_roles)) {
 			// Give Manager Capabilities.
-			$wp_roles->remove_cap( 'give_manager', 'view_give_reports' );
-			$wp_roles->remove_cap( 'give_manager', 'view_give_sensitive_data' );
-			$wp_roles->remove_cap( 'give_manager', 'export_give_reports' );
-			$wp_roles->remove_cap( 'give_manager', 'manage_give_settings' );
+			$wp_roles->remove_cap('give_manager', 'view_give_reports');
+			$wp_roles->remove_cap('give_manager', 'view_give_sensitive_data');
+			$wp_roles->remove_cap('give_manager', 'export_give_reports');
+			$wp_roles->remove_cap('give_manager', 'manage_give_settings');
 
 			// Site Administrator Capabilities.
-			$wp_roles->remove_cap( 'administrator', 'view_give_reports' );
-			$wp_roles->remove_cap( 'administrator', 'view_give_sensitive_data' );
-			$wp_roles->remove_cap( 'administrator', 'export_give_reports' );
-			$wp_roles->remove_cap( 'administrator', 'manage_give_settings' );
+			$wp_roles->remove_cap('administrator', 'view_give_reports');
+			$wp_roles->remove_cap('administrator', 'view_give_sensitive_data');
+			$wp_roles->remove_cap('administrator', 'export_give_reports');
+			$wp_roles->remove_cap('administrator', 'manage_give_settings');
 
 			// Remove the Main Post Type Capabilities.
 			$capabilities = $this->get_core_caps();
 
-			foreach ( $capabilities as $cap_group ) {
-				foreach ( $cap_group as $cap ) {
-					$wp_roles->remove_cap( 'give_manager', $cap );
-					$wp_roles->remove_cap( 'administrator', $cap );
-					$wp_roles->remove_cap( 'give_worker', $cap );
+			foreach ($capabilities as $cap_group) {
+				foreach ($cap_group as $cap) {
+					$wp_roles->remove_cap('give_manager', $cap);
+					$wp_roles->remove_cap('administrator', $cap);
+					$wp_roles->remove_cap('give_worker', $cap);
 				}
 			}
 
 			/** Give Accountant Capabilities */
-			$wp_roles->remove_cap( 'give_accountant', 'edit_give_forms' );
-			$wp_roles->remove_cap( 'give_accountant', 'read_private_give_forms' );
-			$wp_roles->remove_cap( 'give_accountant', 'view_give_reports' );
-			$wp_roles->remove_cap( 'give_accountant', 'export_give_reports' );
+			$wp_roles->remove_cap('give_accountant', 'edit_give_forms');
+			$wp_roles->remove_cap('give_accountant', 'read_private_give_forms');
+			$wp_roles->remove_cap('give_accountant', 'view_give_reports');
+			$wp_roles->remove_cap('give_accountant', 'export_give_reports');
 
 		}
 	}

includes/class-give-db-donor-meta.php

Spacing +26 added lines, -26 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -33,7 +33,7 @@ 
 		/* @var WPDB $wpdb */
 		global $wpdb;
 
-		$wpdb->customermeta = $this->table_name  = $wpdb->prefix . 'give_customermeta';
+		$wpdb->customermeta = $this->table_name = $wpdb->prefix.'give_customermeta';
 		$this->primary_key = 'meta_id';
 		$this->version     = '1.0';
 
@@ -71,13 +71,13 @@ 
 	 *
 	 * @return  mixed                 Will be an array if $single is false. Will be value of meta data field if $single is true.
 	 */
-	public function get_meta( $donor_id = 0, $meta_key = '', $single = false ) {
-		$donor_id = $this->sanitize_donor_id( $donor_id );
-		if ( false === $donor_id ) {
+	public function get_meta($donor_id = 0, $meta_key = '', $single = false) {
+		$donor_id = $this->sanitize_donor_id($donor_id);
+		if (false === $donor_id) {
 			return false;
 		}
 
-		return get_metadata( 'customer', $donor_id, $meta_key, $single );
+		return get_metadata('customer', $donor_id, $meta_key, $single);
 	}
 
 	/**
@@ -95,13 +95,13 @@ 
 	 *
 	 * @return  bool                  False for failure. True for success.
 	 */
-	public function add_meta( $donor_id = 0, $meta_key = '', $meta_value, $unique = false ) {
-		$donor_id = $this->sanitize_donor_id( $donor_id );
-		if ( false === $donor_id ) {
+	public function add_meta($donor_id = 0, $meta_key = '', $meta_value, $unique = false) {
+		$donor_id = $this->sanitize_donor_id($donor_id);
+		if (false === $donor_id) {
 			return false;
 		}
 
-		return add_metadata( 'customer', $donor_id, $meta_key, $meta_value, $unique );
+		return add_metadata('customer', $donor_id, $meta_key, $meta_value, $unique);
 	}
 
 	/**
@@ -124,13 +124,13 @@ 
 	 *
 	 * @return  bool                  False on failure, true if success.
 	 */
-	public function update_meta( $donor_id = 0, $meta_key = '', $meta_value, $prev_value = '' ) {
-		$donor_id = $this->sanitize_donor_id( $donor_id );
-		if ( false === $donor_id ) {
+	public function update_meta($donor_id = 0, $meta_key = '', $meta_value, $prev_value = '') {
+		$donor_id = $this->sanitize_donor_id($donor_id);
+		if (false === $donor_id) {
 			return false;
 		}
 
-		return update_metadata( 'customer', $donor_id, $meta_key, $meta_value, $prev_value );
+		return update_metadata('customer', $donor_id, $meta_key, $meta_value, $prev_value);
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 *
 	 * @return  bool                  False for failure. True for success.
 	 */
-	public function delete_meta( $donor_id = 0, $meta_key = '', $meta_value = '' ) {
-		return delete_metadata( 'customer', $donor_id, $meta_key, $meta_value );
+	public function delete_meta($donor_id = 0, $meta_key = '', $meta_value = '') {
+		return delete_metadata('customer', $donor_id, $meta_key, $meta_value);
 	}
 
 	/**
@@ -165,9 +165,9 @@ 
 	 *
 	 * @return  bool  False for failure. True for success.
 	 */
-	public function delete_all_meta( $donor_id = 0 ) {
+	public function delete_all_meta($donor_id = 0) {
 		global $wpdb;
-		$wpdb->delete( $this->table_name, array( 'customer_id' => $donor_id ), array( '%d' ) );
+		$wpdb->delete($this->table_name, array('customer_id' => $donor_id), array('%d'));
 	}
 
 	/**
@@ -180,7 +180,7 @@ 
 	 */
 	public function create_table() {
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 		$sql = "CREATE TABLE {$this->table_name} (
 			meta_id bigint(20) NOT NULL AUTO_INCREMENT,
@@ -192,9 +192,9 @@ 
 			KEY meta_key (meta_key)
 			) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
-		update_option( $this->table_name . '_db_version', $this->version );
+		update_option($this->table_name.'_db_version', $this->version);
 	}
 
 	/**
@@ -207,23 +207,23 @@ 
 	 *
 	 * @return int|bool                The normalized donor ID or false if it's found to not be valid.
 	 */
-	private function sanitize_donor_id( $donor_id ) {
-		if ( ! is_numeric( $donor_id ) ) {
+	private function sanitize_donor_id($donor_id) {
+		if ( ! is_numeric($donor_id)) {
 			return false;
 		}
 
 		$donor_id = (int) $donor_id;
 
 		// We were given a non positive number.
-		if ( absint( $donor_id ) !== $donor_id ) {
+		if (absint($donor_id) !== $donor_id) {
 			return false;
 		}
 
-		if ( empty( $donor_id ) ) {
+		if (empty($donor_id)) {
 			return false;
 		}
 
-		return absint( $donor_id );
+		return absint($donor_id);
 
 	}