WordImpress / Give

includes/admin/class-admin-notices.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 *
 	 * Display admin bar when active
 	 *
-	 * @return bool
+	 * @return false|null
 	 */
 	public function give_admin_bar_menu() {
 		global $wp_admin_bar;

Spacing +49 added lines, -49 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -27,9 +27,9 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'give_dismiss_notices', array( $this, 'dismiss_notices' ) );
-		add_action( 'admin_bar_menu', array( $this, 'give_admin_bar_menu' ), 1000 );
+		add_action('admin_notices', array($this, 'show_notices'));
+		add_action('give_dismiss_notices', array($this, 'dismiss_notices'));
+		add_action('admin_bar_menu', array($this, 'give_admin_bar_menu'), 1000);
 	}
 
 
@@ -42,18 +42,18 @@ 
 	public function give_admin_bar_menu() {
 		global $wp_admin_bar;
 
-		if ( ! give_is_test_mode() || ! current_user_can( 'view_give_reports' ) ) {
+		if ( ! give_is_test_mode() || ! current_user_can('view_give_reports')) {
 			return false;
 		}
 
 		//Add the main siteadmin menu item
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'id'     => 'give-test-notice',
-			'href'   => admin_url() . 'edit.php?post_type=give_forms&page=give-settings&tab=gateways',
+			'href'   => admin_url().'edit.php?post_type=give_forms&page=give-settings&tab=gateways',
 			'parent' => 'top-secondary',
-			'title'  => __( 'Give Test Mode Active', 'give' ),
-			'meta'   => array( 'class' => 'give-test-mode-active' ),
-		) );
+			'title'  => __('Give Test Mode Active', 'give'),
+			'meta'   => array('class' => 'give-test-mode-active'),
+		));
 
 	}
 
@@ -68,97 +68,97 @@ 
 			'error'   => array()
 		);
 
