WordImpress / Give

includes/admin/class-api-keys-table.php

Spacing +58 added lines, -58 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -50,11 +50,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => esc_html__( 'API Key', 'give' ),     // Singular name of the listed records
-			'plural'   => esc_html__( 'API Keys', 'give' ),    // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => esc_html__('API Key', 'give'), // Singular name of the listed records
+			'plural'   => esc_html__('API Keys', 'give'), // Plural name of the listed records
 			'ajax'     => false                       // Does this table support ajax?
-		) );
+		));
 
 		$this->query();
 	}
@@ -70,8 +70,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		return $item[ $column_name ];
+	public function column_default($item, $column_name) {
+		return $item[$column_name];
 	}
 
 	/**
@@ -85,8 +85,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_key( $item ) {
-		return '<input readonly="readonly" type="text" class="large-text" value="' . esc_attr__( $item['key'] ) . '"/>';
+	public function column_key($item) {
+		return '<input readonly="readonly" type="text" class="large-text" value="'.esc_attr__($item['key']).'"/>';
 	}
 
 	/**
@@ -100,8 +100,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_token( $item ) {
-		return '<input readonly="readonly" type="text" class="large-text" value="' . esc_attr__( $item['token'] ) . '"/>';
+	public function column_token($item) {
+		return '<input readonly="readonly" type="text" class="large-text" value="'.esc_attr__($item['token']).'"/>';
 	}
 
 	/**
@@ -115,8 +115,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_secret( $item ) {
-		return '<input readonly="readonly" type="text" class="large-text" value="' . esc_attr__( $item['secret'] ) . '"/>';
+	public function column_secret($item) {
+		return '<input readonly="readonly" type="text" class="large-text" value="'.esc_attr__($item['secret']).'"/>';
 	}
 
 	/**
@@ -126,46 +126,46 @@ 
 	 * @since  1.1
 	 * @return void
 	 */
-	public function column_user( $item ) {
+	public function column_user($item) {
 
 		$actions = array();
 
-		if ( apply_filters( 'give_api_log_requests', true ) ) {
+		if (apply_filters('give_api_log_requests', true)) {
 			$actions['view'] = sprintf(
 				'<a href="%s">%s</a>',
-				esc_url( add_query_arg( array(
+				esc_url(add_query_arg(array(
 					'view'      => 'api_requests',
 					'post_type' => 'give_forms',
 					'page'      => 'give-reports',
 					'tab'       => 'logs',
 					's'         => $item['email']
-				), 'edit.php' ) ),
-				esc_html__( 'View API Log', 'give' )
+				), 'edit.php')),
+				esc_html__('View API Log', 'give')
 			);
 		}
 
 		$actions['reissue'] = sprintf(
 			'<a href="%s" class="give-regenerate-api-key">%s</a>',
-			esc_url( wp_nonce_url( add_query_arg( array(
+			esc_url(wp_nonce_url(add_query_arg(array(
 				'user_id'          => $item['id'],
 				'give_action'      => 'process_api_key',
 				'give_api_process' => 'regenerate'
-			) ), 'give-api-nonce' ) ),
-			esc_html__( 'Reissue', 'give' )
+			)), 'give-api-nonce')),
+			esc_html__('Reissue', 'give')
 		);
-		$actions['revoke']  = sprintf(
+		$actions['revoke'] = sprintf(
 			'<a href="%s" class="give-revoke-api-key give-delete">%s</a>',
-			esc_url( wp_nonce_url( add_query_arg( array(
+			esc_url(wp_nonce_url(add_query_arg(array(
 				'user_id'          => $item['id'],
 				'give_action'      => 'process_api_key',
 				'give_api_process' => 'revoke'
-			) ), 'give-api-nonce' ) ),
-			esc_html__( 'Revoke', 'give' )
+			)), 'give-api-nonce')),
+			esc_html__('Revoke', 'give')
 		);
 
-		$actions = apply_filters( 'give_api_row_actions', array_filter( $actions ) );
+		$actions = apply_filters('give_api_row_actions', array_filter($actions));
 
-		return sprintf( '%1$s %2$s', $item['user'], $this->row_actions( $actions ) );
+		return sprintf('%1$s %2$s', $item['user'], $this->row_actions($actions));
 	}
 
 	/**
@@ -177,10 +177,10 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'user'   => esc_html__( 'Username', 'give' ),
-			'key'    => esc_html__( 'Public Key', 'give' ),
-			'token'  => esc_html__( 'Token', 'give' ),
-			'secret' => esc_html__( 'Secret Key', 'give' )
+			'user'   => esc_html__('Username', 'give'),
+			'key'    => esc_html__('Public Key', 'give'),
+			'token'  => esc_html__('Token', 'give'),
+			'secret' => esc_html__('Secret Key', 'give')
 		);
 
 		return $columns;
@@ -193,19 +193,19 @@ 
 	 * @since  1.1
 	 * @return void
 	 */
-	function bulk_actions( $which = '' ) {
+	function bulk_actions($which = '') {
 		// These aren't really bulk actions but this outputs the markup in the right place
 		static $give_api_is_bottom;
 
-		if ( $give_api_is_bottom ) {
+		if ($give_api_is_bottom) {
 			return;
 		}
 		?>
 		<input type="hidden" name="give_action" value="process_api_key"/>
 		<input type="hidden" name="give_api_process" value="generate"/>
-		<?php wp_nonce_field( 'give-api-nonce' ); ?>
+		<?php wp_nonce_field('give-api-nonce'); ?>
 		<?php echo Give()->html->ajax_user_search(); ?>
-		<?php submit_button( esc_html__( 'Generate New API Keys', 'give' ), 'secondary', 'submit', false ); ?>
+		<?php submit_button(esc_html__('Generate New API Keys', 'give'), 'secondary', 'submit', false); ?>
 		<?php
 		$give_api_is_bottom = true;
 	}
@@ -218,7 +218,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -229,21 +229,21 @@ 
 	 * @return array
 	 */
 	public function query() {
-		$users = get_users( array(
+		$users = get_users(array(
 			'meta_value' => 'give_user_secret_key',
 			'number'     => $this->per_page,
-			'offset'     => $this->per_page * ( $this->get_paged() - 1 )
-		) );
-		$keys  = array();
-
-		foreach ( $users as $user ) {
-			$keys[ $user->ID ]['id']    = $user->ID;
-			$keys[ $user->ID ]['email'] = $user->user_email;
-			$keys[ $user->ID ]['user']  = '<a href="' . add_query_arg( 'user_id', $user->ID, 'user-edit.php' ) . '"><strong>' . $user->user_login . '</strong></a>';
-
-			$keys[ $user->ID ]['key']    = Give()->api->get_user_public_key( $user->ID );
-			$keys[ $user->ID ]['secret'] = Give()->api->get_user_secret_key( $user->ID );
-			$keys[ $user->ID ]['token']  = Give()->api->get_token( $user->ID );
+			'offset'     => $this->per_page * ($this->get_paged() - 1)
+		));
+		$keys = array();
+
+		foreach ($users as $user) {
+			$keys[$user->ID]['id']    = $user->ID;
+			$keys[$user->ID]['email'] = $user->user_email;
+			$keys[$user->ID]['user']  = '<a href="'.add_query_arg('user_id', $user->ID, 'user-edit.php').'"><strong>'.$user->user_login.'</strong></a>';
+
+			$keys[$user->ID]['key']    = Give()->api->get_user_public_key($user->ID);
+			$keys[$user->ID]['secret'] = Give()->api->get_user_secret_key($user->ID);
+			$keys[$user->ID]['token']  = Give()->api->get_token($user->ID);
 		}
 
 		return $keys;
@@ -260,13 +260,13 @@ 
 	public function total_items() {
 		global $wpdb;
 
-		if ( ! get_transient( 'give_total_api_keys' ) ) {
-			$total_items = $wpdb->get_var( "SELECT count(user_id) FROM $wpdb->usermeta WHERE meta_value='give_user_secret_key'" );
+		if ( ! get_transient('give_total_api_keys')) {
+			$total_items = $wpdb->get_var("SELECT count(user_id) FROM $wpdb->usermeta WHERE meta_value='give_user_secret_key'");
 
-			set_transient( 'give_total_api_keys', $total_items, 60 * 60 );
+			set_transient('give_total_api_keys', $total_items, 60 * 60);
 		}
 
-		return get_transient( 'give_total_api_keys' );
+		return get_transient('give_total_api_keys');
 	}
 
 	/**
@@ -282,7 +282,7 @@ 
 		$hidden   = array(); // No hidden columns
 		$sortable = array(); // Not sortable... for now
 
-		$this->_column_headers = array( $columns, $hidden, $sortable, 'id' );
+		$this->_column_headers = array($columns, $hidden, $sortable, 'id');
 
 		$data = $this->query();
 
@@ -290,10 +290,10 @@ 
 
 		$this->items = $data;
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $total_items / $this->per_page )
+				'total_pages' => ceil($total_items / $this->per_page)
 			)
 		);
 	}

includes/admin/EDD_SL_Plugin_Updater.php

Indentation +272 added lines, -272 removed lines

@@ -13,330 +13,330 @@
  * @version 1.6
  */
 class EDD_SL_Plugin_Updater {
-    private $api_url   = '';
-    private $api_data  = array();
-    private $name      = '';
-    private $slug      = '';
-
-    /**
-     * Class constructor.
-     *
-     * @uses plugin_basename()
-     * @uses hook()
-     *
-     * @param string  $_api_url     The URL pointing to the custom API endpoint.
-     * @param string  $_plugin_file Path to the plugin file.
-     * @param array   $_api_data    Optional data to send with API calls.
-     * @return void
-     */
-    function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
-        $this->api_url  = trailingslashit( $_api_url );
-        $this->api_data = $_api_data;
-        $this->name     = plugin_basename( $_plugin_file );
-        $this->slug     = basename( $_plugin_file, '.php' );
-        $this->version  = $_api_data['version'];
-
-        // Set up hooks.
-        $this->init();
-        add_action( 'admin_init', array( $this, 'show_changelog' ) );
-    }
-
-    /**
-     * Set up WordPress filters to hook into WP's update process.
-     *
-     * @uses add_filter()
-     *
-     * @return void
-     */
-    public function init() {
+	private $api_url   = '';
+	private $api_data  = array();
+	private $name      = '';
+	private $slug      = '';
+
+	/**
+	 * Class constructor.
+	 *
+	 * @uses plugin_basename()
+	 * @uses hook()
+	 *
+	 * @param string  $_api_url     The URL pointing to the custom API endpoint.
+	 * @param string  $_plugin_file Path to the plugin file.
+	 * @param array   $_api_data    Optional data to send with API calls.
+	 * @return void
+	 */
+	function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
+		$this->api_url  = trailingslashit( $_api_url );
+		$this->api_data = $_api_data;
+		$this->name     = plugin_basename( $_plugin_file );
+		$this->slug     = basename( $_plugin_file, '.php' );
+		$this->version  = $_api_data['version'];
+
+		// Set up hooks.
+		$this->init();
+		add_action( 'admin_init', array( $this, 'show_changelog' ) );
+	}
+
+	/**
+	 * Set up WordPress filters to hook into WP's update process.
+	 *
+	 * @uses add_filter()
+	 *
+	 * @return void
+	 */
+	public function init() {
 
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-        add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
 
-        add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
-    }
+		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+	}
 
-    /**
-     * Check for Updates at the defined API endpoint and modify the update array.
-     *
-     * This function dives into the update API just when WordPress creates its update array,
-     * then adds a custom API call and injects the custom plugin data retrieved from the API.
-     * It is reassembled from parts of the native WordPress plugin update code.
-     * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
-     *
-     * @uses api_request()
-     *
-     * @param array   $_transient_data Update array build by WordPress.
-     * @return array Modified update array with custom plugin data.
-     */
-    function check_update( $_transient_data ) {
+	/**
+	 * Check for Updates at the defined API endpoint and modify the update array.
+	 *
+	 * This function dives into the update API just when WordPress creates its update array,
+	 * then adds a custom API call and injects the custom plugin data retrieved from the API.
+	 * It is reassembled from parts of the native WordPress plugin update code.
+	 * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param array   $_transient_data Update array build by WordPress.
+	 * @return array Modified update array with custom plugin data.
+	 */
+	function check_update( $_transient_data ) {
 
-        global $pagenow;
+		global $pagenow;
 
-        if( ! is_object( $_transient_data ) ) {
-            $_transient_data = new stdClass;
-        }
+		if( ! is_object( $_transient_data ) ) {
+			$_transient_data = new stdClass;
+		}
 
-        if( 'plugins.php' == $pagenow && is_multisite() ) {
-            return $_transient_data;
-        }
+		if( 'plugins.php' == $pagenow && is_multisite() ) {
+			return $_transient_data;
+		}
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
 
-            $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-            if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
 
-                $this->did_check = true;
+				$this->did_check = true;
 
-                if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+				if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-                    $_transient_data->response[ $this->name ] = $version_info;
+					$_transient_data->response[ $this->name ] = $version_info;
 
-                }
+				}
 
-                $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
+				$_transient_data->last_checked = time();
+				$_transient_data->checked[ $this->name ] = $this->version;
 
-            }
+			}
 
-        }
+		}
 
-        return $_transient_data;
-    }
+		return $_transient_data;
+	}
 
-    /**
-     * show update nofication row -- needed for multisite subsites, because WP won't tell you otherwise!
-     *
-     * @param string  $file
-     * @param array   $plugin
-     */
-    public function show_update_notification( $file, $plugin ) {
+	/**
+	 * show update nofication row -- needed for multisite subsites, because WP won't tell you otherwise!
+	 *
+	 * @param string  $file
+	 * @param array   $plugin
+	 */
+	public function show_update_notification( $file, $plugin ) {
 
-        if( ! current_user_can( 'update_plugins' ) ) {
-            return;
-        }
+		if( ! current_user_can( 'update_plugins' ) ) {
+			return;
+		}
 
-        if( ! is_multisite() ) {
-            return;
-        }
+		if( ! is_multisite() ) {
+			return;
+		}
 
-        if ( $this->name != $file ) {
-            return;
-        }
+		if ( $this->name != $file ) {
+			return;
+		}
 
-        // Remove our filter on the site transient
-        remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
+		// Remove our filter on the site transient
+		remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
 
-        $update_cache = get_site_transient( 'update_plugins' );
+		$update_cache = get_site_transient( 'update_plugins' );
 
-        if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+		if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
 
-            $cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
-            $version_info = get_transient( $cache_key );
+			$cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
+			$version_info = get_transient( $cache_key );
 
-            if( false === $version_info ) {
+			if( false === $version_info ) {
 
-                $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-                set_transient( $cache_key, $version_info, 3600 );
-            }
+				set_transient( $cache_key, $version_info, 3600 );
+			}
 
 
-            if( ! is_object( $version_info ) ) {
-                return;
-            }
+			if( ! is_object( $version_info ) ) {
+				return;
+			}
 
-            if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+			if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-                $update_cache->response[ $this->name ] = $version_info;
+				$update_cache->response[ $this->name ] = $version_info;
 
-            }
+			}
 
-            $update_cache->last_checked = time();
-            $update_cache->checked[ $this->name ] = $this->version;
+			$update_cache->last_checked = time();
+			$update_cache->checked[ $this->name ] = $this->version;
 
-            set_site_transient( 'update_plugins', $update_cache );
+			set_site_transient( 'update_plugins', $update_cache );
 
-        } else {
+		} else {
 
-            $version_info = $update_cache->response[ $this->name ];
+			$version_info = $update_cache->response[ $this->name ];
 
-        }
+		}
 
-        // Restore our filter
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		// Restore our filter
+		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
 
-        if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-            // build a plugin list row, with update notification
-            $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-            echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+			// build a plugin list row, with update notification
+			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
+			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
 
-            $changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
 