-		if ( ! give_test_ajax_works() && ! get_user_meta( get_current_user_id(), '_give_admin_ajax_inaccessible_dismissed', true ) && current_user_can( 'manage_give_settings' ) ) {
+		if ( ! give_test_ajax_works() && ! get_user_meta(get_current_user_id(), '_give_admin_ajax_inaccessible_dismissed', true) && current_user_can('manage_give_settings')) {
 			echo '<div class="error">';
-			echo '<p>' . __( 'Your site appears to be blocking the WordPress ajax interface. This may cause issues with Give.', 'give' ) . '</p>';
-			echo '<p>' . sprintf( esc_attr__( 'Please see %1$sthis reference%2$s for possible solutions.', 'give' ), '<a href="https://givewp.com/documentation/core/troubleshooting/admin-ajax-blocked/" target="_blank">', '</a>' ) . '</p>';
-			echo '<p><a href="' . add_query_arg( array(
+			echo '<p>'.__('Your site appears to be blocking the WordPress ajax interface. This may cause issues with Give.', 'give').'</p>';
+			echo '<p>'.sprintf(esc_attr__('Please see %1$sthis reference%2$s for possible solutions.', 'give'), '<a href="https://givewp.com/documentation/core/troubleshooting/admin-ajax-blocked/" target="_blank">', '</a>').'</p>';
+			echo '<p><a href="'.add_query_arg(array(
 					'give_action' => 'dismiss_notices',
 					'give_notice' => 'admin_ajax_inaccessible'
-				) ) . '">' . esc_attr__( 'Dismiss Notice', 'give' ) . '</a></p>';
+				)).'">'.esc_attr__('Dismiss Notice', 'give').'</a></p>';
 			echo '</div>';
 		}
 
 
-		if ( isset( $_GET['give-message'] ) ) {
+		if (isset($_GET['give-message'])) {
 
 			// Donation reports errors
-			if ( current_user_can( 'view_give_reports' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('view_give_reports')) {
+				switch ($_GET['give-message']) {
 					case 'payment_deleted' :
-						$notices['updated']['give-payment-deleted'] = esc_attr__( 'The payment has been deleted.', 'give' );
+						$notices['updated']['give-payment-deleted'] = esc_attr__('The payment has been deleted.', 'give');
 						break;
 					case 'email_sent' :
-						$notices['updated']['give-payment-sent'] = esc_attr__( 'The donation receipt has been resent.', 'give' );
+						$notices['updated']['give-payment-sent'] = esc_attr__('The donation receipt has been resent.', 'give');
 						break;
 					case 'refreshed-reports' :
-						$notices['updated']['give-refreshed-reports'] = esc_attr__( 'The reports cache has been cleared.', 'give' );
+						$notices['updated']['give-refreshed-reports'] = esc_attr__('The reports cache has been cleared.', 'give');
 						break;
 					case 'payment-note-deleted' :
-						$notices['updated']['give-payment-note-deleted'] = esc_attr__( 'The payment note has been deleted.', 'give' );
+						$notices['updated']['give-payment-note-deleted'] = esc_attr__('The payment note has been deleted.', 'give');
 						break;
 				}
 			}
 
 			// Give settings notices and errors
-			if ( current_user_can( 'manage_give_settings' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('manage_give_settings')) {
+				switch ($_GET['give-message']) {
 					case 'settings-imported' :
-						$notices['updated']['give-settings-imported'] = esc_attr__( 'The settings have been imported.', 'give' );
+						$notices['updated']['give-settings-imported'] = esc_attr__('The settings have been imported.', 'give');
 						break;
 					case 'api-key-generated' :
-						$notices['updated']['give-api-key-generated'] = esc_attr__( 'API keys successfully generated.', 'give' );
+						$notices['updated']['give-api-key-generated'] = esc_attr__('API keys successfully generated.', 'give');
 						break;
 					case 'api-key-exists' :
-						$notices['error']['give-api-key-exists'] = esc_attr__( 'The specified user already has API keys.', 'give' );
+						$notices['error']['give-api-key-exists'] = esc_attr__('The specified user already has API keys.', 'give');
 						break;
 					case 'api-key-regenerated' :
-						$notices['updated']['give-api-key-regenerated'] = esc_attr__( 'API keys successfully regenerated.', 'give' );
+						$notices['updated']['give-api-key-regenerated'] = esc_attr__('API keys successfully regenerated.', 'give');
 						break;
 					case 'api-key-revoked' :
-						$notices['updated']['give-api-key-revoked'] = esc_attr__( 'API keys successfully revoked.', 'give' );
+						$notices['updated']['give-api-key-revoked'] = esc_attr__('API keys successfully revoked.', 'give');
 						break;
 					case 'sent-test-email' :
-						$notices['updated']['give-sent-test-email'] = esc_attr__( 'The test email has been sent.', 'give' );
+						$notices['updated']['give-sent-test-email'] = esc_attr__('The test email has been sent.', 'give');
 						break;
 				}
 			}
 			// Payments errors
-			if ( current_user_can( 'edit_give_payments' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('edit_give_payments')) {
+				switch ($_GET['give-message']) {
 					case 'note-added' :
-						$notices['updated']['give-note-added'] = esc_attr__( 'The payment note has been added successfully.', 'give' );
+						$notices['updated']['give-note-added'] = esc_attr__('The payment note has been added successfully.', 'give');
 						break;
 					case 'payment-updated' :
-						$notices['updated']['give-payment-updated'] = esc_attr__( 'The payment has been successfully updated.', 'give' );
+						$notices['updated']['give-payment-updated'] = esc_attr__('The payment has been successfully updated.', 'give');
 						break;
 				}
 			}
 
 			// Customer Notices
-			if ( current_user_can( 'edit_give_payments' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('edit_give_payments')) {
+				switch ($_GET['give-message']) {
 					case 'customer-deleted' :
-						$notices['updated']['give-customer-deleted'] = esc_attr__( 'Donor successfully deleted', 'give' );
+						$notices['updated']['give-customer-deleted'] = esc_attr__('Donor successfully deleted', 'give');
 						break;
 				}
 			}
 
 		}
 
-		if ( count( $notices['updated'] ) > 0 ) {
-			foreach ( $notices['updated'] as $notice => $message ) {
-				add_settings_error( 'give-notices', $notice, $message, 'updated' );
+		if (count($notices['updated']) > 0) {
+			foreach ($notices['updated'] as $notice => $message) {
+				add_settings_error('give-notices', $notice, $message, 'updated');
 			}
 		}
 
-		if ( count( $notices['error'] ) > 0 ) {
-			foreach ( $notices['error'] as $notice => $message ) {
-				add_settings_error( 'give-notices', $notice, $message, 'error' );
+		if (count($notices['error']) > 0) {
+			foreach ($notices['error'] as $notice => $message) {
+				add_settings_error('give-notices', $notice, $message, 'error');
 			}
 		}
 
-		settings_errors( 'give-notices' );
+		settings_errors('give-notices');
 
 	}
 
@@ -170,8 +170,8 @@ 
 	 * @return void
 	 */
 	function give_admin_addons_notices() {
-		add_settings_error( 'give-notices', 'give-addons-feed-error', esc_attr__( 'There seems to be an issue with the server. Please try again in a few minutes.', 'give' ), 'error' );
-		settings_errors( 'give-notices' );
+		add_settings_error('give-notices', 'give-addons-feed-error', esc_attr__('There seems to be an issue with the server. Please try again in a few minutes.', 'give'), 'error');
+		settings_errors('give-notices');
 	}
 
 
@@ -182,9 +182,9 @@ 
 	 * @return void
 	 */
 	function dismiss_notices() {
-		if ( isset( $_GET['give_notice'] ) ) {
-			update_user_meta( get_current_user_id(), '_give_' . $_GET['give_notice'] . '_dismissed', 1 );
-			wp_redirect( remove_query_arg( array( 'give_action', 'give_notice' ) ) );
+		if (isset($_GET['give_notice'])) {
+			update_user_meta(get_current_user_id(), '_give_'.$_GET['give_notice'].'_dismissed', 1);
+			wp_redirect(remove_query_arg(array('give_action', 'give_notice')));
 			exit;
 		}
 	}

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

Doc Comments +1 added lines, -4 removed lines

@@ -81,7 +81,6 @@ 
 	 * @since  1.1
 	 *
 	 * @param array  $item        Contains all the data of the keys
-	 * @param string $column_name The name of the column
 	 *
 	 * @return string Column Name
 	 */
@@ -96,7 +95,6 @@ 
 	 * @since  1.1
 	 *
 	 * @param array  $item        Contains all the data of the keys
-	 * @param string $column_name The name of the column
 	 *
 	 * @return string Column Name
 	 */
@@ -111,7 +109,6 @@ 
 	 * @since  1.1
 	 *
 	 * @param array  $item        Contains all the data of the keys
-	 * @param string $column_name The name of the column
 	 *
 	 * @return string Column Name
 	 */
@@ -124,7 +121,7 @@ 
 	 *
 	 * @access public
 	 * @since  1.1
-	 * @return void
+	 * @return string
 	 */
 	public function column_user( $item ) {
 

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' => __( 'API Key', 'give' ),     // Singular name of the listed records
-			'plural'   => __( 'API Keys', 'give' ),    // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => __('API Key', 'give'), // Singular name of the listed records
+			'plural'   => __('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' ) ),
-				__( 'View API Log', 'give' )
+				), 'edit.php')),
+				__('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' ) ),
-			__( 'Reissue', 'give' )
+			)), 'give-api-nonce')),
+			__('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' ) ),
-			__( 'Revoke', 'give' )
+			)), 'give-api-nonce')),
+			__('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'   => __( 'Username', 'give' ),
-			'key'    => __( 'Public Key', 'give' ),
-			'token'  => __( 'Token', 'give' ),
-			'secret' => __( 'Secret Key', 'give' )
+			'user'   => __('Username', 'give'),
+			'key'    => __('Public Key', 'give'),
+			'token'  => __('Token', 'give'),
+			'secret' => __('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( __( 'Generate New API Keys', 'give' ), 'secondary', 'submit', false ); ?>
+		<?php submit_button(__('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

Doc Comments +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
      * @uses api_request()
      *
      * @param array   $_transient_data Update array build by WordPress.
-     * @return array Modified update array with custom plugin data.
+     * @return stdClass Modified update array with custom plugin data.
      */
     function check_update( $_transient_data ) {
 

Indentation +255 added lines, -255 removed lines

@@ -13,328 +13,328 @@
  * @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(
-                    __( '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> 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 ) )
-                );
-            }
+			if ( empty( $version_info->download_link ) ) {
+				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(
+					__( '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>';
-        }
-    }
+			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 ) {
+	/**
+	 * 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' ) {
+		if ( $_action != 'plugin_information' ) {
 
-            return $_data;
+			return $_data;
 
-        }
+		}
 
-        if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
 
-            return $_data;
+			return $_data;
 
-        }
+		}
 
-        $to_send = array(
-            'slug'   => $this->slug,
-            'is_ssl' => is_ssl(),
-            'fields' => array(
-                'banners' => false, // These will be supported soon hopefully
-                'reviews' => false
-            )
-        );
+		$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 );
+		$api_response = $this->api_request( 'plugin_information', $to_send );
 
-        if ( false !== $api_response ) {
-            $_data = $api_response;
-        }
+		if ( false !== $api_response ) {
+			$_data = $api_response;
+		}
 
-        return $_data;
-    }
+		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;
-    }
+	/**
+	 * 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()
-        );
+	/**
+	 * 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( __( 'You do not have permission to install plugin updates', 'edd' ), __( '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( __( 'You do not have permission to install plugin updates', 'edd' ), __( '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,84 +111,84 @@ 
      * @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(
-                    __( '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(
-                    __( '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))
                 );
             }
 
@@ -207,16 +207,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;
 
@@ -231,9 +231,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;
         }
 
@@ -248,9 +248,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;
@@ -267,40 +267,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;
         }
@@ -311,26 +311,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( __( 'You do not have permission to install plugin updates', 'edd' ), __( 'Error', 'edd' ), array( 'response' => 403 ) );
+        if ( ! current_user_can('update_plugins')) {
+            wp_die(__('You do not have permission to install plugin updates', 'edd'), __('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>';
         }
 
 

Braces +9 added lines, -5 removed lines

@@ -4,7 +4,9 @@ 
 //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.
@@ -273,11 +275,13 @@ 
 
         $data = array_merge( $this->api_data, $_data );
 
-        if ( $data['slug'] != $this->slug )
-            return;
+        if ( $data['slug'] != $this->slug ) {
+                    return;
+        }
 
-        if ( empty( $data['license'] ) )
-            return;
+        if ( empty( $data['license'] ) ) {
+                    return;
+        }
 
         if( $this->api_url == home_url() ) {
             return false; // Don't allow a plugin to ping itself

includes/admin/forms/dashboard-columns.php

Doc Comments +1 added lines, -1 removed lines

@@ -321,7 +321,7 @@
  *
  * @param int $post_id Download (Post) ID
  *
- * @return void
+ * @return null|integer
  */
 function give_price_save_quick_edit( $post_id ) {
 	if ( ! isset( $_POST['post_type'] ) || 'give_forms' !== $_POST['post_type'] ) {

Spacing +83 added lines, -83 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -27,34 +27,34 @@ 
  * @return array $form_columns Updated array of forms columns
  *  Post Type List Table
  */
-function give_form_columns( $give_form_columns ) {
+function give_form_columns($give_form_columns) {
 
 	//Standard columns
 	$give_form_columns = array(
 		'cb'            => '<input type="checkbox"/>',
-		'title'         => __( 'Name', 'give' ),
-		'form_category' => __( 'Categories', 'give' ),
-		'form_tag'      => __( 'Tags', 'give' ),
-		'price'         => __( 'Price', 'give' ),
-		'goal'          => __( 'Goal', 'give' ),
-		'donations'     => __( 'Donations', 'give' ),
-		'earnings'      => __( 'Income', 'give' ),
-		'shortcode'     => __( 'Shortcode', 'give' ),
-		'date'          => __( 'Date', 'give' )
+		'title'         => __('Name', 'give'),
+		'form_category' => __('Categories', 'give'),
+		'form_tag'      => __('Tags', 'give'),
+		'price'         => __('Price', 'give'),
+		'goal'          => __('Goal', 'give'),
+		'donations'     => __('Donations', 'give'),
+		'earnings'      => __('Income', 'give'),
+		'shortcode'     => __('Shortcode', 'give'),
+		'date'          => __('Date', 'give')
 	);
 
 	//Does the user want categories / tags?
-	if ( give_get_option( 'enable_categories' ) !== 'on' ) {
-		unset( $give_form_columns['form_category'] );
+	if (give_get_option('enable_categories') !== 'on') {
+		unset($give_form_columns['form_category']);
 	}
-	if ( give_get_option( 'enable_tags' ) !== 'on' ) {
-		unset( $give_form_columns['form_tag'] );
+	if (give_get_option('enable_tags') !== 'on') {
+		unset($give_form_columns['form_tag']);
 	}
 
-	return apply_filters( 'give_forms_columns', $give_form_columns );
+	return apply_filters('give_forms_columns', $give_form_columns);
 }
 
-add_filter( 'manage_edit-give_forms_columns', 'give_form_columns' );
+add_filter('manage_edit-give_forms_columns', 'give_form_columns');
 
 /**
  * Render Give Form Columns
@@ -66,67 +66,67 @@ 
  *
  * @return void
  */
-function give_render_form_columns( $column_name, $post_id ) {
-	if ( get_post_type( $post_id ) == 'give_forms' ) {
+function give_render_form_columns($column_name, $post_id) {
+	if (get_post_type($post_id) == 'give_forms') {
 		global $give_options;
 
-		$style = isset( $give_options['button_style'] ) ? $give_options['button_style'] : 'button';
-		$color = isset( $give_options['checkout_color'] ) ? $give_options['checkout_color'] : 'blue';
-		$color = ( $color == 'inherit' ) ? '' : $color;
+		$style = isset($give_options['button_style']) ? $give_options['button_style'] : 'button';
+		$color = isset($give_options['checkout_color']) ? $give_options['checkout_color'] : 'blue';
+		$color = ($color == 'inherit') ? '' : $color;
 
-		$purchase_text = ! empty( $give_options['add_to_cart_text'] ) ? $give_options['add_to_cart_text'] : __( 'Purchase', 'give' );
+		$purchase_text = ! empty($give_options['add_to_cart_text']) ? $give_options['add_to_cart_text'] : __('Purchase', 'give');
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'form_category':
-				echo get_the_term_list( $post_id, 'give_forms_category', '', ', ', '' );
+				echo get_the_term_list($post_id, 'give_forms_category', '', ', ', '');
 				break;
 			case 'form_tag':
-				echo get_the_term_list( $post_id, 'give_forms_tag', '', ', ', '' );
+				echo get_the_term_list($post_id, 'give_forms_tag', '', ', ', '');
 				break;
 			case 'price':
-				if ( give_has_variable_prices( $post_id ) ) {
-					echo give_price_range( $post_id );
+				if (give_has_variable_prices($post_id)) {
+					echo give_price_range($post_id);
 				} else {
-					echo give_price( $post_id, false );
-					echo '<input type="hidden" class="formprice-' . $post_id . '" value="' . give_get_form_price( $post_id ) . '" />';
+					echo give_price($post_id, false);
+					echo '<input type="hidden" class="formprice-'.$post_id.'" value="'.give_get_form_price($post_id).'" />';
 				}
 				break;
 			case 'goal':
-				$goal_option = get_post_meta( $post_id, '_give_goal_option', true );
-				if ( ! empty( $goal_option ) && $goal_option === 'yes' ) {
-					echo give_goal( $post_id, false );
+				$goal_option = get_post_meta($post_id, '_give_goal_option', true);
+				if ( ! empty($goal_option) && $goal_option === 'yes') {
+					echo give_goal($post_id, false);
 				} else {
-					echo __( 'No Goal Set', 'give' );
+					echo __('No Goal Set', 'give');
 				}
 
-				echo '<input type="hidden" class="formgoal-' . $post_id . '" value="' . give_get_form_goal( $post_id ) . '" />';
+				echo '<input type="hidden" class="formgoal-'.$post_id.'" value="'.give_get_form_goal($post_id).'" />';
 				break;
 			case 'donations':
-				if ( current_user_can( 'view_give_forms_stats', $post_id ) ) {
-					echo '<a href="' . esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-reports&tab=logs&view=sales&form=' . $post_id ) ) . '">';
-					echo give_get_form_sales_stats( $post_id );
+				if (current_user_can('view_give_forms_stats', $post_id)) {
+					echo '<a href="'.esc_url(admin_url('edit.php?post_type=give_forms&page=give-reports&tab=logs&view=sales&form='.$post_id)).'">';
+					echo give_get_form_sales_stats($post_id);
 					echo '</a>';
 				} else {
 					echo '-';
 				}
 				break;
 			case 'earnings':
-				if ( current_user_can( 'view_give_forms_stats', $post_id ) ) {
-					echo '<a href="' . esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=forms&form-id=' . $post_id ) ) . '">';
-					echo give_currency_filter( give_format_amount( give_get_form_earnings_stats( $post_id ) ) );
+				if (current_user_can('view_give_forms_stats', $post_id)) {
+					echo '<a href="'.esc_url(admin_url('edit.php?post_type=give_forms&page=give-reports&view=forms&form-id='.$post_id)).'">';
+					echo give_currency_filter(give_format_amount(give_get_form_earnings_stats($post_id)));
 					echo '</a>';
 				} else {
 					echo '-';
 				}
 				break;
 			case 'shortcode':
-				echo '<input onclick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly="" value="[give_form id=&#34;' . absint( $post_id ) . '&#34;]">';
+				echo '<input onclick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly="" value="[give_form id=&#34;'.absint($post_id).'&#34;]">';
 				break;
 		}
 	}
 }
 
-add_action( 'manage_posts_custom_column', 'give_render_form_columns', 10, 2 );
+add_action('manage_posts_custom_column', 'give_render_form_columns', 10, 2);
 
 /**
  * Registers the sortable columns in the list table
@@ -137,7 +137,7 @@ 
  *
  * @return array $columns Array of sortable columns
  */
-function give_sortable_form_columns( $columns ) {
+function give_sortable_form_columns($columns) {
 	$columns['price']    = 'price';
 	$columns['sales']    = 'sales';
 	$columns['earnings'] = 'earnings';
@@ -146,7 +146,7 @@ 
 	return $columns;
 }
 
-add_filter( 'manage_edit-give_forms_sortable_columns', 'give_sortable_form_columns' );
+add_filter('manage_edit-give_forms_sortable_columns', 'give_sortable_form_columns');
 
 /**
  * Sorts Columns in the Forms List Table
@@ -157,11 +157,11 @@ 
  *
  * @return array $vars Array of all the sort variables
  */
-function give_sort_forms( $vars ) {
+function give_sort_forms($vars) {
 	// Check if we're viewing the "give_forms" post type
-	if ( isset( $vars['post_type'] ) && 'give_forms' == $vars['post_type'] ) {
+	if (isset($vars['post_type']) && 'give_forms' == $vars['post_type']) {
 		// Check if 'orderby' is set to "sales"
-		if ( isset( $vars['orderby'] ) && 'sales' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'sales' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -172,7 +172,7 @@ 
 		}
 
 		// Check if "orderby" is set to "earnings"
-		if ( isset( $vars['orderby'] ) && 'earnings' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'earnings' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -183,7 +183,7 @@ 
 		}
 
 		// Check if "orderby" is set to "price"
-		if ( isset( $vars['orderby'] ) && 'price' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'price' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -194,7 +194,7 @@ 
 		}
 
 		// Check if "orderby" is set to "goal"
-		if ( isset( $vars['orderby'] ) && 'goal' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'goal' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -217,16 +217,16 @@ 
  *
  * @return array       Array of all sort variables
  */
-function give_filter_forms( $vars ) {
-	if ( isset( $vars['post_type'] ) && 'give_forms' == $vars['post_type'] ) {
+function give_filter_forms($vars) {
+	if (isset($vars['post_type']) && 'give_forms' == $vars['post_type']) {
 
 		// If an author ID was passed, use it
-		if ( isset( $_REQUEST['author'] ) && ! current_user_can( 'view_give_reports' ) ) {
+		if (isset($_REQUEST['author']) && ! current_user_can('view_give_reports')) {
 
 			$author_id = $_REQUEST['author'];
-			if ( (int) $author_id !== get_current_user_id() ) {
+			if ((int) $author_id !== get_current_user_id()) {
 				// Tried to view the products of another person, sorry
-				wp_die( __( 'You do not have permission to view this data.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+				wp_die(__('You do not have permission to view this data.', 'give'), __('Error', 'give'), array('response' => 403));
 			}
 			$vars = array_merge(
 				$vars,
@@ -251,11 +251,11 @@ 
  * @return void
  */
 function give_forms_load() {
-	add_filter( 'request', 'give_sort_forms' );
-	add_filter( 'request', 'give_filter_forms' );
+	add_filter('request', 'give_sort_forms');
+	add_filter('request', 'give_filter_forms');
 }
 
-add_action( 'load-edit.php', 'give_forms_load', 9999 );
+add_action('load-edit.php', 'give_forms_load', 9999);
 
 /**
  * Remove Forms Month Filter
@@ -269,17 +269,17 @@ 
  * @global      $typenow The post type we are viewing
  * @return array Empty array disables the dropdown
  */
-function give_remove_month_filter( $dates ) {
+function give_remove_month_filter($dates) {
 	global $typenow;
 
-	if ( $typenow == 'give_forms' ) {
+	if ($typenow == 'give_forms') {
 		$dates = array();
 	}
 
 	return $dates;
 }
 
-add_filter( 'months_dropdown_results', 'give_remove_month_filter', 99 );
+add_filter('months_dropdown_results', 'give_remove_month_filter', 99);
 
 /**
  * Adds price field to Quick Edit options
@@ -291,16 +291,16 @@ 
  *
  * @return void
  */
-function give_price_field_quick_edit( $column_name, $post_type ) {
-	if ( $column_name != 'price' || $post_type != 'give_forms' ) {
+function give_price_field_quick_edit($column_name, $post_type) {
+	if ($column_name != 'price' || $post_type != 'give_forms') {
 		return;
 	}
 	?>
 	<fieldset class="inline-edit-col-left">
 		<div id="give-give-data" class="inline-edit-col">
-			<h4><?php echo sprintf( __( '%s Configuration', 'give' ), give_get_forms_label_singular() ); ?></h4>
+			<h4><?php echo sprintf(__('%s Configuration', 'give'), give_get_forms_label_singular()); ?></h4>
 			<label>
-				<span class="title"><?php _e( 'Price', 'give' ); ?></span>
+				<span class="title"><?php _e('Price', 'give'); ?></span>
 				<span class="input-text-wrap">
 					<input type="text" name="_give_regprice" class="text regprice" />
 				</span>
@@ -311,8 +311,8 @@ 
 	<?php
 }
 
-add_action( 'quick_edit_custom_box', 'give_price_field_quick_edit', 10, 2 );
-add_action( 'bulk_edit_custom_box', 'give_price_field_quick_edit', 10, 2 );
+add_action('quick_edit_custom_box', 'give_price_field_quick_edit', 10, 2);
+add_action('bulk_edit_custom_box', 'give_price_field_quick_edit', 10, 2);
 
 /**
  * Updates price when saving post
@@ -323,23 +323,23 @@ 
  *
  * @return void
  */
-function give_price_save_quick_edit( $post_id ) {
-	if ( ! isset( $_POST['post_type'] ) || 'give_forms' !== $_POST['post_type'] ) {
+function give_price_save_quick_edit($post_id) {
+	if ( ! isset($_POST['post_type']) || 'give_forms' !== $_POST['post_type']) {
 		return;
 	}
-	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+	if ( ! current_user_can('edit_post', $post_id)) {
 		return $post_id;
 	}
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 		return $post_id;
 	}
 
-	if ( isset( $_REQUEST['_give_regprice'] ) ) {
-		update_post_meta( $post_id, '_give_set_price', strip_tags( stripslashes( $_REQUEST['_give_regprice'] ) ) );
+	if (isset($_REQUEST['_give_regprice'])) {
+		update_post_meta($post_id, '_give_set_price', strip_tags(stripslashes($_REQUEST['_give_regprice'])));
 	}
 }
 
-add_action( 'save_post', 'give_price_save_quick_edit' );
+add_action('save_post', 'give_price_save_quick_edit');
 
 /**
  * Process bulk edit actions via AJAX
@@ -349,18 +349,18 @@ 
  */
 function give_save_bulk_edit() {
 
-	$post_ids = ( isset( $_POST['post_ids'] ) && ! empty( $_POST['post_ids'] ) ) ? $_POST['post_ids'] : array();
+	$post_ids = (isset($_POST['post_ids']) && ! empty($_POST['post_ids'])) ? $_POST['post_ids'] : array();
 
-	if ( ! empty( $post_ids ) && is_array( $post_ids ) ) {
-		$price = isset( $_POST['price'] ) ? strip_tags( stripslashes( $_POST['price'] ) ) : 0;
-		foreach ( $post_ids as $post_id ) {
+	if ( ! empty($post_ids) && is_array($post_ids)) {
+		$price = isset($_POST['price']) ? strip_tags(stripslashes($_POST['price'])) : 0;
+		foreach ($post_ids as $post_id) {
 
-			if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			if ( ! current_user_can('edit_post', $post_id)) {
 				continue;
 			}
 
-			if ( ! empty( $price ) ) {
-				update_post_meta( $post_id, '_give_set_price', give_sanitize_amount( $price ) );
+			if ( ! empty($price)) {
+				update_post_meta($post_id, '_give_set_price', give_sanitize_amount($price));
 			}
 		}
 	}
@@ -368,4 +368,4 @@ 
 	die();
 }
 
-add_action( 'wp_ajax_give_save_bulk_edit', 'give_save_bulk_edit' );
+add_action('wp_ajax_give_save_bulk_edit', 'give_save_bulk_edit');

includes/admin/reporting/class-api-requests-logs-list-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 	 *
 	 * @access public
 	 * @since  1.0
-	 * @return mixed String if search is present, false otherwise
+	 * @return string|false String if search is present, false otherwise
 	 */
 	public function get_search() {
 		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;

Spacing +64 added lines, -64 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -45,11 +45,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 	}
 
 	/**
@@ -63,20 +63,20 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
-		$input_id = $input_id . '-search-input';
+	public function search_box($text, $input_id) {
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
 		}
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if ( ! empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
 		}
 		?>
 		<p class="search-box">
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-			<?php submit_button( $text, 'button', false, false, array( 'ID' => 'search-submit' ) ); ?>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?>
 		</p>
 	<?php
 	}
@@ -90,10 +90,10 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'ID'      => __( 'Log ID', 'give' ),
-			'details' => __( 'Request Details', 'give' ),
-			'ip'      => __( 'Request IP', 'give' ),
-			'date'    => __( 'Date', 'give' )
+			'ID'      => __('Log ID', 'give'),
+			'details' => __('Request Details', 'give'),
+			'ip'      => __('Request IP', 'give'),
+			'date'    => __('Date', 'give')
 		);
 
 		return $columns;
@@ -110,10 +110,10 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -127,26 +127,26 @@ 
 	 *
 	 * @return void
 	 */
-	public function column_details( $item ) {
+	public function column_details($item) {
 		?>
-		<a href="#TB_inline?width=640&amp;inlineId=log-details-<?php echo $item['ID']; ?>" class="thickbox" title="<?php _e( 'View Request Details', 'give' ); ?> "><?php _e( 'View Request', 'give' ); ?></a>
+		<a href="#TB_inline?width=640&amp;inlineId=log-details-<?php echo $item['ID']; ?>" class="thickbox" title="<?php _e('View Request Details', 'give'); ?> "><?php _e('View Request', 'give'); ?></a>
 		<div id="log-details-<?php echo $item['ID']; ?>" style="display:none;">
 			<?php
 
-			$request = get_post_field( 'post_excerpt', $item['ID'] );
-			$error   = get_post_field( 'post_content', $item['ID'] );
-			echo '<p><strong>' . __( 'API Request:', 'give' ) . '</strong></p>';
-			echo '<div>' . $request . '</div>';
-			if ( ! empty( $error ) ) {
-				echo '<p><strong>' . __( 'Error', 'give' ) . '</strong></p>';
-				echo '<div>' . esc_html( $error ) . '</div>';
+			$request = get_post_field('post_excerpt', $item['ID']);
+			$error   = get_post_field('post_content', $item['ID']);
+			echo '<p><strong>'.__('API Request:', 'give').'</strong></p>';
+			echo '<div>'.$request.'</div>';
+			if ( ! empty($error)) {
+				echo '<p><strong>'.__('Error', 'give').'</strong></p>';
+				echo '<div>'.esc_html($error).'</div>';
 			}
-			echo '<p><strong>' . __( 'API User:', 'give' ) . '</strong></p>';
-			echo '<div>' . get_post_meta( $item['ID'], '_give_log_user', true ) . '</div>';
-			echo '<p><strong>' . __( 'API Key:', 'give' ) . '</strong></p>';
-			echo '<div>' . get_post_meta( $item['ID'], '_give_log_key', true ) . '</div>';
-			echo '<p><strong>' . __( 'Request Date:', 'give' ) . '</strong></p>';
-			echo '<div>' . get_post_field( 'post_date', $item['ID'] ) . '</div>';
+			echo '<p><strong>'.__('API User:', 'give').'</strong></p>';
+			echo '<div>'.get_post_meta($item['ID'], '_give_log_user', true).'</div>';
+			echo '<p><strong>'.__('API Key:', 'give').'</strong></p>';
+			echo '<div>'.get_post_meta($item['ID'], '_give_log_key', true).'</div>';
+			echo '<p><strong>'.__('Request Date:', 'give').'</strong></p>';
+			echo '<div>'.get_post_field('post_date', $item['ID']).'</div>';
 			?>
 		</div>
 	<?php
@@ -160,7 +160,7 @@ 
 	 * @return mixed String if search is present, false otherwise
 	 */
 	public function get_search() {
-		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;
+		return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false;
 	}
 
 
@@ -176,19 +176,19 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+	protected function display_tablenav($which) {
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav <?php echo esc_attr($which); ?>">
 
 			<div class="alignleft actions bulkactions">
-				<?php $this->bulk_actions( $which ); ?>
+				<?php $this->bulk_actions($which); ?>
 			</div>
 			<?php
-			$this->extra_tablenav( $which );
-			$this->pagination( $which );
+			$this->extra_tablenav($which);
+			$this->pagination($which);
 			?>
 
 			<br class="clear"/>
@@ -210,31 +210,31 @@ 
 
 		$search = $this->get_search();
 
-		if ( $search ) {
-			if ( filter_var( $search, FILTER_VALIDATE_IP ) ) {
+		if ($search) {
+			if (filter_var($search, FILTER_VALIDATE_IP)) {
 				// This is an IP address search
 				$key = '_give_log_request_ip';
-			} else if ( is_email( $search ) ) {
+			} else if (is_email($search)) {
 				// This is an email search
-				$userdata = get_user_by( 'email', $search );
+				$userdata = get_user_by('email', $search);
 
-				if ( $userdata ) {
+				if ($userdata) {
 					$search = $userdata->ID;
 				}
 
 				$key = '_give_log_user';
-			} elseif ( strlen( $search ) == 32 ) {
+			} elseif (strlen($search) == 32) {
 				// Look for an API key
 				$key = '_give_log_key';
-			} elseif ( stristr( $search, 'token:' ) ) {
+			} elseif (stristr($search, 'token:')) {
 				// Look for an API token
-				$search = str_ireplace( 'token:', '', $search );
+				$search = str_ireplace('token:', '', $search);
 				$key    = '_give_log_token';
 			} else {
 				// This is (probably) a user ID search
-				$userdata = get_userdata( $search );
+				$userdata = get_userdata($search);
 
-				if ( $userdata ) {
+				if ($userdata) {
 					$search = $userdata->ID;
 				}
 
@@ -260,7 +260,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;
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	function bulk_actions( $which = '' ) {
+	function bulk_actions($which = '') {
 		give_log_views();
 	}
 
@@ -293,14 +293,14 @@ 
 			'meta_query' => $this->get_meta_query()
 		);
 
-		$logs = $give_logs->get_connected_logs( $log_query );
+		$logs = $give_logs->get_connected_logs($log_query);
 
-		if ( $logs ) {
-			foreach ( $logs as $log ) {
+		if ($logs) {
+			foreach ($logs as $log) {
 
 				$logs_data[] = array(
 					'ID'   => $log->ID,
-					'ip'   => get_post_meta( $log->ID, '_give_log_request_ip', true ),
+					'ip'   => get_post_meta($log->ID, '_give_log_request_ip', true),
 					'date' => $log->post_date
 				);
 			}
@@ -328,14 +328,14 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->get_logs();
-		$total_items           = $give_logs->get_log_count( 0, 'api_requests' );
+		$total_items           = $give_logs->get_log_count(0, 'api_requests');
 
-		$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/reporting/class-sales-logs-list-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 	 *
 	 * @access public
 	 * @since  1.0
-	 * @return mixed string If search is present, false otherwise
+	 * @return string|false string If search is present, false otherwise
 	 */
 	public function get_search() {
 		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;

Indentation +2 added lines, -2 removed lines

@@ -71,8 +71,8 @@
 
 			case 'user_id' :
 				return '<a href="' .
-				       admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . ( ! empty( $item['user_id'] ) ? urlencode( $item['user_id'] ) : give_get_payment_user_email( $item['payment_id'] ) ) ) .
-				       '">' . $item['user_name'] . '</a>';
+					   admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . ( ! empty( $item['user_id'] ) ? urlencode( $item['user_id'] ) : give_get_payment_user_email( $item['payment_id'] ) ) ) .
+					   '">' . $item['user_name'] . '</a>';
 
 			case 'amount' :
 				return give_currency_filter( give_format_amount( $item['amount'] ) );

Spacing +74 added lines, -74 removed lines

@@ -9,13 +9,13 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -44,13 +44,13 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
-		add_action( 'give_log_view_actions', array( $this, 'give_forms_filter' ) );
+		add_action('give_log_view_actions', array($this, 'give_forms_filter'));
 	}
 
 	/**
@@ -64,37 +64,37 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 
-		$payment = give_get_payment_by( 'id', $item['payment_id'] );
+		$payment = give_get_payment_by('id', $item['payment_id']);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'form' :
-				return '<a href="' . esc_url( add_query_arg( 'form', $item[ $column_name ] ) ) . '" >' . get_the_title( $item[ $column_name ] ) . '</a>';
+				return '<a href="'.esc_url(add_query_arg('form', $item[$column_name])).'" >'.get_the_title($item[$column_name]).'</a>';
 
 			case 'user_id' :
-				return '<a href="' .
-				       admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . ( ! empty( $item['user_id'] ) ? urlencode( $item['user_id'] ) : give_get_payment_user_email( $item['payment_id'] ) ) ) .
-				       '">' . $item['user_name'] . '</a>';
+				return '<a href="'.
+				       admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.( ! empty($item['user_id']) ? urlencode($item['user_id']) : give_get_payment_user_email($item['payment_id']))).
+				       '">'.$item['user_name'].'</a>';
 
 			case 'amount' :
-				return give_currency_filter( give_format_amount( $item['amount'] ) );
+				return give_currency_filter(give_format_amount($item['amount']));
 
 			case 'status' :
 
-				$value = '<div class="give-donation-status status-' . sanitize_title( give_get_payment_status( $payment, true ) ) . '"><span class="give-donation-status-icon"></span> ' . give_get_payment_status( $payment, true ) . '</div>';
+				$value = '<div class="give-donation-status status-'.sanitize_title(give_get_payment_status($payment, true)).'"><span class="give-donation-status-icon"></span> '.give_get_payment_status($payment, true).'</div>';
 
-				if ( $payment->mode == 'test' ) {
-					$value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="' . __( 'This payment was made in test mode', 'give' ) . '">' . __( 'Test', 'give' ) . '</span>';
+				if ($payment->mode == 'test') {
+					$value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="'.__('This payment was made in test mode', 'give').'">'.__('Test', 'give').'</span>';
 				}
 
 				return $value;
 
 			case 'payment_id' :
-				return '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id=' . $item['payment_id'] ) . '">' . give_get_payment_number( $item['payment_id'] ) . '</a>';
+				return '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id='.$item['payment_id']).'">'.give_get_payment_number($item['payment_id']).'</a>';
 
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -107,13 +107,13 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'ID'         => __( 'Log ID', 'give' ),
-			'user_id'    => __( 'Donor', 'give' ),
+			'ID'         => __('Log ID', 'give'),
+			'user_id'    => __('Donor', 'give'),
 			'form'       => give_get_forms_label_singular(),
-			'amount'     => __( 'Donation Amount', 'give' ),
-			'status'     => __( 'Status', 'give' ),
-			'payment_id' => __( 'Transaction ID', 'give' ),
-			'date'       => __( 'Date', 'give' )
+			'amount'     => __('Donation Amount', 'give'),
+			'status'     => __('Status', 'give'),
+			'payment_id' => __('Transaction ID', 'give'),
+			'date'       => __('Date', 'give')
 		);
 
 		return $columns;
@@ -127,7 +127,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;
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 * @return mixed int If User ID, string If Email/Login
 	 */
 	public function get_filtered_user() {
-		return isset( $_GET['user'] ) ? absint( $_GET['user'] ) : false;
+		return isset($_GET['user']) ? absint($_GET['user']) : false;
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 * @return int Download ID
 	 */
 	public function get_filtered_give_form() {
-		return ! empty( $_GET['form'] ) ? absint( $_GET['form'] ) : false;
+		return ! empty($_GET['form']) ? absint($_GET['form']) : false;
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 * @return mixed string If search is present, false otherwise
 	 */
 	public function get_search() {
-		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;
+		return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false;
 	}
 
 
@@ -176,20 +176,20 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav <?php echo esc_attr($which); ?>">
 
 			<div class="alignleft actions bulkactions">
-				<?php $this->bulk_actions( $which ); ?>
+				<?php $this->bulk_actions($which); ?>
 			</div>
 			<?php
-			$this->extra_tablenav( $which );
-			$this->pagination( $which );
+			$this->extra_tablenav($which);
+			$this->pagination($which);
 			?>
 
 			<br class="clear"/>
@@ -212,7 +212,7 @@ 
 
 		$meta_query = array();
 
-		if ( $user ) {
+		if ($user) {
 			// Show only logs from a specific user
 			$meta_query[] = array(
 				'key'   => '_give_log_user_id',
@@ -221,8 +221,8 @@ 
 		}
 
 		$search = $this->get_search();
-		if ( $search ) {
-			if ( is_email( $search ) ) {
+		if ($search) {
+			if (is_email($search)) {
 				// This is an email search. We use this to ensure it works for guest users and logged-in users
 				$key     = '_give_log_user_info';
 				$compare = 'LIKE';
@@ -231,32 +231,32 @@ 
 				$key     = '_give_log_user_id';
 				$compare = 'LIKE';
 
-				if ( ! is_numeric( $search ) ) {
+				if ( ! is_numeric($search)) {
 					// Searching for user by username
-					$user = get_user_by( 'login', $search );
+					$user = get_user_by('login', $search);
 
-					if ( $user ) {
+					if ($user) {
 						// Found one, set meta value to user's ID
 						$search = $user->ID;
 					} else {
 						// No user found so let's do a real search query
-						$users = new WP_User_Query( array(
+						$users = new WP_User_Query(array(
 							'search'         => $search,
-							'search_columns' => array( 'user_url', 'user_nicename' ),
+							'search_columns' => array('user_url', 'user_nicename'),
 							'number'         => 1,
 							'fields'         => 'ids'
-						) );
+						));
 
 						$found_user = $users->get_results();
 
-						if ( $found_user ) {
+						if ($found_user) {
 							$search = $found_user[0];
 						}
 					}
 				}
 			}
 
-			if ( ! $this->file_search ) {
+			if ( ! $this->file_search) {
 				// Meta query only works for non file name searche
 				$meta_query[] = array(
 					'key'     => $key,
@@ -277,7 +277,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	function bulk_actions( $which = '' ) {
+	function bulk_actions($which = '') {
 		give_log_views();
 	}
 
@@ -289,22 +289,22 @@ 
 	 * @return void
 	 */
 	public function give_forms_filter() {
-		$give_forms = get_posts( array(
+		$give_forms = get_posts(array(
 			'post_type'              => 'give_forms',
 			'post_status'            => 'any',
-			'posts_per_page'         => - 1,
+			'posts_per_page'         => -1,
 			'orderby'                => 'title',
 			'order'                  => 'ASC',
 			'fields'                 => 'ids',
 			'update_post_meta_cache' => false,
 			'update_post_term_cache' => false
-		) );
+		));
 
-		if ( $give_forms ) {
+		if ($give_forms) {
 			echo '<select name="form" id="give-log-form-filter">';
-			echo '<option value="0">' . __( 'All', 'give' ) . '</option>';
-			foreach ( $give_forms as $form ) {
-				echo '<option value="' . $form . '"' . selected( $form, $this->get_filtered_give_form() ) . '>' . esc_html( get_the_title( $form ) ) . '</option>';
+			echo '<option value="0">'.__('All', 'give').'</option>';
+			foreach ($give_forms as $form) {
+				echo '<option value="'.$form.'"'.selected($form, $this->get_filtered_give_form()).'>'.esc_html(get_the_title($form)).'</option>';
 			}
 			echo '</select>';
 		}
@@ -322,11 +322,11 @@ 
 		global $give_logs;
 
 		// Prevent the queries from getting cached. Without this there are occasional memory issues for some installs
-		wp_suspend_cache_addition( true );
+		wp_suspend_cache_addition(true);
 
 		$logs_data = array();
 		$paged     = $this->get_paged();
-		$give_form = empty( $_GET['s'] ) ? $this->get_filtered_give_form() : null;
+		$give_form = empty($_GET['s']) ? $this->get_filtered_give_form() : null;
 		$user      = $this->get_filtered_user();
 
 		$log_query = array(
@@ -336,26 +336,26 @@ 
 			'meta_query'  => $this->get_meta_query()
 		);
 
-		$logs = $give_logs->get_connected_logs( $log_query );
+		$logs = $give_logs->get_connected_logs($log_query);
 
-		if ( $logs ) {
-			foreach ( $logs as $log ) {
-				$payment_id = get_post_meta( $log->ID, '_give_log_payment_id', true );
+		if ($logs) {
+			foreach ($logs as $log) {
+				$payment_id = get_post_meta($log->ID, '_give_log_payment_id', true);
 
 				// Make sure this payment hasn't been deleted
-				if ( get_post( $payment_id ) ) :
-					$user_info      = give_get_payment_meta_user_info( $payment_id );
-					$payment_meta   = give_get_payment_meta( $payment_id );
-					$payment_amount = give_get_payment_amount( $payment_id );
+				if (get_post($payment_id)) :
+					$user_info      = give_get_payment_meta_user_info($payment_id);
+					$payment_meta   = give_get_payment_meta($payment_id);
+					$payment_amount = give_get_payment_amount($payment_id);
 
 					$logs_data[] = array(
-						'ID'         => '<span class="give-item-label give-item-label-gray">' . $log->ID . '</span>',
+						'ID'         => '<span class="give-item-label give-item-label-gray">'.$log->ID.'</span>',
 						'payment_id' => $payment_id,
 						'form'       => $log->post_parent,
 						'amount'     => $payment_amount,
 						'user_id'    => $user_info['id'],
-						'user_name'  => $user_info['first_name'] . ' ' . $user_info['last_name'],
-						'date'       => get_post_field( 'post_date', $payment_id )
+						'user_name'  => $user_info['first_name'].' '.$user_info['last_name'],
+						'date'       => get_post_field('post_date', $payment_id)
 					);
 
 				endif;
@@ -384,15 +384,15 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array();
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$current_page          = $this->get_pagenum();
 		$this->items           = $this->get_logs();
-		$total_items           = $give_logs->get_log_count( $this->get_filtered_give_form(), 'sale', $this->get_meta_query() );
+		$total_items           = $give_logs->get_log_count($this->get_filtered_give_form(), 'sale', $this->get_meta_query());
 
-		$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/reporting/graphing.php

Doc Comments +1 added lines, -1 removed lines

@@ -576,7 +576,7 @@
  * selected date-range (if any)
  *
  * @since 1.0
- * @return array
+ * @return integer|null
  */
 function give_get_report_dates() {
 	$dates = array();

Spacing +243 added lines, -243 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,7 +25,7 @@ 
 	$dates = give_get_report_dates();
 
 	// Determine graph options
-	switch ( $dates['range'] ) :
+	switch ($dates['range']) :
 		case 'today' :
 		case 'yesterday' :
 			$day_by_day = true;
@@ -37,7 +37,7 @@ 
 			$day_by_day = false;
 			break;
 		case 'other' :
-			if ( $dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] && ( $dates['m_start'] != '12' && $dates['m_end'] != '1' ) ) {
+			if ($dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] && ($dates['m_start'] != '12' && $dates['m_end'] != '1')) {
 				$day_by_day = false;
 			} else {
 				$day_by_day = true;
@@ -49,61 +49,61 @@ 
 	endswitch;
 
 	$earnings_totals = 0.00; // Total earnings for time period shown
-	$sales_totals    = 0;            // Total sales for time period shown
+	$sales_totals    = 0; // Total sales for time period shown
 
 	$earnings_data = array();
 	$sales_data    = array();
 
-	if ( $dates['range'] == 'today' || $dates['range'] == 'yesterday' ) {
+	if ($dates['range'] == 'today' || $dates['range'] == 'yesterday') {
 		// Hour by hour
 		$hour  = 1;
-		$month = date( 'n', current_time( 'timestamp' ) );
-		while ( $hour <= 23 ) :
+		$month = date('n', current_time('timestamp'));
+		while ($hour <= 23) :
 
-			$sales    = give_get_sales_by_date( $dates['day'], $month, $dates['year'], $hour );
-			$earnings = give_get_earnings_by_date( $dates['day'], $month, $dates['year'], $hour );
+			$sales    = give_get_sales_by_date($dates['day'], $month, $dates['year'], $hour);
+			$earnings = give_get_earnings_by_date($dates['day'], $month, $dates['year'], $hour);
 
 			$sales_totals += $sales;
 			$earnings_totals += $earnings;
 
-			$date            = mktime( $hour, 0, 0, $month, $dates['day'], $dates['year'] ) * 1000;
-			$sales_data[]    = array( $date, $sales );
-			$earnings_data[] = array( $date, $earnings );
+			$date            = mktime($hour, 0, 0, $month, $dates['day'], $dates['year']) * 1000;
+			$sales_data[]    = array($date, $sales);
+			$earnings_data[] = array($date, $earnings);
 
-			$hour ++;
+			$hour++;
 		endwhile;
 
-	} elseif ( $dates['range'] == 'this_week' || $dates['range'] == 'last_week' ) {
+	} elseif ($dates['range'] == 'this_week' || $dates['range'] == 'last_week') {
 
 		// Day by day
 		$day     = $dates['day'];
 		$day_end = $dates['day_end'];
 		$month   = $dates['m_start'];
-		while ( $day <= $day_end ) :
-			$sales = give_get_sales_by_date( $day, $month, $dates['year'] );
+		while ($day <= $day_end) :
+			$sales = give_get_sales_by_date($day, $month, $dates['year']);
 			$sales_totals += $sales;
 
-			$earnings = give_get_earnings_by_date( $day, $month, $dates['year'] );
+			$earnings = give_get_earnings_by_date($day, $month, $dates['year']);
 			$earnings_totals += $earnings;
 
-			$date            = mktime( 0, 0, 0, $month, $day, $dates['year'] ) * 1000;
-			$sales_data[]    = array( $date, $sales );
-			$earnings_data[] = array( $date, $earnings );
-			$day ++;
+			$date            = mktime(0, 0, 0, $month, $day, $dates['year']) * 1000;
+			$sales_data[]    = array($date, $sales);
+			$earnings_data[] = array($date, $earnings);
+			$day++;
 		endwhile;
 
 	} else {
 
 		$y = $dates['year'];
-		while ( $y <= $dates['year_end'] ) :
+		while ($y <= $dates['year_end']) :
 
-			if ( $dates['year'] == $dates['year_end'] ) {
+			if ($dates['year'] == $dates['year_end']) {
 				$month_start = $dates['m_start'];
 				$month_end   = $dates['m_end'];
-			} elseif ( $y == $dates['year'] ) {
+			} elseif ($y == $dates['year']) {
 				$month_start = $dates['m_start'];
 				$month_end   = 12;
-			} elseif ( $y == $dates['year_end'] ) {
+			} elseif ($y == $dates['year_end']) {
 				$month_start = 1;
 				$month_end   = $dates['m_end'];
 			} else {
@@ -112,48 +112,48 @@ 
 			}
 
 			$i = $month_start;
-			while ( $i <= $month_end ) :
+			while ($i <= $month_end) :
 
-				if ( $day_by_day ) :
+				if ($day_by_day) :
 
-					if ( $i == $month_end ) {
+					if ($i == $month_end) {
 
 						$num_of_days = $dates['day_end'];
 
 					} else {
 
-						$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+						$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
 					}
 
 					$d = $dates['day'];
 
-					while ( $d <= $num_of_days ) :
+					while ($d <= $num_of_days) :
 
-						$sales = give_get_sales_by_date( $d, $i, $y );
+						$sales = give_get_sales_by_date($d, $i, $y);
 						$sales_totals += $sales;
 
-						$earnings = give_get_earnings_by_date( $d, $i, $y );
+						$earnings = give_get_earnings_by_date($d, $i, $y);
 						$earnings_totals += $earnings;
 
-						$date            = mktime( 0, 0, 0, $i, $d, $y ) * 1000;
-						$sales_data[]    = array( $date, $sales );
-						$earnings_data[] = array( $date, $earnings );
-						$d ++;
+						$date            = mktime(0, 0, 0, $i, $d, $y) * 1000;
+						$sales_data[]    = array($date, $sales);
+						$earnings_data[] = array($date, $earnings);
+						$d++;
 
 					endwhile;
 
 				else :
 
-					$sales = give_get_sales_by_date( null, $i, $y );
+					$sales = give_get_sales_by_date(null, $i, $y);
 					$sales_totals += $sales;
 
-					$earnings = give_get_earnings_by_date( null, $i, $y );
+					$earnings = give_get_earnings_by_date(null, $i, $y);
 					$earnings_totals += $earnings;
 
-					if ( $i == $month_end ) {
+					if ($i == $month_end) {
 
-						$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+						$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
 					} else {
 
@@ -161,24 +161,24 @@ 
 
 					}
 
-					$date            = mktime( 0, 0, 0, $i, $num_of_days, $y ) * 1000;
-					$sales_data[]    = array( $date, $sales );
-					$earnings_data[] = array( $date, $earnings );
+					$date            = mktime(0, 0, 0, $i, $num_of_days, $y) * 1000;
+					$sales_data[]    = array($date, $sales);
+					$earnings_data[] = array($date, $earnings);
 
 				endif;
 
-				$i ++;
+				$i++;
 
 			endwhile;
 
-			$y ++;
+			$y++;
 		endwhile;
 
 	}
 
 	$data = array(
-		__( 'Income', 'give' )    => $earnings_data,
-		__( 'Donations', 'give' ) => $sales_data
+		__('Income', 'give')    => $earnings_data,
+		__('Donations', 'give') => $sales_data
 	);
 
 	// start our own output buffer
@@ -190,12 +190,12 @@ 
 			<div class="postbox">
 				<div class="inside">
 					<?php
-					$graph = new Give_Graph( $data );
-					$graph->set( 'x_mode', 'time' );
-					$graph->set( 'multiple_y_axes', true );
+					$graph = new Give_Graph($data);
+					$graph->set('x_mode', 'time');
+					$graph->set('multiple_y_axes', true);
 					$graph->display();
 
-					if ( 'this_month' == $dates['range'] ) {
+					if ('this_month' == $dates['range']) {
 						$estimated = give_estimated_monthly_stats();
 					}
 					?>
@@ -206,32 +206,32 @@ 
 				<tbody>
 				<tr>
 					<td class="row-title">
-						<label for="tablecell"><?php _e( 'Total income for period: ', 'give' ); ?></label></td>
-					<td><?php echo give_currency_filter( give_format_amount( $earnings_totals ) ); ?></td>
+						<label for="tablecell"><?php _e('Total income for period: ', 'give'); ?></label></td>
+					<td><?php echo give_currency_filter(give_format_amount($earnings_totals)); ?></td>
 				</tr>
 				<tr class="alternate">
 					<td class="row-title">
-						<label for="tablecell"><?php _e( 'Total donations for period shown: ', 'give' ); ?></label>
+						<label for="tablecell"><?php _e('Total donations for period shown: ', 'give'); ?></label>
 					</td>
-					<td><?php echo give_format_amount( $sales_totals, false ); ?></td>
+					<td><?php echo give_format_amount($sales_totals, false); ?></td>
 				</tr>
-				<?php if ( 'this_month' == $dates['range'] ) : ?>
+				<?php if ('this_month' == $dates['range']) : ?>
 					<tr>
 						<td class="row-title">
-							<label for="tablecell"><?php _e( 'Estimated monthly income: ', 'give' ); ?></label>
+							<label for="tablecell"><?php _e('Estimated monthly income: ', 'give'); ?></label>
 						</td>
-						<td><?php echo give_currency_filter( give_format_amount( $estimated['earnings'] ) ); ?></td>
+						<td><?php echo give_currency_filter(give_format_amount($estimated['earnings'])); ?></td>
 					</tr>
 					<tr class="alternate">
 						<td class="row-title">
-							<label for="tablecell"><?php _e( 'Estimated monthly donations: ', 'give' ); ?></label>
+							<label for="tablecell"><?php _e('Estimated monthly donations: ', 'give'); ?></label>
 						</td>
-						<td><?php echo give_format_amount( $estimated['sales'], false ); ?></td>
+						<td><?php echo give_format_amount($estimated['sales'], false); ?></td>
 					</tr>
 				<?php endif; ?>
 			</table>
 
-			<?php do_action( 'give_reports_graph_additional_stats' ); ?>
+			<?php do_action('give_reports_graph_additional_stats'); ?>
 
 		</div>
 	</div>
@@ -249,12 +249,12 @@ 
  * @since 1.0
  * @return void
  */
-function give_reports_graph_of_form( $form_id = 0 ) {
+function give_reports_graph_of_form($form_id = 0) {
 	// Retrieve the queried dates
 	$dates = give_get_report_dates();
 
 	// Determine graph options
-	switch ( $dates['range'] ) :
+	switch ($dates['range']) :
 		case 'today' :
 		case 'yesterday' :
 			$day_by_day = true;
@@ -272,7 +272,7 @@ 
 			$day_by_day = false;
 			break;
 		case 'other' :
-			if ( $dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] ) {
+			if ($dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year']) {
 				$day_by_day = false;
 			} else {
 				$day_by_day = true;
@@ -284,75 +284,75 @@ 
 	endswitch;
 
 	$earnings_totals = (float) 0.00; // Total earnings for time period shown
-	$sales_totals    = 0;            // Total sales for time period shown
+	$sales_totals    = 0; // Total sales for time period shown
 
 	$earnings_data = array();
 	$sales_data    = array();
 	$stats         = new Give_Payment_Stats;
 
-	if ( $dates['range'] == 'today' || $dates['range'] == 'yesterday' ) {
+	if ($dates['range'] == 'today' || $dates['range'] == 'yesterday') {
 
 		// Hour by hour
 		$month  = $dates['m_start'];
 		$hour   = 1;
 		$minute = 0;
 		$second = 0;
-		while ( $hour <= 23 ) :
+		while ($hour <= 23) :
 
-			if ( $hour == 23 ) {
+			if ($hour == 23) {
 				$minute = $second = 59;
 			}
 
-			$date     = mktime( $hour, $minute, $second, $month, $dates['day'], $dates['year'] );
-			$date_end = mktime( $hour + 1, $minute, $second, $month, $dates['day'], $dates['year'] );
+			$date     = mktime($hour, $minute, $second, $month, $dates['day'], $dates['year']);
+			$date_end = mktime($hour + 1, $minute, $second, $month, $dates['day'], $dates['year']);
 
-			$sales = $stats->get_sales( $form_id, $date, $date_end );
+			$sales = $stats->get_sales($form_id, $date, $date_end);
 			$sales_totals += $sales;
 
-			$earnings = $stats->get_earnings( $form_id, $date, $date_end );
+			$earnings = $stats->get_earnings($form_id, $date, $date_end);
 			$earnings_totals += $earnings;
 
-			$sales_data[]    = array( $date * 1000, $sales );
-			$earnings_data[] = array( $date * 1000, $earnings );
+			$sales_data[]    = array($date * 1000, $sales);
+			$earnings_data[] = array($date * 1000, $earnings);
 
-			$hour ++;
+			$hour++;
 		endwhile;
 
-	} elseif ( $dates['range'] == 'this_week' || $dates['range'] == 'last_week' ) {
+	} elseif ($dates['range'] == 'this_week' || $dates['range'] == 'last_week') {
 
 		//Day by day
 		$day     = $dates['day'];
 		$day_end = $dates['day_end'];
 		$month   = $dates['m_start'];
-		while ( $day <= $day_end ) :
+		while ($day <= $day_end) :
 
-			$date     = mktime( 0, 0, 0, $month, $day, $dates['year'] );
-			$date_end = mktime( 0, 0, 0, $month, $day + 1, $dates['year'] );
-			$sales    = $stats->get_sales( $form_id, $date, $date_end );
+			$date     = mktime(0, 0, 0, $month, $day, $dates['year']);
+			$date_end = mktime(0, 0, 0, $month, $day + 1, $dates['year']);
+			$sales    = $stats->get_sales($form_id, $date, $date_end);
 			$sales_totals += $sales;
 
-			$earnings = $stats->get_earnings( $form_id, $date, $date_end );
+			$earnings = $stats->get_earnings($form_id, $date, $date_end);
 			$earnings_totals += $earnings;
 
-			$sales_data[]    = array( $date * 1000, $sales );
-			$earnings_data[] = array( $date * 1000, $earnings );
+			$sales_data[]    = array($date * 1000, $sales);
+			$earnings_data[] = array($date * 1000, $earnings);
 
-			$day ++;
+			$day++;
 		endwhile;
 
 	} else {
 
 		$y = $dates['year'];
 
-		while ( $y <= $dates['year_end'] ) :
+		while ($y <= $dates['year_end']) :
 
 			$last_year = false;
 
-			if ( $dates['year'] == $dates['year_end'] ) {
+			if ($dates['year'] == $dates['year_end']) {
 				$month_start = $dates['m_start'];
 				$month_end   = $dates['m_end'];
 				$last_year   = true;
-			} elseif ( $y == $dates['year'] ) {
+			} elseif ($y == $dates['year']) {
 				$month_start = $dates['m_start'];
 				$month_end   = 12;
 			} else {
@@ -361,79 +361,79 @@ 
 			}
 
 			$i = $month_start;
-			while ( $i <= $month_end ) :
+			while ($i <= $month_end) :
 
-				if ( $day_by_day ) :
+				if ($day_by_day) :
 
-					if ( $i == $month_end && $last_year ) {
+					if ($i == $month_end && $last_year) {
 
 						$num_of_days = $dates['day_end'];
 
 					} else {
 
-						$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+						$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
 					}
 
 					$d = $dates['day'];
-					while ( $d <= $num_of_days ) :
+					while ($d <= $num_of_days) :
 
-						$date     = mktime( 0, 0, 0, $i, $d, $y );
-						$end_date = mktime( 23, 59, 59, $i, $d, $y );
+						$date     = mktime(0, 0, 0, $i, $d, $y);
+						$end_date = mktime(23, 59, 59, $i, $d, $y);
 
-						$sales = $stats->get_sales( $form_id, $date, $end_date );
+						$sales = $stats->get_sales($form_id, $date, $end_date);
 						$sales_totals += $sales;
 
-						$earnings = $stats->get_earnings( $form_id, $date, $end_date );
+						$earnings = $stats->get_earnings($form_id, $date, $end_date);
 						$earnings_totals += $earnings;
 
-						$sales_data[]    = array( $date * 1000, $sales );
-						$earnings_data[] = array( $date * 1000, $earnings );
-						$d ++;
+						$sales_data[]    = array($date * 1000, $sales);
+						$earnings_data[] = array($date * 1000, $earnings);
+						$d++;
 
 					endwhile;
 
 				else :
 
-					$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+					$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
-					$date     = mktime( 0, 0, 0, $i, 1, $y );
-					$end_date = mktime( 23, 59, 59, $i, $num_of_days, $y );
+					$date     = mktime(0, 0, 0, $i, 1, $y);
+					$end_date = mktime(23, 59, 59, $i, $num_of_days, $y);
 
-					$sales = $stats->get_sales( $form_id, $date, $end_date );
+					$sales = $stats->get_sales($form_id, $date, $end_date);
 					$sales_totals += $sales;
 
-					$earnings = $stats->get_earnings( $form_id, $date, $end_date );
+					$earnings = $stats->get_earnings($form_id, $date, $end_date);
 					$earnings_totals += $earnings;
 
-					$sales_data[]    = array( $date * 1000, $sales );
-					$earnings_data[] = array( $date * 1000, $earnings );
+					$sales_data[]    = array($date * 1000, $sales);
+					$earnings_data[] = array($date * 1000, $earnings);
 				endif;
 
-				$i ++;
+				$i++;
 
 			endwhile;
 
-			$y ++;
+			$y++;
 		endwhile;
 
 	}
 
 	$data = array(
-		__( 'Income', 'give' )    => $earnings_data,
-		__( 'Donations', 'give' ) => $sales_data
+		__('Income', 'give')    => $earnings_data,
+		__('Donations', 'give') => $sales_data
 	);
 
 	?>
-	<h3><span><?php printf( __( 'Income Over Time for %s', 'give' ), get_the_title( $form_id ) ); ?></span></h3>
+	<h3><span><?php printf(__('Income Over Time for %s', 'give'), get_the_title($form_id)); ?></span></h3>
 
 	<div class="metabox-holder" style="padding-top: 0;">
 		<div class="postbox">
 			<div class="inside">
 				<?php
-				$graph = new Give_Graph( $data );
-				$graph->set( 'x_mode', 'time' );
-				$graph->set( 'multiple_y_axes', true );
+				$graph = new Give_Graph($data);
+				$graph->set('x_mode', 'time');
+				$graph->set('multiple_y_axes', true);
 				$graph->display();
 				?>
 			</div>
@@ -443,26 +443,26 @@ 
 			<tbody>
 			<tr>
 				<td class="row-title">
-					<label for="tablecell"><?php _e( 'Total income for period: ', 'give' ); ?></label></td>
-				<td><?php echo give_currency_filter( give_format_amount( $earnings_totals ) ); ?></td>
+					<label for="tablecell"><?php _e('Total income for period: ', 'give'); ?></label></td>
+				<td><?php echo give_currency_filter(give_format_amount($earnings_totals)); ?></td>
 			</tr>
 			<tr class="alternate">
 				<td class="row-title">
-					<label for="tablecell"><?php _e( 'Total donations for period: ', 'give' ); ?></label>
+					<label for="tablecell"><?php _e('Total donations for period: ', 'give'); ?></label>
 				</td>
 				<td><?php echo $sales_totals; ?></td>
 			</tr>
 			<tr>
 				<td class="row-title">
-					<label for="tablecell"><?php _e( 'Average monthly income: %s', 'give' ); ?></label>
+					<label for="tablecell"><?php _e('Average monthly income: %s', 'give'); ?></label>
 				</td>
-				<td><?php echo give_currency_filter( give_format_amount( give_get_average_monthly_form_earnings( $form_id ) ) ); ?></td>
+				<td><?php echo give_currency_filter(give_format_amount(give_get_average_monthly_form_earnings($form_id))); ?></td>
 			</tr>
 			<tr class="alternate">
 				<td class="row-title">
-					<label for="tablecell"><?php _e( 'Average monthly donations: %s', 'give' ); ?></label>
+					<label for="tablecell"><?php _e('Average monthly donations: %s', 'give'); ?></label>
 				</td>
-				<td><?php echo number_format( give_get_average_monthly_form_sales( $form_id ), 0 ); ?></td>
+				<td><?php echo number_format(give_get_average_monthly_form_sales($form_id), 0); ?></td>
 			</tr>
 			</tbody>
 		</table>
@@ -479,30 +479,30 @@ 
  * @return void
  */
 function give_reports_graph_controls() {
-	$date_options = apply_filters( 'give_report_date_options', array(
-		'today'        => __( 'Today', 'give' ),
-		'yesterday'    => __( 'Yesterday', 'give' ),
-		'this_week'    => __( 'This Week', 'give' ),
-		'last_week'    => __( 'Last Week', 'give' ),
-		'this_month'   => __( 'This Month', 'give' ),
-		'last_month'   => __( 'Last Month', 'give' ),
-		'this_quarter' => __( 'This Quarter', 'give' ),
-		'last_quarter' => __( 'Last Quarter', 'give' ),
-		'this_year'    => __( 'This Year', 'give' ),
-		'last_year'    => __( 'Last Year', 'give' ),
-		'other'        => __( 'Custom', 'give' )
-	) );
+	$date_options = apply_filters('give_report_date_options', array(
+		'today'        => __('Today', 'give'),
+		'yesterday'    => __('Yesterday', 'give'),
+		'this_week'    => __('This Week', 'give'),
+		'last_week'    => __('Last Week', 'give'),
+		'this_month'   => __('This Month', 'give'),
+		'last_month'   => __('Last Month', 'give'),
+		'this_quarter' => __('This Quarter', 'give'),
+		'last_quarter' => __('Last Quarter', 'give'),
+		'this_year'    => __('This Year', 'give'),
+		'last_year'    => __('Last Year', 'give'),
+		'other'        => __('Custom', 'give')
+	));
 
 	$dates   = give_get_report_dates();
 	$display = $dates['range'] == 'other' ? '' : 'style="display:none;"';
 	$view    = give_get_reporting_view();
 
-	if ( empty( $dates['day_end'] ) ) {
-		$dates['day_end'] = cal_days_in_month( CAL_GREGORIAN, date( 'n' ), date( 'Y' ) );
+	if (empty($dates['day_end'])) {
+		$dates['day_end'] = cal_days_in_month(CAL_GREGORIAN, date('n'), date('Y'));
 	}
 
 	//echo '<pre>'; print_r( $dates ); echo '</pre>';
-	do_action( 'give_report_graph_controls_before' );
+	do_action('give_report_graph_controls_before');
 	?>
 	<form id="give-graphs-filter" method="get" class="alignright">
 		<div class="tablenav top alignright">
@@ -510,53 +510,53 @@ 
 
 				<input type="hidden" name="post_type" value="give_forms" />
 				<input type="hidden" name="page" value="give-reports" />
-				<input type="hidden" name="view" value="<?php echo esc_attr( $view ); ?>" />
+				<input type="hidden" name="view" value="<?php echo esc_attr($view); ?>" />
 
-				<?php if ( isset( $_GET['form-id'] ) ) : ?>
-					<input type="hidden" name="form-id" value="<?php echo absint( $_GET['form-id'] ); ?>" />
+				<?php if (isset($_GET['form-id'])) : ?>
+					<input type="hidden" name="form-id" value="<?php echo absint($_GET['form-id']); ?>" />
 				<?php endif; ?>
 
 				<div id="give-graphs-date-options-wrap" class="alignright">
 					<select id="give-graphs-date-options" name="range">
-						<?php foreach ( $date_options as $key => $option ) : ?>
-							<option value="<?php echo esc_attr( $key ); ?>"<?php selected( $key, $dates['range'] ); ?>><?php echo esc_html( $option ); ?></option>
+						<?php foreach ($date_options as $key => $option) : ?>
+							<option value="<?php echo esc_attr($key); ?>"<?php selected($key, $dates['range']); ?>><?php echo esc_html($option); ?></option>
 						<?php endforeach; ?>
 					</select>
 
-					<input type="submit" class="button-secondary" value="<?php _e( 'Filter', 'give' ); ?>" />
+					<input type="submit" class="button-secondary" value="<?php _e('Filter', 'give'); ?>" />
 				</div>
 
 				<div id="give-date-range-options" <?php echo $display; ?>>
-					<span><?php _e( 'From', 'give' ); ?>&nbsp;</span>
+					<span><?php _e('From', 'give'); ?>&nbsp;</span>
 					<select id="give-graphs-month-start" name="m_start">
-						<?php for ( $i = 1; $i <= 12; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['m_start'] ); ?>><?php echo give_month_num_to_name( $i ); ?></option>
+						<?php for ($i = 1; $i <= 12; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['m_start']); ?>><?php echo give_month_num_to_name($i); ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-day-start" name="day">
-						<?php for ( $i = 1; $i <= 31; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['day'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 1; $i <= 31; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['day']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-year-start" name="year">
-						<?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['year'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 2007; $i <= date('Y'); $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['year']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
-					<span><?php _e( 'To', 'give' ); ?>&nbsp;</span>
+					<span><?php _e('To', 'give'); ?>&nbsp;</span>
 					<select id="give-graphs-month-end" name="m_end">
-						<?php for ( $i = 1; $i <= 12; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['m_end'] ); ?>><?php echo give_month_num_to_name( $i ); ?></option>
+						<?php for ($i = 1; $i <= 12; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['m_end']); ?>><?php echo give_month_num_to_name($i); ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-day-end" name="day_end">
-						<?php for ( $i = 1; $i <= 31; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['day_end'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 1; $i <= 31; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['day_end']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-year-end" name="year_end">
-						<?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['year_end'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 2007; $i <= date('Y'); $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['year_end']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
 				</div>
@@ -566,7 +566,7 @@ 
 		</div>
 	</form>
 	<?php
-	do_action( 'give_report_graph_controls_after' );
+	do_action('give_report_graph_controls_after');
 }
 
 /**
@@ -581,65 +581,65 @@ 
 function give_get_report_dates() {
 	$dates = array();
 
-	$current_time = current_time( 'timestamp' );
+	$current_time = current_time('timestamp');
 
-	$dates['range']    = isset( $_GET['range'] ) ? $_GET['range'] : 'this_month';
-	$dates['year']     = isset( $_GET['year'] ) ? $_GET['year'] : date( 'Y' );
-	$dates['year_end'] = isset( $_GET['year_end'] ) ? $_GET['year_end'] : date( 'Y' );
-	$dates['m_start']  = isset( $_GET['m_start'] ) ? $_GET['m_start'] : 1;
-	$dates['m_end']    = isset( $_GET['m_end'] ) ? $_GET['m_end'] : 12;
-	$dates['day']      = isset( $_GET['day'] ) ? $_GET['day'] : 1;
-	$dates['day_end']  = isset( $_GET['day_end'] ) ? $_GET['day_end'] : cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] );
+	$dates['range']    = isset($_GET['range']) ? $_GET['range'] : 'this_month';
+	$dates['year']     = isset($_GET['year']) ? $_GET['year'] : date('Y');
+	$dates['year_end'] = isset($_GET['year_end']) ? $_GET['year_end'] : date('Y');
+	$dates['m_start']  = isset($_GET['m_start']) ? $_GET['m_start'] : 1;
+	$dates['m_end']    = isset($_GET['m_end']) ? $_GET['m_end'] : 12;
+	$dates['day']      = isset($_GET['day']) ? $_GET['day'] : 1;
+	$dates['day_end']  = isset($_GET['day_end']) ? $_GET['day_end'] : cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']);
 
 	// Modify dates based on predefined ranges
-	switch ( $dates['range'] ) :
+	switch ($dates['range']) :
 
 		case 'this_month' :
-			$dates['m_start']  = date( 'n', $current_time );
-			$dates['m_end']    = date( 'n', $current_time );
+			$dates['m_start']  = date('n', $current_time);
+			$dates['m_end']    = date('n', $current_time);
 			$dates['day']      = 1;
-			$dates['day_end']  = cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] );
-			$dates['year']     = date( 'Y' );
-			$dates['year_end'] = date( 'Y' );
+			$dates['day_end']  = cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']);
+			$dates['year']     = date('Y');
+			$dates['year_end'] = date('Y');
 			break;
 
 		case 'last_month' :
-			if ( date( 'n' ) == 1 ) {
+			if (date('n') == 1) {
 				$dates['m_start']  = 12;
 				$dates['m_end']    = 12;
-				$dates['year']     = date( 'Y', $current_time ) - 1;
-				$dates['year_end'] = date( 'Y', $current_time ) - 1;
+				$dates['year']     = date('Y', $current_time) - 1;
+				$dates['year_end'] = date('Y', $current_time) - 1;
 			} else {
-				$dates['m_start']  = date( 'n' ) - 1;
-				$dates['m_end']    = date( 'n' ) - 1;
+				$dates['m_start']  = date('n') - 1;
+				$dates['m_end']    = date('n') - 1;
 				$dates['year_end'] = $dates['year'];
 			}
-			$dates['day_end'] = cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] );
+			$dates['day_end'] = cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']);
 			break;
 
 		case 'today' :
-			$dates['day']     = date( 'd', $current_time );
-			$dates['m_start'] = date( 'n', $current_time );
-			$dates['m_end']   = date( 'n', $current_time );
-			$dates['year']    = date( 'Y', $current_time );
+			$dates['day']     = date('d', $current_time);
+			$dates['m_start'] = date('n', $current_time);
+			$dates['m_end']   = date('n', $current_time);
+			$dates['year']    = date('Y', $current_time);
 			break;
 
 		case 'yesterday' :
 
-			$year  = date( 'Y', $current_time );
-			$month = date( 'n', $current_time );
-			$day   = date( 'd', $current_time );
+			$year  = date('Y', $current_time);
+			$month = date('n', $current_time);
+			$day   = date('d', $current_time);
 
-			if ( $month == 1 && $day == 1 ) {
+			if ($month == 1 && $day == 1) {
 
 				$year -= 1;
 				$month = 12;
-				$day   = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+				$day   = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
-			} elseif ( $month > 1 && $day == 1 ) {
+			} elseif ($month > 1 && $day == 1) {
 
 				$month -= 1;
-				$day = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+				$day = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
 			} else {
 
@@ -655,91 +655,91 @@ 
 			break;
 
 		case 'this_week' :
-			$dates['day'] = date( 'd', $current_time - ( date( 'w', $current_time ) - 1 ) * 60 * 60 * 24 ) - 1;
-			$dates['day'] += get_option( 'start_of_week' );
+			$dates['day'] = date('d', $current_time - (date('w', $current_time) - 1) * 60 * 60 * 24) - 1;
+			$dates['day'] += get_option('start_of_week');
 			$dates['day_end'] = $dates['day'] + 6;
-			$dates['m_start'] = date( 'n', $current_time );
-			$dates['m_end']   = date( 'n', $current_time );
-			$dates['year']    = date( 'Y', $current_time );
+			$dates['m_start'] = date('n', $current_time);
+			$dates['m_end']   = date('n', $current_time);
+			$dates['year']    = date('Y', $current_time);
 			break;
 
 		case 'last_week' :
-			$dates['day'] = date( 'd', $current_time - ( date( 'w' ) - 1 ) * 60 * 60 * 24 ) - 8;
-			$dates['day'] += get_option( 'start_of_week' );
+			$dates['day'] = date('d', $current_time - (date('w') - 1) * 60 * 60 * 24) - 8;
+			$dates['day'] += get_option('start_of_week');
 			$dates['day_end'] = $dates['day'] + 6;
-			$dates['year']    = date( 'Y' );
-
-			if ( date( 'j', $current_time ) <= 7 ) {
-				$dates['m_start'] = date( 'n', $current_time ) - 1;
-				$dates['m_end']   = date( 'n', $current_time ) - 1;
-				if ( $dates['m_start'] <= 1 ) {
-					$dates['year']     = date( 'Y', $current_time ) - 1;
-					$dates['year_end'] = date( 'Y', $current_time ) - 1;
+			$dates['year']    = date('Y');
+
+			if (date('j', $current_time) <= 7) {
+				$dates['m_start'] = date('n', $current_time) - 1;
+				$dates['m_end']   = date('n', $current_time) - 1;
+				if ($dates['m_start'] <= 1) {
+					$dates['year']     = date('Y', $current_time) - 1;
+					$dates['year_end'] = date('Y', $current_time) - 1;
 				}
 			} else {
-				$dates['m_start'] = date( 'n', $current_time );
-				$dates['m_end']   = date( 'n', $current_time );
+				$dates['m_start'] = date('n', $current_time);
+				$dates['m_end']   = date('n', $current_time);
 			}
 			break;
 
 		case 'this_quarter' :
-			$month_now = date( 'n', $current_time );
+			$month_now = date('n', $current_time);
 
-			if ( $month_now <= 3 ) {
+			if ($month_now <= 3) {
 
 				$dates['m_start'] = 1;
 				$dates['m_end']   = 4;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
-			} else if ( $month_now <= 6 ) {
+			} else if ($month_now <= 6) {
 
 				$dates['m_start'] = 4;
 				$dates['m_end']   = 7;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
-			} else if ( $month_now <= 9 ) {
+			} else if ($month_now <= 9) {
 
 				$dates['m_start'] = 7;
 				$dates['m_end']   = 10;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
 			} else {
 
 				$dates['m_start']  = 10;
 				$dates['m_end']    = 1;
-				$dates['year']     = date( 'Y', $current_time );
-				$dates['year_end'] = date( 'Y', $current_time ) + 1;
+				$dates['year']     = date('Y', $current_time);
+				$dates['year_end'] = date('Y', $current_time) + 1;
 
 			}
 			break;
 
 		case 'last_quarter' :
-			$month_now = date( 'n' );
+			$month_now = date('n');
 
-			if ( $month_now <= 3 ) {
+			if ($month_now <= 3) {
 
 				$dates['m_start']  = 10;
 				$dates['m_end']    = 12;
-				$dates['year']     = date( 'Y', $current_time ) - 1; // Previous year
-				$dates['year_end'] = date( 'Y', $current_time ) - 1; // Previous year
+				$dates['year']     = date('Y', $current_time) - 1; // Previous year
+				$dates['year_end'] = date('Y', $current_time) - 1; // Previous year
 
-			} else if ( $month_now <= 6 ) {
+			} else if ($month_now <= 6) {
 
 				$dates['m_start'] = 1;
 				$dates['m_end']   = 3;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
-			} else if ( $month_now <= 9 ) {
+			} else if ($month_now <= 9) {
 
 				$dates['m_start'] = 4;
 				$dates['m_end']   = 6;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
 			} else {
 
 				$dates['m_start'] = 7;
 				$dates['m_end']   = 9;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
 			}
 			break;
@@ -747,19 +747,19 @@ 
 		case 'this_year' :
 			$dates['m_start'] = 1;
 			$dates['m_end']   = 12;
-			$dates['year']    = date( 'Y', $current_time );
+			$dates['year']    = date('Y', $current_time);
 			break;
 
 		case 'last_year' :
 			$dates['m_start']  = 1;
 			$dates['m_end']    = 12;
-			$dates['year']     = date( 'Y', $current_time ) - 1;
-			$dates['year_end'] = date( 'Y', $current_time ) - 1;
+			$dates['year']     = date('Y', $current_time) - 1;
+			$dates['year_end'] = date('Y', $current_time) - 1;
 			break;
 
 	endswitch;
 
-	return apply_filters( 'give_report_dates', $dates );
+	return apply_filters('give_report_dates', $dates);
 }
 
 /**
@@ -769,17 +769,17 @@ 
  *
  * @param $data
  */
-function give_parse_report_dates( $data ) {
+function give_parse_report_dates($data) {
 	$dates = give_get_report_dates();
 
 	$view = give_get_reporting_view();
-	$id   = isset( $_GET['form-id'] ) ? $_GET['form-id'] : null;
+	$id   = isset($_GET['form-id']) ? $_GET['form-id'] : null;
 
-	wp_redirect( add_query_arg( $dates, admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=' . esc_attr( $view ) . '&form-id=' . absint( $id ) ) ) );
+	wp_redirect(add_query_arg($dates, admin_url('edit.php?post_type=give_forms&page=give-reports&view='.esc_attr($view).'&form-id='.absint($id))));
 	give_die();
 }
 
-add_action( 'give_filter_reports', 'give_parse_report_dates' );
+add_action('give_filter_reports', 'give_parse_report_dates');
 
 
 /**
@@ -789,16 +789,16 @@ 
  */
 function give_reports_refresh_button() {
 
-	$url = wp_nonce_url( add_query_arg( array(
+	$url = wp_nonce_url(add_query_arg(array(
 		'give_action'  => 'refresh_reports_transients',
 		'give-message' => 'refreshed-reports'
-	) ), 'give-refresh-reports' );
+	)), 'give-refresh-reports');
 
-	echo '<a href="' . $url . '" data-tooltip="' . __( 'Clicking this will clear the reports cache.', 'give' ) . '" data-tooltip-my-position="right center"  data-tooltip-target-position="left center" class="button alignright give-refresh-reports-button give-tooltip">' . __( 'Refresh Reports', 'give' ) . '</a>';
+	echo '<a href="'.$url.'" data-tooltip="'.__('Clicking this will clear the reports cache.', 'give').'" data-tooltip-my-position="right center"  data-tooltip-target-position="left center" class="button alignright give-refresh-reports-button give-tooltip">'.__('Refresh Reports', 'give').'</a>';
 
 }
 
-add_action( 'give_reports_graph_additional_stats', 'give_reports_refresh_button' );
+add_action('give_reports_graph_additional_stats', 'give_reports_refresh_button');
 
 /**
  * Trigger the refresh of reports transients
@@ -809,18 +809,18 @@ 
  *
  * @return void
  */
-function give_run_refresh_reports_transients( $data ) {
+function give_run_refresh_reports_transients($data) {
 
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give-refresh-reports' ) ) {
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give-refresh-reports')) {
 		return;
 	}
 
 	//Delete transients
-	delete_transient( 'give_estimated_monthly_stats' );
-	delete_transient( 'give_earnings_total' );
-	delete_transient( md5( 'give_earnings_this_monththis_month' ) );
-	delete_transient( md5( 'give_earnings_todaytoday' ) );
+	delete_transient('give_estimated_monthly_stats');
+	delete_transient('give_earnings_total');
+	delete_transient(md5('give_earnings_this_monththis_month'));
+	delete_transient(md5('give_earnings_todaytoday'));
 
 }
 
-add_action( 'give_refresh_reports_transients', 'give_run_refresh_reports_transients' );
\ No newline at end of file
+add_action('give_refresh_reports_transients', 'give_run_refresh_reports_transients');
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -143,9 +143,11 @@ 
 
 					endwhile;
 
-				else :
+				else {
+					:
 
 					$sales = give_get_sales_by_date( null, $i, $y );
+				}
 					$sales_totals += $sales;
 
 					$earnings = give_get_earnings_by_date( null, $i, $y );
@@ -393,9 +395,11 @@ 
 
 					endwhile;
 
-				else :
+				else {
+					:
 
 					$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+				}
 
 					$date     = mktime( 0, 0, 0, $i, 1, $y );
 					$end_date = mktime( 23, 59, 59, $i, $num_of_days, $y );

includes/admin/shortcodes/abstract-shortcode-generator.php

Doc Comments +2 added lines, -2 removed lines

@@ -104,7 +104,7 @@ 
 	/**
 	 * Define the shortcode attribute fields
 	 *
-	 * @return false|array
+	 * @return boolean
 	 *
 	 * @since 1.0
 	 */
@@ -116,7 +116,7 @@ 
 	/**
 	 * Generate the shortcode dialog fields
 	 *
-	 * @param array $defined_fields
+	 * @param boolean $defined_fields
 	 *
 	 * @return array
 	 *

Indentation +2 added lines, -2 removed lines

@@ -246,8 +246,8 @@
 
 			// do not reindex array!
 			$field['options'] = array(
-				                    '' => ( $field['placeholder'] ? $field['placeholder'] : sprintf( '– %s –', __( 'Select', 'give' ) ) ),
-			                    ) + $field['options'];
+									'' => ( $field['placeholder'] ? $field['placeholder'] : sprintf( '– %s –', __( 'Select', 'give' ) ) ),
+								) + $field['options'];
 
 			foreach ( $field['options'] as $value => $text ) {
 				$new_listbox['values'][] = array(

Spacing +64 added lines, -64 removed lines

@@ -11,7 +11,7 @@ 
  * @since       1.3.0
  */
 
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 abstract class Give_Shortcode_Generator {
 
@@ -57,12 +57,12 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __construct( $shortcode ) {
+	public function __construct($shortcode) {
 
 
 		$this->shortcode_tag = $shortcode;
 
-		add_action( 'admin_init', array( $this, 'init' ) );
+		add_action('admin_init', array($this, 'init'));
 
 	}
 
@@ -73,9 +73,9 @@ 
 	 */
 	public function init() {
 
-		if ( $this->shortcode_tag ) {
+		if ($this->shortcode_tag) {
 
-			$this->self = get_class( $this );
+			$this->self = get_class($this);
 
 			$this->errors   = array();
 			$this->required = array();
@@ -84,18 +84,18 @@ 
 			$fields = $this->get_fields();
 
 			$defaults = array(
-				'btn_close' => __( 'Close', 'give' ),
-				'btn_okay'  => __( 'Insert Shortcode', 'give' ),
+				'btn_close' => __('Close', 'give'),
+				'btn_okay'  => __('Insert Shortcode', 'give'),
 				'errors'    => $this->errors,
 				'fields'    => $fields,
-				'label'     => '[' . $this->shortcode_tag . ']',
+				'label'     => '['.$this->shortcode_tag.']',
 				'required'  => $this->required,
-				'title'     => __( 'Insert Shortcode', 'give' ),
+				'title'     => __('Insert Shortcode', 'give'),
 			);
 
-			if ( user_can_richedit() ) {
+			if (user_can_richedit()) {
 
-				Give_Shortcode_Button::$shortcodes[ $this->shortcode_tag ] = wp_parse_args( $this->shortcode, $defaults );
+				Give_Shortcode_Button::$shortcodes[$this->shortcode_tag] = wp_parse_args($this->shortcode, $defaults);
 
 			}
 		}
@@ -124,13 +124,13 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_fields( $defined_fields ) {
+	protected function generate_fields($defined_fields) {
 
 		$fields = array();
 
-		if ( is_array( $defined_fields ) ) {
+		if (is_array($defined_fields)) {
 
-			foreach ( $defined_fields as $field ) {
+			foreach ($defined_fields as $field) {
 
 				$defaults = array(
 					'label'       => false,
@@ -141,14 +141,14 @@ 
 					'type'        => '',
 				);
 
-				$field  = wp_parse_args( (array) $field, $defaults );
-				$method = 'generate_' . strtolower( $field['type'] );
+				$field  = wp_parse_args((array) $field, $defaults);
+				$method = 'generate_'.strtolower($field['type']);
 
-				if ( method_exists( $this, $method ) ) {
+				if (method_exists($this, $method)) {
 
-					$field = call_user_func( array( $this, $method ), $field );
+					$field = call_user_func(array($this, $method), $field);
 
-					if ( $field ) {
+					if ($field) {
 						$fields[] = $field;
 					}
 				}
@@ -168,22 +168,22 @@ 
 	protected function get_fields() {
 
 		$defined_fields   = $this->define_fields();
-		$generated_fields = $this->generate_fields( $defined_fields );
+		$generated_fields = $this->generate_fields($defined_fields);
 
 		$errors = array();
 
-		if ( ! empty( $this->errors ) ) {
-			foreach ( $this->required as $name => $alert ) {
-				if ( false === array_search( $name, array_column( $generated_fields, 'name' ) ) ) {
+		if ( ! empty($this->errors)) {
+			foreach ($this->required as $name => $alert) {
+				if (false === array_search($name, array_column($generated_fields, 'name'))) {
 
-					$errors[] = $this->errors[ $name ];
+					$errors[] = $this->errors[$name];
 				}
 			}
 
 			$this->errors = $errors;
 		}
 
-		if ( ! empty( $errors ) ) {
+		if ( ! empty($errors)) {
 
 			return $errors;
 		}
@@ -200,9 +200,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_container( $field ) {
+	protected function generate_container($field) {
 
-		if ( array_key_exists( 'html', $field ) ) {
+		if (array_key_exists('html', $field)) {
 
 			return array(
 				'type' => $field['type'],
@@ -222,36 +222,36 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_listbox( $field ) {
+	protected function generate_listbox($field) {
 
-		$listbox = shortcode_atts( array(
+		$listbox = shortcode_atts(array(
 			'label'    => '',
 			'minWidth' => '',
 			'name'     => false,
 			'tooltip'  => '',
 			'type'     => '',
 			'value'    => '',
-		), $field );
+		), $field);
 
-		if ( $this->validate( $field ) ) {
+		if ($this->validate($field)) {
 
 			$new_listbox = array();
 
-			foreach ( $listbox as $key => $value ) {
+			foreach ($listbox as $key => $value) {
 
-				if ( $key == 'value' && empty( $value ) ) {
-					$new_listbox[ $key ] = $listbox['name'];
-				} else if ( $value ) {
-					$new_listbox[ $key ] = $value;
+				if ($key == 'value' && empty($value)) {
+					$new_listbox[$key] = $listbox['name'];
+				} else if ($value) {
+					$new_listbox[$key] = $value;
 				}
 			}
 
 			// do not reindex array!
 			$field['options'] = array(
-				                    '' => ( $field['placeholder'] ? $field['placeholder'] : sprintf( '– %s –', __( 'Select', 'give' ) ) ),
+				                    '' => ($field['placeholder'] ? $field['placeholder'] : sprintf('– %s –', __('Select', 'give'))),
 			                    ) + $field['options'];
 
-			foreach ( $field['options'] as $value => $text ) {
+			foreach ($field['options'] as $value => $text) {
 				$new_listbox['values'][] = array(
 					'text'  => $text,
 					'value' => $value,
@@ -273,7 +273,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_post( $field ) {
+	protected function generate_post($field) {
 
 		$args = array(
 			'post_type'      => 'post',
@@ -282,23 +282,23 @@ 
 			'posts_per_page' => 30,
 		);
 
-		$args    = wp_parse_args( (array) $field['query_args'], $args );
-		$posts   = get_posts( $args );
+		$args    = wp_parse_args((array) $field['query_args'], $args);
+		$posts   = get_posts($args);
 		$options = array();
 
-		if ( $posts ) {
-			foreach ( $posts as $post ) {
-				$options[ absint( $post->ID ) ] = esc_html( $post->post_title );
+		if ($posts) {
+			foreach ($posts as $post) {
+				$options[absint($post->ID)] = esc_html($post->post_title);
 			}
 
 			$field['type']    = 'listbox';
 			$field['options'] = $options;
 
-			return $this->generate_listbox( $field );
+			return $this->generate_listbox($field);
 		}
 
 		// perform validation here before returning false
-		$this->validate( $field );
+		$this->validate($field);
 
 		return false;
 	}
@@ -312,9 +312,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_textbox( $field ) {
+	protected function generate_textbox($field) {
 
-		$textbox = shortcode_atts( array(
+		$textbox = shortcode_atts(array(
 			'label'     => '',
 			'maxLength' => '',
 			'minHeight' => '',
@@ -324,10 +324,10 @@ 
 			'tooltip'   => '',
 			'type'      => '',
 			'value'     => '',
-		), $field );
+		), $field);
 
-		if ( $this->validate( $field ) ) {
-			return array_filter( $textbox, array( $this, 'return_textbox_value' ) );
+		if ($this->validate($field)) {
+			return array_filter($textbox, array($this, 'return_textbox_value'));
 		}
 
 		return false;
@@ -340,7 +340,7 @@ 
 	 *
 	 * @return bool
 	 */
-	function return_textbox_value( $value ) {
+	function return_textbox_value($value) {
 		return $value !== '';
 	}
 
@@ -356,9 +356,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function validate( $field ) {
+	protected function validate($field) {
 
-		extract( shortcode_atts(
+		extract(shortcode_atts(
 				array(
 					'name'     => false,
 					'required' => false,
@@ -366,34 +366,34 @@ 
 				), $field )
 		);
 
-		if ( $name ) {
+		if ($name) {
 
-			if ( isset( $required['error'] ) ) {
+			if (isset($required['error'])) {
 
 				$error = array(
 					'type' => 'container',
 					'html' => $required['error'],
 				);
 
-				$this->errors[ $name ] = $this->generate_container( $error );
+				$this->errors[$name] = $this->generate_container($error);
 			}
 
-			if ( ! ! $required || is_array( $required ) ) {
+			if ( ! ! $required || is_array($required)) {
 
-				$alert = __( 'Some of the Shortcode options are required.', 'give' );
+				$alert = __('Some of the Shortcode options are required.', 'give');
 
-				if ( isset( $required['alert'] ) ) {
+				if (isset($required['alert'])) {
 
 					$alert = $required['alert'];
 
-				} else if ( ! empty( $label ) ) {
+				} else if ( ! empty($label)) {
 
-					$alert = sprintf( __( 'The "%s" option is required.', 'give' ),
-						str_replace( ':', '', $label )
+					$alert = sprintf(__('The "%s" option is required.', 'give'),
+						str_replace(':', '', $label)
 					);
 				}
 
-				$this->required[ $name ] = $alert;
+				$this->required[$name] = $alert;
 			}
 
 			return true;

includes/api/class-give-api.php

Doc Comments +3 added lines, -3 removed lines

@@ -211,7 +211,7 @@ 
 	 *
 	 * @access public
 	 * @since  1.1
-	 * @return array
+	 * @return string
 	 */
 	public function get_versions() {
 		return $this->versions;
@@ -662,7 +662,7 @@ 
 	 *
 	 * @param array $args Arguments to override defaults
 	 *
-	 * @return array $dates
+	 * @return integer|null $dates
 	 */
 	public function get_dates( $args = array() ) {
 		$dates = array();
@@ -1712,7 +1712,7 @@ 
 	 *
 	 * @param int $user_id User ID of user to revoke key for
 	 *
-	 * @return string
+	 * @return boolean
 	 */
 	public function revoke_api_key( $user_id = 0 ) {
 

Spacing +478 added lines, -478 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -139,27 +139,27 @@ 
 			'v1' => 'GIVE_API_V1',
 		);
 
-		foreach ( $this->get_versions() as $version => $class ) {
-			require_once GIVE_PLUGIN_DIR . 'includes/api/class-give-api-' . $version . '.php';
+		foreach ($this->get_versions() as $version => $class) {
+			require_once GIVE_PLUGIN_DIR.'includes/api/class-give-api-'.$version.'.php';
 		}
 
-		add_action( 'init', array( $this, 'add_endpoint' ) );
-		add_action( 'wp', array( $this, 'process_query' ), - 1 );
-		add_filter( 'query_vars', array( $this, 'query_vars' ) );
-		add_action( 'show_user_profile', array( $this, 'user_key_field' ) );
-		add_action( 'edit_user_profile', array( $this, 'user_key_field' ) );
-		add_action( 'personal_options_update', array( $this, 'update_key' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'update_key' ) );
-		add_action( 'give_process_api_key', array( $this, 'process_api_key' ) );
+		add_action('init', array($this, 'add_endpoint'));
+		add_action('wp', array($this, 'process_query'), - 1);
+		add_filter('query_vars', array($this, 'query_vars'));
+		add_action('show_user_profile', array($this, 'user_key_field'));
+		add_action('edit_user_profile', array($this, 'user_key_field'));
+		add_action('personal_options_update', array($this, 'update_key'));
+		add_action('edit_user_profile_update', array($this, 'update_key'));
+		add_action('give_process_api_key', array($this, 'process_api_key'));
 
 		// Setup a backwards compatibility check for user API Keys
-		add_filter( 'get_user_metadata', array( $this, 'api_key_backwards_compat' ), 10, 4 );
+		add_filter('get_user_metadata', array($this, 'api_key_backwards_compat'), 10, 4);
 
 		// Determine if JSON_PRETTY_PRINT is available
-		$this->pretty_print = defined( 'JSON_PRETTY_PRINT' ) ? JSON_PRETTY_PRINT : null;
+		$this->pretty_print = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : null;
 
 		// Allow API request logging to be turned off
-		$this->log_requests = apply_filters( 'give_api_log_requests', $this->log_requests );
+		$this->log_requests = apply_filters('give_api_log_requests', $this->log_requests);
 
 		// Setup Give_Payment_Stats instance
 		$this->stats = new Give_Payment_Stats;
@@ -175,8 +175,8 @@ 
 	 *
 	 * @since  1.1
 	 */
-	public function add_endpoint( $rewrite_rules ) {
-		add_rewrite_endpoint( 'give-api', EP_ALL );
+	public function add_endpoint($rewrite_rules) {
+		add_rewrite_endpoint('give-api', EP_ALL);
 	}
 
 	/**
@@ -189,7 +189,7 @@ 
 	 *
 	 * @return string[] $vars New query vars
 	 */
-	public function query_vars( $vars ) {
+	public function query_vars($vars) {
 
 		$vars[] = 'token';
 		$vars[] = 'key';
@@ -240,11 +240,11 @@ 
 	 */
 	public function get_default_version() {
 
-		$version = get_option( 'give_default_api_version' );
+		$version = get_option('give_default_api_version');
 
-		if ( defined( 'GIVE_API_VERSION' ) ) {
+		if (defined('GIVE_API_VERSION')) {
 			$version = GIVE_API_VERSION;
-		} elseif ( ! $version ) {
+		} elseif ( ! $version) {
 			$version = 'v1';
 		}
 
@@ -265,14 +265,14 @@ 
 
 		$version = $wp_query->query_vars['give-api'];
 
-		if ( strpos( $version, '/' ) ) {
+		if (strpos($version, '/')) {
 
-			$version = explode( '/', $version );
-			$version = strtolower( $version[0] );
+			$version = explode('/', $version);
+			$version = strtolower($version[0]);
 
-			$wp_query->query_vars['give-api'] = str_replace( $version . '/', '', $wp_query->query_vars['give-api'] );
+			$wp_query->query_vars['give-api'] = str_replace($version.'/', '', $wp_query->query_vars['give-api']);
 
-			if ( array_key_exists( $version, $this->versions ) ) {
+			if (array_key_exists($version, $this->versions)) {
 
 				$this->queried_version = $version;
 
@@ -309,32 +309,32 @@ 
 		$this->override = false;
 
 		// Make sure we have both user and api key
-		if ( ! empty( $wp_query->query_vars['give-api'] ) && ( $wp_query->query_vars['give-api'] != 'forms' || ! empty( $wp_query->query_vars['token'] ) ) ) {
+		if ( ! empty($wp_query->query_vars['give-api']) && ($wp_query->query_vars['give-api'] != 'forms' || ! empty($wp_query->query_vars['token']))) {
 
-			if ( empty( $wp_query->query_vars['token'] ) || empty( $wp_query->query_vars['key'] ) ) {
+			if (empty($wp_query->query_vars['token']) || empty($wp_query->query_vars['key'])) {
 				$this->missing_auth();
 			}
 
 			// Retrieve the user by public API key and ensure they exist
-			if ( ! ( $user = $this->get_user( $wp_query->query_vars['key'] ) ) ) {
+			if ( ! ($user = $this->get_user($wp_query->query_vars['key']))) {
 
 				$this->invalid_key();
 
 			} else {
 
-				$token  = urldecode( $wp_query->query_vars['token'] );
-				$secret = $this->get_user_secret_key( $user );
-				$public = urldecode( $wp_query->query_vars['key'] );
+				$token  = urldecode($wp_query->query_vars['token']);
+				$secret = $this->get_user_secret_key($user);
+				$public = urldecode($wp_query->query_vars['key']);
 
-				if ( hash_equals( md5( $secret . $public ), $token ) ) {
+				if (hash_equals(md5($secret.$public), $token)) {
 					$this->is_valid_request = true;
 				} else {
 					$this->invalid_auth();
 				}
 			}
-		} elseif ( ! empty( $wp_query->query_vars['give-api'] ) && $wp_query->query_vars['give-api'] == 'forms' ) {
+		} elseif ( ! empty($wp_query->query_vars['give-api']) && $wp_query->query_vars['give-api'] == 'forms') {
 			$this->is_valid_request = true;
-			$wp_query->set( 'key', 'public' );
+			$wp_query->set('key', 'public');
 		}
 	}
 
@@ -350,25 +350,25 @@ 
 	 *
 	 * @return bool if user ID is found, false otherwise
 	 */
-	public function get_user( $key = '' ) {
+	public function get_user($key = '') {
 		global $wpdb, $wp_query;
 
-		if ( empty( $key ) ) {
-			$key = urldecode( $wp_query->query_vars['key'] );
+		if (empty($key)) {
+			$key = urldecode($wp_query->query_vars['key']);
 		}
 
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		$user = get_transient( md5( 'give_api_user_' . $key ) );
+		$user = get_transient(md5('give_api_user_'.$key));
 
-		if ( false === $user ) {
-			$user = $wpdb->get_var( $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s LIMIT 1", $key ) );
-			set_transient( md5( 'give_api_user_' . $key ), $user, DAY_IN_SECONDS );
+		if (false === $user) {
+			$user = $wpdb->get_var($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s LIMIT 1", $key));
+			set_transient(md5('give_api_user_'.$key), $user, DAY_IN_SECONDS);
 		}
 
-		if ( $user != null ) {
+		if ($user != null) {
 			$this->user_id = $user;
 
 			return $user;
@@ -377,37 +377,37 @@ 
 		return false;
 	}
 
-	public function get_user_public_key( $user_id = 0 ) {
+	public function get_user_public_key($user_id = 0) {
 		global $wpdb;
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return '';
 		}
 
-		$cache_key       = md5( 'give_api_user_public_key' . $user_id );
-		$user_public_key = get_transient( $cache_key );
+		$cache_key       = md5('give_api_user_public_key'.$user_id);
+		$user_public_key = get_transient($cache_key);
 
-		if ( empty( $user_public_key ) ) {
-			$user_public_key = $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_public_key' AND user_id = %d", $user_id ) );
-			set_transient( $cache_key, $user_public_key, HOUR_IN_SECONDS );
+		if (empty($user_public_key)) {
+			$user_public_key = $wpdb->get_var($wpdb->prepare("SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_public_key' AND user_id = %d", $user_id));
+			set_transient($cache_key, $user_public_key, HOUR_IN_SECONDS);
 		}
 
 		return $user_public_key;
 	}
 
-	public function get_user_secret_key( $user_id = 0 ) {
+	public function get_user_secret_key($user_id = 0) {
 		global $wpdb;
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return '';
 		}
 
-		$cache_key       = md5( 'give_api_user_secret_key' . $user_id );
-		$user_secret_key = get_transient( $cache_key );
+		$cache_key       = md5('give_api_user_secret_key'.$user_id);
+		$user_secret_key = get_transient($cache_key);
 
-		if ( empty( $user_secret_key ) ) {
-			$user_secret_key = $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_secret_key' AND user_id = %d", $user_id ) );
-			set_transient( $cache_key, $user_secret_key, HOUR_IN_SECONDS );
+		if (empty($user_secret_key)) {
+			$user_secret_key = $wpdb->get_var($wpdb->prepare("SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_secret_key' AND user_id = %d", $user_id));
+			set_transient($cache_key, $user_secret_key, HOUR_IN_SECONDS);
 		}
 
 		return $user_secret_key;
@@ -423,10 +423,10 @@ 
 	 */
 	private function missing_auth() {
 		$error          = array();
-		$error['error'] = esc_attr__( 'You must specify both a token and API key!', 'give' );
+		$error['error'] = esc_attr__('You must specify both a token and API key!', 'give');
 
 		$this->data = $error;
-		$this->output( 401 );
+		$this->output(401);
 	}
 
 	/**
@@ -440,10 +440,10 @@ 
 	 */
 	private function invalid_auth() {
 		$error          = array();
-		$error['error'] = esc_attr__( 'Your request could not be authenticated!', 'give' );
+		$error['error'] = esc_attr__('Your request could not be authenticated!', 'give');
 
 		$this->data = $error;
-		$this->output( 403 );
+		$this->output(403);
 	}
 
 	/**
@@ -457,10 +457,10 @@ 
 	 */
 	private function invalid_key() {
 		$error          = array();
-		$error['error'] = esc_attr__( 'Invalid API key!', 'give' );
+		$error['error'] = esc_attr__('Invalid API key!', 'give');
 
 		$this->data = $error;
-		$this->output( 403 );
+		$this->output(403);
 	}
 
 	/**
@@ -473,10 +473,10 @@ 
 	 */
 	private function invalid_version() {
 		$error          = array();
-		$error['error'] = esc_attr__( 'Invalid API version!', 'give' );
+		$error['error'] = esc_attr__('Invalid API version!', 'give');
 
 		$this->data = $error;
-		$this->output( 404 );
+		$this->output(404);
 	}
 
 	/**
@@ -492,10 +492,10 @@ 
 		global $wp_query;
 
 		// Start logging how long the request takes for logging
-		$before = microtime( true );
+		$before = microtime(true);
 
 		// Check for give-api var. Get out if not present
-		if ( empty( $wp_query->query_vars['give-api'] ) ) {
+		if (empty($wp_query->query_vars['give-api'])) {
 			return;
 		}
 
@@ -509,45 +509,45 @@ 
 		$this->validate_request();
 
 		// Only proceed if no errors have been noted
-		if ( ! $this->is_valid_request ) {
+		if ( ! $this->is_valid_request) {
 			return;
 		}
 
-		if ( ! defined( 'GIVE_DOING_API' ) ) {
-			define( 'GIVE_DOING_API', true );
+		if ( ! defined('GIVE_DOING_API')) {
+			define('GIVE_DOING_API', true);
 		}
 
 		$data         = array();
 		$this->routes = new $this->versions[$this->get_queried_version()];
 		$this->routes->validate_request();
 
-		switch ( $this->endpoint ) :
+		switch ($this->endpoint) :
 
 			case 'stats' :
 
-				$data = $this->routes->get_stats( array(
-					'type'      => isset( $wp_query->query_vars['type'] ) ? $wp_query->query_vars['type'] : null,
-					'form'      => isset( $wp_query->query_vars['form'] ) ? $wp_query->query_vars['form'] : null,
-					'date'      => isset( $wp_query->query_vars['date'] ) ? $wp_query->query_vars['date'] : null,
-					'startdate' => isset( $wp_query->query_vars['startdate'] ) ? $wp_query->query_vars['startdate'] : null,
-					'enddate'   => isset( $wp_query->query_vars['enddate'] ) ? $wp_query->query_vars['enddate'] : null
-				) );
+				$data = $this->routes->get_stats(array(
+					'type'      => isset($wp_query->query_vars['type']) ? $wp_query->query_vars['type'] : null,
+					'form'      => isset($wp_query->query_vars['form']) ? $wp_query->query_vars['form'] : null,
+					'date'      => isset($wp_query->query_vars['date']) ? $wp_query->query_vars['date'] : null,
+					'startdate' => isset($wp_query->query_vars['startdate']) ? $wp_query->query_vars['startdate'] : null,
+					'enddate'   => isset($wp_query->query_vars['enddate']) ? $wp_query->query_vars['enddate'] : null
+				));
 
 				break;
 
 			case 'forms' :
 
-				$form = isset( $wp_query->query_vars['form'] ) ? $wp_query->query_vars['form'] : null;
+				$form = isset($wp_query->query_vars['form']) ? $wp_query->query_vars['form'] : null;
 
-				$data = $this->routes->get_forms( $form );
+				$data = $this->routes->get_forms($form);
 
 				break;
 
 			case 'donors' :
 
-				$customer = isset( $wp_query->query_vars['donor'] ) ? $wp_query->query_vars['donor'] : null;
+				$customer = isset($wp_query->query_vars['donor']) ? $wp_query->query_vars['donor'] : null;
 
-				$data = $this->routes->get_customers( $customer );
+				$data = $this->routes->get_customers($customer);
 
 				break;
 
@@ -560,14 +560,14 @@ 
 		endswitch;
 
 		// Allow extensions to setup their own return data
-		$this->data = apply_filters( 'give_api_output_data', $data, $this->endpoint, $this );
+		$this->data = apply_filters('give_api_output_data', $data, $this->endpoint, $this);
 
-		$after                       = microtime( true );
-		$request_time                = ( $after - $before );
+		$after                       = microtime(true);
+		$request_time                = ($after - $before);
 		$this->data['request_speed'] = $request_time;
 
 		// Log this API request, if enabled. We log it here because we have access to errors.
-		$this->log_request( $this->data );
+		$this->log_request($this->data);
 
 		// Send out data to the output function
 		$this->output();
@@ -597,25 +597,25 @@ 
 		global $wp_query;
 
 		// Whitelist our query options
-		$accepted = apply_filters( 'give_api_valid_query_modes', array(
+		$accepted = apply_filters('give_api_valid_query_modes', array(
 			'stats',
 			'forms',
 			'donors',
 			'donations'
-		) );
+		));
 
-		$query = isset( $wp_query->query_vars['give-api'] ) ? $wp_query->query_vars['give-api'] : null;
-		$query = str_replace( $this->queried_version . '/', '', $query );
+		$query = isset($wp_query->query_vars['give-api']) ? $wp_query->query_vars['give-api'] : null;
+		$query = str_replace($this->queried_version.'/', '', $query);
 
 		$error = array();
 
 		// Make sure our query is valid
-		if ( ! in_array( $query, $accepted ) ) {
-			$error['error'] = __( 'Invalid query!', 'give' );
+		if ( ! in_array($query, $accepted)) {
+			$error['error'] = __('Invalid query!', 'give');
 
 			$this->data = $error;
 			// 400 is Bad Request
-			$this->output( 400 );
+			$this->output(400);
 		}
 
 		$this->endpoint = $query;
@@ -632,7 +632,7 @@ 
 	public function get_paged() {
 		global $wp_query;
 
-		return isset( $wp_query->query_vars['page'] ) ? $wp_query->query_vars['page'] : 1;
+		return isset($wp_query->query_vars['page']) ? $wp_query->query_vars['page'] : 1;
 	}
 
 
@@ -647,13 +647,13 @@ 
 	public function per_page() {
 		global $wp_query;
 
-		$per_page = isset( $wp_query->query_vars['number'] ) ? $wp_query->query_vars['number'] : 10;
+		$per_page = isset($wp_query->query_vars['number']) ? $wp_query->query_vars['number'] : 10;
 
-		if ( $per_page < 0 && $this->get_query_mode() == 'donors' ) {
+		if ($per_page < 0 && $this->get_query_mode() == 'donors') {
 			$per_page = 99999999;
 		} // Customers query doesn't support -1
 
-		return apply_filters( 'give_api_results_per_page', $per_page );
+		return apply_filters('give_api_results_per_page', $per_page);
 	}
 
 	/**
@@ -666,7 +666,7 @@ 
 	 *
 	 * @return array $dates
 	 */
-	public function get_dates( $args = array() ) {
+	public function get_dates($args = array()) {
 		$dates = array();
 
 		$defaults = array(
@@ -677,60 +677,60 @@ 
 			'enddate'   => null
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$current_time = current_time( 'timestamp' );
+		$current_time = current_time('timestamp');
 
-		if ( 'range' === $args['date'] ) {
-			$startdate          = strtotime( $args['startdate'] );
-			$enddate            = strtotime( $args['enddate'] );
-			$dates['day_start'] = date( 'd', $startdate );
-			$dates['day_end']   = date( 'd', $enddate );
-			$dates['m_start']   = date( 'n', $startdate );
-			$dates['m_end']     = date( 'n', $enddate );
-			$dates['year']      = date( 'Y', $startdate );
-			$dates['year_end']  = date( 'Y', $enddate );
+		if ('range' === $args['date']) {
+			$startdate          = strtotime($args['startdate']);
+			$enddate            = strtotime($args['enddate']);
+			$dates['day_start'] = date('d', $startdate);
+			$dates['day_end']   = date('d', $enddate);
+			$dates['m_start']   = date('n', $startdate);
+			$dates['m_end']     = date('n', $enddate);
+			$dates['year']      = date('Y', $startdate);
+			$dates['year_end']  = date('Y', $enddate);
 		} else {
 			// Modify dates based on predefined ranges
-			switch ( $args['date'] ) :
+			switch ($args['date']) :
 
 				case 'this_month' :
 					$dates['day']     = null;
-					$dates['m_start'] = date( 'n', $current_time );
-					$dates['m_end']   = date( 'n', $current_time );
-					$dates['year']    = date( 'Y', $current_time );
+					$dates['m_start'] = date('n', $current_time);
+					$dates['m_end']   = date('n', $current_time);
+					$dates['year']    = date('Y', $current_time);
 					break;
 
 				case 'last_month' :
 					$dates['day']     = null;
-					$dates['m_start'] = date( 'n', $current_time ) == 1 ? 12 : date( 'n', $current_time ) - 1;
+					$dates['m_start'] = date('n', $current_time) == 1 ? 12 : date('n', $current_time) - 1;
 					$dates['m_end']   = $dates['m_start'];
-					$dates['year']    = date( 'n', $current_time ) == 1 ? date( 'Y', $current_time ) - 1 : date( 'Y', $current_time );
+					$dates['year']    = date('n', $current_time) == 1 ? date('Y', $current_time) - 1 : date('Y', $current_time);
 					break;
 
 				case 'today' :
-					$dates['day']     = date( 'd', $current_time );
-					$dates['m_start'] = date( 'n', $current_time );
-					$dates['m_end']   = date( 'n', $current_time );
-					$dates['year']    = date( 'Y', $current_time );
+					$dates['day']     = date('d', $current_time);
+					$dates['m_start'] = date('n', $current_time);
+					$dates['m_end']   = date('n', $current_time);
+					$dates['year']    = date('Y', $current_time);
 					break;
 
 				case 'yesterday' :
 
-					$year  = date( 'Y', $current_time );
-					$month = date( 'n', $current_time );
-					$day   = date( 'd', $current_time );
+					$year  = date('Y', $current_time);
+					$month = date('n', $current_time);
+					$day   = date('d', $current_time);
 
-					if ( $month == 1 && $day == 1 ) {
+					if ($month == 1 && $day == 1) {
 
 						$year -= 1;
 						$month = 12;
-						$day   = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+						$day   = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
-					} elseif ( $month > 1 && $day == 1 ) {
+					} elseif ($month > 1 && $day == 1) {
 
 						$month -= 1;
-						$day = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+						$day = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
 					} else {
 
@@ -746,65 +746,65 @@ 
 					break;
 
 				case 'this_quarter' :
-					$month_now = date( 'n', $current_time );
+					$month_now = date('n', $current_time);
 
 					$dates['day'] = null;
 
-					if ( $month_now <= 3 ) {
+					if ($month_now <= 3) {
 
 						$dates['m_start'] = 1;
 						$dates['m_end']   = 3;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
-					} else if ( $month_now <= 6 ) {
+					} else if ($month_now <= 6) {
 
 						$dates['m_start'] = 4;
 						$dates['m_end']   = 6;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
-					} else if ( $month_now <= 9 ) {
+					} else if ($month_now <= 9) {
 
 						$dates['m_start'] = 7;
 						$dates['m_end']   = 9;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					} else {
 
 						$dates['m_start'] = 10;
 						$dates['m_end']   = 12;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					}
 					break;
 
 				case 'last_quarter' :
-					$month_now = date( 'n', $current_time );
+					$month_now = date('n', $current_time);
 
 					$dates['day'] = null;
 
-					if ( $month_now <= 3 ) {
+					if ($month_now <= 3) {
 
 						$dates['m_start'] = 10;
 						$dates['m_end']   = 12;
-						$dates['year']    = date( 'Y', $current_time ) - 1; // Previous year
+						$dates['year']    = date('Y', $current_time) - 1; // Previous year
 
-					} else if ( $month_now <= 6 ) {
+					} else if ($month_now <= 6) {
 
 						$dates['m_start'] = 1;
 						$dates['m_end']   = 3;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
-					} else if ( $month_now <= 9 ) {
+					} else if ($month_now <= 9) {
 
 						$dates['m_start'] = 4;
 						$dates['m_end']   = 6;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					} else {
 
 						$dates['m_start'] = 7;
 						$dates['m_end']   = 9;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					}
 					break;
@@ -813,14 +813,14 @@ 
 					$dates['day']     = null;
 					$dates['m_start'] = null;
 					$dates['m_end']   = null;
-					$dates['year']    = date( 'Y', $current_time );
+					$dates['year']    = date('Y', $current_time);
 					break;
 
 				case 'last_year' :
 					$dates['day']     = null;
 					$dates['m_start'] = null;
 					$dates['m_end']   = null;
-					$dates['year']    = date( 'Y', $current_time ) - 1;
+					$dates['year']    = date('Y', $current_time) - 1;
 					break;
 
 			endswitch;
@@ -834,7 +834,7 @@ 
 		 * @param object $dates The dates used for retreiving earnings/donations
 		 */
 
-		return apply_filters( 'give_api_stat_dates', $dates );
+		return apply_filters('give_api_stat_dates', $dates);
 	}
 
 	/**
@@ -849,11 +849,11 @@ 
 	 *
 	 * @return array $customers Multidimensional array of the customers
 	 */
-	public function get_customers( $customer = null ) {
+	public function get_customers($customer = null) {
 
 		$customers = array();
 		$error     = array();
-		if ( ! user_can( $this->user_id, 'view_give_sensitive_data' ) && ! $this->override ) {
+		if ( ! user_can($this->user_id, 'view_give_sensitive_data') && ! $this->override) {
 			return $customers;
 		}
 
@@ -861,68 +861,68 @@ 
 
 		$paged    = $this->get_paged();
 		$per_page = $this->per_page();
-		$offset   = $per_page * ( $paged - 1 );
+		$offset   = $per_page * ($paged - 1);
 
-		if ( is_numeric( $customer ) ) {
+		if (is_numeric($customer)) {
 			$field = 'id';
 		} else {
 			$field = 'email';
 		}
 
-		$customer_query = Give()->customers->get_customers( array(
+		$customer_query = Give()->customers->get_customers(array(
 			'number' => $per_page,
 			'offset' => $offset,
 			$field   => $customer
-		) );
+		));
 		$customer_count = 0;
 
-		if ( $customer_query ) {
+		if ($customer_query) {
 
-			foreach ( $customer_query as $customer_obj ) {
+			foreach ($customer_query as $customer_obj) {
 
-				$names      = explode( ' ', $customer_obj->name );
-				$first_name = ! empty( $names[0] ) ? $names[0] : '';
+				$names      = explode(' ', $customer_obj->name);
+				$first_name = ! empty($names[0]) ? $names[0] : '';
 				$last_name  = '';
-				if ( ! empty( $names[1] ) ) {
-					unset( $names[0] );
-					$last_name = implode( ' ', $names );
+				if ( ! empty($names[1])) {
+					unset($names[0]);
+					$last_name = implode(' ', $names);
 				}
 
-				$customers['donors'][ $customer_count ]['info']['user_id']      = '';
-				$customers['donors'][ $customer_count ]['info']['username']     = '';
-				$customers['donors'][ $customer_count ]['info']['display_name'] = '';
-				$customers['donors'][ $customer_count ]['info']['customer_id']  = $customer_obj->id;
-				$customers['donors'][ $customer_count ]['info']['first_name']   = $first_name;
-				$customers['donors'][ $customer_count ]['info']['last_name']    = $last_name;
-				$customers['donors'][ $customer_count ]['info']['email']        = $customer_obj->email;
+				$customers['donors'][$customer_count]['info']['user_id']      = '';
+				$customers['donors'][$customer_count]['info']['username']     = '';
+				$customers['donors'][$customer_count]['info']['display_name'] = '';
+				$customers['donors'][$customer_count]['info']['customer_id']  = $customer_obj->id;
+				$customers['donors'][$customer_count]['info']['first_name']   = $first_name;
+				$customers['donors'][$customer_count]['info']['last_name']    = $last_name;
+				$customers['donors'][$customer_count]['info']['email']        = $customer_obj->email;
 
-				if ( ! empty( $customer_obj->user_id ) ) {
+				if ( ! empty($customer_obj->user_id)) {
 
-					$user_data = get_userdata( $customer_obj->user_id );
+					$user_data = get_userdata($customer_obj->user_id);
 
 					// Customer with registered account
-					$customers['donors'][ $customer_count ]['info']['user_id']      = $customer_obj->user_id;
-					$customers['donors'][ $customer_count ]['info']['username']     = $user_data->user_login;
-					$customers['donors'][ $customer_count ]['info']['display_name'] = $user_data->display_name;
+					$customers['donors'][$customer_count]['info']['user_id']      = $customer_obj->user_id;
+					$customers['donors'][$customer_count]['info']['username']     = $user_data->user_login;
+					$customers['donors'][$customer_count]['info']['display_name'] = $user_data->display_name;
 
 				}
 
-				$customers['donors'][ $customer_count ]['stats']['total_donations'] = $customer_obj->purchase_count;
-				$customers['donors'][ $customer_count ]['stats']['total_spent']     = $customer_obj->purchase_value;
+				$customers['donors'][$customer_count]['stats']['total_donations'] = $customer_obj->purchase_count;
+				$customers['donors'][$customer_count]['stats']['total_spent']     = $customer_obj->purchase_value;
 
-				$customer_count ++;
+				$customer_count++;
 
 			}
 
-		} elseif ( $customer ) {
+		} elseif ($customer) {
 
-			$error['error'] = sprintf( __( 'Donor %s not found!', 'give' ), $customer );
+			$error['error'] = sprintf(__('Donor %s not found!', 'give'), $customer);
 
 			return $error;
 
 		} else {
 
-			$error['error'] = __( 'No donors found!', 'give' );
+			$error['error'] = __('No donors found!', 'give');
 
 			return $error;
 
@@ -941,36 +941,36 @@ 
 	 *
 	 * @return array $customers Multidimensional array of the forms
 	 */
-	public function get_forms( $form = null ) {
+	public function get_forms($form = null) {
 
 		$forms = array();
 		$error = array();
 
-		if ( $form == null ) {
+		if ($form == null) {
 			$forms['forms'] = array();
 
-			$form_list = get_posts( array(
+			$form_list = get_posts(array(
 				'post_type'        => 'give_forms',
 				'posts_per_page'   => $this->per_page(),
 				'suppress_filters' => true,
 				'paged'            => $this->get_paged()
-			) );
+			));
 
-			if ( $form_list ) {
+			if ($form_list) {
 				$i = 0;
-				foreach ( $form_list as $form_info ) {
-					$forms['forms'][ $i ] = $this->get_form_data( $form_info );
-					$i ++;
+				foreach ($form_list as $form_info) {
+					$forms['forms'][$i] = $this->get_form_data($form_info);
+					$i++;
 				}
 			}
 		} else {
-			if ( get_post_type( $form ) == 'give_forms' ) {
-				$form_info = get_post( $form );
+			if (get_post_type($form) == 'give_forms') {
+				$form_info = get_post($form);
 
-				$forms['forms'][0] = $this->get_form_data( $form_info );
+				$forms['forms'][0] = $this->get_form_data($form_info);
 
 			} else {
-				$error['error'] = sprintf( __( 'Form %s not found!', 'give' ), $form );
+				$error['error'] = sprintf(__('Form %s not found!', 'give'), $form);
 
 				return $error;
 			}
@@ -988,7 +988,7 @@ 
 	 *
 	 * @return array                Array of post data to return back in the API
 	 */
-	private function get_form_data( $form_info ) {
+	private function get_form_data($form_info) {
 
 		$form = array();
 
@@ -998,46 +998,46 @@ 
 		$form['info']['create_date']   = $form_info->post_date;
 		$form['info']['modified_date'] = $form_info->post_modified;
 		$form['info']['status']        = $form_info->post_status;
-		$form['info']['link']          = html_entity_decode( $form_info->guid );
-		$form['info']['content']       = get_post_meta( $form_info->ID, '_give_form_content', true );
-		$form['info']['thumbnail']     = wp_get_attachment_url( get_post_thumbnail_id( $form_info->ID ) );
+		$form['info']['link']          = html_entity_decode($form_info->guid);
+		$form['info']['content']       = get_post_meta($form_info->ID, '_give_form_content', true);
+		$form['info']['thumbnail']     = wp_get_attachment_url(get_post_thumbnail_id($form_info->ID));
 
-		if ( give_get_option( 'enable_categories' ) == 'on' ) {
-			$form['info']['category'] = get_the_terms( $form_info, 'give_forms_category' );
-			$form['info']['tags']     = get_the_terms( $form_info, 'give_forms_tag' );
+		if (give_get_option('enable_categories') == 'on') {
+			$form['info']['category'] = get_the_terms($form_info, 'give_forms_category');
+			$form['info']['tags']     = get_the_terms($form_info, 'give_forms_tag');
 		}
-		if ( give_get_option( 'enable_tags' ) == 'on' ) {
-			$form['info']['tags'] = get_the_terms( $form_info, 'give_forms_tag' );
+		if (give_get_option('enable_tags') == 'on') {
+			$form['info']['tags'] = get_the_terms($form_info, 'give_forms_tag');
 		}
 
-		if ( user_can( $this->user_id, 'view_give_reports' ) || $this->override ) {
-			$form['stats']['total']['donations']           = give_get_form_sales_stats( $form_info->ID );
-			$form['stats']['total']['earnings']            = give_get_form_earnings_stats( $form_info->ID );
-			$form['stats']['monthly_average']['donations'] = give_get_average_monthly_form_sales( $form_info->ID );
-			$form['stats']['monthly_average']['earnings']  = give_get_average_monthly_form_earnings( $form_info->ID );
+		if (user_can($this->user_id, 'view_give_reports') || $this->override) {
+			$form['stats']['total']['donations']           = give_get_form_sales_stats($form_info->ID);
+			$form['stats']['total']['earnings']            = give_get_form_earnings_stats($form_info->ID);
+			$form['stats']['monthly_average']['donations'] = give_get_average_monthly_form_sales($form_info->ID);
+			$form['stats']['monthly_average']['earnings']  = give_get_average_monthly_form_earnings($form_info->ID);
 		}
 
 		$counter = 0;
-		if ( give_has_variable_prices( $form_info->ID ) ) {
-			foreach ( give_get_variable_prices( $form_info->ID ) as $price ) {
-				$counter ++;
+		if (give_has_variable_prices($form_info->ID)) {
+			foreach (give_get_variable_prices($form_info->ID) as $price) {
+				$counter++;
 				//muli-level item
-				$level                                     = isset( $price['_give_text'] ) ? $price['_give_text'] : 'level-' . $counter;
-				$form['pricing'][ sanitize_key( $level ) ] = $price['_give_amount'];
+				$level                                     = isset($price['_give_text']) ? $price['_give_text'] : 'level-'.$counter;
+				$form['pricing'][sanitize_key($level)] = $price['_give_amount'];
 
 			}
 		} else {
-			$form['pricing']['amount'] = give_get_form_price( $form_info->ID );
+			$form['pricing']['amount'] = give_get_form_price($form_info->ID);
 		}
 
-		if ( user_can( $this->user_id, 'view_give_sensitive_data' ) || $this->override ) {
+		if (user_can($this->user_id, 'view_give_sensitive_data') || $this->override) {
 
 			//Sensitive data here
-			do_action( 'give_api_sensitive_data' );
+			do_action('give_api_sensitive_data');
 
 		}
 
-		return apply_filters( 'give_api_forms_form', $form );
+		return apply_filters('give_api_forms_form', $form);
 
 	}
 
@@ -1052,7 +1052,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_stats( $args = array() ) {
+	public function get_stats($args = array()) {
 		$defaults = array(
 			'type'      => null,
 			'form'      => null,
@@ -1061,9 +1061,9 @@ 
 			'enddate'   => null
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$dates = $this->get_dates( $args );
+		$dates = $this->get_dates($args);
 
 		$stats    = array();
 		$earnings = array(
@@ -1074,41 +1074,41 @@ 
 		);
 		$error    = array();
 
-		if ( ! user_can( $this->user_id, 'view_give_reports' ) && ! $this->override ) {
+		if ( ! user_can($this->user_id, 'view_give_reports') && ! $this->override) {
 			return $stats;
 		}
 
-		if ( $args['type'] == 'donations' ) {
+		if ($args['type'] == 'donations') {
 
-			if ( $args['form'] == null ) {
-				if ( $args['date'] == null ) {
+			if ($args['form'] == null) {
+				if ($args['date'] == null) {
 					$sales = $this->get_default_sales_stats();
-				} elseif ( $args['date'] === 'range' ) {
+				} elseif ($args['date'] === 'range') {
 					// Return sales for a date range
 
 					// Ensure the end date is later than the start date
-					if ( $args['enddate'] < $args['startdate'] ) {
-						$error['error'] = __( 'The end date must be later than the start date!', 'give' );
+					if ($args['enddate'] < $args['startdate']) {
+						$error['error'] = __('The end date must be later than the start date!', 'give');
 					}
 
 					// Ensure both the start and end date are specified
-					if ( empty( $args['startdate'] ) || empty( $args['enddate'] ) ) {
-						$error['error'] = __( 'Invalid or no date range specified!', 'give' );
+					if (empty($args['startdate']) || empty($args['enddate'])) {
+						$error['error'] = __('Invalid or no date range specified!', 'give');
 					}
 
 					$total = 0;
 
 					// Loop through the years
 					$y = $dates['year'];
-					while ( $y <= $dates['year_end'] ) :
+					while ($y <= $dates['year_end']) :
 
-						if ( $dates['year'] == $dates['year_end'] ) {
+						if ($dates['year'] == $dates['year_end']) {
 							$month_start = $dates['m_start'];
 							$month_end   = $dates['m_end'];
-						} elseif ( $y == $dates['year'] && $dates['year_end'] > $dates['year'] ) {
+						} elseif ($y == $dates['year'] && $dates['year_end'] > $dates['year']) {
 							$month_start = $dates['m_start'];
 							$month_end   = 12;
-						} elseif ( $y == $dates['year_end'] ) {
+						} elseif ($y == $dates['year_end']) {
 							$month_start = 1;
 							$month_end   = $dates['m_end'];
 						} else {
@@ -1117,109 +1117,109 @@ 
 						}
 
 						$i = $month_start;
-						while ( $i <= $month_end ) :
+						while ($i <= $month_end) :
 
-							if ( $i == $dates['m_start'] ) {
+							if ($i == $dates['m_start']) {
 								$d = $dates['day_start'];
 							} else {
 								$d = 1;
 							}
 
-							if ( $i == $dates['m_end'] ) {
+							if ($i == $dates['m_end']) {
 								$num_of_days = $dates['day_end'];
 							} else {
-								$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+								$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 							}
 
-							while ( $d <= $num_of_days ) :
-								$sale_count = give_get_sales_by_date( $d, $i, $y );
-								$date_key   = date( 'Ymd', strtotime( $y . '/' . $i . '/' . $d ) );
-								if ( ! isset( $sales['sales'][ $date_key ] ) ) {
-									$sales['sales'][ $date_key ] = 0;
+							while ($d <= $num_of_days) :
+								$sale_count = give_get_sales_by_date($d, $i, $y);
+								$date_key   = date('Ymd', strtotime($y.'/'.$i.'/'.$d));
+								if ( ! isset($sales['sales'][$date_key])) {
+									$sales['sales'][$date_key] = 0;
 								}
-								$sales['sales'][ $date_key ] += $sale_count;
+								$sales['sales'][$date_key] += $sale_count;
 								$total += $sale_count;
-								$d ++;
+								$d++;
 							endwhile;
-							$i ++;
+							$i++;
 						endwhile;
 
-						$y ++;
+						$y++;
 					endwhile;
 
 					$sales['totals'] = $total;
 				} else {
-					if ( $args['date'] == 'this_quarter' || $args['date'] == 'last_quarter' ) {
+					if ($args['date'] == 'this_quarter' || $args['date'] == 'last_quarter') {
 						$sales_count = 0;
 
 						// Loop through the months
 						$month = $dates['m_start'];
 
-						while ( $month <= $dates['m_end'] ) :
-							$sales_count += give_get_sales_by_date( null, $month, $dates['year'] );
-							$month ++;
+						while ($month <= $dates['m_end']) :
+							$sales_count += give_get_sales_by_date(null, $month, $dates['year']);
+							$month++;
 						endwhile;
 
-						$sales['donations'][ $args['date'] ] = $sales_count;
+						$sales['donations'][$args['date']] = $sales_count;
 					} else {
-						$sales['donations'][ $args['date'] ] = give_get_sales_by_date( $dates['day'], $dates['m_start'], $dates['year'] );
+						$sales['donations'][$args['date']] = give_get_sales_by_date($dates['day'], $dates['m_start'], $dates['year']);
 					}
 				}
-			} elseif ( $args['form'] == 'all' ) {
-				$forms = get_posts( array( 'post_type' => 'give_forms', 'nopaging' => true ) );
+			} elseif ($args['form'] == 'all') {
+				$forms = get_posts(array('post_type' => 'give_forms', 'nopaging' => true));
 				$i     = 0;
-				foreach ( $forms as $form_info ) {
-					$sales['donations'][ $i ] = array( $form_info->post_name => give_get_form_sales_stats( $form_info->ID ) );
-					$i ++;
+				foreach ($forms as $form_info) {
+					$sales['donations'][$i] = array($form_info->post_name => give_get_form_sales_stats($form_info->ID));
+					$i++;
 				}
 			} else {
-				if ( get_post_type( $args['form'] ) == 'give_forms' ) {
-					$form_info             = get_post( $args['form'] );
-					$sales['donations'][0] = array( $form_info->post_name => give_get_form_sales_stats( $args['form'] ) );
+				if (get_post_type($args['form']) == 'give_forms') {
+					$form_info             = get_post($args['form']);
+					$sales['donations'][0] = array($form_info->post_name => give_get_form_sales_stats($args['form']));
 				} else {
-					$error['error'] = sprintf( __( 'Product %s not found!', 'give' ), $args['form'] );
+					$error['error'] = sprintf(__('Product %s not found!', 'give'), $args['form']);
 				}
 			}
 
-			if ( ! empty( $error ) ) {
+			if ( ! empty($error)) {
 				return $error;
 			}
 
 			return $sales;
 
-		} elseif ( $args['type'] == 'earnings' ) {
-			if ( $args['form'] == null ) {
-				if ( $args['date'] == null ) {
+		} elseif ($args['type'] == 'earnings') {
+			if ($args['form'] == null) {
+				if ($args['date'] == null) {
 					$earnings = $this->get_default_earnings_stats();
-				} elseif ( $args['date'] === 'range' ) {
+				} elseif ($args['date'] === 'range') {
 					// Return sales for a date range
 
 					// Ensure the end date is later than the start date
-					if ( $args['enddate'] < $args['startdate'] ) {
-						$error['error'] = __( 'The end date must be later than the start date!', 'give' );
+					if ($args['enddate'] < $args['startdate']) {
+						$error['error'] = __('The end date must be later than the start date!', 'give');
 					}
 
 					// Ensure both the start and end date are specified
-					if ( empty( $args['startdate'] ) || empty( $args['enddate'] ) ) {
-						$error['error'] = __( 'Invalid or no date range specified!', 'give' );
+					if (empty($args['startdate']) || empty($args['enddate'])) {
+						$error['error'] = __('Invalid or no date range specified!', 'give');
 					}
 
 					$total = (float) 0.00;
 
 					// Loop through the years
 					$y = $dates['year'];
-					if ( ! isset( $earnings['earnings'] ) ) {
+					if ( ! isset($earnings['earnings'])) {
 						$earnings['earnings'] = array();
 					}
-					while ( $y <= $dates['year_end'] ) :
+					while ($y <= $dates['year_end']) :
 
-						if ( $dates['year'] == $dates['year_end'] ) {
+						if ($dates['year'] == $dates['year_end']) {
 							$month_start = $dates['m_start'];
 							$month_end   = $dates['m_end'];
-						} elseif ( $y == $dates['year'] && $dates['year_end'] > $dates['year'] ) {
+						} elseif ($y == $dates['year'] && $dates['year_end'] > $dates['year']) {
 							$month_start = $dates['m_start'];
 							$month_end   = 12;
-						} elseif ( $y == $dates['year_end'] ) {
+						} elseif ($y == $dates['year_end']) {
 							$month_start = 1;
 							$month_end   = $dates['m_end'];
 						} else {
@@ -1228,88 +1228,88 @@ 
 						}
 
 						$i = $month_start;
-						while ( $i <= $month_end ) :
+						while ($i <= $month_end) :
 
-							if ( $i == $dates['m_start'] ) {
+							if ($i == $dates['m_start']) {
 								$d = $dates['day_start'];
 							} else {
 								$d = 1;
 							}
 
-							if ( $i == $dates['m_end'] ) {
+							if ($i == $dates['m_end']) {
 								$num_of_days = $dates['day_end'];
 							} else {
-								$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+								$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 							}
 
-							while ( $d <= $num_of_days ) :
-								$earnings_stat = give_get_earnings_by_date( $d, $i, $y );
-								$date_key      = date( 'Ymd', strtotime( $y . '/' . $i . '/' . $d ) );
-								if ( ! isset( $earnings['earnings'][ $date_key ] ) ) {
-									$earnings['earnings'][ $date_key ] = 0;
+							while ($d <= $num_of_days) :
+								$earnings_stat = give_get_earnings_by_date($d, $i, $y);
+								$date_key      = date('Ymd', strtotime($y.'/'.$i.'/'.$d));
+								if ( ! isset($earnings['earnings'][$date_key])) {
+									$earnings['earnings'][$date_key] = 0;
 								}
-								$earnings['earnings'][ $date_key ] += $earnings_stat;
+								$earnings['earnings'][$date_key] += $earnings_stat;
 								$total += $earnings_stat;
-								$d ++;
+								$d++;
 							endwhile;
 
-							$i ++;
+							$i++;
 						endwhile;
 
-						$y ++;
+						$y++;
 					endwhile;
 
 					$earnings['totals'] = $total;
 				} else {
-					if ( $args['date'] == 'this_quarter' || $args['date'] == 'last_quarter' ) {
+					if ($args['date'] == 'this_quarter' || $args['date'] == 'last_quarter') {
 						$earnings_count = (float) 0.00;
 
 						// Loop through the months
 						$month = $dates['m_start'];
 
-						while ( $month <= $dates['m_end'] ) :
-							$earnings_count += give_get_earnings_by_date( null, $month, $dates['year'] );
-							$month ++;
+						while ($month <= $dates['m_end']) :
+							$earnings_count += give_get_earnings_by_date(null, $month, $dates['year']);
+							$month++;
 						endwhile;
 
-						$earnings['earnings'][ $args['date'] ] = $earnings_count;
+						$earnings['earnings'][$args['date']] = $earnings_count;
 					} else {
-						$earnings['earnings'][ $args['date'] ] = give_get_earnings_by_date( $dates['day'], $dates['m_start'], $dates['year'] );
+						$earnings['earnings'][$args['date']] = give_get_earnings_by_date($dates['day'], $dates['m_start'], $dates['year']);
 					}
 				}
-			} elseif ( $args['form'] == 'all' ) {
-				$forms = get_posts( array( 'post_type' => 'give_forms', 'nopaging' => true ) );
+			} elseif ($args['form'] == 'all') {
+				$forms = get_posts(array('post_type' => 'give_forms', 'nopaging' => true));
 
 				$i = 0;
-				foreach ( $forms as $form_info ) {
-					$earnings['earnings'][ $i ] = array( $form_info->post_name => give_get_form_earnings_stats( $form_info->ID ) );
-					$i ++;
+				foreach ($forms as $form_info) {
+					$earnings['earnings'][$i] = array($form_info->post_name => give_get_form_earnings_stats($form_info->ID));
+					$i++;
 				}
 			} else {
-				if ( get_post_type( $args['form'] ) == 'give_forms' ) {
-					$form_info               = get_post( $args['form'] );
-					$earnings['earnings'][0] = array( $form_info->post_name => give_get_form_earnings_stats( $args['form'] ) );
+				if (get_post_type($args['form']) == 'give_forms') {
+					$form_info               = get_post($args['form']);
+					$earnings['earnings'][0] = array($form_info->post_name => give_get_form_earnings_stats($args['form']));
 				} else {
-					$error['error'] = sprintf( __( 'Form %s not found!', 'give' ), $args['form'] );
+					$error['error'] = sprintf(__('Form %s not found!', 'give'), $args['form']);
 				}
 			}
 
-			if ( ! empty( $error ) ) {
+			if ( ! empty($error)) {
 				return $error;
 			}
 
 			return $earnings;
-		} elseif ( $args['type'] == 'donors' ) {
+		} elseif ($args['type'] == 'donors') {
 			$customers                          = new Give_DB_Customers();
 			$stats['donations']['total_donors'] = $customers->count();
 
 			return $stats;
 
-		} elseif ( empty( $args['type'] ) ) {
-			$stats = array_merge( $stats, $this->get_default_sales_stats() );
-			$stats = array_merge( $stats, $this->get_default_earnings_stats() );
+		} elseif (empty($args['type'])) {
+			$stats = array_merge($stats, $this->get_default_sales_stats());
+			$stats = array_merge($stats, $this->get_default_earnings_stats());
 
-			return array( 'stats' => $stats );
+			return array('stats' => $stats);
 		}
 	}
 
@@ -1325,18 +1325,18 @@ 
 
 		$sales = array();
 
-		if ( ! user_can( $this->user_id, 'view_give_reports' ) && ! $this->override ) {
+		if ( ! user_can($this->user_id, 'view_give_reports') && ! $this->override) {
 			return $sales;
 		}
 
-		if ( isset( $wp_query->query_vars['id'] ) ) {
+		if (isset($wp_query->query_vars['id'])) {
 			$query   = array();
-			$query[] = new Give_Payment( $wp_query->query_vars['id'] );
-		} elseif ( isset( $wp_query->query_vars['purchasekey'] ) ) {
+			$query[] = new Give_Payment($wp_query->query_vars['id']);
+		} elseif (isset($wp_query->query_vars['purchasekey'])) {
 			$query   = array();
-			$query[] = give_get_payment_by( 'key', $wp_query->query_vars['purchasekey'] );
-		} elseif ( isset( $wp_query->query_vars['email'] ) ) {
-			$args  = array(
+			$query[] = give_get_payment_by('key', $wp_query->query_vars['purchasekey']);
+		} elseif (isset($wp_query->query_vars['email'])) {
+			$args = array(
 				'fields'     => 'ids',
 				'meta_key'   => '_give_payment_user_email',
 				'meta_value' => $wp_query->query_vars['email'],
@@ -1344,7 +1344,7 @@ 
 				'page'       => $this->get_paged(),
 				'status'     => 'publish'
 			);
-			$query = give_get_payments( $args );
+			$query = give_get_payments($args);
 		} else {
 			$args  = array(
 				'fields' => 'ids',
@@ -1352,14 +1352,14 @@ 
 				'page'   => $this->get_paged(),
 				'status' => 'publish'
 			);
-			$query = give_get_payments( $args );
+			$query = give_get_payments($args);
 		}
-		if ( $query ) {
+		if ($query) {
 			$i = 0;
-			foreach ( $query as $payment ) {
+			foreach ($query as $payment) {
 
-				if ( is_numeric( $payment ) ) {
-					$payment      = new Give_Payment( $payment );
+				if (is_numeric($payment)) {
+					$payment      = new Give_Payment($payment);
 					$payment_meta = $payment->get_meta();
 					$user_info    = $payment->user_info;
 				} else {
@@ -1369,40 +1369,40 @@ 
 				$payment_meta = $payment->get_meta();
 				$user_info    = $payment->user_info;
 
-				$first_name = isset( $user_info['first_name'] ) ? $user_info['first_name'] : '';
-				$last_name  = isset( $user_info['last_name'] ) ? $user_info['last_name'] : '';
-
-				$sales['donations'][ $i ]['ID']             = $payment->number;
-				$sales['donations'][ $i ]['transaction_id'] = $payment->transaction_id;
-				$sales['donations'][ $i ]['key']            = $payment->key;
-				$sales['donations'][ $i ]['total']          = $payment->total;
-				$sales['donations'][ $i ]['gateway']        = $payment->gateway;
-				$sales['donations'][ $i ]['name']           = $first_name . ' ' . $last_name;
-				$sales['donations'][ $i ]['fname']          = $first_name;
-				$sales['donations'][ $i ]['lname']          = $last_name;
-				$sales['donations'][ $i ]['email']          = $payment->email;
-				$sales['donations'][ $i ]['date']           = $payment->date;
-
-				$form_id  = isset( $payment_meta['form_id'] ) ? $payment_meta['form_id'] : $payment_meta;
-				$price    = isset( $payment_meta['form_id'] ) ? give_get_form_price( $payment_meta['form_id'] ) : false;
-				$price_id = isset( $payment_meta['price_id'] ) ? $payment_meta['price_id'] : null;
-
-				$sales['donations'][ $i ]['form']['id']    = $form_id;
-				$sales['donations'][ $i ]['form']['name']  = get_the_title( $payment_meta['form_id'] );
-				$sales['donations'][ $i ]['form']['price'] = $price;
-
-				if ( give_has_variable_prices( $form_id ) ) {
-					if ( isset( $payment_meta['price_id'] ) ) {
-						$price_name                                     = give_get_price_option_name( $form_id, $payment_meta['price_id'], $payment->ID );
-						$sales['donations'][ $i ]['form']['price_name'] = $price_name;
-						$sales['donations'][ $i ]['form']['price_id']   = $price_id;
-						$sales['donations'][ $i ]['form']['price']      = give_get_price_option_amount( $form_id, $price_id );
+				$first_name = isset($user_info['first_name']) ? $user_info['first_name'] : '';
+				$last_name  = isset($user_info['last_name']) ? $user_info['last_name'] : '';
+
+				$sales['donations'][$i]['ID']             = $payment->number;
+				$sales['donations'][$i]['transaction_id'] = $payment->transaction_id;
+				$sales['donations'][$i]['key']            = $payment->key;
+				$sales['donations'][$i]['total']          = $payment->total;
+				$sales['donations'][$i]['gateway']        = $payment->gateway;
+				$sales['donations'][$i]['name']           = $first_name.' '.$last_name;
+				$sales['donations'][$i]['fname']          = $first_name;
+				$sales['donations'][$i]['lname']          = $last_name;
+				$sales['donations'][$i]['email']          = $payment->email;
+				$sales['donations'][$i]['date']           = $payment->date;
+
+				$form_id  = isset($payment_meta['form_id']) ? $payment_meta['form_id'] : $payment_meta;
+				$price    = isset($payment_meta['form_id']) ? give_get_form_price($payment_meta['form_id']) : false;
+				$price_id = isset($payment_meta['price_id']) ? $payment_meta['price_id'] : null;
+
+				$sales['donations'][$i]['form']['id']    = $form_id;
+				$sales['donations'][$i]['form']['name']  = get_the_title($payment_meta['form_id']);
+				$sales['donations'][$i]['form']['price'] = $price;
+
+				if (give_has_variable_prices($form_id)) {
+					if (isset($payment_meta['price_id'])) {
+						$price_name                                     = give_get_price_option_name($form_id, $payment_meta['price_id'], $payment->ID);
+						$sales['donations'][$i]['form']['price_name'] = $price_name;
+						$sales['donations'][$i]['form']['price_id']   = $price_id;
+						$sales['donations'][$i]['form']['price']      = give_get_price_option_amount($form_id, $price_id);
 
 					}
 				}
 
 				//Add custom meta to API
-				foreach ( $payment_meta as $meta_key => $meta_value ) {
+				foreach ($payment_meta as $meta_key => $meta_value) {
 
 					$exceptions = array(
 						'form_title',
@@ -1415,19 +1415,19 @@ 
 					);
 
 					//Don't clutter up results with dupes
-					if ( in_array( $meta_key, $exceptions ) ) {
+					if (in_array($meta_key, $exceptions)) {
 						continue;
 					}
 
-					$sales['donations'][ $i ]['payment_meta'][ $meta_key ] = $meta_value;
+					$sales['donations'][$i]['payment_meta'][$meta_key] = $meta_value;
 
 				}
 
-				$i ++;
+				$i++;
 			}
 		}
 
-		return apply_filters( 'give_api_donations_endpoint', $sales );
+		return apply_filters('give_api_donations_endpoint', $sales);
 	}
 
 	/**
@@ -1442,9 +1442,9 @@ 
 	public function get_output_format() {
 		global $wp_query;
 
-		$format = isset( $wp_query->query_vars['format'] ) ? $wp_query->query_vars['format'] : 'json';
+		$format = isset($wp_query->query_vars['format']) ? $wp_query->query_vars['format'] : 'json';
 
-		return apply_filters( 'give_api_output_format', $format );
+		return apply_filters('give_api_output_format', $format);
 	}
 
 
@@ -1460,8 +1460,8 @@ 
 	 *
 	 * @return void
 	 */
-	private function log_request( $data = array() ) {
-		if ( ! $this->log_requests ) {
+	private function log_request($data = array()) {
+		if ( ! $this->log_requests) {
 			return;
 		}
 
@@ -1469,36 +1469,36 @@ 
 
 		$query = array(
 			'give-api'    => $wp_query->query_vars['give-api'],
-			'key'         => isset( $wp_query->query_vars['key'] ) ? $wp_query->query_vars['key'] : null,
-			'token'       => isset( $wp_query->query_vars['token'] ) ? $wp_query->query_vars['token'] : null,
-			'query'       => isset( $wp_query->query_vars['query'] ) ? $wp_query->query_vars['query'] : null,
-			'type'        => isset( $wp_query->query_vars['type'] ) ? $wp_query->query_vars['type'] : null,
-			'form'        => isset( $wp_query->query_vars['form'] ) ? $wp_query->query_vars['form'] : null,
-			'customer'    => isset( $wp_query->query_vars['customer'] ) ? $wp_query->query_vars['customer'] : null,
-			'date'        => isset( $wp_query->query_vars['date'] ) ? $wp_query->query_vars['date'] : null,
-			'startdate'   => isset( $wp_query->query_vars['startdate'] ) ? $wp_query->query_vars['startdate'] : null,
-			'enddate'     => isset( $wp_query->query_vars['enddate'] ) ? $wp_query->query_vars['enddate'] : null,
-			'id'          => isset( $wp_query->query_vars['id'] ) ? $wp_query->query_vars['id'] : null,
-			'purchasekey' => isset( $wp_query->query_vars['purchasekey'] ) ? $wp_query->query_vars['purchasekey'] : null,
-			'email'       => isset( $wp_query->query_vars['email'] ) ? $wp_query->query_vars['email'] : null,
+			'key'         => isset($wp_query->query_vars['key']) ? $wp_query->query_vars['key'] : null,
+			'token'       => isset($wp_query->query_vars['token']) ? $wp_query->query_vars['token'] : null,
+			'query'       => isset($wp_query->query_vars['query']) ? $wp_query->query_vars['query'] : null,
+			'type'        => isset($wp_query->query_vars['type']) ? $wp_query->query_vars['type'] : null,
+			'form'        => isset($wp_query->query_vars['form']) ? $wp_query->query_vars['form'] : null,
+			'customer'    => isset($wp_query->query_vars['customer']) ? $wp_query->query_vars['customer'] : null,
+			'date'        => isset($wp_query->query_vars['date']) ? $wp_query->query_vars['date'] : null,
+			'startdate'   => isset($wp_query->query_vars['startdate']) ? $wp_query->query_vars['startdate'] : null,
+			'enddate'     => isset($wp_query->query_vars['enddate']) ? $wp_query->query_vars['enddate'] : null,
+			'id'          => isset($wp_query->query_vars['id']) ? $wp_query->query_vars['id'] : null,
+			'purchasekey' => isset($wp_query->query_vars['purchasekey']) ? $wp_query->query_vars['purchasekey'] : null,
+			'email'       => isset($wp_query->query_vars['email']) ? $wp_query->query_vars['email'] : null,
 		);
 
 		$log_data = array(
 			'log_type'     => 'api_request',
-			'post_excerpt' => http_build_query( $query ),
-			'post_content' => ! empty( $data['error'] ) ? $data['error'] : '',
+			'post_excerpt' => http_build_query($query),
+			'post_content' => ! empty($data['error']) ? $data['error'] : '',
 		);
 
 		$log_meta = array(
 			'request_ip' => give_get_ip(),
 			'user'       => $this->user_id,
-			'key'        => isset( $wp_query->query_vars['key'] ) ? $wp_query->query_vars['key'] : null,
-			'token'      => isset( $wp_query->query_vars['token'] ) ? $wp_query->query_vars['token'] : null,
+			'key'        => isset($wp_query->query_vars['key']) ? $wp_query->query_vars['key'] : null,
+			'token'      => isset($wp_query->query_vars['token']) ? $wp_query->query_vars['token'] : null,
 			'time'       => $data['request_speed'],
 			'version'    => $this->get_queried_version()
 		);
 
-		$give_logs->insert_log( $log_data, $log_meta );
+		$give_logs->insert_log($log_data, $log_meta);
 	}
 
 
@@ -1522,32 +1522,32 @@ 
 	 *
 	 * @param int $status_code
 	 */
-	public function output( $status_code = 200 ) {
+	public function output($status_code = 200) {
 		global $wp_query;
 
 		$format = $this->get_output_format();
 
-		status_header( $status_code );
+		status_header($status_code);
 
-		do_action( 'give_api_output_before', $this->data, $this, $format );
+		do_action('give_api_output_before', $this->data, $this, $format);
 
-		switch ( $format ) :
+		switch ($format) :
 
 			case 'xml' :
 
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/array2xml.php';
-				$xml = Array2XML::createXML( 'give', $this->data );
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/array2xml.php';
+				$xml = Array2XML::createXML('give', $this->data);
 				echo $xml->saveXML();
 
 				break;
 
 			case 'json' :
 
-				header( 'Content-Type: application/json' );
-				if ( ! empty( $this->pretty_print ) ) {
-					echo json_encode( $this->data, $this->pretty_print );
+				header('Content-Type: application/json');
+				if ( ! empty($this->pretty_print)) {
+					echo json_encode($this->data, $this->pretty_print);
 				} else {
-					echo json_encode( $this->data );
+					echo json_encode($this->data);
 				}
 
 				break;
@@ -1556,13 +1556,13 @@ 
 			default :
 
 				// Allow other formats to be added via extensions
-				do_action( 'give_api_output_' . $format, $this->data, $this );
+				do_action('give_api_output_'.$format, $this->data, $this);
 
 				break;
 
 		endswitch;
 
-		do_action( 'give_api_output_after', $this->data, $this, $format );
+		do_action('give_api_output_after', $this->data, $this, $format);
 
 		give_die();
 	}
@@ -1579,37 +1579,37 @@ 
 	 *
 	 * @return void
 	 */
-	function user_key_field( $user ) {
+	function user_key_field($user) {
 
-		if ( ( give_get_option( 'api_allow_user_keys', false ) || current_user_can( 'manage_give_settings' ) ) && current_user_can( 'edit_user', $user->ID ) ) {
-			$user = get_userdata( $user->ID );
+		if ((give_get_option('api_allow_user_keys', false) || current_user_can('manage_give_settings')) && current_user_can('edit_user', $user->ID)) {
+			$user = get_userdata($user->ID);
 			?>
 			<table class="form-table">
 				<tbody>
 				<tr>
 					<th>
-						<?php esc_attr_e( 'Give API Keys', 'give' ); ?>
+						<?php esc_attr_e('Give API Keys', 'give'); ?>
 					</th>
 					<td>
 						<?php
-						$public_key = $this->get_user_public_key( $user->ID );
-						$secret_key = $this->get_user_secret_key( $user->ID );
+						$public_key = $this->get_user_public_key($user->ID);
+						$secret_key = $this->get_user_secret_key($user->ID);
 						?>
-						<?php if ( empty( $user->give_user_public_key ) ) { ?>
+						<?php if (empty($user->give_user_public_key)) { ?>
 							<input name="give_set_api_key" type="checkbox" id="give_set_api_key" value="0"/>
-							<span class="description"><?php esc_attr_e( 'Generate API Key', 'give' ); ?></span>
+							<span class="description"><?php esc_attr_e('Generate API Key', 'give'); ?></span>
 						<?php } else { ?>
-							<strong style="display:inline-block; width: 125px;"><?php _e( 'Public key:', 'give' ); ?>&nbsp;</strong>
-							<input type="text" disabled="disabled" class="regular-text" id="publickey" value="<?php echo esc_attr( $public_key ); ?>"/>
+							<strong style="display:inline-block; width: 125px;"><?php _e('Public key:', 'give'); ?>&nbsp;</strong>
+							<input type="text" disabled="disabled" class="regular-text" id="publickey" value="<?php echo esc_attr($public_key); ?>"/>
 							<br/>
-							<strong style="display:inline-block; width: 125px;"><?php esc_attr_e( 'Secret key:', 'give' ); ?>&nbsp;</strong>
-							<input type="text" disabled="disabled" class="regular-text" id="privatekey" value="<?php echo esc_attr( $secret_key ); ?>"/>
+							<strong style="display:inline-block; width: 125px;"><?php esc_attr_e('Secret key:', 'give'); ?>&nbsp;</strong>
+							<input type="text" disabled="disabled" class="regular-text" id="privatekey" value="<?php echo esc_attr($secret_key); ?>"/>
 							<br/>
-							<strong style="display:inline-block; width: 125px;"><?php esc_attr_e( 'Token:', 'give' ); ?>&nbsp;</strong>
-							<input type="text" disabled="disabled" class="regular-text" id="token" value="<?php echo esc_attr( $this->get_token( $user->ID ) ); ?>"/>
+							<strong style="display:inline-block; width: 125px;"><?php esc_attr_e('Token:', 'give'); ?>&nbsp;</strong>
+							<input type="text" disabled="disabled" class="regular-text" id="token" value="<?php echo esc_attr($this->get_token($user->ID)); ?>"/>
 							<br/>
 							<input name="give_set_api_key" type="checkbox" id="give_set_api_key" value="0"/>
-							<span class="description"><label for="give_set_api_key"><?php esc_attr_e( 'Revoke API Keys', 'give' ); ?></label></span>
+							<span class="description"><label for="give_set_api_key"><?php esc_attr_e('Revoke API Keys', 'give'); ?></label></span>
 						<?php } ?>
 					</td>
 				</tr>
@@ -1628,53 +1628,53 @@ 
 	 *
 	 * @return void
 	 */
-	public function process_api_key( $args ) {
+	public function process_api_key($args) {
 
-		if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'give-api-nonce' ) ) {
+		if ( ! wp_verify_nonce($_REQUEST['_wpnonce'], 'give-api-nonce')) {
 
-			wp_die( esc_attr__( 'Nonce verification failed', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+			wp_die(esc_attr__('Nonce verification failed', 'give'), __('Error', 'give'), array('response' => 403));
 
 		}
 
-		if ( empty( $args['user_id'] ) ) {
-			wp_die( esc_attr__( 'User ID Required', 'give' ), esc_attr__( 'Error', 'give' ), array( 'response' => 401 ) );
+		if (empty($args['user_id'])) {
+			wp_die(esc_attr__('User ID Required', 'give'), esc_attr__('Error', 'give'), array('response' => 401));
 		}
 
-		if ( is_numeric( $args['user_id'] ) ) {
-			$user_id = isset( $args['user_id'] ) ? absint( $args['user_id'] ) : get_current_user_id();
+		if (is_numeric($args['user_id'])) {
+			$user_id = isset($args['user_id']) ? absint($args['user_id']) : get_current_user_id();
 		} else {
-			$userdata = get_user_by( 'login', $args['user_id'] );
+			$userdata = get_user_by('login', $args['user_id']);
 			$user_id  = $userdata->ID;
 		}
-		$process = isset( $args['give_api_process'] ) ? strtolower( $args['give_api_process'] ) : false;
+		$process = isset($args['give_api_process']) ? strtolower($args['give_api_process']) : false;
 
-		if ( $user_id == get_current_user_id() && ! give_get_option( 'allow_user_api_keys' ) && ! current_user_can( 'manage_give_settings' ) ) {
-			wp_die( sprintf( __( 'You do not have permission to %s API keys for this user', 'give' ), $process ), __( 'Error', 'give' ), array( 'response' => 403 ) );
-		} elseif ( ! current_user_can( 'manage_give_settings' ) ) {
-			wp_die( sprintf( __( 'You do not have permission to %s API keys for this user', 'give' ), $process ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ($user_id == get_current_user_id() && ! give_get_option('allow_user_api_keys') && ! current_user_can('manage_give_settings')) {
+			wp_die(sprintf(__('You do not have permission to %s API keys for this user', 'give'), $process), __('Error', 'give'), array('response' => 403));
+		} elseif ( ! current_user_can('manage_give_settings')) {
+			wp_die(sprintf(__('You do not have permission to %s API keys for this user', 'give'), $process), __('Error', 'give'), array('response' => 403));
 		}
 
-		switch ( $process ) {
+		switch ($process) {
 			case 'generate':
-				if ( $this->generate_api_key( $user_id ) ) {
-					delete_transient( 'give-total-api-keys' );
-					wp_redirect( add_query_arg( 'give-message', 'api-key-generated', 'edit.php?post_type=give_forms&page=give-settings&tab=api' ) );
+				if ($this->generate_api_key($user_id)) {
+					delete_transient('give-total-api-keys');
+					wp_redirect(add_query_arg('give-message', 'api-key-generated', 'edit.php?post_type=give_forms&page=give-settings&tab=api'));
 					exit();
 				} else {
-					wp_redirect( add_query_arg( 'give-message', 'api-key-failed', 'edit.php?post_type=give_forms&page=give-settings&tab=api' ) );
+					wp_redirect(add_query_arg('give-message', 'api-key-failed', 'edit.php?post_type=give_forms&page=give-settings&tab=api'));
 					exit();
 				}
 				break;
 			case 'regenerate':
-				$this->generate_api_key( $user_id, true );
-				delete_transient( 'give-total-api-keys' );
-				wp_redirect( add_query_arg( 'give-message', 'api-key-regenerated', 'edit.php?post_type=give_forms&page=give-settings&tab=api' ) );
+				$this->generate_api_key($user_id, true);
+				delete_transient('give-total-api-keys');
+				wp_redirect(add_query_arg('give-message', 'api-key-regenerated', 'edit.php?post_type=give_forms&page=give-settings&tab=api'));
 				exit();
 				break;
 			case 'revoke':
-				$this->revoke_api_key( $user_id );
-				delete_transient( 'give-total-api-keys' );
-				wp_redirect( add_query_arg( 'give-message', 'api-key-revoked', 'edit.php?post_type=give_forms&page=give-settings&tab=api' ) );
+				$this->revoke_api_key($user_id);
+				delete_transient('give-total-api-keys');
+				wp_redirect(add_query_arg('give-message', 'api-key-revoked', 'edit.php?post_type=give_forms&page=give-settings&tab=api'));
 				exit();
 				break;
 			default;
@@ -1693,34 +1693,34 @@ 
 	 *
 	 * @return boolean True if (re)generated succesfully, false otherwise.
 	 */
-	public function generate_api_key( $user_id = 0, $regenerate = false ) {
+	public function generate_api_key($user_id = 0, $regenerate = false) {
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return false;
 		}
 
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-		if ( ! $user ) {
+		if ( ! $user) {
 			return false;
 		}
 
-		$public_key = $this->get_user_public_key( $user_id );
-		$secret_key = $this->get_user_secret_key( $user_id );
+		$public_key = $this->get_user_public_key($user_id);
+		$secret_key = $this->get_user_secret_key($user_id);
 
-		if ( empty( $public_key ) || $regenerate == true ) {
-			$new_public_key = $this->generate_public_key( $user->user_email );
-			$new_secret_key = $this->generate_private_key( $user->ID );
+		if (empty($public_key) || $regenerate == true) {
+			$new_public_key = $this->generate_public_key($user->user_email);
+			$new_secret_key = $this->generate_private_key($user->ID);
 		} else {
 			return false;
 		}
 
-		if ( $regenerate == true ) {
-			$this->revoke_api_key( $user->ID );
+		if ($regenerate == true) {
+			$this->revoke_api_key($user->ID);
 		}
 
-		update_user_meta( $user_id, $new_public_key, 'give_user_public_key' );
-		update_user_meta( $user_id, $new_secret_key, 'give_user_secret_key' );
+		update_user_meta($user_id, $new_public_key, 'give_user_public_key');
+		update_user_meta($user_id, $new_secret_key, 'give_user_secret_key');
 
 		return true;
 	}
@@ -1735,26 +1735,26 @@ 
 	 *
 	 * @return string
 	 */
-	public function revoke_api_key( $user_id = 0 ) {
+	public function revoke_api_key($user_id = 0) {
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return false;
 		}
 
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-		if ( ! $user ) {
+		if ( ! $user) {
 			return false;
 		}
 
-		$public_key = $this->get_user_public_key( $user_id );
-		$secret_key = $this->get_user_secret_key( $user_id );
-		if ( ! empty( $public_key ) ) {
-			delete_transient( md5( 'give_api_user_' . $public_key ) );
-			delete_transient( md5( 'give_api_user_public_key' . $user_id ) );
-			delete_transient( md5( 'give_api_user_secret_key' . $user_id ) );
-			delete_user_meta( $user_id, $public_key );
-			delete_user_meta( $user_id, $secret_key );
+		$public_key = $this->get_user_public_key($user_id);
+		$secret_key = $this->get_user_secret_key($user_id);
+		if ( ! empty($public_key)) {
+			delete_transient(md5('give_api_user_'.$public_key));
+			delete_transient(md5('give_api_user_public_key'.$user_id));
+			delete_transient(md5('give_api_user_secret_key'.$user_id));
+			delete_user_meta($user_id, $public_key);
+			delete_user_meta($user_id, $secret_key);
 		} else {
 			return false;
 		}
@@ -1779,22 +1779,22 @@ 
 	 *
 	 * @return void
 	 */
-	public function update_key( $user_id ) {
-		if ( current_user_can( 'edit_user', $user_id ) && isset( $_POST['give_set_api_key'] ) ) {
+	public function update_key($user_id) {
+		if (current_user_can('edit_user', $user_id) && isset($_POST['give_set_api_key'])) {
 
-			$user = get_userdata( $user_id );
+			$user = get_userdata($user_id);
 
-			$public_key = $this->get_user_public_key( $user_id );
-			$secret_key = $this->get_user_secret_key( $user_id );
+			$public_key = $this->get_user_public_key($user_id);
+			$secret_key = $this->get_user_secret_key($user_id);
 
-			if ( empty( $public_key ) ) {
-				$new_public_key = $this->generate_public_key( $user->user_email );
-				$new_secret_key = $this->generate_private_key( $user->ID );
+			if (empty($public_key)) {
+				$new_public_key = $this->generate_public_key($user->user_email);
+				$new_secret_key = $this->generate_private_key($user->ID);
 
-				update_user_meta( $user_id, $new_public_key, 'give_user_public_key' );
-				update_user_meta( $user_id, $new_secret_key, 'give_user_secret_key' );
+				update_user_meta($user_id, $new_public_key, 'give_user_public_key');
+				update_user_meta($user_id, $new_secret_key, 'give_user_secret_key');
 			} else {
-				$this->revoke_api_key( $user_id );
+				$this->revoke_api_key($user_id);
 			}
 		}
 	}
@@ -1809,9 +1809,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function generate_public_key( $user_email = '' ) {
-		$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-		$public   = hash( 'md5', $user_email . $auth_key . date( 'U' ) );
+	private function generate_public_key($user_email = '') {
+		$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+		$public   = hash('md5', $user_email.$auth_key.date('U'));
 
 		return $public;
 	}
@@ -1826,9 +1826,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function generate_private_key( $user_id = 0 ) {
-		$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-		$secret   = hash( 'md5', $user_id . $auth_key . date( 'U' ) );
+	private function generate_private_key($user_id = 0) {
+		$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+		$secret   = hash('md5', $user_id.$auth_key.date('U'));
 
 		return $secret;
 	}
@@ -1843,8 +1843,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_token( $user_id = 0 ) {
-		return hash( 'md5', $this->get_user_secret_key( $user_id ) . $this->get_user_public_key( $user_id ) );
+	public function get_token($user_id = 0) {
+		return hash('md5', $this->get_user_secret_key($user_id).$this->get_user_public_key($user_id));
 	}
 
 	/**
@@ -1858,9 +1858,9 @@ 
 
 		// Default sales return
 		$sales                               = array();
-		$sales['donations']['today']         = $this->stats->get_sales( 0, 'today' );
-		$sales['donations']['current_month'] = $this->stats->get_sales( 0, 'this_month' );
-		$sales['donations']['last_month']    = $this->stats->get_sales( 0, 'last_month' );
+		$sales['donations']['today']         = $this->stats->get_sales(0, 'today');
+		$sales['donations']['current_month'] = $this->stats->get_sales(0, 'this_month');
+		$sales['donations']['last_month']    = $this->stats->get_sales(0, 'last_month');
 		$sales['donations']['totals']        = give_get_total_sales();
 
 		return $sales;
@@ -1877,9 +1877,9 @@ 
 
 		// Default earnings return
 		$earnings                              = array();
-		$earnings['earnings']['today']         = $this->stats->get_earnings( 0, 'today' );
-		$earnings['earnings']['current_month'] = $this->stats->get_earnings( 0, 'this_month' );
-		$earnings['earnings']['last_month']    = $this->stats->get_earnings( 0, 'last_month' );
+		$earnings['earnings']['today']         = $this->stats->get_earnings(0, 'today');
+		$earnings['earnings']['current_month'] = $this->stats->get_earnings(0, 'this_month');
+		$earnings['earnings']['last_month']    = $this->stats->get_earnings(0, 'last_month');
 		$earnings['earnings']['totals']        = give_get_total_earnings();
 
 		return $earnings;
@@ -1899,25 +1899,25 @@ 
 	 *
 	 * @return string            The API key/secret for the user supplied
 	 */
-	public function api_key_backwards_compat( $check, $object_id, $meta_key, $single ) {
+	public function api_key_backwards_compat($check, $object_id, $meta_key, $single) {
 
-		if ( $meta_key !== 'give_user_public_key' && $meta_key !== 'give_user_secret_key' ) {
+		if ($meta_key !== 'give_user_public_key' && $meta_key !== 'give_user_secret_key') {
 			return $check;
 		}
 
 		$return = $check;
 
-		switch ( $meta_key ) {
+		switch ($meta_key) {
 			case 'give_user_public_key':
-				$return = Give()->api->get_user_public_key( $object_id );
+				$return = Give()->api->get_user_public_key($object_id);
 				break;
 			case 'give_user_secret_key':
-				$return = Give()->api->get_user_secret_key( $object_id );
+				$return = Give()->api->get_user_secret_key($object_id);
 				break;
 		}
 
-		if ( ! $single ) {
-			$return = array( $return );
+		if ( ! $single) {
+			$return = array($return);
 		}
 
 		return $return;

Indentation +12 added lines, -12 removed lines

@@ -1437,7 +1437,7 @@ 
 	 * Determines whether results should be displayed in XML or JSON
 	 *
 	 * @since 1.1
-     * @access public
+	 * @access public
 	 *
 	 * @return mixed|void
 	 */
@@ -1455,7 +1455,7 @@ 
 	 *
 	 * @access private
 	 * @since  1.1
-     *
+	 *
 	 * @global Give_Logging $give_logs
 	 * @global WP_Query     $wp_query
 	 *
@@ -1468,15 +1468,15 @@ 
 			return;
 		}
 
-        /**
-         * @var Give_Logging $give_logs
-         */
+		/**
+		 * @var Give_Logging $give_logs
+		 */
 		global $give_logs;
 
-        /**
-         * @var WP_Query $wp_query
-         */
-        global $wp_query;
+		/**
+		 * @var WP_Query $wp_query
+		 */
+		global $wp_query;
 
 		$query = array(
 			'give-api'    => $wp_query->query_vars['give-api'],
@@ -1534,9 +1534,9 @@ 
 	 * @param int $status_code
 	 */
 	public function output( $status_code = 200 ) {
-        /**
-         * @var WP_Query $wp_query
-         */
+		/**
+		 * @var WP_Query $wp_query
+		 */
 		global $wp_query;
 
 		$format = $this->get_output_format();