-            if ( empty( $version_info->download_link ) ) {
-                printf(
+			if ( empty( $version_info->download_link ) ) {
+				printf(
 					/* translators: 1: name 2: changelog URL 3: version */
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ),
-                    esc_html__( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html__( $version_info->new_version )
-                );
-            } else {
-                printf(
+					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ),
+					esc_html__( $version_info->name ),
+					esc_url( $changelog_link ),
+					esc_html__( $version_info->new_version )
+				);
+			} else {
+				printf(
 					/* translators: 1: name 2: changelog URL 3: version 4: update URL */
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ),
-                    esc_html__( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html__( $version_info->new_version ),
-                    esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
-                );
-            }
-
-            echo '</div></td></tr>';
-        }
-    }
-
-
-    /**
-     * Updates information on the "View version x.x details" page with custom data.
-     *
-     * @uses api_request()
-     *
-     * @param mixed   $_data
-     * @param string  $_action
-     * @param object  $_args
-     * @return object $_data
-     */
-    function plugins_api_filter( $_data, $_action = '', $_args = null ) {
-
-
-        if ( $_action != 'plugin_information' ) {
-
-            return $_data;
-
-        }
-
-        if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
-
-            return $_data;
-
-        }
-
-        $to_send = array(
-            'slug'   => $this->slug,
-            'is_ssl' => is_ssl(),
-            'fields' => array(
-                'banners' => false, // These will be supported soon hopefully
-                'reviews' => false
-            )
-        );
-
-        $api_response = $this->api_request( 'plugin_information', $to_send );
-
-        if ( false !== $api_response ) {
-            $_data = $api_response;
-        }
-
-        return $_data;
-    }
-
-
-    /**
-     * Disable SSL verification in order to prevent download update failures
-     *
-     * @param array   $args
-     * @param string  $url
-     * @return object $array
-     */
-    function http_request_args( $args, $url ) {
-        // If it is an https request and we are performing a package download, disable ssl verification
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
-            $args['sslverify'] = false;
-        }
-        return $args;
-    }
-
-    /**
-     * Calls the API and, if successfull, returns the object delivered by the API.
-     *
-     * @uses get_bloginfo()
-     * @uses wp_remote_post()
-     * @uses is_wp_error()
-     *
-     * @param string  $_action The requested action.
-     * @param array   $_data   Parameters for the API action.
-     * @return false||object
-     */
-    private function api_request( $_action, $_data ) {
-
-        global $wp_version;
-
-        $data = array_merge( $this->api_data, $_data );
-
-        if ( $data['slug'] != $this->slug )
-            return;
-
-        if ( empty( $data['license'] ) )
-            return;
-
-        if( $this->api_url == home_url() ) {
-            return false; // Don't allow a plugin to ping itself
-        }
-
-        $api_params = array(
-            'edd_action' => 'get_version',
-            'license'    => $data['license'],
-            'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-            'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
-            'slug'       => $data['slug'],
-            'author'     => $data['author'],
-            'url'        => home_url()
-        );
+					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ),
+					esc_html__( $version_info->name ),
+					esc_url( $changelog_link ),
+					esc_html__( $version_info->new_version ),
+					esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
+				);
+			}
+
+			echo '</div></td></tr>';
+		}
+	}
+
+
+	/**
+	 * Updates information on the "View version x.x details" page with custom data.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param mixed   $_data
+	 * @param string  $_action
+	 * @param object  $_args
+	 * @return object $_data
+	 */
+	function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+
+
+		if ( $_action != 'plugin_information' ) {
+
+			return $_data;
+
+		}
+
+		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+
+			return $_data;
+
+		}
+
+		$to_send = array(
+			'slug'   => $this->slug,
+			'is_ssl' => is_ssl(),
+			'fields' => array(
+				'banners' => false, // These will be supported soon hopefully
+				'reviews' => false
+			)
+		);
+
+		$api_response = $this->api_request( 'plugin_information', $to_send );
+
+		if ( false !== $api_response ) {
+			$_data = $api_response;
+		}
+
+		return $_data;
+	}
+
+
+	/**
+	 * Disable SSL verification in order to prevent download update failures
+	 *
+	 * @param array   $args
+	 * @param string  $url
+	 * @return object $array
+	 */
+	function http_request_args( $args, $url ) {
+		// If it is an https request and we are performing a package download, disable ssl verification
+		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+			$args['sslverify'] = false;
+		}
+		return $args;
+	}
+
+	/**
+	 * Calls the API and, if successfull, returns the object delivered by the API.
+	 *
+	 * @uses get_bloginfo()
+	 * @uses wp_remote_post()
+	 * @uses is_wp_error()
+	 *
+	 * @param string  $_action The requested action.
+	 * @param array   $_data   Parameters for the API action.
+	 * @return false||object
+	 */
+	private function api_request( $_action, $_data ) {
+
+		global $wp_version;
+
+		$data = array_merge( $this->api_data, $_data );
+
+		if ( $data['slug'] != $this->slug )
+			return;
+
+		if ( empty( $data['license'] ) )
+			return;
+
+		if( $this->api_url == home_url() ) {
+			return false; // Don't allow a plugin to ping itself
+		}
+
+		$api_params = array(
+			'edd_action' => 'get_version',
+			'license'    => $data['license'],
+			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
+			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'slug'       => $data['slug'],
+			'author'     => $data['author'],
+			'url'        => home_url()
+		);
 
-        $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
 
-        if ( ! is_wp_error( $request ) ) {
-            $request = json_decode( wp_remote_retrieve_body( $request ) );
-        }
+		if ( ! is_wp_error( $request ) ) {
+			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		}
 
-        if ( $request && isset( $request->sections ) ) {
-            $request->sections = maybe_unserialize( $request->sections );
-        } else {
-            $request = false;
-        }
+		if ( $request && isset( $request->sections ) ) {
+			$request->sections = maybe_unserialize( $request->sections );
+		} else {
+			$request = false;
+		}
 
-        return $request;
-    }
+		return $request;
+	}
 
-    public function show_changelog() {
+	public function show_changelog() {
 
 
-        if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
-            return;
-        }
+		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+			return;
+		}
 
-        if( empty( $_REQUEST['plugin'] ) ) {
-            return;
-        }
-
-        if( empty( $_REQUEST['slug'] ) ) {
-            return;
-        }
-
-        if( ! current_user_can( 'update_plugins' ) ) {
-            wp_die( esc_html__( 'You do not have permission to install plugin updates.', 'edd' ), esc_html__( 'Error', 'edd' ), array( 'response' => 403 ) );
-        }
-
-        $response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
-
-        if( $response && isset( $response->sections['changelog'] ) ) {
-            echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
-        }
-
-
-        exit;
-    }
+		if( empty( $_REQUEST['plugin'] ) ) {
+			return;
+		}
+
+		if( empty( $_REQUEST['slug'] ) ) {
+			return;
+		}
+
+		if( ! current_user_can( 'update_plugins' ) ) {
+			wp_die( esc_html__( 'You do not have permission to install plugin updates.', 'edd' ), esc_html__( 'Error', 'edd' ), array( 'response' => 403 ) );
+		}
+
+		$response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
+
+		if( $response && isset( $response->sections['changelog'] ) ) {
+			echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
+		}
+
+
+		exit;
+	}
 
 }

Spacing +78 added lines, -78 removed lines

@@ -4,7 +4,7 @@ 
 //set_site_transient( 'update_plugins', null );
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Allows plugins to use their own update API.
@@ -29,16 +29,16 @@ 
      * @param array   $_api_data    Optional data to send with API calls.
      * @return void
      */
-    function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
-        $this->api_url  = trailingslashit( $_api_url );
+    function __construct($_api_url, $_plugin_file, $_api_data = null) {
+        $this->api_url  = trailingslashit($_api_url);
         $this->api_data = $_api_data;
-        $this->name     = plugin_basename( $_plugin_file );
-        $this->slug     = basename( $_plugin_file, '.php' );
+        $this->name     = plugin_basename($_plugin_file);
+        $this->slug     = basename($_plugin_file, '.php');
         $this->version  = $_api_data['version'];
 
         // Set up hooks.
         $this->init();
-        add_action( 'admin_init', array( $this, 'show_changelog' ) );
+        add_action('admin_init', array($this, 'show_changelog'));
     }
 
     /**
@@ -50,10 +50,10 @@ 
      */
     public function init() {
 
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-        add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+        add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
+        add_filter('plugins_api', array($this, 'plugins_api_filter'), 10, 3);
 
-        add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+        add_action('after_plugin_row_'.$this->name, array($this, 'show_update_notification'), 10, 2);
     }
 
     /**
@@ -69,34 +69,34 @@ 
      * @param array   $_transient_data Update array build by WordPress.
      * @return array Modified update array with custom plugin data.
      */
-    function check_update( $_transient_data ) {
+    function check_update($_transient_data) {
 
         global $pagenow;
 
-        if( ! is_object( $_transient_data ) ) {
+        if ( ! is_object($_transient_data)) {
             $_transient_data = new stdClass;
         }
 
-        if( 'plugins.php' == $pagenow && is_multisite() ) {
+        if ('plugins.php' == $pagenow && is_multisite()) {
             return $_transient_data;
         }
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+        if (empty($_transient_data->response) || empty($_transient_data->response[$this->name])) {
 
-            $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+            $version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-            if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+            if (false !== $version_info && is_object($version_info) && isset($version_info->new_version)) {
 
                 $this->did_check = true;
 
-                if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+                if (version_compare($this->version, $version_info->new_version, '<')) {
 
-                    $_transient_data->response[ $this->name ] = $version_info;
+                    $_transient_data->response[$this->name] = $version_info;
 
                 }
 
                 $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
+                $_transient_data->checked[$this->name] = $this->version;
 
             }
 
@@ -111,86 +111,86 @@ 
      * @param string  $file
      * @param array   $plugin
      */
-    public function show_update_notification( $file, $plugin ) {
+    public function show_update_notification($file, $plugin) {
 
-        if( ! current_user_can( 'update_plugins' ) ) {
+        if ( ! current_user_can('update_plugins')) {
             return;
         }
 
-        if( ! is_multisite() ) {
+        if ( ! is_multisite()) {
             return;
         }
 
-        if ( $this->name != $file ) {
+        if ($this->name != $file) {
             return;
         }
 
         // Remove our filter on the site transient
-        remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
+        remove_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'), 10);
 
-        $update_cache = get_site_transient( 'update_plugins' );
+        $update_cache = get_site_transient('update_plugins');
 
-        if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+        if ( ! is_object($update_cache) || empty($update_cache->response) || empty($update_cache->response[$this->name])) {
 
-            $cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
-            $version_info = get_transient( $cache_key );
+            $cache_key    = md5('edd_plugin_'.sanitize_key($this->name).'_version_info');
+            $version_info = get_transient($cache_key);
 
-            if( false === $version_info ) {
+            if (false === $version_info) {
 
-                $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+                $version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-                set_transient( $cache_key, $version_info, 3600 );
+                set_transient($cache_key, $version_info, 3600);
             }
 
 
-            if( ! is_object( $version_info ) ) {
+            if ( ! is_object($version_info)) {
                 return;
             }
 
-            if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+            if (version_compare($this->version, $version_info->new_version, '<')) {
 
-                $update_cache->response[ $this->name ] = $version_info;
+                $update_cache->response[$this->name] = $version_info;
 
             }
 
             $update_cache->last_checked = time();
-            $update_cache->checked[ $this->name ] = $this->version;
+            $update_cache->checked[$this->name] = $this->version;
 
-            set_site_transient( 'update_plugins', $update_cache );
+            set_site_transient('update_plugins', $update_cache);
 
         } else {
 
-            $version_info = $update_cache->response[ $this->name ];
+            $version_info = $update_cache->response[$this->name];
 
         }
 
         // Restore our filter
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+        add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
 
-        if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+        if ( ! empty($update_cache->response[$this->name]) && version_compare($this->version, $version_info->new_version, '<')) {
 
             // build a plugin list row, with update notification
-            $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-            echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+            $wp_list_table = _get_list_table('WP_Plugins_List_Table');
+            echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
 
-            $changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+            $changelog_link = self_admin_url('index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911');
 
-            if ( empty( $version_info->download_link ) ) {
+            if (empty($version_info->download_link)) {
                 printf(
 					/* translators: 1: name 2: changelog URL 3: version */
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ),
-                    esc_html__( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html__( $version_info->new_version )
+                    __('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd'),
+                    esc_html__($version_info->name),
+                    esc_url($changelog_link),
+                    esc_html__($version_info->new_version)
                 );
             } else {
                 printf(
 					/* translators: 1: name 2: changelog URL 3: version 4: update URL */
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ),
-                    esc_html__( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html__( $version_info->new_version ),
-                    esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
+                    __('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd'),
+                    esc_html__($version_info->name),
+                    esc_url($changelog_link),
+                    esc_html__($version_info->new_version),
+                    esc_url(wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$this->name, 'upgrade-plugin_'.$this->name))
                 );
             }
 
@@ -209,16 +209,16 @@ 
      * @param object  $_args
      * @return object $_data
      */
-    function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+    function plugins_api_filter($_data, $_action = '', $_args = null) {
 
 
-        if ( $_action != 'plugin_information' ) {
+        if ($_action != 'plugin_information') {
 
             return $_data;
 
         }
 
-        if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+        if ( ! isset($_args->slug) || ($_args->slug != $this->slug)) {
 
             return $_data;
 
@@ -233,9 +233,9 @@ 
             )
         );
 
-        $api_response = $this->api_request( 'plugin_information', $to_send );
+        $api_response = $this->api_request('plugin_information', $to_send);
 
-        if ( false !== $api_response ) {
+        if (false !== $api_response) {
             $_data = $api_response;
         }
 
@@ -250,9 +250,9 @@ 
      * @param string  $url
      * @return object $array
      */
-    function http_request_args( $args, $url ) {
+    function http_request_args($args, $url) {
         // If it is an https request and we are performing a package download, disable ssl verification
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+        if (strpos($url, 'https://') !== false && strpos($url, 'edd_action=package_download')) {
             $args['sslverify'] = false;
         }
         return $args;
@@ -269,40 +269,40 @@ 
      * @param array   $_data   Parameters for the API action.
      * @return false||object
      */
-    private function api_request( $_action, $_data ) {
+    private function api_request($_action, $_data) {
 
         global $wp_version;
 
-        $data = array_merge( $this->api_data, $_data );
+        $data = array_merge($this->api_data, $_data);
 
-        if ( $data['slug'] != $this->slug )
+        if ($data['slug'] != $this->slug)
             return;
 
-        if ( empty( $data['license'] ) )
+        if (empty($data['license']))
             return;
 
-        if( $this->api_url == home_url() ) {
+        if ($this->api_url == home_url()) {
             return false; // Don't allow a plugin to ping itself
         }
 
         $api_params = array(
             'edd_action' => 'get_version',
             'license'    => $data['license'],
-            'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-            'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+            'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
+            'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
             'slug'       => $data['slug'],
             'author'     => $data['author'],
             'url'        => home_url()
         );
 
-        $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+        $request = wp_remote_post($this->api_url, array('timeout' => 15, 'sslverify' => false, 'body' => $api_params));
 
-        if ( ! is_wp_error( $request ) ) {
-            $request = json_decode( wp_remote_retrieve_body( $request ) );
+        if ( ! is_wp_error($request)) {
+            $request = json_decode(wp_remote_retrieve_body($request));
         }
 
-        if ( $request && isset( $request->sections ) ) {
-            $request->sections = maybe_unserialize( $request->sections );
+        if ($request && isset($request->sections)) {
+            $request->sections = maybe_unserialize($request->sections);
         } else {
             $request = false;
         }
@@ -313,26 +313,26 @@ 
     public function show_changelog() {
 
 
-        if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+        if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) {
             return;
         }
 
-        if( empty( $_REQUEST['plugin'] ) ) {
+        if (empty($_REQUEST['plugin'])) {
             return;
         }
 
-        if( empty( $_REQUEST['slug'] ) ) {
+        if (empty($_REQUEST['slug'])) {
             return;
         }
 
-        if( ! current_user_can( 'update_plugins' ) ) {
-            wp_die( esc_html__( 'You do not have permission to install plugin updates.', 'edd' ), esc_html__( 'Error', 'edd' ), array( 'response' => 403 ) );
+        if ( ! current_user_can('update_plugins')) {
+            wp_die(esc_html__('You do not have permission to install plugin updates.', 'edd'), esc_html__('Error', 'edd'), array('response' => 403));
         }
 
-        $response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
+        $response = $this->api_request('plugin_latest_version', array('slug' => $_REQUEST['slug']));
 
-        if( $response && isset( $response->sections['changelog'] ) ) {
-            echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
+        if ($response && isset($response->sections['changelog'])) {
+            echo '<div style="background:#fff;padding:10px;">'.$response->sections['changelog'].'</div>';
         }
 
 

includes/install.php

Spacing +52 added lines, -52 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,15 +24,15 @@ 
  * @global $wp_version
  * @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();
 
@@ -46,7 +46,7 @@ 
 
 }
 
-register_activation_hook( GIVE_PLUGIN_FILE, 'give_install' );
+register_activation_hook(GIVE_PLUGIN_FILE, 'give_install');
 
 /**
  * Run the Give Install process
@@ -62,24 +62,24 @@ 
 	give_setup_post_types();
 
 	// Clear the permalinks
-	flush_rewrite_rules( false );
+	flush_rewrite_rules(false);
 
 	// Add Upgraded From Option
-	$current_version = get_option( 'give_version' );
-	if ( $current_version ) {
-		update_option( 'give_version_upgraded_from', $current_version );
+	$current_version = get_option('give_version');
+	if ($current_version) {
+		update_option('give_version_upgraded_from', $current_version);
 	}
 
 	// Setup some default options
 	$options = array();
 
 	// Checks if the Success Page option exists AND that the page exists
-	if ( ! get_post( give_get_option( 'success_page' ) ) ) {
+	if ( ! get_post(give_get_option('success_page'))) {
 
 		// Purchase Confirmation (Success) Page
 		$success = wp_insert_post(
 			array(
-				'post_title'     => esc_html__( 'Donation Confirmation', 'give' ),
+				'post_title'     => esc_html__('Donation Confirmation', 'give'),
 				'post_content'   => '[give_receipt]',
 				'post_status'    => 'publish',
 				'post_author'    => 1,
@@ -93,13 +93,13 @@ 
 	}
 
 	// Checks if the Failure Page option exists AND that the page exists
-	if ( ! get_post( give_get_option( 'failure_page' ) ) ) {
+	if ( ! get_post(give_get_option('failure_page'))) {
 
 		// Failed Purchase Page
 		$failed = wp_insert_post(
 			array(
-				'post_title'     => esc_html__( 'Transaction Failed', 'give' ),
-				'post_content'   => esc_html__( 'We\'re sorry, your transaction failed to process. Please try again or contact site support.', 'give' ),
+				'post_title'     => esc_html__('Transaction Failed', 'give'),
+				'post_content'   => esc_html__('We\'re sorry, your transaction failed to process. Please try again or contact site support.', 'give'),
 				'post_status'    => 'publish',
 				'post_author'    => 1,
 				'post_type'      => 'page',
@@ -111,11 +111,11 @@ 
 	}
 
 	// Checks if the History Page option exists AND that the page exists
-	if ( ! get_post( give_get_option( 'history_page' ) ) ) {
+	if ( ! get_post(give_get_option('history_page'))) {
 		// Purchase History (History) Page
 		$history = wp_insert_post(
 			array(
-				'post_title'     => esc_html__( 'Donation History', 'give' ),
+				'post_title'     => esc_html__('Donation History', 'give'),
 				'post_content'   => '[donation_history]',
 				'post_status'    => 'publish',
 				'post_author'    => 1,
@@ -128,7 +128,7 @@ 
 	}
 
 	//Fresh Install? Setup Test Mode, Base Country (US), Test Gateway, Currency
-	if ( empty( $current_version ) ) {
+	if (empty($current_version)) {
 		$options['base_country']       = 'US';
 		$options['test_mode']          = 1;
 		$options['currency']           = 'USD';
@@ -145,12 +145,12 @@ 
 	}
 
 	// Populate some default values
-	update_option( 'give_settings', array_merge( $give_options, $options ) );
-	update_option( 'give_version', GIVE_VERSION );
+	update_option('give_settings', array_merge($give_options, $options));
+	update_option('give_version', GIVE_VERSION);
 
 	//Update Version Number
-	if ( $current_version ) {
-		update_option( 'give_version_upgraded_from', $current_version );
+	if ($current_version) {
+		update_option('give_version_upgraded_from', $current_version);
 	}
 
 	// Create Give roles
@@ -159,7 +159,7 @@ 
 	$roles->add_caps();
 
 	$api = new Give_API();
-	update_option( 'give_default_api_version', 'v' . $api->get_version() );
+	update_option('give_default_api_version', 'v'.$api->get_version());
 
 	// Create the customers database
 	@Give()->customers->create_table();
@@ -168,11 +168,11 @@ 
 	Give()->session->use_php_sessions();
 
 	// Add a temporary option to note that Give pages have been created
-	set_transient( '_give_installed', $options, 30 );
+	set_transient('_give_installed', $options, 30);
 	
-	if ( ! $current_version ) {
+	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(
@@ -181,22 +181,22 @@ 
 			'upgrade_give_offline_status'
 		);
 
-		foreach ( $upgrade_routines as $upgrade ) {
-			give_set_upgrade_complete( $upgrade );
+		foreach ($upgrade_routines as $upgrade) {
+			give_set_upgrade_complete($upgrade);
 		}
 	}
 
 	// Bail if activating from network, or bulk
-	if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+	if (is_network_admin() || isset($_GET['activate-multi'])) {
 		return;
 	}
 
 	// Add the transient to redirect
-	set_transient( '_give_activation_redirect', true, 30 );
+	set_transient('_give_activation_redirect', true, 30);
 
 }
 
-register_activation_hook( GIVE_PLUGIN_FILE, 'give_install' );
+register_activation_hook(GIVE_PLUGIN_FILE, 'give_install');
 
 /**
  * Network Activated New Site Setup
@@ -212,11 +212,11 @@ 
  * @param  int    $site_id The Site ID
  * @param  array  $meta    Blog Meta
  */
-function on_create_blog( $blog_id, $user_id, $domain, $path, $site_id, $meta ) {
+function 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();
 
@@ -224,7 +224,7 @@ 
 
 }
 
-add_action( 'wpmu_new_blog', 'on_create_blog', 10, 6 );
+add_action('wpmu_new_blog', 'on_create_blog', 10, 6);
 
 
 /**
@@ -237,11 +237,11 @@ 
  *
  * @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);
 	$customers_db = new Give_DB_Customers();
-	if ( $customers_db->installed() ) {
+	if ($customers_db->installed()) {
 		$tables[] = $customers_db->table_name;
 	}
 	restore_current_blog();
@@ -250,7 +250,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
@@ -262,35 +262,35 @@ 
  */
 function give_after_install() {
 
-	if ( ! is_admin() ) {
+	if ( ! is_admin()) {
 		return;
 	}
 
-	$give_options     = get_transient( '_give_installed' );
-	$give_table_check = get_option( '_give_table_check', false );
+	$give_options     = get_transient('_give_installed');
+	$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()->customers->installed() ) {
+		if ( ! @Give()->customers->installed()) {
 			// Create the customers database (this ensures it creates it on multisite instances where it is network activated)
 			@Give()->customers->create_table();
 
-			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 ) {
-		delete_transient( '_give_installed' );
+	if (false !== $give_options) {
+		delete_transient('_give_installed');
 	}
 
 
 }
 
-add_action( 'admin_init', 'give_after_install' );
+add_action('admin_init', 'give_after_install');
 
 
 /**
@@ -305,11 +305,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();
@@ -320,4 +320,4 @@ 
 
 }
 
-add_action( 'admin_init', 'give_install_roles_on_network' );
\ No newline at end of file
+add_action('admin_init', 'give_install_roles_on_network');
\ No newline at end of file

includes/payments/functions.php

Spacing +380 added lines, -380 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,15 +32,15 @@ 
  *
  * @return object $payments Payments retrieved from the database
  */
-function give_get_payments( $args = array() ) {
+function give_get_payments($args = array()) {
 
 	// Fallback to post objects to ensure backwards compatibility
-	if ( ! isset( $args['output'] ) ) {
+	if ( ! isset($args['output'])) {
 		$args['output'] = 'posts';
 	}
 
-	$args     = apply_filters( 'give_get_payments_args', $args );
-	$payments = new Give_Payments_Query( $args );
+	$args     = apply_filters('give_get_payments_args', $args);
+	$payments = new Give_Payments_Query($args);
 
 	return $payments->get_payments();
 }
@@ -55,48 +55,48 @@ 
  *
  * @return      mixed
  */
-function give_get_payment_by( $field = '', $value = '' ) {
+function give_get_payment_by($field = '', $value = '') {
 
-	if ( empty( $field ) || empty( $value ) ) {
+	if (empty($field) || empty($value)) {
 		return false;
 	}
 
-	switch ( strtolower( $field ) ) {
+	switch (strtolower($field)) {
 
 		case 'id':
-			$payment = new Give_Payment( $value );
+			$payment = new Give_Payment($value);
 			$id      = $payment->ID;
 
-			if ( empty( $id ) ) {
+			if (empty($id)) {
 				return false;
 			}
 
 			break;
 
 		case 'key':
-			$payment = give_get_payments( array(
+			$payment = give_get_payments(array(
 				'meta_key'       => '_give_payment_purchase_key',
 				'meta_value'     => $value,
 				'posts_per_page' => 1,
 				'fields'         => 'ids',
-			) );
+			));
 
-			if ( $payment ) {
-				$payment = new Give_Payment( $payment[0] );
+			if ($payment) {
+				$payment = new Give_Payment($payment[0]);
 			}
 
 			break;
 
 		case 'payment_number':
-			$payment = give_get_payments( array(
+			$payment = give_get_payments(array(
 				'meta_key'       => '_give_payment_number',
 				'meta_value'     => $value,
 				'posts_per_page' => 1,
 				'fields'         => 'ids',
-			) );
+			));
 
-			if ( $payment ) {
-				$payment = new Give_Payment( $payment[0] );
+			if ($payment) {
+				$payment = new Give_Payment($payment[0]);
 			}
 
 			break;
@@ -105,7 +105,7 @@ 
 			return false;
 	}
 
-	if ( $payment ) {
+	if ($payment) {
 		return $payment;
 	}
 
@@ -121,23 +121,23 @@ 
  *
  * @return int|bool Payment ID if payment is inserted, false otherwise
  */
-function give_insert_payment( $payment_data = array() ) {
+function give_insert_payment($payment_data = array()) {
 
-	if ( empty( $payment_data ) ) {
+	if (empty($payment_data)) {
 		return false;
 	}
 
 	$payment    = new Give_Payment();
-	$gateway    = ! empty( $payment_data['gateway'] ) ? $payment_data['gateway'] : '';
-	$gateway    = empty( $gateway ) && isset( $_POST['give-gateway'] ) ? $_POST['give-gateway'] : $gateway;
-	$form_id    = isset( $payment_data['give_form_id'] ) ? $payment_data['give_form_id'] : 0;
-	$price_id   = isset( $payment_data['give_price_id'] ) ? $payment_data['give_price_id'] : give_get_price_id( $payment_data['give_form_id'], $payment_data['price'] );
-	$form_title = isset( $payment_data['give_form_title'] ) ? $payment_data['give_form_title'] : get_the_title( $form_id );
+	$gateway    = ! empty($payment_data['gateway']) ? $payment_data['gateway'] : '';
+	$gateway    = empty($gateway) && isset($_POST['give-gateway']) ? $_POST['give-gateway'] : $gateway;
+	$form_id    = isset($payment_data['give_form_id']) ? $payment_data['give_form_id'] : 0;
+	$price_id   = isset($payment_data['give_price_id']) ? $payment_data['give_price_id'] : give_get_price_id($payment_data['give_form_id'], $payment_data['price']);
+	$form_title = isset($payment_data['give_form_title']) ? $payment_data['give_form_title'] : get_the_title($form_id);
 
 	//Set properties
 	$payment->total          = $payment_data['price'];
-	$payment->status         = ! empty( $payment_data['status'] ) ? $payment_data['status'] : 'pending';
-	$payment->currency       = ! empty( $payment_data['currency'] ) ? $payment_data['currency'] : give_get_currency();
+	$payment->status         = ! empty($payment_data['status']) ? $payment_data['status'] : 'pending';
+	$payment->currency       = ! empty($payment_data['currency']) ? $payment_data['currency'] : give_get_currency();
 	$payment->user_info      = $payment_data['user_info'];
 	$payment->gateway        = $gateway;
 	$payment->form_title     = $form_title;
@@ -151,40 +151,40 @@ 
 	$payment->ip             = give_get_ip();
 	$payment->key            = $payment_data['purchase_key'];
 	$payment->mode           = give_is_test_mode() ? 'test' : 'live';
-	$payment->parent_payment = ! empty( $payment_data['parent'] ) ? absint( $payment_data['parent'] ) : '';
+	$payment->parent_payment = ! empty($payment_data['parent']) ? absint($payment_data['parent']) : '';
 
 	//Add the donation
 	$args = array(
 		'price'    => $payment->total,
 		'price_id' => $payment->price_id,
-		'fees'     => isset( $payment_data['fees'] ) ? $payment_data['fees'] : array()
+		'fees'     => isset($payment_data['fees']) ? $payment_data['fees'] : array()
 	);
 
-	$payment->add_donation( $payment->form_id, $args );
+	$payment->add_donation($payment->form_id, $args);
 
 	//Set date if present
-	if ( isset( $payment_data['post_date'] ) ) {
+	if (isset($payment_data['post_date'])) {
 		$payment->date = $payment_data['post_date'];
 	}
 
 	//Handle sequential payments
-	if ( give_get_option( 'enable_sequential' ) ) {
+	if (give_get_option('enable_sequential')) {
 		$number          = give_get_next_payment_number();
-		$payment->number = give_format_payment_number( $number );
-		update_option( 'give_last_payment_number', $number );
+		$payment->number = give_format_payment_number($number);
+		update_option('give_last_payment_number', $number);
 	}
 
 	// Clear the user's purchased cache
-	delete_transient( 'give_user_' . $payment_data['user_info']['id'] . '_purchases' );
+	delete_transient('give_user_'.$payment_data['user_info']['id'].'_purchases');
 
 	//Save payment
 	$payment->save();
 
 	//Hook it
-	do_action( 'give_insert_payment', $payment->ID, $payment_data );
+	do_action('give_insert_payment', $payment->ID, $payment_data);
 
 	//Return payment ID upon success
-	if ( ! empty( $payment->ID ) ) {
+	if ( ! empty($payment->ID)) {
 		return $payment->ID;
 	}
 
@@ -203,9 +203,9 @@ 
  *
  * @return bool
  */
-function give_update_payment_status( $payment_id, $new_status = 'publish' ) {
+function give_update_payment_status($payment_id, $new_status = 'publish') {
 
-	$payment         = new Give_Payment( $payment_id );
+	$payment         = new Give_Payment($payment_id);
 	$payment->status = $new_status;
 	$updated         = $payment->save();
 
@@ -225,52 +225,52 @@ 
  *
  * @return void
  */
-function give_delete_purchase( $payment_id = 0, $update_customer = true ) {
+function give_delete_purchase($payment_id = 0, $update_customer = true) {
 	global $give_logs;
 
-	$payment     = new Give_Payment( $payment_id );
-	$amount      = give_get_payment_amount( $payment_id );
+	$payment     = new Give_Payment($payment_id);
+	$amount      = give_get_payment_amount($payment_id);
 	$status      = $payment->post_status;
-	$customer_id = give_get_payment_customer_id( $payment_id );
-	$customer    = new Give_Customer( $customer_id );
+	$customer_id = give_get_payment_customer_id($payment_id);
+	$customer    = new Give_Customer($customer_id);
 
 	//Only undo purchases that aren't these statuses
-	$dont_undo_statuses = apply_filters( 'give_undo_purchase_statuses', array(
+	$dont_undo_statuses = apply_filters('give_undo_purchase_statuses', array(
 		'pending',
 		'cancelled'
-	) );
+	));
 
-	if ( ! in_array( $status, $dont_undo_statuses ) ) {
-		give_undo_purchase( false, $payment_id );
+	if ( ! in_array($status, $dont_undo_statuses)) {
+		give_undo_purchase(false, $payment_id);
 	}
 
-	if ( $status == 'publish' ) {
+	if ($status == 'publish') {
 
 		// Only decrease earnings if they haven't already been decreased (or were never increased for this payment)
-		give_decrease_total_earnings( $amount );
+		give_decrease_total_earnings($amount);
 		// Clear the This Month earnings (this_monththis_month is NOT a typo)
-		delete_transient( md5( 'give_earnings_this_monththis_month' ) );
+		delete_transient(md5('give_earnings_this_monththis_month'));
 
-		if ( $customer->id && $update_customer ) {
+		if ($customer->id && $update_customer) {
 
 			// Decrement the stats for the customer
 			$customer->decrease_purchase_count();
-			$customer->decrease_value( $amount );
+			$customer->decrease_value($amount);
 
 		}
 	}
 
-	do_action( 'give_payment_delete', $payment_id );
+	do_action('give_payment_delete', $payment_id);
 
-	if ( $customer->id && $update_customer ) {
+	if ($customer->id && $update_customer) {
 
 		// Remove the payment ID from the customer
-		$customer->remove_payment( $payment_id );
+		$customer->remove_payment($payment_id);
 
 	}
 
 	// Remove the payment
-	wp_delete_post( $payment_id, true );
+	wp_delete_post($payment_id, true);
 
 	// Remove related sale log entries
 	$give_logs->delete_logs(
@@ -284,7 +284,7 @@ 
 		)
 	);
 
-	do_action( 'give_payment_deleted', $payment_id );
+	do_action('give_payment_deleted', $payment_id);
 }
 
 /**
@@ -297,25 +297,25 @@ 
  *
  * @return void
  */
-function give_undo_purchase( $form_id = false, $payment_id ) {
+function give_undo_purchase($form_id = false, $payment_id) {
 
-	if ( ! empty( $form_id ) ) {
+	if ( ! empty($form_id)) {
 		$form_id = false;
-		_give_deprected_argument( 'form_id', 'give_undo_purchase', '1.5' );
+		_give_deprected_argument('form_id', 'give_undo_purchase', '1.5');
 	}
 
-	$payment = new Give_Payment( $payment_id );
+	$payment = new Give_Payment($payment_id);
 
-	$maybe_decrease_earnings = apply_filters( 'give_decrease_earnings_on_undo', true, $payment, $payment->form_id );
-	if ( true === $maybe_decrease_earnings ) {
+	$maybe_decrease_earnings = apply_filters('give_decrease_earnings_on_undo', true, $payment, $payment->form_id);
+	if (true === $maybe_decrease_earnings) {
 		// decrease earnings
-		give_decrease_earnings( $payment->form_id, $payment->total );
+		give_decrease_earnings($payment->form_id, $payment->total);
 	}
 
-	$maybe_decrease_sales = apply_filters( 'give_decrease_sales_on_undo', true, $payment, $payment->form_id );
-	if ( true === $maybe_decrease_sales ) {
+	$maybe_decrease_sales = apply_filters('give_decrease_sales_on_undo', true, $payment, $payment->form_id);
+	if (true === $maybe_decrease_sales) {
 		// decrease purchase count
-		give_decrease_purchase_count( $payment->form_id );
+		give_decrease_purchase_count($payment->form_id);
 	}
 
 }
@@ -332,7 +332,7 @@ 
  *
  * @return array $count Number of payments sorted by payment status
  */
-function give_count_payments( $args = array() ) {
+function give_count_payments($args = array()) {
 
 	global $wpdb;
 
@@ -344,18 +344,18 @@ 
 		'form_id'    => null,
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$select = "SELECT p.post_status,count( * ) AS num_posts";
 	$join   = '';
 	$where  = "WHERE p.post_type = 'give_payment'";
 
 	// Count payments for a specific user
-	if ( ! empty( $args['user'] ) ) {
+	if ( ! empty($args['user'])) {
 
-		if ( is_email( $args['user'] ) ) {
+		if (is_email($args['user'])) {
 			$field = 'email';
-		} elseif ( is_numeric( $args['user'] ) ) {
+		} elseif (is_numeric($args['user'])) {
 			$field = 'id';
 		} else {
 			$field = '';
@@ -363,108 +363,108 @@ 
 
 		$join = "LEFT JOIN $wpdb->postmeta m ON (p.ID = m.post_id)";
 
-		if ( ! empty( $field ) ) {
+		if ( ! empty($field)) {
 			$where .= "
 				AND m.meta_key = '_give_payment_user_{$field}'
 				AND m.meta_value = '{$args['user']}'";
 		}
 
 		// Count payments for a search
-	} elseif ( ! empty( $args['s'] ) ) {
+	} elseif ( ! empty($args['s'])) {
 
-		if ( is_email( $args['s'] ) || strlen( $args['s'] ) == 32 ) {
+		if (is_email($args['s']) || strlen($args['s']) == 32) {
 
-			if ( is_email( $args['s'] ) ) {
+			if (is_email($args['s'])) {
 				$field = '_give_payment_user_email';
 			} else {
 				$field = '_give_payment_purchase_key';
 			}
 
 			$join = "LEFT JOIN $wpdb->postmeta m ON (p.ID = m.post_id)";
-			$where .= $wpdb->prepare( "
+			$where .= $wpdb->prepare("
 				AND m.meta_key = %s
 				AND m.meta_value = %s",
 				$field,
 				$args['s']
 			);
 
-		} elseif ( '#' == substr( $args['s'], 0, 1 ) ) {
+		} elseif ('#' == substr($args['s'], 0, 1)) {
 
-			$search = str_replace( '#:', '', $args['s'] );
-			$search = str_replace( '#', '', $search );
+			$search = str_replace('#:', '', $args['s']);
+			$search = str_replace('#', '', $search);
 
 			$select = "SELECT p2.post_status,count( * ) AS num_posts ";
 			$join   = "LEFT JOIN $wpdb->postmeta m ON m.meta_key = '_give_log_payment_id' AND m.post_id = p.ID ";
 			$join .= "INNER JOIN $wpdb->posts p2 ON m.meta_value = p2.ID ";
 			$where = "WHERE p.post_type = 'give_log' ";
-			$where .= $wpdb->prepare( "AND p.post_parent = %d} ", $search );
+			$where .= $wpdb->prepare("AND p.post_parent = %d} ", $search);
 
-		} elseif ( is_numeric( $args['s'] ) ) {
+		} elseif (is_numeric($args['s'])) {
 
 			$join = "LEFT JOIN $wpdb->postmeta m ON (p.ID = m.post_id)";
-			$where .= $wpdb->prepare( "
+			$where .= $wpdb->prepare("
 				AND m.meta_key = '_give_payment_user_id'
 				AND m.meta_value = %d",
 				$args['s']
 			);
 
 		} else {
-			$search = $wpdb->esc_like( $args['s'] );
-			$search = '%' . $search . '%';
+			$search = $wpdb->esc_like($args['s']);
+			$search = '%'.$search.'%';
 
-			$where .= $wpdb->prepare( "AND ((p.post_title LIKE %s) OR (p.post_content LIKE %s))", $search, $search );
+			$where .= $wpdb->prepare("AND ((p.post_title LIKE %s) OR (p.post_content LIKE %s))", $search, $search);
 		}
 
 	}
 
-	if ( ! empty( $args['form_id'] ) && is_numeric( $args['form_id'] ) ) {
+	if ( ! empty($args['form_id']) && is_numeric($args['form_id'])) {
 
-		$where .= $wpdb->prepare( " AND p.post_parent = %d", $args['form_id'] );
+		$where .= $wpdb->prepare(" AND p.post_parent = %d", $args['form_id']);
 
 	}
 	// Limit payments count by date
-	if ( ! empty( $args['start-date'] ) && false !== strpos( $args['start-date'], '/' ) ) {
+	if ( ! empty($args['start-date']) && false !== strpos($args['start-date'], '/')) {
 
-		$date_parts = explode( '/', $args['start-date'] );
-		$month      = ! empty( $date_parts[0] ) && is_numeric( $date_parts[0] ) ? $date_parts[0] : 0;
-		$day        = ! empty( $date_parts[1] ) && is_numeric( $date_parts[1] ) ? $date_parts[1] : 0;
-		$year       = ! empty( $date_parts[2] ) && is_numeric( $date_parts[2] ) ? $date_parts[2] : 0;
+		$date_parts = explode('/', $args['start-date']);
+		$month      = ! empty($date_parts[0]) && is_numeric($date_parts[0]) ? $date_parts[0] : 0;
+		$day        = ! empty($date_parts[1]) && is_numeric($date_parts[1]) ? $date_parts[1] : 0;
+		$year       = ! empty($date_parts[2]) && is_numeric($date_parts[2]) ? $date_parts[2] : 0;
 
-		$is_date = checkdate( $month, $day, $year );
-		if ( false !== $is_date ) {
+		$is_date = checkdate($month, $day, $year);
+		if (false !== $is_date) {
 
-			$date = new DateTime( $args['start-date'] );
-			$where .= $wpdb->prepare( " AND p.post_date >= '%s'", $date->format( 'Y-m-d' ) );
+			$date = new DateTime($args['start-date']);
+			$where .= $wpdb->prepare(" AND p.post_date >= '%s'", $date->format('Y-m-d'));
 
 		}
 
 		// Fixes an issue with the payments list table counts when no end date is specified (partiy with stats class)
-		if ( empty( $args['end-date'] ) ) {
+		if (empty($args['end-date'])) {
 			$args['end-date'] = $args['start-date'];
 		}
 
 	}
 
-	if ( ! empty ( $args['end-date'] ) && false !== strpos( $args['end-date'], '/' ) ) {
+	if ( ! empty ($args['end-date']) && false !== strpos($args['end-date'], '/')) {
 
-		$date_parts = explode( '/', $args['end-date'] );
+		$date_parts = explode('/', $args['end-date']);
 
-		$month = ! empty( $date_parts[0] ) ? $date_parts[0] : 0;
-		$day   = ! empty( $date_parts[1] ) ? $date_parts[1] : 0;
-		$year  = ! empty( $date_parts[2] ) ? $date_parts[2] : 0;
+		$month = ! empty($date_parts[0]) ? $date_parts[0] : 0;
+		$day   = ! empty($date_parts[1]) ? $date_parts[1] : 0;
+		$year  = ! empty($date_parts[2]) ? $date_parts[2] : 0;
 
-		$is_date = checkdate( $month, $day, $year );
-		if ( false !== $is_date ) {
+		$is_date = checkdate($month, $day, $year);
+		if (false !== $is_date) {
 
-			$date = new DateTime( $args['end-date'] );
-			$where .= $wpdb->prepare( " AND p.post_date <= '%s'", $date->format( 'Y-m-d' ) );
+			$date = new DateTime($args['end-date']);
+			$where .= $wpdb->prepare(" AND p.post_date <= '%s'", $date->format('Y-m-d'));
 
 		}
 
 	}
 
-	$where = apply_filters( 'give_count_payments_where', $where );
-	$join  = apply_filters( 'give_count_payments_join', $join );
+	$where = apply_filters('give_count_payments_where', $where);
+	$join  = apply_filters('give_count_payments_join', $join);
 
 	$query = "$select
 		FROM $wpdb->posts p
@@ -473,36 +473,36 @@ 
 		GROUP BY p.post_status
 	";
 
-	$cache_key = md5( $query );
+	$cache_key = md5($query);
 
-	$count = wp_cache_get( $cache_key, 'counts' );
-	if ( false !== $count ) {
+	$count = wp_cache_get($cache_key, 'counts');
+	if (false !== $count) {
 		return $count;
 	}
 
-	$count = $wpdb->get_results( $query, ARRAY_A );
+	$count = $wpdb->get_results($query, ARRAY_A);
 
 	$stats    = array();
 	$statuses = get_post_stati();
-	if ( isset( $statuses['private'] ) && empty( $args['s'] ) ) {
-		unset( $statuses['private'] );
+	if (isset($statuses['private']) && empty($args['s'])) {
+		unset($statuses['private']);
 	}
 
-	foreach ( $statuses as $state ) {
-		$stats[ $state ] = 0;
+	foreach ($statuses as $state) {
+		$stats[$state] = 0;
 	}
 
-	foreach ( (array) $count as $row ) {
+	foreach ((array) $count as $row) {
 
-		if ( 'private' == $row['post_status'] && empty( $args['s'] ) ) {
+		if ('private' == $row['post_status'] && empty($args['s'])) {
 			continue;
 		}
 
-		$stats[ $row['post_status'] ] = $row['num_posts'];
+		$stats[$row['post_status']] = $row['num_posts'];
 	}
 
 	$stats = (object) $stats;
-	wp_cache_set( $cache_key, $stats, 'counts' );
+	wp_cache_set($cache_key, $stats, 'counts');
 
 	return $stats;
 }
@@ -517,12 +517,12 @@ 
  *
  * @return bool true if payment exists, false otherwise
  */
-function give_check_for_existing_payment( $payment_id ) {
+function give_check_for_existing_payment($payment_id) {
 	$exists  = false;
-	$payment = new Give_Payment( $payment_id );
+	$payment = new Give_Payment($payment_id);
 
 
-	if ( $payment_id === $payment->ID && 'publish' === $payment->status ) {
+	if ($payment_id === $payment->ID && 'publish' === $payment->status) {
 		$exists = true;
 	}
 
@@ -539,29 +539,29 @@ 
  *
  * @return bool|mixed if payment status exists, false otherwise
  */
-function give_get_payment_status( $payment, $return_label = false ) {
+function give_get_payment_status($payment, $return_label = false) {
 
-	if ( ! is_object( $payment ) || ! isset( $payment->post_status ) ) {
+	if ( ! is_object($payment) || ! isset($payment->post_status)) {
 		return false;
 	}
 
 	$statuses = give_get_payment_statuses();
 
-	if ( ! is_array( $statuses ) || empty( $statuses ) ) {
+	if ( ! is_array($statuses) || empty($statuses)) {
 		return false;
 	}
 
-	$payment = new Give_Payment( $payment->ID );
+	$payment = new Give_Payment($payment->ID);
 
-	if ( array_key_exists( $payment->status, $statuses ) ) {
-		if ( true === $return_label ) {
-			return $statuses[ $payment->status ];
+	if (array_key_exists($payment->status, $statuses)) {
+		if (true === $return_label) {
+			return $statuses[$payment->status];
 		} else {
 			// Account that our 'publish' status is labeled 'Complete'
 			$post_status = 'publish' == $payment->status ? 'Complete' : $payment->post_status;
 
 			// Make sure we're matching cases, since they matter
-			return array_search( strtolower( $post_status ), array_map( 'strtolower', $statuses ) );
+			return array_search(strtolower($post_status), array_map('strtolower', $statuses));
 		}
 	}
 
@@ -576,17 +576,17 @@ 
  */
 function give_get_payment_statuses() {
 	$payment_statuses = array(
-		'pending'     => esc_html__( 'Pending', 'give' ),
-		'publish'     => esc_html__( 'Complete', 'give' ),
-		'refunded'    => esc_html__( 'Refunded', 'give' ),
-		'failed'      => esc_html__( 'Failed', 'give' ),
-		'cancelled'   => esc_html__( 'Cancelled', 'give' ),
-		'abandoned'   => esc_html__( 'Abandoned', 'give' ),
-		'preapproval' => esc_html__( 'Pre-Approved', 'give' ),
-		'revoked'     => esc_html__( 'Revoked', 'give' )
+		'pending'     => esc_html__('Pending', 'give'),
+		'publish'     => esc_html__('Complete', 'give'),
+		'refunded'    => esc_html__('Refunded', 'give'),
+		'failed'      => esc_html__('Failed', 'give'),
+		'cancelled'   => esc_html__('Cancelled', 'give'),
+		'abandoned'   => esc_html__('Abandoned', 'give'),
+		'preapproval' => esc_html__('Pre-Approved', 'give'),
+		'revoked'     => esc_html__('Revoked', 'give')
 	);
 
-	return apply_filters( 'give_payment_statuses', $payment_statuses );
+	return apply_filters('give_payment_statuses', $payment_statuses);
 }
 
 /**
@@ -598,10 +598,10 @@ 
  * @return array $payment_status All the available payment statuses
  */
 function give_get_payment_status_keys() {
-	$statuses = array_keys( give_get_payment_statuses() );
-	asort( $statuses );
+	$statuses = array_keys(give_get_payment_statuses());
+	asort($statuses);
 
-	return array_values( $statuses );
+	return array_values($statuses);
 }
 
 /**
@@ -616,7 +616,7 @@ 
  *
  * @return int $earnings Earnings
  */
-function give_get_earnings_by_date( $day = null, $month_num, $year = null, $hour = null ) {
+function give_get_earnings_by_date($day = null, $month_num, $year = null, $hour = null) {
 
 	// This is getting deprecated soon. Use Give_Payment_Stats with the get_earnings() method instead
 
@@ -627,41 +627,41 @@ 
 		'nopaging'               => true,
 		'year'                   => $year,
 		'monthnum'               => $month_num,
-		'post_status'            => array( 'publish', 'revoked' ),
+		'post_status'            => array('publish', 'revoked'),
 		'fields'                 => 'ids',
 		'update_post_term_cache' => false
 	);
-	if ( ! empty( $day ) ) {
+	if ( ! empty($day)) {
 		$args['day'] = $day;
 	}
 
-	if ( ! empty( $hour ) ) {
+	if ( ! empty($hour)) {
 		$args['hour'] = $hour;
 	}
 
-	$args = apply_filters( 'give_get_earnings_by_date_args', $args );
-	$key  = 'give_stats_' . substr( md5( serialize( $args ) ), 0, 15 );
+	$args = apply_filters('give_get_earnings_by_date_args', $args);
+	$key  = 'give_stats_'.substr(md5(serialize($args)), 0, 15);
 
-	if ( ! empty( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'give-refresh-reports' ) ) {
+	if ( ! empty($_GET['_wpnonce']) && wp_verify_nonce($_GET['_wpnonce'], 'give-refresh-reports')) {
 		$earnings = false;
 	} else {
-		$earnings = get_transient( $key );
+		$earnings = get_transient($key);
 	}
 
-	if ( false === $earnings ) {
-		$sales    = get_posts( $args );
+	if (false === $earnings) {
+		$sales    = get_posts($args);
 		$earnings = 0;
-		if ( $sales ) {
-			$sales = implode( ',', $sales );
+		if ($sales) {
+			$sales = implode(',', $sales);
 
-			$earnings = $wpdb->get_var( "SELECT SUM(meta_value) FROM $wpdb->postmeta WHERE meta_key = '_give_payment_total' AND post_id IN ({$sales})" );
+			$earnings = $wpdb->get_var("SELECT SUM(meta_value) FROM $wpdb->postmeta WHERE meta_key = '_give_payment_total' AND post_id IN ({$sales})");
 
 		}
 		// Cache the results for one hour
-		set_transient( $key, $earnings, HOUR_IN_SECONDS );
+		set_transient($key, $earnings, HOUR_IN_SECONDS);
 	}
 
-	return round( $earnings, 2 );
+	return round($earnings, 2);
 }
 
 /**
@@ -676,7 +676,7 @@ 
  *
  * @return int $count Sales
  */
-function give_get_sales_by_date( $day = null, $month_num = null, $year = null, $hour = null ) {
+function give_get_sales_by_date($day = null, $month_num = null, $year = null, $hour = null) {
 
 	// This is getting deprecated soon. Use Give_Payment_Stats with the get_sales() method instead
 	$args = array(
@@ -684,14 +684,14 @@ 
 		'nopaging'               => true,
 		'year'                   => $year,
 		'fields'                 => 'ids',
-		'post_status'            => array( 'publish', 'revoked' ),
+		'post_status'            => array('publish', 'revoked'),
 		'update_post_meta_cache' => false,
 		'update_post_term_cache' => false
 	);
 
-	$show_free = apply_filters( 'give_sales_by_date_show_free', true, $args );
+	$show_free = apply_filters('give_sales_by_date_show_free', true, $args);
 
-	if ( false === $show_free ) {
+	if (false === $show_free) {
 		$args['meta_query'] = array(
 			array(
 				'key'     => '_give_payment_total',
@@ -702,33 +702,33 @@ 
 		);
 	}
 
-	if ( ! empty( $month_num ) ) {
+	if ( ! empty($month_num)) {
 		$args['monthnum'] = $month_num;
 	}
 
-	if ( ! empty( $day ) ) {
+	if ( ! empty($day)) {
 		$args['day'] = $day;
 	}
 
-	if ( ! empty( $hour ) ) {
+	if ( ! empty($hour)) {
 		$args['hour'] = $hour;
 	}
 
-	$args = apply_filters( 'give_get_sales_by_date_args', $args );
+	$args = apply_filters('give_get_sales_by_date_args', $args);
 
-	$key = 'give_stats_' . substr( md5( serialize( $args ) ), 0, 15 );
+	$key = 'give_stats_'.substr(md5(serialize($args)), 0, 15);
 
-	if ( ! empty( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], 'give-refresh-reports' ) ) {
+	if ( ! empty($_GET['_wpnonce']) && wp_verify_nonce($_GET['_wpnonce'], 'give-refresh-reports')) {
 		$count = false;
 	} else {
-		$count = get_transient( $key );
+		$count = get_transient($key);
 	}
 
-	if ( false === $count ) {
-		$sales = new WP_Query( $args );
+	if (false === $count) {
+		$sales = new WP_Query($args);
 		$count = (int) $sales->post_count;
 		// Cache the results for one hour
-		set_transient( $key, $count, HOUR_IN_SECONDS );
+		set_transient($key, $count, HOUR_IN_SECONDS);
 	}
 
 	return $count;
@@ -743,20 +743,20 @@ 
  *
  * @return bool true if complete, false otherwise
  */
-function give_is_payment_complete( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_is_payment_complete($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	$ret = false;
 
-	if ( $payment->ID > 0 ) {
+	if ($payment->ID > 0) {
 
-		if ( (int) $payment_id === (int) $payment->ID && 'publish' == $payment->status ) {
+		if ((int) $payment_id === (int) $payment->ID && 'publish' == $payment->status) {
 			$ret = true;
 		}
 
 	}
 
-	return apply_filters( 'give_is_payment_complete', $ret, $payment_id, $payment->post_status );
+	return apply_filters('give_is_payment_complete', $ret, $payment_id, $payment->post_status);
 }
 
 /**
@@ -780,29 +780,29 @@ 
  */
 function give_get_total_earnings() {
 
-	$total = get_option( 'give_earnings_total', false );
+	$total = get_option('give_earnings_total', false);
 
 	// If no total stored in DB, use old method of calculating total earnings
-	if ( false === $total ) {
+	if (false === $total) {
 
 		global $wpdb;
 
-		$total = get_transient( 'give_earnings_total' );
+		$total = get_transient('give_earnings_total');
 
-		if ( false === $total ) {
+		if (false === $total) {
 
 			$total = (float) 0;
 
-			$args = apply_filters( 'give_get_total_earnings_args', array(
+			$args = apply_filters('give_get_total_earnings_args', array(
 				'offset' => 0,
-				'number' => - 1,
-				'status' => array( 'publish', 'revoked' ),
+				'number' => -1,
+				'status' => array('publish', 'revoked'),
 				'fields' => 'ids'
-			) );
+			));
 
 
-			$payments = give_get_payments( $args );
-			if ( $payments ) {
+			$payments = give_get_payments($args);
+			if ($payments) {
 
 				/*
 				 * If performing a purchase, we need to skip the very last payment in the database, since it calls
@@ -810,30 +810,30 @@ 
 				 * first purchase
 				 */
 
-				if ( did_action( 'give_update_payment_status' ) ) {
-					array_pop( $payments );
+				if (did_action('give_update_payment_status')) {
+					array_pop($payments);
 				}
 
-				if ( ! empty( $payments ) ) {
-					$payments = implode( ',', $payments );
-					$total += $wpdb->get_var( "SELECT SUM(meta_value) FROM $wpdb->postmeta WHERE meta_key = '_give_payment_total' AND post_id IN({$payments})" );
+				if ( ! empty($payments)) {
+					$payments = implode(',', $payments);
+					$total += $wpdb->get_var("SELECT SUM(meta_value) FROM $wpdb->postmeta WHERE meta_key = '_give_payment_total' AND post_id IN({$payments})");
 				}
 
 			}
 
 			// Cache results for 1 day. This cache is cleared automatically when a payment is made
-			set_transient( 'give_earnings_total', $total, 86400 );
+			set_transient('give_earnings_total', $total, 86400);
 
 			// Store the total for the first time
-			update_option( 'give_earnings_total', $total );
+			update_option('give_earnings_total', $total);
 		}
 	}
 
-	if ( $total < 0 ) {
+	if ($total < 0) {
 		$total = 0; // Don't ever show negative earnings
 	}
 
-	return apply_filters( 'give_total_earnings', round( $total, give_currency_decimal_filter() ) );
+	return apply_filters('give_total_earnings', round($total, give_currency_decimal_filter()));
 }
 
 /**
@@ -845,10 +845,10 @@ 
  *
  * @return float $total Total earnings
  */
-function give_increase_total_earnings( $amount = 0 ) {
+function give_increase_total_earnings($amount = 0) {
 	$total = give_get_total_earnings();
 	$total += $amount;
-	update_option( 'give_earnings_total', $total );
+	update_option('give_earnings_total', $total);
 
 	return $total;
 }
@@ -862,13 +862,13 @@ 
  *
  * @return float $total Total earnings
  */
-function give_decrease_total_earnings( $amount = 0 ) {
+function give_decrease_total_earnings($amount = 0) {
 	$total = give_get_total_earnings();
 	$total -= $amount;
-	if ( $total < 0 ) {
+	if ($total < 0) {
 		$total = 0;
 	}
-	update_option( 'give_earnings_total', $total );
+	update_option('give_earnings_total', $total);
 
 	return $total;
 }
@@ -884,10 +884,10 @@ 
  *
  * @return mixed $meta Payment Meta
  */
-function give_get_payment_meta( $payment_id = 0, $meta_key = '_give_payment_meta', $single = true ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_meta($payment_id = 0, $meta_key = '_give_payment_meta', $single = true) {
+	$payment = new Give_Payment($payment_id);
 
-	return $payment->get_meta( $meta_key, $single );
+	return $payment->get_meta($meta_key, $single);
 }
 
 /**
@@ -900,10 +900,10 @@ 
  *
  * @return mixed               Meta ID if successful, false if unsuccessful
  */
-function give_update_payment_meta( $payment_id = 0, $meta_key = '', $meta_value = '', $prev_value = '' ) {
-	$payment = new Give_Payment( $payment_id );
+function give_update_payment_meta($payment_id = 0, $meta_key = '', $meta_value = '', $prev_value = '') {
+	$payment = new Give_Payment($payment_id);
 
-	return $payment->update_meta( $meta_key, $meta_value, $prev_value );
+	return $payment->update_meta($meta_key, $meta_value, $prev_value);
 }
 
 /**
@@ -915,8 +915,8 @@ 
  *
  * @return array $user_info User Info Meta Values
  */
-function give_get_payment_meta_user_info( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_meta_user_info($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->user_info;
 }
@@ -931,8 +931,8 @@ 
  *
  * @return int $form_id
  */
-function give_get_payment_form_id( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_form_id($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->form_id;
 }
@@ -946,8 +946,8 @@ 
  *
  * @return string $email User Email
  */
-function give_get_payment_user_email( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_user_email($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->email;
 }
@@ -961,11 +961,11 @@ 
  *
  * @return bool            If the payment is associated with a user (false) or not (true)
  */
-function give_is_guest_payment( $payment_id ) {
-	$payment_user_id  = give_get_payment_user_id( $payment_id );
-	$is_guest_payment = ! empty( $payment_user_id ) && $payment_user_id > 0 ? false : true;
+function give_is_guest_payment($payment_id) {
+	$payment_user_id  = give_get_payment_user_id($payment_id);
+	$is_guest_payment = ! empty($payment_user_id) && $payment_user_id > 0 ? false : true;
 
-	return (bool) apply_filters( 'give_is_guest_payment', $is_guest_payment, $payment_id );
+	return (bool) apply_filters('give_is_guest_payment', $is_guest_payment, $payment_id);
 }
 
 /**
@@ -977,8 +977,8 @@ 
  *
  * @return string $user_id User ID
  */
-function give_get_payment_user_id( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_user_id($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->user_id;
 }
@@ -992,8 +992,8 @@ 
  *
  * @return string $customer_id Customer ID
  */
-function give_get_payment_customer_id( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_customer_id($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->customer_id;
 }
@@ -1007,8 +1007,8 @@ 
  *
  * @return string $ip User IP
  */
-function give_get_payment_user_ip( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_user_ip($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->ip;
 }
@@ -1022,8 +1022,8 @@ 
  *
  * @return string $date The date the payment was completed
  */
-function give_get_payment_completed_date( $payment_id = 0 ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_completed_date($payment_id = 0) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->completed_date;
 }
@@ -1037,8 +1037,8 @@ 
  *
  * @return string $gateway Gateway
  */
-function give_get_payment_gateway( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_gateway($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->gateway;
 }
@@ -1052,8 +1052,8 @@ 
  *
  * @return string $currency The currency code
  */
-function give_get_payment_currency_code( $payment_id = 0 ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_currency_code($payment_id = 0) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->currency;
 }
@@ -1067,10 +1067,10 @@ 
  *
  * @return string $currency The currency name
  */
-function give_get_payment_currency( $payment_id = 0 ) {
-	$currency = give_get_payment_currency_code( $payment_id );
+function give_get_payment_currency($payment_id = 0) {
+	$currency = give_get_payment_currency_code($payment_id);
 
-	return apply_filters( 'give_payment_currency', give_get_currency_name( $currency ), $payment_id );
+	return apply_filters('give_payment_currency', give_get_currency_name($currency), $payment_id);
 }
 
 /**
@@ -1082,8 +1082,8 @@ 
  *
  * @return string $key Purchase key
  */
-function give_get_payment_key( $payment_id = 0 ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_key($payment_id = 0) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->key;
 }
@@ -1099,8 +1099,8 @@ 
  *
  * @return string $number Payment order number
  */
-function give_get_payment_number( $payment_id = 0 ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_number($payment_id = 0) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->number;
 }
@@ -1114,23 +1114,23 @@ 
  *
  * @return string      The formatted payment number
  */
-function give_format_payment_number( $number ) {
+function give_format_payment_number($number) {
 
-	if ( ! give_get_option( 'enable_sequential' ) ) {
+	if ( ! give_get_option('enable_sequential')) {
 		return $number;
 	}
 
-	if ( ! is_numeric( $number ) ) {
+	if ( ! is_numeric($number)) {
 		return $number;
 	}
 
-	$prefix  = give_get_option( 'sequential_prefix' );
-	$number  = absint( $number );
-	$postfix = give_get_option( 'sequential_postfix' );
+	$prefix  = give_get_option('sequential_prefix');
+	$number  = absint($number);
+	$postfix = give_get_option('sequential_postfix');
 
-	$formatted_number = $prefix . $number . $postfix;
+	$formatted_number = $prefix.$number.$postfix;
 
-	return apply_filters( 'give_format_payment_number', $formatted_number, $prefix, $number, $postfix );
+	return apply_filters('give_format_payment_number', $formatted_number, $prefix, $number, $postfix);
 }
 
 /**
@@ -1143,17 +1143,17 @@ 
  */
 function give_get_next_payment_number() {
 
-	if ( ! give_get_option( 'enable_sequential' ) ) {
+	if ( ! give_get_option('enable_sequential')) {
 		return false;
 	}
 
-	$number           = get_option( 'give_last_payment_number' );
-	$start            = give_get_option( 'sequential_start', 1 );
+	$number           = get_option('give_last_payment_number');
+	$start            = give_get_option('sequential_start', 1);
 	$increment_number = true;
 
-	if ( false !== $number ) {
+	if (false !== $number) {
 
-		if ( empty( $number ) ) {
+		if (empty($number)) {
 
 			$number           = $start;
 			$increment_number = false;
@@ -1163,24 +1163,24 @@ 
 	} else {
 
 		// This case handles the first addition of the new option, as well as if it get's deleted for any reason
-		$payments     = new Give_Payments_Query( array(
+		$payments = new Give_Payments_Query(array(
 			'number'  => 1,
 			'order'   => 'DESC',
 			'orderby' => 'ID',
 			'output'  => 'posts',
 			'fields'  => 'ids'
-		) );
+		));
 		$last_payment = $payments->get_payments();
 
-		if ( ! empty( $last_payment ) ) {
+		if ( ! empty($last_payment)) {
 
-			$number = give_get_payment_number( $last_payment[0] );
+			$number = give_get_payment_number($last_payment[0]);
 
 		}
 
-		if ( ! empty( $number ) && $number !== (int) $last_payment[0] ) {
+		if ( ! empty($number) && $number !== (int) $last_payment[0]) {
 
-			$number = give_remove_payment_prefix_postfix( $number );
+			$number = give_remove_payment_prefix_postfix($number);
 
 		} else {
 
@@ -1190,13 +1190,13 @@ 
 
 	}
 
-	$increment_number = apply_filters( 'give_increment_payment_number', $increment_number, $number );
+	$increment_number = apply_filters('give_increment_payment_number', $increment_number, $number);
 
-	if ( $increment_number ) {
-		$number ++;
+	if ($increment_number) {
+		$number++;
 	}
 
-	return apply_filters( 'give_get_next_payment_number', $number );
+	return apply_filters('give_get_next_payment_number', $number);
 }
 
 /**
@@ -1208,25 +1208,25 @@ 
  *
  * @return string          The new Payment number without prefix and postfix
  */
-function give_remove_payment_prefix_postfix( $number ) {
+function give_remove_payment_prefix_postfix($number) {
 
-	$prefix  = give_get_option( 'sequential_prefix' );
-	$postfix = give_get_option( 'sequential_postfix' );
+	$prefix  = give_get_option('sequential_prefix');
+	$postfix = give_get_option('sequential_postfix');
 
 	// Remove prefix
-	$number = preg_replace( '/' . $prefix . '/', '', $number, 1 );
+	$number = preg_replace('/'.$prefix.'/', '', $number, 1);
 
 	// Remove the postfix
-	$length      = strlen( $number );
-	$postfix_pos = strrpos( $number, $postfix );
-	if ( false !== $postfix_pos ) {
-		$number = substr_replace( $number, '', $postfix_pos, $length );
+	$length      = strlen($number);
+	$postfix_pos = strrpos($number, $postfix);
+	if (false !== $postfix_pos) {
+		$number = substr_replace($number, '', $postfix_pos, $length);
 	}
 
 	// Ensure it's a whole number
-	$number = intval( $number );
+	$number = intval($number);
 
-	return apply_filters( 'give_remove_payment_prefix_postfix', $number, $prefix, $postfix );
+	return apply_filters('give_remove_payment_prefix_postfix', $number, $prefix, $postfix);
 
 }
 
@@ -1242,10 +1242,10 @@ 
  *
  * @return string $amount Fully formatted payment amount
  */
-function give_payment_amount( $payment_id = 0 ) {
-	$amount = give_get_payment_amount( $payment_id );
+function give_payment_amount($payment_id = 0) {
+	$amount = give_get_payment_amount($payment_id);
 
-	return give_currency_filter( give_format_amount( $amount ), give_get_payment_currency_code( $payment_id ) );
+	return give_currency_filter(give_format_amount($amount), give_get_payment_currency_code($payment_id));
 }
 
 /**
@@ -1258,11 +1258,11 @@ 
  *
  * @return mixed|void
  */
-function give_get_payment_amount( $payment_id ) {
+function give_get_payment_amount($payment_id) {
 
-	$payment = new Give_Payment( $payment_id );
+	$payment = new Give_Payment($payment_id);
 
-	return apply_filters( 'give_payment_amount', floatval( $payment->total ), $payment_id );
+	return apply_filters('give_payment_amount', floatval($payment->total), $payment_id);
 }
 
 /**
@@ -1278,10 +1278,10 @@ 
  *
  * @return array Fully formatted payment subtotal
  */
-function give_payment_subtotal( $payment_id = 0 ) {
-	$subtotal = give_get_payment_subtotal( $payment_id );
+function give_payment_subtotal($payment_id = 0) {
+	$subtotal = give_get_payment_subtotal($payment_id);
 
-	return give_currency_filter( give_format_amount( $subtotal ), give_get_payment_currency_code( $payment_id ) );
+	return give_currency_filter(give_format_amount($subtotal), give_get_payment_currency_code($payment_id));
 }
 
 /**
@@ -1295,8 +1295,8 @@ 
  *
  * @return float $subtotal Subtotal for payment (non formatted)
  */
-function give_get_payment_subtotal( $payment_id = 0 ) {
-	$payment = new G_Payment( $payment_id );
+function give_get_payment_subtotal($payment_id = 0) {
+	$payment = new G_Payment($payment_id);
 
 	return $payment->subtotal;
 }
@@ -1311,10 +1311,10 @@ 
  *
  * @return mixed array if payment fees found, false otherwise
  */
-function give_get_payment_fees( $payment_id = 0, $type = 'all' ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_fees($payment_id = 0, $type = 'all') {
+	$payment = new Give_Payment($payment_id);
 
-	return $payment->get_fees( $type );
+	return $payment->get_fees($type);
 }
 
 /**
@@ -1326,8 +1326,8 @@ 
  *
  * @return string The Transaction ID
  */
-function give_get_payment_transaction_id( $payment_id = 0 ) {
-	$payment = new Give_Payment( $payment_id );
+function give_get_payment_transaction_id($payment_id = 0) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->transaction_id;
 }
@@ -1342,15 +1342,15 @@ 
  *
  * @return bool|mixed
  */
-function give_set_payment_transaction_id( $payment_id = 0, $transaction_id = '' ) {
+function give_set_payment_transaction_id($payment_id = 0, $transaction_id = '') {
 
-	if ( empty( $payment_id ) || empty( $transaction_id ) ) {
+	if (empty($payment_id) || empty($transaction_id)) {
 		return false;
 	}
 
-	$transaction_id = apply_filters( 'give_set_payment_transaction_id', $transaction_id, $payment_id );
+	$transaction_id = apply_filters('give_set_payment_transaction_id', $transaction_id, $payment_id);
 
-	return give_update_payment_meta( $payment_id, '_give_payment_transaction_id', $transaction_id );
+	return give_update_payment_meta($payment_id, '_give_payment_transaction_id', $transaction_id);
 }
 
 /**
@@ -1364,12 +1364,12 @@ 
  *
  * @return int $purchase Purchase ID
  */
-function give_get_purchase_id_by_key( $key ) {
+function give_get_purchase_id_by_key($key) {
 	global $wpdb;
 
-	$purchase = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_give_payment_purchase_key' AND meta_value = %s LIMIT 1", $key ) );
+	$purchase = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_give_payment_purchase_key' AND meta_value = %s LIMIT 1", $key));
 
-	if ( $purchase != null ) {
+	if ($purchase != null) {
 		return $purchase;
 	}
 
@@ -1388,12 +1388,12 @@ 
  *
  * @return int $purchase Purchase ID
  */
-function give_get_purchase_id_by_transaction_id( $key ) {
+function give_get_purchase_id_by_transaction_id($key) {
 	global $wpdb;
 
-	$purchase = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_give_payment_transaction_id' AND meta_value = %s LIMIT 1", $key ) );
+	$purchase = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_give_payment_transaction_id' AND meta_value = %s LIMIT 1", $key));
 
-	if ( $purchase != null ) {
+	if ($purchase != null) {
 		return $purchase;
 	}
 
@@ -1410,19 +1410,19 @@ 
  *
  * @return array $notes Payment Notes
  */
-function give_get_payment_notes( $payment_id = 0, $search = '' ) {
+function give_get_payment_notes($payment_id = 0, $search = '') {
 
-	if ( empty( $payment_id ) && empty( $search ) ) {
+	if (empty($payment_id) && empty($search)) {
 		return false;
 	}
 
-	remove_action( 'pre_get_comments', 'give_hide_payment_notes', 10 );
-	remove_filter( 'comments_clauses', 'give_hide_payment_notes_pre_41', 10, 2 );
+	remove_action('pre_get_comments', 'give_hide_payment_notes', 10);
+	remove_filter('comments_clauses', 'give_hide_payment_notes_pre_41', 10, 2);
 
-	$notes = get_comments( array( 'post_id' => $payment_id, 'order' => 'ASC', 'search' => $search ) );
+	$notes = get_comments(array('post_id' => $payment_id, 'order' => 'ASC', 'search' => $search));
 
-	add_action( 'pre_get_comments', 'give_hide_payment_notes', 10 );
-	add_filter( 'comments_clauses', 'give_hide_payment_notes_pre_41', 10, 2 );
+	add_action('pre_get_comments', 'give_hide_payment_notes', 10);
+	add_filter('comments_clauses', 'give_hide_payment_notes_pre_41', 10, 2);
 
 	return $notes;
 }
@@ -1438,19 +1438,19 @@ 
  *
  * @return int The new note ID
  */
-function give_insert_payment_note( $payment_id = 0, $note = '' ) {
-	if ( empty( $payment_id ) ) {
+function give_insert_payment_note($payment_id = 0, $note = '') {
+	if (empty($payment_id)) {
 		return false;
 	}
 
-	do_action( 'give_pre_insert_payment_note', $payment_id, $note );
+	do_action('give_pre_insert_payment_note', $payment_id, $note);
 
-	$note_id = wp_insert_comment( wp_filter_comment( array(
+	$note_id = wp_insert_comment(wp_filter_comment(array(
 		'comment_post_ID'      => $payment_id,
 		'comment_content'      => $note,
 		'user_id'              => is_admin() ? get_current_user_id() : 0,
-		'comment_date'         => current_time( 'mysql' ),
-		'comment_date_gmt'     => current_time( 'mysql', 1 ),
+		'comment_date'         => current_time('mysql'),
+		'comment_date_gmt'     => current_time('mysql', 1),
 		'comment_approved'     => 1,
 		'comment_parent'       => 0,
 		'comment_author'       => '',
@@ -1459,9 +1459,9 @@ 
 		'comment_author_email' => '',
 		'comment_type'         => 'give_payment_note'
 
-	) ) );
+	)));
 
-	do_action( 'give_insert_payment_note', $note_id, $payment_id, $note );
+	do_action('give_insert_payment_note', $note_id, $payment_id, $note);
 
 	return $note_id;
 }
@@ -1476,14 +1476,14 @@ 
  *
  * @return bool True on success, false otherwise
  */
-function give_delete_payment_note( $comment_id = 0, $payment_id = 0 ) {
-	if ( empty( $comment_id ) ) {
+function give_delete_payment_note($comment_id = 0, $payment_id = 0) {
+	if (empty($comment_id)) {
 		return false;
 	}
 
-	do_action( 'give_pre_delete_payment_note', $comment_id, $payment_id );
-	$ret = wp_delete_comment( $comment_id, true );
-	do_action( 'give_post_delete_payment_note', $comment_id, $payment_id );
+	do_action('give_pre_delete_payment_note', $comment_id, $payment_id);
+	$ret = wp_delete_comment($comment_id, true);
+	do_action('give_post_delete_payment_note', $comment_id, $payment_id);
 
 	return $ret;
 }
@@ -1498,32 +1498,32 @@ 
  *
  * @return string
  */
-function give_get_payment_note_html( $note, $payment_id = 0 ) {
+function give_get_payment_note_html($note, $payment_id = 0) {
 
-	if ( is_numeric( $note ) ) {
-		$note = get_comment( $note );
+	if (is_numeric($note)) {
+		$note = get_comment($note);
 	}
 
-	if ( ! empty( $note->user_id ) ) {
-		$user = get_userdata( $note->user_id );
+	if ( ! empty($note->user_id)) {
+		$user = get_userdata($note->user_id);
 		$user = $user->display_name;
 	} else {
-		$user = esc_html__( 'System', 'give' );
+		$user = esc_html__('System', 'give');
 	}
 
-	$date_format = get_option( 'date_format' ) . ', ' . get_option( 'time_format' );
+	$date_format = get_option('date_format').', '.get_option('time_format');
 
-	$delete_note_url = wp_nonce_url( add_query_arg( array(
+	$delete_note_url = wp_nonce_url(add_query_arg(array(
 		'give-action' => 'delete_payment_note',
 		'note_id'     => $note->comment_ID,
 		'payment_id'  => $payment_id
-	) ), 'give_delete_payment_note_' . $note->comment_ID );
+	)), 'give_delete_payment_note_'.$note->comment_ID);
 
-	$note_html = '<div class="give-payment-note" id="give-payment-note-' . $note->comment_ID . '">';
+	$note_html = '<div class="give-payment-note" id="give-payment-note-'.$note->comment_ID.'">';
 	$note_html .= '<p>';
-	$note_html .= '<strong>' . $user . '</strong>&nbsp;&ndash;&nbsp;<span style="color:#aaa;font-style:italic;">' . date_i18n( $date_format, strtotime( $note->comment_date ) ) . '</span><br/>';
+	$note_html .= '<strong>'.$user.'</strong>&nbsp;&ndash;&nbsp;<span style="color:#aaa;font-style:italic;">'.date_i18n($date_format, strtotime($note->comment_date)).'</span><br/>';
 	$note_html .= $note->comment_content;
-	$note_html .= '&nbsp;&ndash;&nbsp;<a href="' . esc_url( $delete_note_url ) . '" class="give-delete-payment-note" data-note-id="' . absint( $note->comment_ID ) . '" data-payment-id="' . absint( $payment_id ) . '" title="' . esc_attr__( 'Delete this payment note', 'give' ) . '">' . esc_html__( 'Delete', 'give' ) . '</a>';
+	$note_html .= '&nbsp;&ndash;&nbsp;<a href="'.esc_url($delete_note_url).'" class="give-delete-payment-note" data-note-id="'.absint($note->comment_ID).'" data-payment-id="'.absint($payment_id).'" title="'.esc_attr__('Delete this payment note', 'give').'">'.esc_html__('Delete', 'give').'</a>';
 	$note_html .= '</p>';
 	$note_html .= '</div>';
 
@@ -1541,20 +1541,20 @@ 
  *
  * @return void
  */
-function give_hide_payment_notes( $query ) {
+function give_hide_payment_notes($query) {
 	global $wp_version;
 
-	if ( version_compare( floatval( $wp_version ), '4.1', '>=' ) ) {
-		$types = isset( $query->query_vars['type__not_in'] ) ? $query->query_vars['type__not_in'] : array();
-		if ( ! is_array( $types ) ) {
-			$types = array( $types );
+	if (version_compare(floatval($wp_version), '4.1', '>=')) {
+		$types = isset($query->query_vars['type__not_in']) ? $query->query_vars['type__not_in'] : array();
+		if ( ! is_array($types)) {
+			$types = array($types);
 		}
 		$types[]                           = 'give_payment_note';
 		$query->query_vars['type__not_in'] = $types;
 	}
 }
 
-add_action( 'pre_get_comments', 'give_hide_payment_notes', 10 );
+add_action('pre_get_comments', 'give_hide_payment_notes', 10);
 
 /**
  * Exclude notes (comments) on give_payment post type from showing in Recent Comments widgets
@@ -1566,17 +1566,17 @@ 
  *
  * @return array $clauses Updated comment clauses
  */
-function give_hide_payment_notes_pre_41( $clauses, $wp_comment_query ) {
+function give_hide_payment_notes_pre_41($clauses, $wp_comment_query) {
 	global $wpdb, $wp_version;
 
-	if ( version_compare( floatval( $wp_version ), '4.1', '<' ) ) {
+	if (version_compare(floatval($wp_version), '4.1', '<')) {
 		$clauses['where'] .= ' AND comment_type != "give_payment_note"';
 	}
 
 	return $clauses;
 }
 
-add_filter( 'comments_clauses', 'give_hide_payment_notes_pre_41', 10, 2 );
+add_filter('comments_clauses', 'give_hide_payment_notes_pre_41', 10, 2);
 
 
 /**
@@ -1589,15 +1589,15 @@ 
  *
  * @return array $where
  */
-function give_hide_payment_notes_from_feeds( $where, $wp_comment_query ) {
+function give_hide_payment_notes_from_feeds($where, $wp_comment_query) {
 	global $wpdb;
 
-	$where .= $wpdb->prepare( " AND comment_type != %s", 'give_payment_note' );
+	$where .= $wpdb->prepare(" AND comment_type != %s", 'give_payment_note');
 
 	return $where;
 }
 
-add_filter( 'comment_feed_where', 'give_hide_payment_notes_from_feeds', 10, 2 );
+add_filter('comment_feed_where', 'give_hide_payment_notes_from_feeds', 10, 2);
 
 
 /**
@@ -1611,32 +1611,32 @@ 
  *
  * @return array Array of comment counts
  */
-function give_remove_payment_notes_in_comment_counts( $stats, $post_id ) {
+function give_remove_payment_notes_in_comment_counts($stats, $post_id) {
 	global $wpdb, $pagenow;
 
-	if ( 'index.php' != $pagenow ) {
+	if ('index.php' != $pagenow) {
 		return $stats;
 	}
 
 	$post_id = (int) $post_id;
 
-	if ( apply_filters( 'give_count_payment_notes_in_comments', false ) ) {
+	if (apply_filters('give_count_payment_notes_in_comments', false)) {
 		return $stats;
 	}
 
-	$stats = wp_cache_get( "comments-{$post_id}", 'counts' );
+	$stats = wp_cache_get("comments-{$post_id}", 'counts');
 
-	if ( false !== $stats ) {
+	if (false !== $stats) {
 		return $stats;
 	}
 
 	$where = 'WHERE comment_type != "give_payment_note"';
 
-	if ( $post_id > 0 ) {
-		$where .= $wpdb->prepare( " AND comment_post_ID = %d", $post_id );
+	if ($post_id > 0) {
+		$where .= $wpdb->prepare(" AND comment_post_ID = %d", $post_id);
 	}
 
-	$count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
+	$count = $wpdb->get_results("SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A);
 
 	$total    = 0;
 	$approved = array(
@@ -1646,30 +1646,30 @@ 
 		'trash'        => 'trash',
 		'post-trashed' => 'post-trashed'
 	);
-	foreach ( (array) $count as $row ) {
+	foreach ((array) $count as $row) {
 		// Don't count post-trashed toward totals
-		if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] ) {
+		if ('post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved']) {
 			$total += $row['num_comments'];
 		}
-		if ( isset( $approved[ $row['comment_approved'] ] ) ) {
-			$stats[ $approved[ $row['comment_approved'] ] ] = $row['num_comments'];
+		if (isset($approved[$row['comment_approved']])) {
+			$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
 		}
 	}
 
 	$stats['total_comments'] = $total;
-	foreach ( $approved as $key ) {
-		if ( empty( $stats[ $key ] ) ) {
-			$stats[ $key ] = 0;
+	foreach ($approved as $key) {
+		if (empty($stats[$key])) {
+			$stats[$key] = 0;
 		}
 	}
 
 	$stats = (object) $stats;
-	wp_cache_set( "comments-{$post_id}", $stats, 'counts' );
+	wp_cache_set("comments-{$post_id}", $stats, 'counts');
 
 	return $stats;
 }
 
-add_filter( 'wp_count_comments', 'give_remove_payment_notes_in_comment_counts', 10, 2 );
+add_filter('wp_count_comments', 'give_remove_payment_notes_in_comment_counts', 10, 2);
 
 
 /**
@@ -1682,9 +1682,9 @@ 
  *
  * @return string $where Modified where clause
  */
-function give_filter_where_older_than_week( $where = '' ) {
+function give_filter_where_older_than_week($where = '') {
 	// Payments older than one week
-	$start = date( 'Y-m-d', strtotime( '-7 days' ) );
+	$start = date('Y-m-d', strtotime('-7 days'));
 	$where .= " AND post_date <= '{$start}'";
 
 	return $where;
@@ -1703,37 +1703,37 @@ 
  *
  * @return string $form_title Returns the full title if $level_title false, otherwise returns the levels title
  */
-function give_get_payment_form_title( $payment_meta, $level_title = false, $separator = '' ) {
+function give_get_payment_form_title($payment_meta, $level_title = false, $separator = '') {
 
-	$form_id    = isset( $payment_meta['form_id'] ) ? $payment_meta['form_id'] : 0;
-	$form_title = isset( $payment_meta['form_title'] ) ? $payment_meta['form_title'] : '';
-	$price_id   = isset( $payment_meta['price_id'] ) ? $payment_meta['price_id'] : null;
+	$form_id    = isset($payment_meta['form_id']) ? $payment_meta['form_id'] : 0;
+	$form_title = isset($payment_meta['form_title']) ? $payment_meta['form_title'] : '';
+	$price_id   = isset($payment_meta['price_id']) ? $payment_meta['price_id'] : null;
 
-	if ( $level_title == true ) {
+	if ($level_title == true) {
 		$form_title = '';
 	}
 
-	if ( give_has_variable_prices( $form_id ) ) {
+	if (give_has_variable_prices($form_id)) {
 
-		if ( ! empty( $separator ) ) {
-			$form_title .= ' ' . $separator;
+		if ( ! empty($separator)) {
+			$form_title .= ' '.$separator;
 		}
 		$form_title .= ' <span class="donation-level-text-wrap">';
 
-		if ( $price_id == 'custom' ) {
+		if ($price_id == 'custom') {
 
-			$custom_amount_text = get_post_meta( $form_id, '_give_custom_amount_text', true );
-			$form_title .= ! empty( $custom_amount_text ) ? $custom_amount_text : esc_html__( 'Custom Amount', 'give' );
+			$custom_amount_text = get_post_meta($form_id, '_give_custom_amount_text', true);
+			$form_title .= ! empty($custom_amount_text) ? $custom_amount_text : esc_html__('Custom Amount', 'give');
 
 		} else {
-			$form_title .= give_get_price_option_name( $form_id, $price_id );
+			$form_title .= give_get_price_option_name($form_id, $price_id);
 		}
 
 		$form_title .= '</span>';
 
 	}
 
-	return apply_filters( 'give_get_payment_form_title', $form_title, $payment_meta );
+	return apply_filters('give_get_payment_form_title', $form_title, $payment_meta);
 
 }
 
@@ -1747,20 +1747,20 @@ 
  *
  * @return string $price_id
  */
-function give_get_price_id( $form_id, $price ) {
+function give_get_price_id($form_id, $price) {
 
 	$price_id = 0;
 
-	if ( give_has_variable_prices( $form_id ) ) {
+	if (give_has_variable_prices($form_id)) {
 
-		$levels = maybe_unserialize( get_post_meta( $form_id, '_give_donation_levels', true ) );
+		$levels = maybe_unserialize(get_post_meta($form_id, '_give_donation_levels', true));
 
-		foreach ( $levels as $level ) {
+		foreach ($levels as $level) {
 
-			$level_amount = (float) give_sanitize_amount( $level['_give_amount'] );
+			$level_amount = (float) give_sanitize_amount($level['_give_amount']);
 
 			//check that this indeed the recurring price
-			if ( $level_amount == $price ) {
+			if ($level_amount == $price) {
 
 				$price_id = $level['_give_id']['level_id'];
 

includes/payments/actions.php

Spacing +53 added lines, -53 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -28,21 +28,21 @@ 
  *
  * @return void
  */
-function give_complete_purchase( $payment_id, $new_status, $old_status ) {
+function give_complete_purchase($payment_id, $new_status, $old_status) {
 
 	// Make sure that payments are only completed once
-	if ( $old_status == 'publish' || $old_status == 'complete' ) {
+	if ($old_status == 'publish' || $old_status == 'complete') {
 		return;
 	}
 
 	// Make sure the payment completion is only processed when new status is complete
-	if ( $new_status != 'publish' && $new_status != 'complete' ) {
+	if ($new_status != 'publish' && $new_status != 'complete') {
 		return;
 	}
 	
-	$payment = new Give_Payment( $payment_id );
+	$payment = new Give_Payment($payment_id);
 
-	$creation_date  = get_post_field( 'post_date', $payment_id, 'raw' );
+	$creation_date  = get_post_field('post_date', $payment_id, 'raw');
 	$payment_meta   = $payment->payment_meta;
 	$completed_date = $payment->completed_date;
 	$user_info      = $payment->user_info;
@@ -51,45 +51,45 @@ 
 	$price_id       = $payment->price_id;
 	$form_id        = $payment->form_id;
 
-	do_action( 'give_pre_complete_purchase', $payment_id );
+	do_action('give_pre_complete_purchase', $payment_id);
 
 	// Ensure these actions only run once, ever
-	if ( empty( $completed_date ) ) {
+	if (empty($completed_date)) {
 
-		give_record_sale_in_log( $form_id, $payment_id, $price_id, $creation_date );
-		do_action( 'give_complete_form_donation', $form_id, $payment_id, $payment_meta );
+		give_record_sale_in_log($form_id, $payment_id, $price_id, $creation_date);
+		do_action('give_complete_form_donation', $form_id, $payment_id, $payment_meta);
 
 	}
 
 	// Increase the earnings for this form ID
-	give_increase_earnings( $form_id, $amount );
-	give_increase_purchase_count( $form_id );
+	give_increase_earnings($form_id, $amount);
+	give_increase_purchase_count($form_id);
 
 	// Clear the total earnings cache
-	delete_transient( 'give_earnings_total' );
+	delete_transient('give_earnings_total');
 	// Clear the This Month earnings (this_monththis_month is NOT a typo)
-	delete_transient( md5( 'give_earnings_this_monththis_month' ) );
-	delete_transient( md5( 'give_earnings_todaytoday' ) );
+	delete_transient(md5('give_earnings_this_monththis_month'));
+	delete_transient(md5('give_earnings_todaytoday'));
 	
 	// Increase the donor's purchase stats
-	$customer = new Give_Customer( $customer_id );
+	$customer = new Give_Customer($customer_id);
 	$customer->increase_purchase_count();
-	$customer->increase_value( $amount );
+	$customer->increase_value($amount);
 
-	give_increase_total_earnings( $amount );
+	give_increase_total_earnings($amount);
 
 	// Ensure this action only runs once ever
-	if ( empty( $completed_date ) ) {
+	if (empty($completed_date)) {
 
 		// Save the completed date
-		$payment->completed_date = current_time( 'mysql' );
+		$payment->completed_date = current_time('mysql');
 		$payment->save();
-		do_action( 'give_complete_purchase', $payment_id );
+		do_action('give_complete_purchase', $payment_id);
 	}
 
 }
 
-add_action( 'give_update_payment_status', 'give_complete_purchase', 100, 3 );
+add_action('give_update_payment_status', 'give_complete_purchase', 100, 3);
 
 
 /**
@@ -103,24 +103,24 @@ 
  *
  * @return void
  */
-function give_record_status_change( $payment_id, $new_status, $old_status ) {
+function give_record_status_change($payment_id, $new_status, $old_status) {
 
 	// Get the list of statuses so that status in the payment note can be translated
 	$stati      = give_get_payment_statuses();
-	$old_status = isset( $stati[ $old_status ] ) ? $stati[ $old_status ] : $old_status;
-	$new_status = isset( $stati[ $new_status ] ) ? $stati[ $new_status ] : $new_status;
+	$old_status = isset($stati[$old_status]) ? $stati[$old_status] : $old_status;
+	$new_status = isset($stati[$new_status]) ? $stati[$new_status] : $new_status;
 
 	$status_change = sprintf(
 		/* translators: 1: old status 2: new status */
-		esc_html__( 'Status changed from %1$s to %2$s.', 'give' ),
+		esc_html__('Status changed from %1$s to %2$s.', 'give'),
 		$old_status,
 		$new_status
 	);
 
-	give_insert_payment_note( $payment_id, $status_change );
+	give_insert_payment_note($payment_id, $status_change);
 }
 
-add_action( 'give_update_payment_status', 'give_record_status_change', 100, 3 );
+add_action('give_update_payment_status', 'give_record_status_change', 100, 3);
 
 
 /**
@@ -133,17 +133,17 @@ 
  * @param $new_status the status of the payment, probably "publish"
  * @param $old_status the status of the payment prior to being marked as "complete", probably "pending"
  */
-function give_clear_user_history_cache( $payment_id, $new_status, $old_status ) {
+function give_clear_user_history_cache($payment_id, $new_status, $old_status) {
 
-	$payment = new Give_Payment( $payment_id );
+	$payment = new Give_Payment($payment_id);
 
-	if ( ! empty( $payment->user_id ) ) {
-		delete_transient( 'give_user_' . $payment->user_id . '_purchases' );
+	if ( ! empty($payment->user_id)) {
+		delete_transient('give_user_'.$payment->user_id.'_purchases');
 	}
 
 }
 
-add_action( 'give_update_payment_status', 'give_clear_user_history_cache', 10, 3 );
+add_action('give_update_payment_status', 'give_clear_user_history_cache', 10, 3);
 
 /**
  * Updates all old payments, prior to 1.2, with new
@@ -157,25 +157,25 @@ 
  *
  * @return void
  */
-function give_update_old_payments_with_totals( $data ) {
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give_upgrade_payments_nonce' ) ) {
+function give_update_old_payments_with_totals($data) {
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give_upgrade_payments_nonce')) {
 		return;
 	}
 
-	if ( get_option( 'give_payment_totals_upgraded' ) ) {
+	if (get_option('give_payment_totals_upgraded')) {
 		return;
 	}
 
-	$payments = give_get_payments( array(
+	$payments = give_get_payments(array(
 		'offset' => 0,
-		'number' => - 1,
+		'number' => -1,
 		'mode'   => 'all'
-	) );
+	));
 
-	if ( $payments ) {
-		foreach ( $payments as $payment ) {
+	if ($payments) {
+		foreach ($payments as $payment) {
 
-			$payment = new Give_Payment( $payment->ID );
+			$payment = new Give_Payment($payment->ID);
 			$meta    = $payment->get_meta();
 
 			$payment->total = $meta['amount'];
@@ -184,10 +184,10 @@ 
 		}
 	}
 
-	add_option( 'give_payment_totals_upgraded', 1 );
+	add_option('give_payment_totals_upgraded', 1);
 }
 
-add_action( 'give_upgrade_payments', 'give_update_old_payments_with_totals' );
+add_action('give_upgrade_payments', 'give_update_old_payments_with_totals');
 
 /**
  * Updates week-old+ 'pending' orders to 'abandoned'
@@ -198,21 +198,21 @@ 
 function give_mark_abandoned_donations() {
 	$args = array(
 		'status' => 'pending',
-		'number' => - 1,
+		'number' => -1,
 		'output' => 'give_payments',
 	);
 
-	add_filter( 'posts_where', 'give_filter_where_older_than_week' );
+	add_filter('posts_where', 'give_filter_where_older_than_week');
 
-	$payments = give_get_payments( $args );
+	$payments = give_get_payments($args);
 
-	remove_filter( 'posts_where', 'give_filter_where_older_than_week' );
+	remove_filter('posts_where', 'give_filter_where_older_than_week');
 
-	if ( $payments ) {
-		foreach ( $payments as $payment ) {
-			$gateway = give_get_payment_gateway( $payment );
+	if ($payments) {
+		foreach ($payments as $payment) {
+			$gateway = give_get_payment_gateway($payment);
 			//Skip offline gateway payments
-			if ( $gateway == 'offline' ) {
+			if ($gateway == 'offline') {
 				continue;
 			}
 			$payment->status = 'abandoned';
@@ -221,4 +221,4 @@ 
 	}
 }
 
-add_action( 'give_weekly_scheduled_events', 'give_mark_abandoned_donations' );
\ No newline at end of file
+add_action('give_weekly_scheduled_events', 'give_mark_abandoned_donations');
\ No newline at end of file

includes/class-give-email-access.php

Spacing +62 added lines, -62 removed lines

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

includes/emails/functions.php

Spacing +95 added lines, -95 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,39 +26,39 @@ 
  *
  * @return void
  */
-function give_email_donation_receipt( $payment_id, $admin_notice = true ) {
+function give_email_donation_receipt($payment_id, $admin_notice = true) {
 
-	$payment_data = give_get_payment_meta( $payment_id );
+	$payment_data = give_get_payment_meta($payment_id);
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_from_address', $from_email, $payment_id, $payment_data);
 
-	$to_email = give_get_payment_user_email( $payment_id );
+	$to_email = give_get_payment_user_email($payment_id);
 
-	$subject = give_get_option( 'donation_subject', esc_html__( 'Donation Receipt', 'give' ) );
-	$subject = apply_filters( 'give_donation_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = give_get_option('donation_subject', esc_html__('Donation Receipt', 'give'));
+	$subject = apply_filters('give_donation_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$attachments = apply_filters( 'give_receipt_attachments', array(), $payment_id, $payment_data );
-	$message     = give_do_email_tags( give_get_email_body_content( $payment_id, $payment_data ), $payment_id );
+	$attachments = apply_filters('give_receipt_attachments', array(), $payment_id, $payment_data);
+	$message     = give_do_email_tags(give_get_email_body_content($payment_id, $payment_data), $payment_id);
 
 	$emails = Give()->emails;
 
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', esc_html__( 'Donation Receipt', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', esc_html__('Donation Receipt', '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);
 
-	if ( $admin_notice && ! give_admin_notices_disabled( $payment_id ) ) {
-		do_action( 'give_admin_sale_notice', $payment_id, $payment_data );
+	if ($admin_notice && ! give_admin_notices_disabled($payment_id)) {
+		do_action('give_admin_sale_notice', $payment_id, $payment_data);
 	}
 }
 
@@ -71,29 +71,29 @@ 
  */
 function give_email_test_donation_receipt() {
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, 0, array() );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, 0, array());
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, 0, array() );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_from_address', $from_email, 0, array());
 
-	$subject = give_get_option( 'donation_subject', esc_html__( 'Donation Receipt', 'give' ) );
-	$subject = apply_filters( 'give_donation_subject', wp_strip_all_tags( $subject ), 0 );
-	$subject = give_do_email_tags( $subject, 0 );
+	$subject = give_get_option('donation_subject', esc_html__('Donation Receipt', 'give'));
+	$subject = apply_filters('give_donation_subject', wp_strip_all_tags($subject), 0);
+	$subject = give_do_email_tags($subject, 0);
 
-	$attachments = apply_filters( 'give_receipt_attachments', array(), 0, array() );
+	$attachments = apply_filters('give_receipt_attachments', array(), 0, array());
 
-	$message = give_email_preview_template_tags( give_get_email_body_content( 0, array() ) );
+	$message = give_email_preview_template_tags(give_get_email_body_content(0, array()));
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', esc_html__( 'Donation Receipt', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', esc_html__('Donation Receipt', 'give'));
 
-	$headers = apply_filters( 'give_receipt_headers', $emails->get_headers(), 0, array() );
-	$emails->__set( 'headers', $headers );
+	$headers = apply_filters('give_receipt_headers', $emails->get_headers(), 0, array());
+	$emails->__set('headers', $headers);
 
-	$emails->send( give_get_admin_notice_emails(), $subject, $message, $attachments );
+	$emails->send(give_get_admin_notice_emails(), $subject, $message, $attachments);
 
 }
 
@@ -107,50 +107,50 @@ 
  *
  * @return void
  */
-function give_admin_email_notice( $payment_id = 0, $payment_data = array() ) {
+function give_admin_email_notice($payment_id = 0, $payment_data = array()) {
 
-	$payment_id = absint( $payment_id );
+	$payment_id = absint($payment_id);
 
-	if ( empty( $payment_id ) ) {
+	if (empty($payment_id)) {
 		return;
 	}
 
-	if ( ! give_get_payment_by( 'id', $payment_id ) ) {
+	if ( ! give_get_payment_by('id', $payment_id)) {
 		return;
 	}
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_from_address', $from_email, $payment_id, $payment_data);
 
 	/* translators: %s: payment id */
-	$subject = give_get_option( 'donation_notification_subject', sprintf( esc_html__( 'New Donation - Payment #%s', 'give' ), $payment_id ) );
-	$subject = apply_filters( 'give_admin_donation_notification_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = give_get_option('donation_notification_subject', sprintf(esc_html__('New Donation - Payment #%s', 'give'), $payment_id));
+	$subject = apply_filters('give_admin_donation_notification_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$headers = "From: " . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
-	$headers .= "Reply-To: " . $from_email . "\r\n";
+	$headers = "From: ".stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8'))." <$from_email>\r\n";
+	$headers .= "Reply-To: ".$from_email."\r\n";
 	//$headers  .= "MIME-Version: 1.0\r\n";
 	$headers .= "Content-Type: text/html; charset=utf-8\r\n";
-	$headers = apply_filters( 'give_admin_donation_notification_headers', $headers, $payment_id, $payment_data );
+	$headers = apply_filters('give_admin_donation_notification_headers', $headers, $payment_id, $payment_data);
 
-	$attachments = apply_filters( 'give_admin_donation_notification_attachments', array(), $payment_id, $payment_data );
+	$attachments = apply_filters('give_admin_donation_notification_attachments', array(), $payment_id, $payment_data);
 
-	$message = give_get_donation_notification_body_content( $payment_id, $payment_data );
+	$message = give_get_donation_notification_body_content($payment_id, $payment_data);
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'headers', $headers );
-	$emails->__set( 'heading', esc_html__( 'New Donation!', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('headers', $headers);
+	$emails->__set('heading', esc_html__('New Donation!', 'give'));
 
-	$emails->send( give_get_admin_notice_emails(), $subject, $message, $attachments );
+	$emails->send(give_get_admin_notice_emails(), $subject, $message, $attachments);
 
 }
 
-add_action( 'give_admin_sale_notice', 'give_admin_email_notice', 10, 2 );
+add_action('give_admin_sale_notice', 'give_admin_email_notice', 10, 2);
 
 /**
  * Retrieves the emails for which admin notifications are sent to (these can be
@@ -163,10 +163,10 @@ 
 function give_get_admin_notice_emails() {
 	global $give_options;
 
-	$emails = isset( $give_options['admin_notice_emails'] ) && strlen( trim( $give_options['admin_notice_emails'] ) ) > 0 ? $give_options['admin_notice_emails'] : get_bloginfo( 'admin_email' );
-	$emails = array_map( 'trim', explode( "\n", $emails ) );
+	$emails = isset($give_options['admin_notice_emails']) && strlen(trim($give_options['admin_notice_emails'])) > 0 ? $give_options['admin_notice_emails'] : get_bloginfo('admin_email');
+	$emails = array_map('trim', explode("\n", $emails));
 
-	return apply_filters( 'give_admin_notice_emails', $emails );
+	return apply_filters('give_admin_notice_emails', $emails);
 }
 
 /**
@@ -178,11 +178,11 @@ 
  *
  * @return mixed
  */
-function give_admin_notices_disabled( $payment_id = 0 ) {
+function give_admin_notices_disabled($payment_id = 0) {
 
-	$retval = give_get_option( 'disable_admin_notices' );
+	$retval = give_get_option('disable_admin_notices');
 
-	return apply_filters( 'give_admin_notices_disabled', $retval, $payment_id );
+	return apply_filters('give_admin_notices_disabled', $retval, $payment_id);
 }
 
 /**
@@ -195,17 +195,17 @@ 
  */
 function give_get_default_donation_notification_email() {
 
-	$default_email_body = esc_html__( 'Hi there,', 'give' ) . "\n\n" . esc_html__( 'This email is to inform you that a new donation has been made on your website: ', 'give' ) . '<a href="' . get_bloginfo( 'url' ) . '" target="_blank">' . get_bloginfo( 'url' ) . '</a>' . ".\n\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Donor: ', 'give' ) . '</strong> ' . ' {name}' . "\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Donation: ', 'give' ) . '</strong> ' . ' {donation}' . "\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Amount: ', 'give' ) . '</strong> ' . ' {price}' . "\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Payment Method: ', 'give' ) . '</strong> ' . ' {payment_method}' . "\n\n";
-	$default_email_body .= esc_html__( 'Thank you,', 'give' ) . "\n\n" . '{sitename}';
+	$default_email_body = esc_html__('Hi there,', 'give')."\n\n".esc_html__('This email is to inform you that a new donation has been made on your website: ', 'give').'<a href="'.get_bloginfo('url').'" target="_blank">'.get_bloginfo('url').'</a>'.".\n\n";
+	$default_email_body .= '<strong>'.esc_html__('Donor: ', 'give').'</strong> '.' {name}'."\n";
+	$default_email_body .= '<strong>'.esc_html__('Donation: ', 'give').'</strong> '.' {donation}'."\n";
+	$default_email_body .= '<strong>'.esc_html__('Amount: ', 'give').'</strong> '.' {price}'."\n";
+	$default_email_body .= '<strong>'.esc_html__('Payment Method: ', 'give').'</strong> '.' {payment_method}'."\n\n";
+	$default_email_body .= esc_html__('Thank you,', 'give')."\n\n".'{sitename}';
 
-	$custom_message = give_get_option( 'donation_notification' );
-	$message        = ! empty( $custom_message ) ? $custom_message : $default_email_body;
+	$custom_message = give_get_option('donation_notification');
+	$message        = ! empty($custom_message) ? $custom_message : $default_email_body;
 
-	return apply_filters( 'give_default_donation_notification_email', $message );
+	return apply_filters('give_default_donation_notification_email', $message);
 }
 
 
@@ -219,26 +219,26 @@ 
  */
 function give_get_default_donation_receipt_email() {
 
-	$default_email_body = esc_html__( 'Dear', 'give' ) . " {name},\n\n";
-	$default_email_body .= esc_html__( 'Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give' ) . "\n\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Donor', 'give' ) . ':</strong> ' . '{fullname}' . "\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Donation', 'give' ) . ':</strong> ' . '{donation}' . "\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Donation Date', 'give' ) . ':</strong> ' . '{date}' . "\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Amount', 'give' ) . ':</strong> ' . '{price}' . "\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Payment Method', 'give' ) . ':</strong> ' . '{payment_method}' . "\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Payment ID', 'give' ) . ':</strong> ' . '{payment_id}' . "\n";
-	$default_email_body .= '<strong>' . esc_html__( 'Receipt ID', 'give' ) . ':</strong> ' . '{receipt_id}' . "\n\n";
-	$default_email_body .= '{receipt_link}' . "\n\n";
+	$default_email_body = esc_html__('Dear', 'give')." {name},\n\n";
+	$default_email_body .= esc_html__('Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give')."\n\n";
+	$default_email_body .= '<strong>'.esc_html__('Donor', 'give').':</strong> '.'{fullname}'."\n";
+	$default_email_body .= '<strong>'.esc_html__('Donation', 'give').':</strong> '.'{donation}'."\n";
+	$default_email_body .= '<strong>'.esc_html__('Donation Date', 'give').':</strong> '.'{date}'."\n";
+	$default_email_body .= '<strong>'.esc_html__('Amount', 'give').':</strong> '.'{price}'."\n";
+	$default_email_body .= '<strong>'.esc_html__('Payment Method', 'give').':</strong> '.'{payment_method}'."\n";
+	$default_email_body .= '<strong>'.esc_html__('Payment ID', 'give').':</strong> '.'{payment_id}'."\n";
+	$default_email_body .= '<strong>'.esc_html__('Receipt ID', 'give').':</strong> '.'{receipt_id}'."\n\n";
+	$default_email_body .= '{receipt_link}'."\n\n";
 
 	$default_email_body .= "\n\n";
-	$default_email_body .= esc_html__( 'Sincerely,', 'give' );
-	$default_email_body .= "\n" . '{sitename}' . "\n";
+	$default_email_body .= esc_html__('Sincerely,', 'give');
+	$default_email_body .= "\n".'{sitename}'."\n";
 
-	$custom_message = give_get_option( 'donation_receipt' );
+	$custom_message = give_get_option('donation_receipt');
 
-	$message = ! empty( $custom_message ) ? $custom_message : $default_email_body;
+	$message = ! empty($custom_message) ? $custom_message : $default_email_body;
 
-	return apply_filters( 'give_default_donation_receipt_email', $message );
+	return apply_filters('give_default_donation_receipt_email', $message);
 }
 
 /**
@@ -250,19 +250,19 @@ 
  *
  * @return array $email_names
  */
-function give_get_email_names( $user_info ) {
+function give_get_email_names($user_info) {
 	$email_names = array();
-	$user_info   = maybe_unserialize( $user_info );
+	$user_info   = maybe_unserialize($user_info);
 
 	$email_names['fullname'] = '';
-	if ( isset( $user_info['id'] ) && $user_info['id'] > 0 && isset( $user_info['first_name'] ) ) {
-		$user_data               = get_userdata( $user_info['id'] );
+	if (isset($user_info['id']) && $user_info['id'] > 0 && isset($user_info['first_name'])) {
+		$user_data               = get_userdata($user_info['id']);
 		$email_names['name']     = $user_info['first_name'];
-		$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+		$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 		$email_names['username'] = $user_data->user_login;
-	} elseif ( isset( $user_info['first_name'] ) ) {
+	} elseif (isset($user_info['first_name'])) {
 		$email_names['name']     = $user_info['first_name'];
-		$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+		$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 		$email_names['username'] = $user_info['first_name'];
 	} else {
 		$email_names['name']     = $user_info['email'];

includes/emails/class-give-emails.php

Spacing +58 added lines, -58 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -79,12 +79,12 @@ 
 	 */
 	public function __construct() {
 
-		if ( 'none' === $this->get_template() ) {
+		if ('none' === $this->get_template()) {
 			$this->html = false;
 		}
 
-		add_action( 'give_email_send_before', array( $this, 'send_before' ) );
-		add_action( 'give_email_send_after', array( $this, 'send_after' ) );
+		add_action('give_email_send_before', array($this, 'send_before'));
+		add_action('give_email_send_after', array($this, 'send_after'));
 
 	}
 
@@ -93,7 +93,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __set( $key, $value ) {
+	public function __set($key, $value) {
 		$this->$key = $value;
 	}
 
@@ -103,11 +103,11 @@ 
 	 * @since 1.0
 	 */
 	public function get_from_name() {
-		if ( ! $this->from_name ) {
-			$this->from_name = give_get_option( 'from_name', get_bloginfo( 'name' ) );
+		if ( ! $this->from_name) {
+			$this->from_name = give_get_option('from_name', get_bloginfo('name'));
 		}
 
-		return apply_filters( 'give_email_from_name', wp_specialchars_decode( $this->from_name ), $this );
+		return apply_filters('give_email_from_name', wp_specialchars_decode($this->from_name), $this);
 	}
 
 	/**
@@ -116,11 +116,11 @@ 
 	 * @since 1.0
 	 */
 	public function get_from_address() {
-		if ( ! $this->from_address ) {
-			$this->from_address = give_get_option( 'from_email', get_option( 'admin_email' ) );
+		if ( ! $this->from_address) {
+			$this->from_address = give_get_option('from_email', get_option('admin_email'));
 		}
 
-		return apply_filters( 'give_email_from_address', $this->from_address, $this );
+		return apply_filters('give_email_from_address', $this->from_address, $this);
 	}
 
 	/**
@@ -129,13 +129,13 @@ 
 	 * @since 1.0
 	 */
 	public function get_content_type() {
-		if ( ! $this->content_type && $this->html ) {
-			$this->content_type = apply_filters( 'give_email_default_content_type', 'text/html', $this );
-		} else if ( ! $this->html ) {
+		if ( ! $this->content_type && $this->html) {
+			$this->content_type = apply_filters('give_email_default_content_type', 'text/html', $this);
+		} else if ( ! $this->html) {
 			$this->content_type = 'text/plain';
 		}
 
-		return apply_filters( 'give_email_content_type', $this->content_type, $this );
+		return apply_filters('give_email_content_type', $this->content_type, $this);
 	}
 
 	/**
@@ -144,13 +144,13 @@ 
 	 * @since 1.0
 	 */
 	public function get_headers() {
-		if ( ! $this->headers ) {
+		if ( ! $this->headers) {
 			$this->headers = "From: {$this->get_from_name()} <{$this->get_from_address()}>\r\n";
 			$this->headers .= "Reply-To: {$this->get_from_address()}\r\n";
 			$this->headers .= "Content-Type: {$this->get_content_type()}; charset=utf-8\r\n";
 		}
 
-		return apply_filters( 'give_email_headers', $this->headers, $this );
+		return apply_filters('give_email_headers', $this->headers, $this);
 	}
 
 	/**
@@ -160,11 +160,11 @@ 
 	 */
 	public function get_templates() {
 		$templates = array(
-			'default' => esc_html__( 'Default Template', 'give' ),
-			'none'    => esc_html__( 'No template, plain text only', 'give' )
+			'default' => esc_html__('Default Template', 'give'),
+			'none'    => esc_html__('No template, plain text only', 'give')
 		);
 
-		return apply_filters( 'give_email_templates', $templates );
+		return apply_filters('give_email_templates', $templates);
 	}
 
 	/**
@@ -173,11 +173,11 @@ 
 	 * @since 1.0
 	 */
 	public function get_template() {
-		if ( ! $this->template ) {
-			$this->template = give_get_option( 'email_template', 'default' );
+		if ( ! $this->template) {
+			$this->template = give_get_option('email_template', 'default');
 		}
 
-		return apply_filters( 'give_email_template', $this->template );
+		return apply_filters('give_email_template', $this->template);
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 * @since 1.0
 	 */
 	public function get_heading() {
-		return apply_filters( 'give_email_heading', $this->heading );
+		return apply_filters('give_email_heading', $this->heading);
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function parse_tags( $content ) {
+	public function parse_tags($content) {
 		return $content;
 	}
 
@@ -205,36 +205,36 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function build_email( $message ) {
+	public function build_email($message) {
 
-		if ( false === $this->html ) {
-			return apply_filters( 'give_email_message', wp_strip_all_tags( $message ), $this );
+		if (false === $this->html) {
+			return apply_filters('give_email_message', wp_strip_all_tags($message), $this);
 		}
 
-		$message = $this->text_to_html( $message );
+		$message = $this->text_to_html($message);
 
 		ob_start();
 
-		give_get_template_part( 'emails/header', $this->get_template(), true );
+		give_get_template_part('emails/header', $this->get_template(), true);
 
-		do_action( 'give_email_header', $this );
+		do_action('give_email_header', $this);
 
-		if ( has_action( 'give_email_template_' . $this->get_template() ) ) {
-			do_action( 'give_email_template_' . $this->get_template() );
+		if (has_action('give_email_template_'.$this->get_template())) {
+			do_action('give_email_template_'.$this->get_template());
 		} else {
-			give_get_template_part( 'emails/body', $this->get_template(), true );
+			give_get_template_part('emails/body', $this->get_template(), true);
 		}
 
-		do_action( 'give_email_body', $this );
+		do_action('give_email_body', $this);
 
-		give_get_template_part( 'emails/footer', $this->get_template(), true );
+		give_get_template_part('emails/footer', $this->get_template(), true);
 
-		do_action( 'give_email_footer', $this );
+		do_action('give_email_footer', $this);
 
 		$body    = ob_get_clean();
-		$message = str_replace( '{email}', $message, $body );
+		$message = str_replace('{email}', $message, $body);
 
-		return apply_filters( 'give_email_message', $message, $this );
+		return apply_filters('give_email_message', $message, $this);
 	}
 
 	/**
@@ -247,26 +247,26 @@ 
 	 *
 	 * @return bool
 	 */
-	public function send( $to, $subject, $message, $attachments = '' ) {
+	public function send($to, $subject, $message, $attachments = '') {
 
-		if ( ! did_action( 'init' ) && ! did_action( 'admin_init' ) ) {
-			_doing_it_wrong( __FUNCTION__, esc_html__( 'You cannot send email with Give_Emails until init/admin_init has been reached.', 'give' ), null );
+		if ( ! did_action('init') && ! did_action('admin_init')) {
+			_doing_it_wrong(__FUNCTION__, esc_html__('You cannot send email with Give_Emails until init/admin_init has been reached.', 'give'), null);
 
 			return false;
 		}
 
-		do_action( 'give_email_send_before', $this );
+		do_action('give_email_send_before', $this);
 
-		$subject = $this->parse_tags( $subject );
-		$message = $this->parse_tags( $message );
+		$subject = $this->parse_tags($subject);
+		$message = $this->parse_tags($message);
 
-		$message = $this->build_email( $message );
+		$message = $this->build_email($message);
 
-		$attachments = apply_filters( 'give_email_attachments', $attachments, $this );
+		$attachments = apply_filters('give_email_attachments', $attachments, $this);
 
-		$sent = wp_mail( $to, $subject, $message, $this->get_headers(), $attachments );
+		$sent = wp_mail($to, $subject, $message, $this->get_headers(), $attachments);
 
-		do_action( 'give_email_send_after', $this );
+		do_action('give_email_send_after', $this);
 
 		return $sent;
 
@@ -278,9 +278,9 @@ 
 	 * @since 1.0
 	 */
 	public function send_before() {
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
+		add_filter('wp_mail_from', array($this, 'get_from_address'));
+		add_filter('wp_mail_from_name', array($this, 'get_from_name'));
+		add_filter('wp_mail_content_type', array($this, 'get_content_type'));
 	}
 
 	/**
@@ -289,9 +289,9 @@ 
 	 * @since 1.0
 	 */
 	public function send_after() {
-		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
+		remove_filter('wp_mail_from', array($this, 'get_from_address'));
+		remove_filter('wp_mail_from_name', array($this, 'get_from_name'));
+		remove_filter('wp_mail_content_type', array($this, 'get_content_type'));
 
 		// Reset heading to an empty string
 		$this->heading = '';
@@ -302,10 +302,10 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function text_to_html( $message ) {
+	public function text_to_html($message) {
 
-		if ( 'text/html' == $this->content_type || true === $this->html ) {
-			$message = wpautop( $message );
+		if ('text/html' == $this->content_type || true === $this->html) {
+			$message = wpautop($message);
 		}
 
 		return $message;

includes/emails/actions.php

Spacing +18 added lines, -18 removed lines

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