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 causes 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 causes 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 +59 added lines, -59 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,43 +126,43 @@ 
 	 * @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( 'view'      => 'api_requests',
+				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( 'user_id'          => $item['id'],
+			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( 'user_id'          => $item['id'],
+			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));
 	}
 
 	/**
@@ -174,10 +174,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;
@@ -190,20 +190,20 @@ 
 	 * @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;
 		}
 		?>
-		<form method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=api' ); ?>">
+		<form method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-settings&tab=api'); ?>">
 			<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); ?>
 		</form>
 		<?php
 		$give_api_is_bottom = true;
@@ -217,7 +217,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;
 	}
 
 	/**
@@ -228,21 +228,21 @@ 
 	 * @return void
 	 */
 	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;
@@ -259,13 +259,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');
 	}
 
 	/**
@@ -281,7 +281,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();
 
@@ -289,10 +289,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)
 			)
 		);
 	}

Indentation +16 added lines, -16 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 /**
- * API Key Table Class
- *
- * @package     Give
- * @subpackage  Admin/Tools/APIKeys
- * @copyright   Copyright (c) 2015, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.1
- */
+	 * API Key Table Class
+	 *
+	 * @package     Give
+	 * @subpackage  Admin/Tools/APIKeys
+	 * @copyright   Copyright (c) 2015, WordImpress
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.1
+	 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
@@ -134,10 +134,10 @@ 
 			$actions['view'] = sprintf(
 				'<a href="%s">%s</a>',
 				esc_url( add_query_arg( array( 'view'      => 'api_requests',
-				                               'post_type' => 'give_forms',
-				                               'page'      => 'give-reports',
-				                               'tab'       => 'logs',
-				                               's'         => $item['email']
+											   'post_type' => 'give_forms',
+											   'page'      => 'give-reports',
+											   'tab'       => 'logs',
+											   's'         => $item['email']
 				), 'edit.php' ) ),
 				__( 'View API Log', 'give' )
 			);
@@ -146,16 +146,16 @@ 
 		$actions['reissue'] = sprintf(
 			'<a href="%s" class="give-regenerate-api-key">%s</a>',
 			esc_url( wp_nonce_url( add_query_arg( array( 'user_id'          => $item['id'],
-			                                             'give_action'      => 'process_api_key',
-			                                             'give_api_process' => 'regenerate'
+														 'give_action'      => 'process_api_key',
+														 'give_api_process' => 'regenerate'
 			) ), 'give-api-nonce' ) ),
 			__( 'Reissue', 'give' )
 		);
 		$actions['revoke']  = sprintf(
 			'<a href="%s" class="give-revoke-api-key give-delete">%s</a>',
 			esc_url( wp_nonce_url( add_query_arg( array( 'user_id'          => $item['id'],
-			                                             'give_action'      => 'process_api_key',
-			                                             'give_api_process' => 'revoke'
+														 'give_action'      => 'process_api_key',
+														 'give_api_process' => 'revoke'
 			) ), 'give-api-nonce' ) ),
 			__( 'Revoke', 'give' )
 		);

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/payments/actions.php

Doc Comments -1 removed lines

@@ -297,7 +297,6 @@
  *
  * @since 1.0
  *
- * @param array $data Arguments passed
  *
  * @return void
  */

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Admin Payment Actions
- *
- * @package     Give
- * @subpackage  Admin/Payments
- * @copyright   Copyright (c) 2015, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+										 * Admin Payment Actions
+										 *
+										 * @package     Give
+										 * @subpackage  Admin/Payments
+										 * @copyright   Copyright (c) 2015, WordImpress
+										 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+										 * @since       1.0
+										 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {

Spacing +110 added lines, -110 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,109 +26,109 @@ 
  * @return      void
  *
  */
-function give_update_payment_details( $data ) {
+function give_update_payment_details($data) {
 
-	if ( ! current_user_can( 'edit_give_payments', $data['give_payment_id'] ) ) {
-		wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $data['give_payment_id'])) {
+		wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	check_admin_referer( 'give_update_payment_details_nonce' );
+	check_admin_referer('give_update_payment_details_nonce');
 
 	// Retrieve the payment ID
-	$payment_id = absint( $data['give_payment_id'] );
+	$payment_id = absint($data['give_payment_id']);
 
 	// Retrieve existing payment meta
-	$meta      = give_get_payment_meta( $payment_id );
-	$user_info = give_get_payment_meta_user_info( $payment_id );
+	$meta      = give_get_payment_meta($payment_id);
+	$user_info = give_get_payment_meta_user_info($payment_id);
 
 	$status  = $data['give-payment-status'];
-	$user_id = isset( $data['give-payment-user-id'] ) ? intval( $data['give-payment-user-id'] ) : '';
-	$date    = sanitize_text_field( $data['give-payment-date'] );
-	$hour    = sanitize_text_field( $data['give-payment-time-hour'] );
+	$user_id = isset($data['give-payment-user-id']) ? intval($data['give-payment-user-id']) : '';
+	$date    = sanitize_text_field($data['give-payment-date']);
+	$hour    = sanitize_text_field($data['give-payment-time-hour']);
 	$form_id = give_get_payment_form_id($payment_id);
 
 	// Restrict to our high and low
-	if ( $hour > 23 ) {
+	if ($hour > 23) {
 		$hour = 23;
-	} elseif ( $hour < 0 ) {
+	} elseif ($hour < 0) {
 		$hour = 00;
 	}
 
-	$minute = sanitize_text_field( $data['give-payment-time-min'] );
+	$minute = sanitize_text_field($data['give-payment-time-min']);
 
 	// Restrict to our high and low
-	if ( $minute > 59 ) {
+	if ($minute > 59) {
 		$minute = 59;
-	} elseif ( $minute < 0 ) {
+	} elseif ($minute < 0) {
 		$minute = 00;
 	}
 
-	$address          = array_map( 'trim', $data['give-payment-address'][0] );
-	$date             = date( 'Y-m-d', strtotime( $date ) ) . ' ' . $hour . ':' . $minute . ':00';
-	$curr_total       = give_sanitize_amount( give_get_payment_amount( $payment_id ) );
-	$new_total        = give_sanitize_amount( $_POST['give-payment-total'] );
-	$curr_customer_id = sanitize_text_field( $data['give-current-customer'] );
-	$new_customer_id  = sanitize_text_field( $data['customer-id'] );
+	$address          = array_map('trim', $data['give-payment-address'][0]);
+	$date             = date('Y-m-d', strtotime($date)).' '.$hour.':'.$minute.':00';
+	$curr_total       = give_sanitize_amount(give_get_payment_amount($payment_id));
+	$new_total        = give_sanitize_amount($_POST['give-payment-total']);
+	$curr_customer_id = sanitize_text_field($data['give-current-customer']);
+	$new_customer_id  = sanitize_text_field($data['customer-id']);
 
-	do_action( 'give_update_edited_purchase', $payment_id );
+	do_action('give_update_edited_purchase', $payment_id);
 
 	// Update main payment record
-	$updated = wp_update_post( array(
+	$updated = wp_update_post(array(
 		'ID'        => $payment_id,
 		'edit_date' => true,
 		'post_date' => $date
-	) );
+	));
 
-	if ( 0 === $updated ) {
-		wp_die( esc_attr__( 'Error Updating Payment', 'give' ), esc_attr__( 'Error', 'give' ), array( 'response' => 400 ) );
+	if (0 === $updated) {
+		wp_die(esc_attr__('Error Updating Payment', 'give'), esc_attr__('Error', 'give'), array('response' => 400));
 	}
 
 	$customer_changed = false;
 
-	if ( isset( $data['give-new-customer'] ) && $data['give-new-customer'] == '1' ) {
+	if (isset($data['give-new-customer']) && $data['give-new-customer'] == '1') {
 
-		$email = isset( $data['give-new-customer-email'] ) ? sanitize_text_field( $data['give-new-customer-email'] ) : '';
-		$names = isset( $data['give-new-customer-name'] ) ? sanitize_text_field( $data['give-new-customer-name'] ) : '';
+		$email = isset($data['give-new-customer-email']) ? sanitize_text_field($data['give-new-customer-email']) : '';
+		$names = isset($data['give-new-customer-name']) ? sanitize_text_field($data['give-new-customer-name']) : '';
 
-		if ( empty( $email ) || empty( $names ) ) {
-			wp_die( esc_attr__( 'New Customers require a name and email address', 'give' ) );
+		if (empty($email) || empty($names)) {
+			wp_die(esc_attr__('New Customers require a name and email address', 'give'));
 		}
 
-		$customer = new Give_Customer( $email );
-		if ( empty( $customer->id ) ) {
-			$customer_data = array( 'name' => $names, 'email' => $email );
-			$user_id       = email_exists( $email );
-			if ( false !== $user_id ) {
+		$customer = new Give_Customer($email);
+		if (empty($customer->id)) {
+			$customer_data = array('name' => $names, 'email' => $email);
+			$user_id       = email_exists($email);
+			if (false !== $user_id) {
 				$customer_data['user_id'] = $user_id;
 			}
 
-			if ( ! $customer->create( $customer_data ) ) {
+			if ( ! $customer->create($customer_data)) {
 				// Failed to crete the new customer, assume the previous customer
 				$customer_changed = false;
-				$customer         = new Give_Customer( $curr_customer_id );
-				give_set_error( 'give-payment-new-customer-fail', __( 'Error creating new customer', 'give' ) );
+				$customer         = new Give_Customer($curr_customer_id);
+				give_set_error('give-payment-new-customer-fail', __('Error creating new customer', 'give'));
 			}
 		}
 
 		$new_customer_id = $customer->id;
 
-		$previous_customer = new Give_Customer( $curr_customer_id );
+		$previous_customer = new Give_Customer($curr_customer_id);
 
 		$customer_changed = true;
 
-	} elseif ( $curr_customer_id !== $new_customer_id ) {
+	} elseif ($curr_customer_id !== $new_customer_id) {
 
-		$customer = new Give_Customer( $new_customer_id );
+		$customer = new Give_Customer($new_customer_id);
 		$email    = $customer->email;
 		$names    = $customer->name;
 
-		$previous_customer = new Give_Customer( $curr_customer_id );
+		$previous_customer = new Give_Customer($curr_customer_id);
 
 		$customer_changed = true;
 
 	} else {
 
-		$customer = new Give_Customer( $curr_customer_id );
+		$customer = new Give_Customer($curr_customer_id);
 		$email    = $customer->email;
 		$names    = $customer->name;
 
@@ -136,32 +136,32 @@ 
 
 
 	// Setup first and last name from input values
-	$names      = explode( ' ', $names );
-	$first_name = ! empty( $names[0] ) ? $names[0] : '';
+	$names      = explode(' ', $names);
+	$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);
 	}
 
 
-	if ( $customer_changed ) {
+	if ($customer_changed) {
 
 		// Remove the stats and payment from the previous customer and attach it to the new customer
-		$previous_customer->remove_payment( $payment_id, false );
-		$customer->attach_payment( $payment_id, false );
+		$previous_customer->remove_payment($payment_id, false);
+		$customer->attach_payment($payment_id, false);
 
 		// If purchase was completed and not ever refunded, adjust stats of customers
-		if ( 'revoked' == $status || 'publish' == $status ) {
+		if ('revoked' == $status || 'publish' == $status) {
 
 			$previous_customer->decrease_purchase_count();
-			$previous_customer->decrease_value( $new_total );
+			$previous_customer->decrease_value($new_total);
 
 			$customer->increase_purchase_count();
-			$customer->increase_value( $new_total );
+			$customer->increase_value($new_total);
 		}
 
-		update_post_meta( $payment_id, '_give_payment_customer_id', $customer->id );
+		update_post_meta($payment_id, '_give_payment_customer_id', $customer->id);
 
 	}
 
@@ -176,47 +176,47 @@ 
 
 
 	// Check for payment notes
-	if ( ! empty( $data['give-payment-note'] ) ) {
+	if ( ! empty($data['give-payment-note'])) {
 
-		$note = wp_kses( $data['give-payment-note'], array() );
-		give_insert_payment_note( $payment_id, $note );
+		$note = wp_kses($data['give-payment-note'], array());
+		give_insert_payment_note($payment_id, $note);
 
 	}
 
 	// Set new status
-	give_update_payment_status( $payment_id, $status );
+	give_update_payment_status($payment_id, $status);
 
-	give_update_payment_meta( $payment_id, '_give_payment_user_id', $customer->user_id );
-	give_update_payment_meta( $payment_id, '_give_payment_user_email', $customer->email );
-	give_update_payment_meta( $payment_id, '_give_payment_meta', $meta );
-	give_update_payment_meta( $payment_id, '_give_payment_total', $new_total );
+	give_update_payment_meta($payment_id, '_give_payment_user_id', $customer->user_id);
+	give_update_payment_meta($payment_id, '_give_payment_user_email', $customer->email);
+	give_update_payment_meta($payment_id, '_give_payment_meta', $meta);
+	give_update_payment_meta($payment_id, '_give_payment_total', $new_total);
 
 	// Adjust total store earnings if the payment total has been changed
-	if ( $new_total !== $curr_total && ( 'publish' == $status || 'revoked' == $status ) ) {
+	if ($new_total !== $curr_total && ('publish' == $status || 'revoked' == $status)) {
 
-		if ( $new_total > $curr_total ) {
+		if ($new_total > $curr_total) {
 			// Increase if our new total is higher
 			$difference = $new_total - $curr_total;
-			give_increase_total_earnings( $difference );
-			$form = new Give_Donate_Form( $form_id );
-			$form->increase_earnings( $difference );
-		} elseif ( $curr_total > $new_total ) {
+			give_increase_total_earnings($difference);
+			$form = new Give_Donate_Form($form_id);
+			$form->increase_earnings($difference);
+		} elseif ($curr_total > $new_total) {
 			// Decrease if our new total is lower
 			$difference = $curr_total - $new_total;
-			give_decrease_total_earnings( $difference );
-			$form = new Give_Donate_Form( $form_id );
-			$form->decrease_earnings( $difference );
+			give_decrease_total_earnings($difference);
+			$form = new Give_Donate_Form($form_id);
+			$form->decrease_earnings($difference);
 		}
 
 	}
 
-	do_action( 'give_updated_edited_purchase', $payment_id );
+	do_action('give_updated_edited_purchase', $payment_id);
 
-	wp_safe_redirect( admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=payment-updated&id=' . $payment_id ) );
+	wp_safe_redirect(admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=payment-updated&id='.$payment_id));
 	exit;
 }
 
-add_action( 'give_update_payment_details', 'give_update_payment_details' );
+add_action('give_update_payment_details', 'give_update_payment_details');
 
 /**
  * Trigger a Purchase Deletion
@@ -227,45 +227,45 @@ 
  *
  * @return void
  */
-function give_trigger_purchase_delete( $data ) {
-	if ( wp_verify_nonce( $data['_wpnonce'], 'give_payment_nonce' ) ) {
+function give_trigger_purchase_delete($data) {
+	if (wp_verify_nonce($data['_wpnonce'], 'give_payment_nonce')) {
 
-		$payment_id = absint( $data['purchase_id'] );
+		$payment_id = absint($data['purchase_id']);
 
-		if ( ! current_user_can( 'edit_give_payments', $payment_id ) ) {
-			wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ( ! current_user_can('edit_give_payments', $payment_id)) {
+			wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 		}
 
-		give_delete_purchase( $payment_id );
-		wp_redirect( admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&give-message=payment_deleted' ) );
+		give_delete_purchase($payment_id);
+		wp_redirect(admin_url('/edit.php?post_type=give_forms&page=give-payment-history&give-message=payment_deleted'));
 		give_die();
 	}
 }
 
-add_action( 'give_delete_payment', 'give_trigger_purchase_delete' );
+add_action('give_delete_payment', 'give_trigger_purchase_delete');
 
 function give_ajax_store_payment_note() {
 
-	$payment_id = absint( $_POST['payment_id'] );
-	$note       = wp_kses( $_POST['note'], array() );
+	$payment_id = absint($_POST['payment_id']);
+	$note       = wp_kses($_POST['note'], array());
 
-	if ( ! current_user_can( 'edit_give_payments', $payment_id ) ) {
-		wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $payment_id)) {
+		wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	if ( empty( $payment_id ) ) {
-		die( '-1' );
+	if (empty($payment_id)) {
+		die('-1');
 	}
 
-	if ( empty( $note ) ) {
-		die( '-1' );
+	if (empty($note)) {
+		die('-1');
 	}
 
-	$note_id = give_insert_payment_note( $payment_id, $note );
-	die( give_get_payment_note_html( $note_id ) );
+	$note_id = give_insert_payment_note($payment_id, $note);
+	die(give_get_payment_note_html($note_id));
 }
 
-add_action( 'wp_ajax_give_insert_payment_note', 'give_ajax_store_payment_note' );
+add_action('wp_ajax_give_insert_payment_note', 'give_ajax_store_payment_note');
 
 /**
  * Triggers a payment note deletion without ajax
@@ -276,24 +276,24 @@ 
  *
  * @return void
  */
-function give_trigger_payment_note_deletion( $data ) {
+function give_trigger_payment_note_deletion($data) {
 
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give_delete_payment_note_' . $data['note_id'] ) ) {
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give_delete_payment_note_'.$data['note_id'])) {
 		return;
 	}
 
-	if ( ! current_user_can( 'edit_give_payments', $data['payment_id'] ) ) {
-		wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $data['payment_id'])) {
+		wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	$edit_order_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=payment-note-deleted&id=' . absint( $data['payment_id'] ) );
+	$edit_order_url = admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=payment-note-deleted&id='.absint($data['payment_id']));
 
-	give_delete_payment_note( $data['note_id'], $data['payment_id'] );
+	give_delete_payment_note($data['note_id'], $data['payment_id']);
 
-	wp_redirect( $edit_order_url );
+	wp_redirect($edit_order_url);
 }
 
-add_action( 'give_delete_payment_note', 'give_trigger_payment_note_deletion' );
+add_action('give_delete_payment_note', 'give_trigger_payment_note_deletion');
 
 /**
  * Delete a payment note deletion with ajax
@@ -306,16 +306,16 @@ 
  */
 function give_ajax_delete_payment_note() {
 
-	if ( ! current_user_can( 'edit_give_payments', $_POST['payment_id'] ) ) {
-		wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $_POST['payment_id'])) {
+		wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	if ( give_delete_payment_note( $_POST['note_id'], $_POST['payment_id'] ) ) {
-		die( '1' );
+	if (give_delete_payment_note($_POST['note_id'], $_POST['payment_id'])) {
+		die('1');
 	} else {
-		die( '-1' );
+		die('-1');
 	}
 
 }
 
-add_action( 'wp_ajax_give_delete_payment_note', 'give_ajax_delete_payment_note' );
\ No newline at end of file
+add_action('wp_ajax_give_delete_payment_note', 'give_ajax_delete_payment_note');
\ No newline at end of file

includes/admin/payments/class-payments-table.php

Doc Comments -1 removed lines

@@ -279,7 +279,6 @@
 	 * @access public
 	 * @since  1.0
 	 *
-	 * @param array  $item        Contains all the data of the discount code
 	 * @param string $column_name The name of the column
 	 *
 	 * @return string Column Name

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Payment History Table Class
- *
- * @package     Give
- * @subpackage  Admin/Payments
- * @copyright   Copyright (c) 2015, Give
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+	 * Payment History Table Class
+	 *
+	 * @package     Give
+	 * @subpackage  Admin/Payments
+	 * @copyright   Copyright (c) 2015, Give
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.0
+	 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {

Spacing +165 added lines, -165 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';
 }
 
 /**
@@ -120,37 +120,37 @@ 
 		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?
-		) );
+		));
 
 		$this->get_payment_counts();
 		$this->process_bulk_action();
-		$this->base_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history' );
+		$this->base_url = admin_url('edit.php?post_type=give_forms&page=give-payment-history');
 	}
 
 	public function advanced_filters() {
-		$start_date = isset( $_GET['start-date'] ) ? sanitize_text_field( $_GET['start-date'] ) : null;
-		$end_date   = isset( $_GET['end-date'] ) ? sanitize_text_field( $_GET['end-date'] ) : null;
-		$status     = isset( $_GET['status'] ) ? $_GET['status'] : '';
+		$start_date = isset($_GET['start-date']) ? sanitize_text_field($_GET['start-date']) : null;
+		$end_date   = isset($_GET['end-date']) ? sanitize_text_field($_GET['end-date']) : null;
+		$status     = isset($_GET['status']) ? $_GET['status'] : '';
 		?>
 		<div id="give-payment-filters">
 			<span id="give-payment-date-filters">
-				<label for="start-date" class="give-start-date-label"><?php _e( 'Start Date:', 'give' ); ?></label>
+				<label for="start-date" class="give-start-date-label"><?php _e('Start Date:', 'give'); ?></label>
 				<input type="text" id="start-date" name="start-date" class="give_datepicker" value="<?php echo $start_date; ?>" placeholder="mm/dd/yyyy" />
-				<label for="end-date" class="give-end-date-label"><?php _e( 'End Date:', 'give' ); ?></label>
+				<label for="end-date" class="give-end-date-label"><?php _e('End Date:', 'give'); ?></label>
 				<input type="text" id="end-date" name="end-date" class="give_datepicker" value="<?php echo $end_date; ?>" placeholder="mm/dd/yyyy" />
-				<input type="submit" class="button-secondary" value="<?php _e( 'Apply', 'give' ); ?>" />
+				<input type="submit" class="button-secondary" value="<?php _e('Apply', 'give'); ?>" />
 			</span>
-			<?php if ( ! empty( $status ) ) : ?>
-				<input type="hidden" name="status" value="<?php echo esc_attr( $status ); ?>" />
+			<?php if ( ! empty($status)) : ?>
+				<input type="hidden" name="status" value="<?php echo esc_attr($status); ?>" />
 			<?php endif; ?>
-			<?php if ( ! empty( $start_date ) || ! empty( $end_date ) ) : ?>
-				<a href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history' ); ?>" class="button-secondary"><?php _e( 'Clear Filter', 'give' ); ?></a>
+			<?php if ( ! empty($start_date) || ! empty($end_date)) : ?>
+				<a href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history'); ?>" class="button-secondary"><?php _e('Clear Filter', 'give'); ?></a>
 			<?php endif; ?>
-			<?php $this->search_box( __( 'Search', 'give' ), 'give-payments' ); ?>
+			<?php $this->search_box(__('Search', 'give'), 'give-payments'); ?>
 		</div>
 
 		<?php
@@ -167,25 +167,25 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+	public function search_box($text, $input_id) {
+		if (empty($_REQUEST['s']) && ! $this->has_items()) {
 			return;
 		}
 
-		$input_id = $input_id . '-search-input';
+		$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">
-			<?php do_action( 'give_payment_history_search' ); ?>
+			<?php do_action('give_payment_history_search'); ?>
 			<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' ) ); ?><br />
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?><br />
 		</p>
 		<?php
 	}
@@ -199,52 +199,52 @@ 
 	 */
 	public function get_views() {
 
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count . ')</span>';
-		$complete_count  = '&nbsp;<span class="count">(' . $this->complete_count . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count . ')</span>';
-		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$refunded_count  = '&nbsp;<span class="count">(' . $this->refunded_count . ')</span>';
-		$failed_count    = '&nbsp;<span class="count">(' . $this->failed_count . ')</span>';
-		$abandoned_count = '&nbsp;<span class="count">(' . $this->abandoned_count . ')</span>';
-		$revoked_count   = '&nbsp;<span class="count">(' . $this->revoked_count . ')</span>';
+		$current         = isset($_GET['status']) ? $_GET['status'] : '';
+		$total_count     = '&nbsp;<span class="count">('.$this->total_count.')</span>';
+		$complete_count  = '&nbsp;<span class="count">('.$this->complete_count.')</span>';
+		$cancelled_count = '&nbsp;<span class="count">('.$this->cancelled_count.')</span>';
+		$pending_count   = '&nbsp;<span class="count">('.$this->pending_count.')</span>';
+		$refunded_count  = '&nbsp;<span class="count">('.$this->refunded_count.')</span>';
+		$failed_count    = '&nbsp;<span class="count">('.$this->failed_count.')</span>';
+		$abandoned_count = '&nbsp;<span class="count">('.$this->abandoned_count.')</span>';
+		$revoked_count   = '&nbsp;<span class="count">('.$this->revoked_count.')</span>';
 
 		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array(
+			'all'       => sprintf('<a href="%s"%s>%s</a>', remove_query_arg(array(
 				'status',
 				'paged'
-			) ), $current === 'all' || $current == '' ? ' class="current"' : '', __( 'All', 'give' ) . $total_count ),
-			'publish'   => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			)), $current === 'all' || $current == '' ? ' class="current"' : '', __('All', 'give').$total_count),
+			'publish'   => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'publish',
 				'paged'  => false
-			) ) ), $current === 'publish' ? ' class="current"' : '', __( 'Completed', 'give' ) . $complete_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'publish' ? ' class="current"' : '', __('Completed', 'give').$complete_count),
+			'pending'   => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'pending',
 				'paged'  => false
-			) ) ), $current === 'pending' ? ' class="current"' : '', __( 'Pending', 'give' ) . $pending_count ),
-			'refunded'  => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'pending' ? ' class="current"' : '', __('Pending', 'give').$pending_count),
+			'refunded'  => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'refunded',
 				'paged'  => false
-			) ) ), $current === 'refunded' ? ' class="current"' : '', __( 'Refunded', 'give' ) . $refunded_count ),
-			'revoked'   => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'refunded' ? ' class="current"' : '', __('Refunded', 'give').$refunded_count),
+			'revoked'   => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'revoked',
 				'paged'  => false
-			) ) ), $current === 'revoked' ? ' class="current"' : '', __( 'Revoked', 'give' ) . $revoked_count ),
-			'failed'    => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'revoked' ? ' class="current"' : '', __('Revoked', 'give').$revoked_count),
+			'failed'    => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'failed',
 				'paged'  => false
-			) ) ), $current === 'failed' ? ' class="current"' : '', __( 'Failed', 'give' ) . $failed_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'failed' ? ' class="current"' : '', __('Failed', 'give').$failed_count),
+			'cancelled' => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'cancelled',
 				'paged'  => false
-			) ) ), $current === 'cancelled' ? ' class="current"' : '', __( 'Cancelled', 'give' ) . $cancelled_count ),
-			'abandoned' => sprintf( '<a href="%s"%s>%s</a>', esc_url( add_query_arg( array(
+			))), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled', 'give').$cancelled_count),
+			'abandoned' => sprintf('<a href="%s"%s>%s</a>', esc_url(add_query_arg(array(
 				'status' => 'abandoned',
 				'paged'  => false
-			) ) ), $current === 'abandoned' ? ' class="current"' : '', __( 'Abandoned', 'give' ) . $abandoned_count )
+			))), $current === 'abandoned' ? ' class="current"' : '', __('Abandoned', 'give').$abandoned_count)
 		);
 
-		return apply_filters( 'give_payments_table_views', $views );
+		return apply_filters('give_payments_table_views', $views);
 	}
 
 	/**
@@ -257,16 +257,16 @@ 
 	public function get_columns() {
 		$columns = array(
 			'cb'      => '<input type="checkbox" />', //Render a checkbox instead of text
-			'email'   => __( 'Email', 'give' ),
-			'details' => __( 'Details', 'give' ),
-			'amount'  => __( 'Amount', 'give' ),
-			'status'  => __( 'Status', 'give' ),
-			'date'    => __( 'Date', 'give' ),
-			'donor'   => __( 'Donor', 'give' ),
-			'ID'      => __( 'ID', 'give' ),
+			'email'   => __('Email', 'give'),
+			'details' => __('Details', 'give'),
+			'amount'  => __('Amount', 'give'),
+			'status'  => __('Status', 'give'),
+			'date'    => __('Date', 'give'),
+			'donor'   => __('Donor', 'give'),
+			'ID'      => __('ID', 'give'),
 		);
 
-		return apply_filters( 'give_payments_table_columns', $columns );
+		return apply_filters('give_payments_table_columns', $columns);
 	}
 
 	/**
@@ -278,12 +278,12 @@ 
 	 */
 	public function get_sortable_columns() {
 		$columns = array(
-			'ID'     => array( 'ID', true ),
-			'amount' => array( 'amount', false ),
-			'date'   => array( 'date', false )
+			'ID'     => array('ID', true),
+			'amount' => array('amount', false),
+			'date'   => array('date', false)
 		);
 
-		return apply_filters( 'give_payments_table_sortable_columns', $columns );
+		return apply_filters('give_payments_table_sortable_columns', $columns);
 	}
 
 	/**
@@ -297,30 +297,30 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $payment, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($payment, $column_name) {
+		switch ($column_name) {
 			case 'amount' :
-				$amount = ! empty( $payment->total ) ? $payment->total : 0;
-				$value  = give_currency_filter( give_format_amount( $amount ), give_get_payment_currency_code( $payment->ID ) );
+				$amount = ! empty($payment->total) ? $payment->total : 0;
+				$value  = give_currency_filter(give_format_amount($amount), give_get_payment_currency_code($payment->ID));
 				break;
 			case 'date' :
-				$date  = strtotime( $payment->date );
-				$value = date_i18n( get_option( 'date_format' ), $date );
+				$date  = strtotime($payment->date);
+				$value = date_i18n(get_option('date_format'), $date);
 				break;
 			case 'status' :
-				$payment = get_post( $payment->ID );
-				$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>';
+				$payment = get_post($payment->ID);
+				$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>';
 				break;
 			case 'details' :
-				$value = '<div class="give-payment-details-link-wrap"><a href="' . esc_url( add_query_arg( 'id', $payment->ID, admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details' ) ) ) . '" class="give-payment-details-link button button-small">' . __( 'View Donation Details', 'give' ) . '</a></div>';
+				$value = '<div class="give-payment-details-link-wrap"><a href="'.esc_url(add_query_arg('id', $payment->ID, admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details'))).'" class="give-payment-details-link button button-small">'.__('View Donation Details', 'give').'</a></div>';
 				break;
 			default:
-				$value = isset( $payment->$column_name ) ? $payment->$column_name : '';
+				$value = isset($payment->$column_name) ? $payment->$column_name : '';
 				break;
 
 		}
 
-		return apply_filters( 'give_payments_table_column', $value, $payment->ID, $column_name );
+		return apply_filters('give_payments_table_column', $value, $payment->ID, $column_name);
 	}
 
 	/**
@@ -333,32 +333,32 @@ 
 	 *
 	 * @return string Data shown in the Email column
 	 */
-	public function column_email( $payment ) {
+	public function column_email($payment) {
 
 		$row_actions = array();
 
-		if ( give_is_payment_complete( $payment->ID ) ) {
-			$row_actions['email_links'] = '<a href="' . add_query_arg( array(
+		if (give_is_payment_complete($payment->ID)) {
+			$row_actions['email_links'] = '<a href="'.add_query_arg(array(
 					'give-action' => 'email_links',
 					'purchase_id' => $payment->ID
-				), $this->base_url ) . '">' . __( 'Resend Donation Receipt', 'give' ) . '</a>';
+				), $this->base_url).'">'.__('Resend Donation Receipt', 'give').'</a>';
 
 		}
 
-		$row_actions['delete'] = '<a href="' . wp_nonce_url( add_query_arg( array(
+		$row_actions['delete'] = '<a href="'.wp_nonce_url(add_query_arg(array(
 				'give-action' => 'delete_payment',
 				'purchase_id' => $payment->ID
-			), $this->base_url ), 'give_payment_nonce' ) . '">' . __( 'Delete', 'give' ) . '</a>';
+			), $this->base_url), 'give_payment_nonce').'">'.__('Delete', 'give').'</a>';
 
-		$row_actions = apply_filters( 'give_payment_row_actions', $row_actions, $payment );
+		$row_actions = apply_filters('give_payment_row_actions', $row_actions, $payment);
 
-		if ( ! isset( $payment->user_info['email'] ) ) {
-			$payment->user_info['email'] = __( '(unknown)', 'give' );
+		if ( ! isset($payment->user_info['email'])) {
+			$payment->user_info['email'] = __('(unknown)', 'give');
 		}
 
-		$value = '<span class="give-email-column-value">' . $payment->user_info['email'] . '</span>' . $this->row_actions( $row_actions );
+		$value = '<span class="give-email-column-value">'.$payment->user_info['email'].'</span>'.$this->row_actions($row_actions);
 
-		return apply_filters( 'give_payments_table_column', $value, $payment->ID, 'email' );
+		return apply_filters('give_payments_table_column', $value, $payment->ID, 'email');
 	}
 
 	/**
@@ -371,7 +371,7 @@ 
 	 *
 	 * @return string Displays a checkbox
 	 */
-	public function column_cb( $payment ) {
+	public function column_cb($payment) {
 		return sprintf(
 			'<input type="checkbox" name="%1$s[]" value="%2$s" />',
 			'payment',
@@ -389,8 +389,8 @@ 
 	 *
 	 * @return string Displays a checkbox
 	 */
-	public function column_ID( $payment ) {
-		return '<span class="give-payment-id">' . give_get_payment_number( $payment->ID ) . '</span>';
+	public function column_ID($payment) {
+		return '<span class="give-payment-id">'.give_get_payment_number($payment->ID).'</span>';
 	}
 
 	/**
@@ -403,18 +403,18 @@ 
 	 *
 	 * @return string Data shown in the User column
 	 */
-	public function column_donor( $payment ) {
+	public function column_donor($payment) {
 
 		//		$user_id = give_get_payment_user_id( $payment->ID );
 
-		$customer_id = give_get_payment_customer_id( $payment->ID );
-		$customer    = new Give_Customer( $customer_id );
+		$customer_id = give_get_payment_customer_id($payment->ID);
+		$customer    = new Give_Customer($customer_id);
 
-		$view_url = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer_id );
+		$view_url = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer_id);
 
-		$value = '<a href="' . esc_url( $view_url ) . '" data-tooltip="' . __( 'Click here to view this Donor\'s profile', 'give' ) . '">' . $customer->name . '</a>';
+		$value = '<a href="'.esc_url($view_url).'" data-tooltip="'.__('Click here to view this Donor\'s profile', 'give').'">'.$customer->name.'</a>';
 
-		return apply_filters( 'give_payments_table_column', $value, $payment->ID, 'donor' );
+		return apply_filters('give_payments_table_column', $value, $payment->ID, 'donor');
 	}
 
 	/**
@@ -426,18 +426,18 @@ 
 	 */
 	public function get_bulk_actions() {
 		$actions = array(
-			'delete'               => __( 'Delete', 'give' ),
-			'set-status-publish'   => __( 'Set To Completed', 'give' ),
-			'set-status-pending'   => __( 'Set To Pending', 'give' ),
-			'set-status-refunded'  => __( 'Set To Refunded', 'give' ),
-			'set-status-revoked'   => __( 'Set To Revoked', 'give' ),
-			'set-status-failed'    => __( 'Set To Failed', 'give' ),
-			'set-status-cancelled' => __( 'Set To Cancelled', 'give' ),
-			'set-status-abandoned' => __( 'Set To Abandoned', 'give' ),
-			'resend-receipt'       => __( 'Resend Email Receipts', 'give' )
+			'delete'               => __('Delete', 'give'),
+			'set-status-publish'   => __('Set To Completed', 'give'),
+			'set-status-pending'   => __('Set To Pending', 'give'),
+			'set-status-refunded'  => __('Set To Refunded', 'give'),
+			'set-status-revoked'   => __('Set To Revoked', 'give'),
+			'set-status-failed'    => __('Set To Failed', 'give'),
+			'set-status-cancelled' => __('Set To Cancelled', 'give'),
+			'set-status-abandoned' => __('Set To Abandoned', 'give'),
+			'resend-receipt'       => __('Resend Email Receipts', 'give')
 		);
 
-		return apply_filters( 'give_payments_table_bulk_actions', $actions );
+		return apply_filters('give_payments_table_bulk_actions', $actions);
 	}
 
 	/**
@@ -448,57 +448,57 @@ 
 	 * @return void
 	 */
 	public function process_bulk_action() {
-		$ids    = isset( $_GET['payment'] ) ? $_GET['payment'] : false;
+		$ids    = isset($_GET['payment']) ? $_GET['payment'] : false;
 		$action = $this->current_action();
 
-		if ( ! is_array( $ids ) ) {
-			$ids = array( $ids );
+		if ( ! is_array($ids)) {
+			$ids = array($ids);
 		}
 
-		if ( empty( $action ) ) {
+		if (empty($action)) {
 			return;
 		}
 
-		foreach ( $ids as $id ) {
+		foreach ($ids as $id) {
 
 			// Detect when a bulk action is being triggered...
-			if ( 'delete' === $this->current_action() ) {
-				give_delete_purchase( $id );
+			if ('delete' === $this->current_action()) {
+				give_delete_purchase($id);
 			}
 
-			if ( 'set-status-publish' === $this->current_action() ) {
-				give_update_payment_status( $id, 'publish' );
+			if ('set-status-publish' === $this->current_action()) {
+				give_update_payment_status($id, 'publish');
 			}
 
-			if ( 'set-status-pending' === $this->current_action() ) {
-				give_update_payment_status( $id, 'pending' );
+			if ('set-status-pending' === $this->current_action()) {
+				give_update_payment_status($id, 'pending');
 			}
 
-			if ( 'set-status-refunded' === $this->current_action() ) {
-				give_update_payment_status( $id, 'refunded' );
+			if ('set-status-refunded' === $this->current_action()) {
+				give_update_payment_status($id, 'refunded');
 			}
 
-			if ( 'set-status-revoked' === $this->current_action() ) {
-				give_update_payment_status( $id, 'revoked' );
+			if ('set-status-revoked' === $this->current_action()) {
+				give_update_payment_status($id, 'revoked');
 			}
 
-			if ( 'set-status-failed' === $this->current_action() ) {
-				give_update_payment_status( $id, 'failed' );
+			if ('set-status-failed' === $this->current_action()) {
+				give_update_payment_status($id, 'failed');
 			}
 
-			if ( 'set-status-cancelled' === $this->current_action() ) {
-				give_update_payment_status( $id, 'cancelled' );
+			if ('set-status-cancelled' === $this->current_action()) {
+				give_update_payment_status($id, 'cancelled');
 			}
 
-			if ( 'set-status-abandoned' === $this->current_action() ) {
-				give_update_payment_status( $id, 'abandoned' );
+			if ('set-status-abandoned' === $this->current_action()) {
+				give_update_payment_status($id, 'abandoned');
 			}
 
-			if ( 'resend-receipt' === $this->current_action() ) {
-				give_email_donation_receipt( $id, false );
+			if ('resend-receipt' === $this->current_action()) {
+				give_email_donation_receipt($id, false);
 			}
 
-			do_action( 'give_payments_table_do_bulk_action', $id, $this->current_action() );
+			do_action('give_payments_table_do_bulk_action', $id, $this->current_action());
 		}
 
 	}
@@ -516,21 +516,21 @@ 
 
 		$args = array();
 
-		if ( isset( $_GET['user'] ) ) {
-			$args['user'] = urldecode( $_GET['user'] );
-		} elseif ( isset( $_GET['s'] ) ) {
-			$args['s'] = urldecode( $_GET['s'] );
+		if (isset($_GET['user'])) {
+			$args['user'] = urldecode($_GET['user']);
+		} elseif (isset($_GET['s'])) {
+			$args['s'] = urldecode($_GET['s']);
 		}
 
-		if ( ! empty( $_GET['start-date'] ) ) {
-			$args['start-date'] = urldecode( $_GET['start-date'] );
+		if ( ! empty($_GET['start-date'])) {
+			$args['start-date'] = urldecode($_GET['start-date']);
 		}
 
-		if ( ! empty( $_GET['end-date'] ) ) {
-			$args['end-date'] = urldecode( $_GET['end-date'] );
+		if ( ! empty($_GET['end-date'])) {
+			$args['end-date'] = urldecode($_GET['end-date']);
 		}
 
-		$payment_count         = give_count_payments( $args );
+		$payment_count         = give_count_payments($args);
 		$this->complete_count  = $payment_count->publish;
 		$this->pending_count   = $payment_count->pending;
 		$this->refunded_count  = $payment_count->refunded;
@@ -539,7 +539,7 @@ 
 		$this->cancelled_count = $payment_count->cancelled;
 		$this->abandoned_count = $payment_count->abandoned;
 
-		foreach ( $payment_count as $count ) {
+		foreach ($payment_count as $count) {
 			$this->total_count += $count;
 		}
 	}
@@ -554,26 +554,26 @@ 
 	public function payments_data() {
 
 		$per_page   = $this->per_page;
-		$orderby    = isset( $_GET['orderby'] ) ? urldecode( $_GET['orderby'] ) : 'ID';
-		$order      = isset( $_GET['order'] ) ? $_GET['order'] : 'DESC';
-		$user       = isset( $_GET['user'] ) ? $_GET['user'] : null;
-		$status     = isset( $_GET['status'] ) ? $_GET['status'] : give_get_payment_status_keys();
-		$meta_key   = isset( $_GET['meta_key'] ) ? $_GET['meta_key'] : null;
-		$year       = isset( $_GET['year'] ) ? $_GET['year'] : null;
-		$month      = isset( $_GET['m'] ) ? $_GET['m'] : null;
-		$day        = isset( $_GET['day'] ) ? $_GET['day'] : null;
-		$search     = isset( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : null;
-		$start_date = isset( $_GET['start-date'] ) ? sanitize_text_field( $_GET['start-date'] ) : null;
-		$end_date   = isset( $_GET['end-date'] ) ? sanitize_text_field( $_GET['end-date'] ) : $start_date;
-
-		if ( ! empty( $search ) ) {
+		$orderby    = isset($_GET['orderby']) ? urldecode($_GET['orderby']) : 'ID';
+		$order      = isset($_GET['order']) ? $_GET['order'] : 'DESC';
+		$user       = isset($_GET['user']) ? $_GET['user'] : null;
+		$status     = isset($_GET['status']) ? $_GET['status'] : give_get_payment_status_keys();
+		$meta_key   = isset($_GET['meta_key']) ? $_GET['meta_key'] : null;
+		$year       = isset($_GET['year']) ? $_GET['year'] : null;
+		$month      = isset($_GET['m']) ? $_GET['m'] : null;
+		$day        = isset($_GET['day']) ? $_GET['day'] : null;
+		$search     = isset($_GET['s']) ? sanitize_text_field($_GET['s']) : null;
+		$start_date = isset($_GET['start-date']) ? sanitize_text_field($_GET['start-date']) : null;
+		$end_date   = isset($_GET['end-date']) ? sanitize_text_field($_GET['end-date']) : $start_date;
+
+		if ( ! empty($search)) {
 			$status = 'any'; // Force all payment statuses when searching
 		}
 
 		$args = array(
 			'output'     => 'payments',
 			'number'     => $per_page,
-			'page'       => isset( $_GET['paged'] ) ? $_GET['paged'] : null,
+			'page'       => isset($_GET['paged']) ? $_GET['paged'] : null,
 			'orderby'    => $orderby,
 			'order'      => $order,
 			'user'       => $user,
@@ -587,14 +587,14 @@ 
 			'end_date'   => $end_date,
 		);
 
-		if ( is_string( $search ) && false !== strpos( $search, 'txn:' ) ) {
+		if (is_string($search) && false !== strpos($search, 'txn:')) {
 
 			$args['search_in_notes'] = true;
-			$args['s']               = trim( str_replace( 'txn:', '', $args['s'] ) );
+			$args['s']               = trim(str_replace('txn:', '', $args['s']));
 
 		}
 
-		$p_query = new Give_Payments_Query( $args );
+		$p_query = new Give_Payments_Query($args);
 
 		return $p_query->get_payments();
 
@@ -614,17 +614,17 @@ 
 	 */
 	public function prepare_items() {
 
-		wp_reset_vars( array( 'action', 'payment', 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('action', 'payment', 'orderby', 'order', 's'));
 
 		$columns  = $this->get_columns();
 		$hidden   = array(); // No hidden columns
 		$sortable = $this->get_sortable_columns();
 		$data     = $this->payments_data();
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+		$status   = isset($_GET['status']) ? $_GET['status'] : 'any';
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'publish':
 				$total_items = $this->complete_count;
 				break;
@@ -651,18 +651,18 @@ 
 				break;
 			default:
 				// Retrieve the count of the non-default-Give status
-				$count       = wp_count_posts( 'give_payment' );
+				$count       = wp_count_posts('give_payment');
 				$total_items = $count->{$status};
 		}
 
 		$this->items = $data;
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				// WE have to calculate the total number of items
 				'per_page'    => $this->per_page,
 				// WE have to determine how many items to show on a page
-				'total_pages' => ceil( $total_items / $this->per_page )
+				'total_pages' => ceil($total_items / $this->per_page)
 				// WE have to calculate the total number of pages
 			)
 		);

includes/admin/register-settings.php

Doc Comments +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 	 *

 	 * @param $url

 	 *

-	 * @return mixed

+	 * @return string

 	 */

 	public function give_update_cmb_meta_box_url( $url ) {

 		//Path to Give's CMB

Spacing +286 added lines, -286 removed lines

@@ -43,24 +43,24 @@ 
 	 */

 	public function __construct() {

 

-		add_action( 'admin_init', array( $this, 'init' ) );

+		add_action('admin_init', array($this, 'init'));

 

 		//Customize CMB2 URL

-		add_filter( 'cmb2_meta_box_url', array( $this, 'give_update_cmb_meta_box_url' ) );

+		add_filter('cmb2_meta_box_url', array($this, 'give_update_cmb_meta_box_url'));

 

 		//Custom CMB2 Settings Fields

-		add_action( 'cmb2_render_give_title', 'give_title_callback', 10, 5 );

-		add_action( 'cmb2_render_give_description', 'give_description_callback', 10, 5 );

-		add_action( 'cmb2_render_enabled_gateways', 'give_enabled_gateways_callback', 10, 5 );

-		add_action( 'cmb2_render_default_gateway', 'give_default_gateway_callback', 10, 5 );

-		add_action( 'cmb2_render_email_preview_buttons', 'give_email_preview_buttons_callback', 10, 5 );

-		add_action( 'cmb2_render_system_info', 'give_system_info_callback', 10, 5 );

-		add_action( 'cmb2_render_api', 'give_api_callback', 10, 5 );

-		add_action( 'cmb2_render_license_key', 'give_license_key_callback', 10, 5 );

-		add_action( 'admin_notices', array( $this, 'settings_notices' ) );

+		add_action('cmb2_render_give_title', 'give_title_callback', 10, 5);

+		add_action('cmb2_render_give_description', 'give_description_callback', 10, 5);

+		add_action('cmb2_render_enabled_gateways', 'give_enabled_gateways_callback', 10, 5);

+		add_action('cmb2_render_default_gateway', 'give_default_gateway_callback', 10, 5);

+		add_action('cmb2_render_email_preview_buttons', 'give_email_preview_buttons_callback', 10, 5);

+		add_action('cmb2_render_system_info', 'give_system_info_callback', 10, 5);

+		add_action('cmb2_render_api', 'give_api_callback', 10, 5);

+		add_action('cmb2_render_license_key', 'give_license_key_callback', 10, 5);

+		add_action('admin_notices', array($this, 'settings_notices'));

 

 		// Include CMB CSS in the head to avoid FOUC

-		add_action( "admin_print_styles-give_forms_page_give-settings", array( 'CMB2_hookup', 'enqueue_cmb_css' ) );

+		add_action("admin_print_styles-give_forms_page_give-settings", array('CMB2_hookup', 'enqueue_cmb_css'));

 

 	}

 

@@ -69,7 +69,7 @@ 
 	 * @since  1.0

 	 */

 	public function init() {

-		register_setting( $this->key, $this->key );

+		register_setting($this->key, $this->key);

 

 	}

 

@@ -83,9 +83,9 @@ 
 	 *

 	 * @return mixed

 	 */

-	public function give_update_cmb_meta_box_url( $url ) {

+	public function give_update_cmb_meta_box_url($url) {

 		//Path to Give's CMB

-		return GIVE_PLUGIN_URL . '/includes/libraries/cmb2';

+		return GIVE_PLUGIN_URL.'/includes/libraries/cmb2';

 	}

 

 

@@ -97,27 +97,27 @@ 
 	 */

 	public function give_get_settings_tabs() {

 

-		$settings = $this->give_settings( null );

+		$settings = $this->give_settings(null);

 

 		$tabs             = array();

-		$tabs['general']  = __( 'General', 'give' );

-		$tabs['gateways'] = __( 'Payment Gateways', 'give' );

-		$tabs['display']  = __( 'Display Options', 'give' );

-		$tabs['emails']   = __( 'Emails', 'give' );

+		$tabs['general']  = __('General', 'give');

+		$tabs['gateways'] = __('Payment Gateways', 'give');

+		$tabs['display']  = __('Display Options', 'give');

+		$tabs['emails']   = __('Emails', 'give');

 

-		if ( ! empty( $settings['addons']['fields'] ) ) {

-			$tabs['addons'] = __( 'Add-ons', 'give' );

+		if ( ! empty($settings['addons']['fields'])) {

+			$tabs['addons'] = __('Add-ons', 'give');

 		}

 

-		if ( ! empty( $settings['licenses']['fields'] ) ) {

-			$tabs['licenses'] = __( 'Licenses', 'give' );

+		if ( ! empty($settings['licenses']['fields'])) {

+			$tabs['licenses'] = __('Licenses', 'give');

 		}

 

-		$tabs['advanced']    = __( 'Advanced', 'give' );

-		$tabs['api']         = __( 'API', 'give' );

-		$tabs['system_info'] = __( 'System Info', 'give' );

+		$tabs['advanced']    = __('Advanced', 'give');

+		$tabs['api']         = __('API', 'give');

+		$tabs['system_info'] = __('System Info', 'give');

 

-		return apply_filters( 'give_settings_tabs', $tabs );

+		return apply_filters('give_settings_tabs', $tabs);

 	}

 

 

@@ -127,31 +127,31 @@ 
 	 */

 	public function admin_page_display() {

 

-		$active_tab = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $this->give_get_settings_tabs() ) ? $_GET['tab'] : 'general';

+		$active_tab = isset($_GET['tab']) && array_key_exists($_GET['tab'], $this->give_get_settings_tabs()) ? $_GET['tab'] : 'general';

 

 		?>

 

 		<div class="wrap give_settings_page cmb2_options_page <?php echo $this->key; ?>">

 			<h1 class="nav-tab-wrapper">

 				<?php

-				foreach ( $this->give_get_settings_tabs() as $tab_id => $tab_name ) {

+				foreach ($this->give_get_settings_tabs() as $tab_id => $tab_name) {

 

-					$tab_url = esc_url( add_query_arg( array(

+					$tab_url = esc_url(add_query_arg(array(

 						'settings-updated' => false,

 						'tab'              => $tab_id

-					) ) );

+					)));

 

 					$active = $active_tab == $tab_id ? ' nav-tab-active' : '';

 

-					echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';

-					echo esc_html( $tab_name );

+					echo '<a href="'.esc_url($tab_url).'" title="'.esc_attr($tab_name).'" class="nav-tab'.$active.'">';

+					echo esc_html($tab_name);

 

 					echo '</a>';

 				}

 				?>

 			</h1>

 

-			<?php cmb2_metabox_form( $this->give_settings( $active_tab ), $this->key ); ?>

+			<?php cmb2_metabox_form($this->give_settings($active_tab), $this->key); ?>

 

 		</div><!-- .wrap -->

 

@@ -167,7 +167,7 @@ 
 	 *

 	 * @return array

 	 */

-	public function give_settings( $active_tab ) {

+	public function give_settings($active_tab) {

 

 		$give_settings = array(

 			/**

@@ -175,60 +175,60 @@ 
 			 */

 			'general'     => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'General Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_general', array(

+				'give_title' => __('General Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_general', array(

 						array(

-							'name' => __( 'General Settings', 'give' ),

+							'name' => __('General Settings', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_1'

 						),

 						array(

-							'name'    => __( 'Success Page', 'give' ),

-							'desc'    => sprintf( __( 'This is the page donors are sent to after completing their donations. The %1$s[give_receipt]%2$s shortcode should be on this page.', 'give' ), '<code>', '</code>' ),

+							'name'    => __('Success Page', 'give'),

+							'desc'    => sprintf(__('This is the page donors are sent to after completing their donations. The %1$s[give_receipt]%2$s shortcode should be on this page.', 'give'), '<code>', '</code>'),

 							'id'      => 'success_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Failed Transaction Page', 'give' ),

-							'desc'    => __( 'This is the page donors are sent to if their transaction is cancelled or fails.', 'give' ),

+							'name'    => __('Failed Transaction Page', 'give'),

+							'desc'    => __('This is the page donors are sent to if their transaction is cancelled or fails.', 'give'),

 							'id'      => 'failure_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Donation History Page', 'give' ),

-							'desc'    => __( 'This page shows a complete donation history for the current user. The <code>[donation_history]</code> shortcode should be on this page.', 'give' ),

+							'name'    => __('Donation History Page', 'give'),

+							'desc'    => __('This page shows a complete donation history for the current user. The <code>[donation_history]</code> shortcode should be on this page.', 'give'),

 							'id'      => 'history_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Base Country', 'give' ),

-							'desc'    => __( 'Where does your site operate from?', 'give' ),

+							'name'    => __('Base Country', 'give'),

+							'desc'    => __('Where does your site operate from?', 'give'),

 							'id'      => 'base_country',

 							'type'    => 'select',

 							'options' => give_get_country_list(),

 						),

 						array(

-							'name' => __( 'Currency Settings', 'give' ),

+							'name' => __('Currency Settings', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_2'

 						),

 						array(

-							'name'    => __( 'Currency', 'give' ),

+							'name'    => __('Currency', 'give'),

 							'desc'    => 'Choose your currency. Note that some payment gateways have currency restrictions.',

 							'id'      => 'currency',

 							'type'    => 'select',

@@ -236,26 +236,26 @@ 
 							'default' => 'USD',

 						),

 						array(

-							'name'    => __( 'Currency Position', 'give' ),

+							'name'    => __('Currency Position', 'give'),

 							'desc'    => 'Choose the position of the currency sign.',

 							'id'      => 'currency_position',

 							'type'    => 'select',

 							'options' => array(

-								'before' => __( 'Before - $10', 'give' ),

-								'after'  => __( 'After - 10$', 'give' )

+								'before' => __('Before - $10', 'give'),

+								'after'  => __('After - 10$', 'give')

 							),

 							'default' => 'before',

 						),

 						array(

-							'name'    => __( 'Thousands Separator', 'give' ),

-							'desc'    => __( 'The symbol (typically , or .) to separate thousands', 'give' ),

+							'name'    => __('Thousands Separator', 'give'),

+							'desc'    => __('The symbol (typically , or .) to separate thousands', 'give'),

 							'id'      => 'thousands_separator',

 							'type'    => 'text_small',

 							'default' => ',',

 						),

 						array(

-							'name'    => __( 'Decimal Separator', 'give' ),

-							'desc'    => __( 'The symbol (usually , or .) to separate decimal points', 'give' ),

+							'name'    => __('Decimal Separator', 'give'),

+							'desc'    => __('The symbol (usually , or .) to separate decimal points', 'give'),

 							'id'      => 'decimal_separator',

 							'type'    => 'text_small',

 							'default' => '.',

@@ -268,83 +268,83 @@ 
 			 */

 			'gateways'    => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Payment Gateways', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_gateways', array(

+				'give_title' => __('Payment Gateways', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_gateways', array(

 						array(

-							'name' => __( 'Gateways Settings', 'give' ),

+							'name' => __('Gateways Settings', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_gateway_settings_1',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Test Mode', 'give' ),

-							'desc' => __( 'While in test mode no live transactions are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give' ),

+							'name' => __('Test Mode', 'give'),

+							'desc' => __('While in test mode no live transactions are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give'),

 							'id'   => 'test_mode',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enabled Gateways', 'give' ),

-							'desc' => __( 'Choose the payment gateways you would like enabled.', 'give' ),

+							'name' => __('Enabled Gateways', 'give'),

+							'desc' => __('Choose the payment gateways you would like enabled.', 'give'),

 							'id'   => 'gateways',

 							'type' => 'enabled_gateways'

 						),

 						array(

-							'name' => __( 'Default Gateway', 'give' ),

-							'desc' => __( 'This is the gateway that will be selected by default.', 'give' ),

+							'name' => __('Default Gateway', 'give'),

+							'desc' => __('This is the gateway that will be selected by default.', 'give'),

 							'id'   => 'default_gateway',

 							'type' => 'default_gateway'

 						),

 						array(

-							'name' => __( 'PayPal Standard', 'give' ),

+							'name' => __('PayPal Standard', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_2',

 						),

 						array(

-							'name' => __( 'PayPal Email', 'give' ),

-							'desc' => __( 'Enter your PayPal account\'s email', 'give' ),

+							'name' => __('PayPal Email', 'give'),

+							'desc' => __('Enter your PayPal account\'s email', 'give'),

 							'id'   => 'paypal_email',

 							'type' => 'text_email',

 						),

 						array(

-							'name' => __( 'PayPal Page Style', 'give' ),

-							'desc' => __( 'Enter the name of the page style to use, or leave blank to use the default', 'give' ),

+							'name' => __('PayPal Page Style', 'give'),

+							'desc' => __('Enter the name of the page style to use, or leave blank to use the default', 'give'),

 							'id'   => 'paypal_page_style',

 							'type' => 'text',

 						),

 						array(

-							'name'    => __( 'PayPal Transaction Type', 'give' ),

-							'desc'    => __( 'Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give' ),

+							'name'    => __('PayPal Transaction Type', 'give'),

+							'desc'    => __('Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give'),

 							'id'      => 'paypal_button_type',

 							'type'    => 'radio_inline',

 							'options' => array(

-								'donation' => __( 'Donation', 'give' ),

-								'standard' => __( 'Standard Transaction', 'give' )

+								'donation' => __('Donation', 'give'),

+								'standard' => __('Standard Transaction', 'give')

 							),

 							'default' => 'donation',

 						),

 						array(

-							'name' => __( 'Disable PayPal IPN Verification', 'give' ),

-							'desc' => __( 'If donations are not getting marked as complete, then check this box. This forces the site to use a slightly less secure method of verifying donations.', 'give' ),

+							'name' => __('Disable PayPal IPN Verification', 'give'),

+							'desc' => __('If donations are not getting marked as complete, then check this box. This forces the site to use a slightly less secure method of verifying donations.', 'give'),

 							'id'   => 'disable_paypal_verification',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Offline Donations', 'give' ),

+							'name' => __('Offline Donations', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_3',

 						),

 						array(

-							'name' => __( 'Collect Billing Details', 'give' ),

-							'desc' => __( 'This option will enable the billing details section for offline donations. The fieldset will appear above the offline donation instructions. Note: You may customize this option per form as needed.', 'give' ),

+							'name' => __('Collect Billing Details', 'give'),

+							'desc' => __('This option will enable the billing details section for offline donations. The fieldset will appear above the offline donation instructions. Note: You may customize this option per form as needed.', 'give'),

 							'id'   => 'give_offline_donation_enable_billing_fields',

 							'type' => 'checkbox'

 						),

 						array(

-							'name'    => __( 'Offline Donation Instructions', 'give' ),

-							'desc'    => __( 'The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give' ),

+							'name'    => __('Offline Donation Instructions', 'give'),

+							'desc'    => __('The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give'),

 							'id'      => 'global_offline_donation_content',

 							'default' => give_get_default_offline_donation_content(),

 							'type'    => 'wysiwyg',

@@ -353,15 +353,15 @@ 
 							)

 						),

 						array(

-							'name'    => __( 'Offline Donation Email Instructions Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation receipt email.', 'give' ),

+							'name'    => __('Offline Donation Email Instructions Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation receipt email.', 'give'),

 							'id'      => 'offline_donation_subject',

-							'default' => __( '{donation} - Offline Donation Instructions', 'give' ),

+							'default' => __('{donation} - Offline Donation Instructions', 'give'),

 							'type'    => 'text'

 						),

 						array(

-							'name'    => __( 'Offline Donation Email Instructions', 'give' ),

-							'desc'    => __( 'Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ),

+							'name'    => __('Offline Donation Email Instructions', 'give'),

+							'desc'    => __('Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give'),

 							'id'      => 'global_offline_donation_email',

 							'default' => give_get_default_offline_donation_email_content(),

 							'type'    => 'wysiwyg',

@@ -375,84 +375,84 @@ 
 			/** Display Settings */

 			'display'     => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Display Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_display', array(

+				'give_title' => __('Display Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_display', array(

 						array(

-							'name' => __( 'Display Settings', 'give' ),

+							'name' => __('Display Settings', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_display_settings_1',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable CSS', 'give' ),

-							'desc' => __( 'Enable this option if you would like to disable all of Give\'s included CSS stylesheets.', 'give' ),

+							'name' => __('Disable CSS', 'give'),

+							'desc' => __('Enable this option if you would like to disable all of Give\'s included CSS stylesheets.', 'give'),

 							'id'   => 'disable_css',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enable Floating Labels', 'give' ),

-							'desc' => sprintf( __( 'Enable this option if you would like to enable <a href="%s" target="_blank">floating labels</a> in Give\'s donation forms.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give' ), esc_url( "http://bradfrost.com/blog/post/float-label-pattern/" ) ),

+							'name' => __('Enable Floating Labels', 'give'),

+							'desc' => sprintf(__('Enable this option if you would like to enable <a href="%s" target="_blank">floating labels</a> in Give\'s donation forms.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give'), esc_url("http://bradfrost.com/blog/post/float-label-pattern/")),

 							'id'   => 'enable_floatlabels',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Welcome Screen', 'give' ),

-							'desc' => sprintf( __( 'Enable this option if you would like to disable the Give Welcome screen every time Give is activated and/or updated. You can always access the Welcome Screen <a href="%s">here</a> if you want in the future.', 'give' ), esc_url( admin_url( 'index.php?page=give-about' ) ) ),

+							'name' => __('Disable Welcome Screen', 'give'),

+							'desc' => sprintf(__('Enable this option if you would like to disable the Give Welcome screen every time Give is activated and/or updated. You can always access the Welcome Screen <a href="%s">here</a> if you want in the future.', 'give'), esc_url(admin_url('index.php?page=give-about'))),

 							'id'   => 'disable_welcome',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Post Types', 'give' ),

+							'name' => __('Post Types', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_display_settings_2',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable Form Single Views', 'give' ),

-							'desc' => __( 'By default, all forms have single views enabled which create a specific URL on your website for that form. This option disables the singular and archive views from being publicly viewable. Note: you will need to embed forms using a shortcode or widget if enabled.', 'give' ),

+							'name' => __('Disable Form Single Views', 'give'),

+							'desc' => __('By default, all forms have single views enabled which create a specific URL on your website for that form. This option disables the singular and archive views from being publicly viewable. Note: you will need to embed forms using a shortcode or widget if enabled.', 'give'),

 							'id'   => 'disable_forms_singular',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Archives', 'give' ),

-							'desc' => __( 'Archives pages list all the forms you have created. This option will disable only the form\'s archive page(s). The single form\'s view will remain in place. Note: you will need to refresh your permalinks after this option has been enabled.', 'give' ),

+							'name' => __('Disable Form Archives', 'give'),

+							'desc' => __('Archives pages list all the forms you have created. This option will disable only the form\'s archive page(s). The single form\'s view will remain in place. Note: you will need to refresh your permalinks after this option has been enabled.', 'give'),

 							'id'   => 'disable_forms_archives',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Excerpts', 'give' ),

-							'desc' => __( 'The excerpt is an optional summary or description of a donation form; in short, a summary as to why the user should give.', 'give' ),

+							'name' => __('Disable Form Excerpts', 'give'),

+							'desc' => __('The excerpt is an optional summary or description of a donation form; in short, a summary as to why the user should give.', 'give'),

 							'id'   => 'disable_forms_excerpt',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Featured Image', 'give' ),

-							'desc' => __( 'The Featured Image is an image that is chosen as the representative image for donation form. The display of this image is largely up to the theme. If you do not wish to use the featured image you can disable it using this option.', 'give' ),

+							'name' => __('Disable Form Featured Image', 'give'),

+							'desc' => __('The Featured Image is an image that is chosen as the representative image for donation form. The display of this image is largely up to the theme. If you do not wish to use the featured image you can disable it using this option.', 'give'),

 							'id'   => 'disable_form_featured_img',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Single Form Sidebar', 'give' ),

-							'desc' => __( 'The sidebar allows you to add additional widget to the Give single form view. If you don\'t plan on using the sidebar you may disable it with this option.', 'give' ),

+							'name' => __('Disable Single Form Sidebar', 'give'),

+							'desc' => __('The sidebar allows you to add additional widget to the Give single form view. If you don\'t plan on using the sidebar you may disable it with this option.', 'give'),

 							'id'   => 'disable_form_sidebar',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Taxonomies', 'give' ),

+							'name' => __('Taxonomies', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_display_settings_3',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Enable Form Categories', 'give' ),

-							'desc' => __( 'Check this option if you would like to categorize your donation forms. This option enables the form\'s category taxonomy.', 'give' ),

+							'name' => __('Enable Form Categories', 'give'),

+							'desc' => __('Check this option if you would like to categorize your donation forms. This option enables the form\'s category taxonomy.', 'give'),

 							'id'   => 'enable_categories',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enable Form Tags', 'give' ),

-							'desc' => __( 'Check this option if you would like to tag your donation forms. This option enables the form\'s tag taxonomy.', 'give' ),

+							'name' => __('Enable Form Tags', 'give'),

+							'desc' => __('Check this option if you would like to tag your donation forms. This option enables the form\'s tag taxonomy.', 'give'),

 							'id'   => 'enable_tags',

 							'type' => 'checkbox'

 						),

@@ -465,93 +465,93 @@ 
 			 */

 			'emails'      => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Give Email Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_emails', array(

+				'give_title' => __('Give Email Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_emails', array(

 						array(

-							'name' => __( 'Email Settings', 'give' ),

+							'name' => __('Email Settings', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_email_settings_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'email_template',

-							'name'    => __( 'Email Template', 'give' ),

-							'desc'    => __( 'Choose a template. Click "Save Changes" then "Preview Donation Receipt" to see the new template.', 'give' ),

+							'name'    => __('Email Template', 'give'),

+							'desc'    => __('Choose a template. Click "Save Changes" then "Preview Donation Receipt" to see the new template.', 'give'),

 							'type'    => 'select',

 							'options' => give_get_email_templates()

 						),

 						array(

 							'id'   => 'email_logo',

-							'name' => __( 'Logo', 'give' ),

-							'desc' => __( 'Upload or choose a logo to be displayed at the top of the donation receipt emails. Displayed on HTML emails only.', 'give' ),

+							'name' => __('Logo', 'give'),

+							'desc' => __('Upload or choose a logo to be displayed at the top of the donation receipt emails. Displayed on HTML emails only.', 'give'),

 							'type' => 'file'

 						),

 						array(

 							'id'      => 'from_name',

-							'name'    => __( 'From Name', 'give' ),

-							'desc'    => __( 'The name donation receipts are said to come from. This should probably be your site or shop name.', 'give' ),

-							'default' => get_bloginfo( 'name' ),

+							'name'    => __('From Name', 'give'),

+							'desc'    => __('The name donation receipts are said to come from. This should probably be your site or shop name.', 'give'),

+							'default' => get_bloginfo('name'),

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'from_email',

-							'name'    => __( 'From Email', 'give' ),

-							'desc'    => __( 'Email to send donation receipts from. This will act as the "from" and "reply-to" address.', 'give' ),

-							'default' => get_bloginfo( 'admin_email' ),

+							'name'    => __('From Email', 'give'),

+							'desc'    => __('Email to send donation receipts from. This will act as the "from" and "reply-to" address.', 'give'),

+							'default' => get_bloginfo('admin_email'),

 							'type'    => 'text'

 						),

 						array(

-							'name' => __( 'Donation Receipt', 'give' ),

+							'name' => __('Donation Receipt', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_email_settings_2',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_subject',

-							'name'    => __( 'Donation Email Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation receipt email', 'give' ),

-							'default' => __( 'Donation Receipt', 'give' ),

+							'name'    => __('Donation Email Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation receipt email', 'give'),

+							'default' => __('Donation Receipt', 'give'),

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'donation_receipt',

-							'name'    => __( 'Donation Receipt', 'give' ),

-							'desc'    => __( 'Enter the email that is sent to users after completing a successful donation. HTML is accepted. Available template tags:', 'give' ) . '<br/>' . give_get_emails_tags_list(),

+							'name'    => __('Donation Receipt', 'give'),

+							'desc'    => __('Enter the email that is sent to users after completing a successful donation. HTML is accepted. Available template tags:', 'give').'<br/>'.give_get_emails_tags_list(),

 							'type'    => 'wysiwyg',

-							'default' => __( "Dear", "give" ) . " {name},\n\n" . __( "Thank you for your donation. Your generosity is appreciated! Please click on the link below to view your receipt.", "give" ) . "\n\n{receipt_link}\n\nSincerely,\n{sitename}"

+							'default' => __("Dear", "give")." {name},\n\n".__("Thank you for your donation. Your generosity is appreciated! Please click on the link below to view your receipt.", "give")."\n\n{receipt_link}\n\nSincerely,\n{sitename}"

 						),

 						array(

-							'name' => __( 'New Donation Notification', 'give' ),

+							'name' => __('New Donation Notification', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_email_settings_3',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_notification_subject',

-							'name'    => __( 'Donation Notification Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation notification email', 'give' ),

+							'name'    => __('Donation Notification Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation notification email', 'give'),

 							'type'    => 'text',

-							'default' => __( 'New Donation - #{payment_id}', 'give' )

+							'default' => __('New Donation - #{payment_id}', 'give')

 						),

 						array(

 							'id'      => 'donation_notification',

-							'name'    => __( 'Donation Notification', 'give' ),

-							'desc'    => __( 'Enter the email that is sent to donation notification emails after completion of a donation. HTML is accepted. Available template tags:', 'give' ) . '<br/>' . give_get_emails_tags_list(),

+							'name'    => __('Donation Notification', 'give'),

+							'desc'    => __('Enter the email that is sent to donation notification emails after completion of a donation. HTML is accepted. Available template tags:', 'give').'<br/>'.give_get_emails_tags_list(),

 							'type'    => 'wysiwyg',

 							'default' => give_get_default_donation_notification_email()

 						),

 						array(

 							'id'      => 'admin_notice_emails',

-							'name'    => __( 'Donation Notification Emails', 'give' ),

-							'desc'    => sprintf( __( 'Enter the email address(es) that should receive a notification anytime a donation is made, please only enter %1$sone email address per line%2$s and not separated by commas.', 'give' ), '<span class="give-underline">', '</span>' ),

+							'name'    => __('Donation Notification Emails', 'give'),

+							'desc'    => sprintf(__('Enter the email address(es) that should receive a notification anytime a donation is made, please only enter %1$sone email address per line%2$s and not separated by commas.', 'give'), '<span class="give-underline">', '</span>'),

 							'type'    => 'textarea',

-							'default' => get_bloginfo( 'admin_email' )

+							'default' => get_bloginfo('admin_email')

 						),

 						array(

 							'id'   => 'disable_admin_notices',

-							'name' => __( 'Disable Admin Notifications', 'give' ),

-							'desc' => __( 'Check this box if you do not want to receive emails when new donations are made.', 'give' ),

+							'name' => __('Disable Admin Notifications', 'give'),

+							'desc' => __('Check this box if you do not want to receive emails when new donations are made.', 'give'),

 							'type' => 'checkbox'

 						)

 					)

@@ -560,76 +560,76 @@ 
 			/** Extension Settings */

 			'addons'      => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Give Add-ons Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_addons', array()

+				'give_title' => __('Give Add-ons Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_addons', array()

 				)

 			),

 			/** Licenses Settings */

 			'licenses'    => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Give Licenses', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_licenses', array()

+				'give_title' => __('Give Licenses', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_licenses', array()

 				)

 			),

 			/** Advanced Options */

 			'advanced'    => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Advanced Options', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_advanced', array(

+				'give_title' => __('Advanced Options', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_advanced', array(

 						array(

-							'name' => __( 'Session Control', 'give' ),

+							'name' => __('Session Control', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_session_control_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'session_lifetime',

-							'name'    => __( 'Session Lifetime', 'give' ),

-							'desc'    => __( 'Give will start a new session per user once they have donated. This option controls the lifetime a user\'s session is kept alive. An active session allows users to view donation receipts on your site without having to be logged in.', 'give' ),

+							'name'    => __('Session Lifetime', 'give'),

+							'desc'    => __('Give will start a new session per user once they have donated. This option controls the lifetime a user\'s session is kept alive. An active session allows users to view donation receipts on your site without having to be logged in.', 'give'),

 							'type'    => 'select',

 							'options' => array(

-								'86400'  => __( '24 Hours', 'give' ),

-								'172800' => __( '48 Hours', 'give' ),

-								'259200' => __( '72 Hours', 'give' ),

-								'604800' => __( '1 Week', 'give' ),

+								'86400'  => __('24 Hours', 'give'),

+								'172800' => __('48 Hours', 'give'),

+								'259200' => __('72 Hours', 'give'),

+								'604800' => __('1 Week', 'give'),

 							)

 						),

 						array(

-							'name' => __( 'Data Control', 'give' ),

+							'name' => __('Data Control', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_data_control_2',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Remove All Data on Uninstall?', 'give' ),

-							'desc' => __( 'Check this box if you would like Give to completely remove all of its data when the plugin is deleted.', 'give' ),

+							'name' => __('Remove All Data on Uninstall?', 'give'),

+							'desc' => __('Check this box if you would like Give to completely remove all of its data when the plugin is deleted.', 'give'),

 							'id'   => 'uninstall_on_delete',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Filter Control', 'give' ),

+							'name' => __('Filter Control', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_filter_control',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable <code>the_content</code> filter', 'give' ),

-							'desc' => sprintf( __( 'If you are seeing extra social buttons, related posts, or other unwanted elements appearing within your forms then you can disable WordPress\' content filter. <a href="%s" target="_blank">Learn more</a> about the_content filter.', 'give' ), esc_url( 'https://codex.wordpress.org/Plugin_API/Filter_Reference/the_content' ) ),

+							'name' => __('Disable <code>the_content</code> filter', 'give'),

+							'desc' => sprintf(__('If you are seeing extra social buttons, related posts, or other unwanted elements appearing within your forms then you can disable WordPress\' content filter. <a href="%s" target="_blank">Learn more</a> about the_content filter.', 'give'), esc_url('https://codex.wordpress.org/Plugin_API/Filter_Reference/the_content')),

 							'id'   => 'disable_the_content_filter',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Script Loading', 'give' ),

+							'name' => __('Script Loading', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_script_control',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Load Scripts in Footer?', 'give' ),

-							'desc' => __( 'Check this box if you would like Give to load all frontend JavaScript files in the footer.', 'give' ),

+							'name' => __('Load Scripts in Footer?', 'give'),

+							'desc' => __('Check this box if you would like Give to load all frontend JavaScript files in the footer.', 'give'),

 							'id'   => 'scripts_footer',

 							'type' => 'checkbox'

 						)

@@ -639,13 +639,13 @@ 
 			/** API Settings */

 			'api'         => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'API', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

+				'give_title' => __('API', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

 				'show_names' => false, // Hide field names on the left

-				'fields'     => apply_filters( 'give_settings_system', array(

+				'fields'     => apply_filters('give_settings_system', array(

 						array(

 							'id'   => 'api',

-							'name' => __( 'API', 'give' ),

+							'name' => __('API', 'give'),

 							'type' => 'api'

 						)

 					)

@@ -654,13 +654,13 @@ 
 			/** Licenses Settings */

 			'system_info' => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'System Info', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_system', array(

+				'give_title' => __('System Info', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_system', array(

 						array(

 							'id'   => 'system_info',

-							'name' => __( 'System Info', 'give' ),

-							'desc' => __( 'Please copy and paste this information in your ticket when contacting support.', 'give' ),

+							'name' => __('System Info', 'give'),

+							'desc' => __('Please copy and paste this information in your ticket when contacting support.', 'give'),

 							'type' => 'system_info'

 						)

 					)

@@ -669,12 +669,12 @@ 
 		);

 

 		//Return all settings array if necessary

-		if ( $active_tab === null || ! isset( $give_settings[ $active_tab ] ) ) {

-			return apply_filters( 'give_registered_settings', $give_settings );

+		if ($active_tab === null || ! isset($give_settings[$active_tab])) {

+			return apply_filters('give_registered_settings', $give_settings);

 		}

 

 		// Add other tabs and settings fields as needed

-		return apply_filters( 'give_registered_settings', $give_settings[ $active_tab ] );

+		return apply_filters('give_registered_settings', $give_settings[$active_tab]);

 

 	}

 

@@ -687,11 +687,11 @@ 
 	 */

 	public function settings_notices() {

 

-		if ( ! isset( $_POST['give_settings_saved'] ) ) {

+		if ( ! isset($_POST['give_settings_saved'])) {

 			return;

 		}

 

-		add_settings_error( 'give-notices', 'global-settings-updated', __( 'Settings updated.', 'give' ), 'updated' );

+		add_settings_error('give-notices', 'global-settings-updated', __('Settings updated.', 'give'), 'updated');

 

 	}

 

@@ -705,17 +705,17 @@ 
 	 *

 	 * @return mixed          Field value or exception is thrown

 	 */

-	public function __get( $field ) {

+	public function __get($field) {

 

 		// Allowed fields to retrieve

-		if ( in_array( $field, array( 'key', 'fields', 'give_title', 'options_page' ), true ) ) {

+		if (in_array($field, array('key', 'fields', 'give_title', 'options_page'), true)) {

 			return $this->{$field};

 		}

-		if ( 'option_metabox' === $field ) {

+		if ('option_metabox' === $field) {

 			return $this->option_metabox();

 		}

 

-		throw new Exception( 'Invalid property: ' . $field );

+		throw new Exception('Invalid property: '.$field);

 	}

 

 

@@ -732,12 +732,12 @@ 
  *

  * @return mixed        Option value

  */

-function give_get_option( $key = '', $default = false ) {

+function give_get_option($key = '', $default = false) {

 	global $give_options;

-	$value = ! empty( $give_options[ $key ] ) ? $give_options[ $key ] : $default;

-	$value = apply_filters( 'give_get_option', $value, $key, $default );

+	$value = ! empty($give_options[$key]) ? $give_options[$key] : $default;

+	$value = apply_filters('give_get_option', $value, $key, $default);

 

-	return apply_filters( 'give_get_option_' . $key, $value, $key, $default );

+	return apply_filters('give_get_option_'.$key, $value, $key, $default);

 }

 

 

@@ -755,33 +755,33 @@ 
  *

  * @return boolean True if updated, false if not.

  */

-function give_update_option( $key = '', $value = false ) {

+function give_update_option($key = '', $value = false) {

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

-	if ( empty( $value ) ) {

-		$remove_option = give_delete_option( $key );

+	if (empty($value)) {

+		$remove_option = give_delete_option($key);

 

 		return $remove_option;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

 	// Let's let devs alter that value coming in

-	$value = apply_filters( 'give_update_option', $value, $key );

+	$value = apply_filters('give_update_option', $value, $key);

 

 	// Next let's try to update the value

-	$options[ $key ] = $value;

-	$did_update      = update_option( 'give_settings', $options );

+	$options[$key] = $value;

+	$did_update      = update_option('give_settings', $options);

 

 	// If it updated, let's update the global variable

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

-		$give_options[ $key ] = $value;

+		$give_options[$key] = $value;

 	}

 

 	return $did_update;

@@ -798,27 +798,27 @@ 
  *

  * @return boolean True if updated, false if not.

  */

-function give_delete_option( $key = '' ) {

+function give_delete_option($key = '') {

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

 	// Next let's try to update the value

-	if ( isset( $options[ $key ] ) ) {

+	if (isset($options[$key])) {

 

-		unset( $options[ $key ] );

+		unset($options[$key]);

 

 	}

 

-	$did_update = update_option( 'give_settings', $options );

+	$did_update = update_option('give_settings', $options);

 

 	// If it updated, let's update the global variable

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

 		$give_options = $options;

 	}

@@ -837,9 +837,9 @@ 
  */

 function give_get_settings() {

 

-	$settings = get_option( 'give_settings' );

+	$settings = get_option('give_settings');

 

-	return (array) apply_filters( 'give_get_settings', $settings );

+	return (array) apply_filters('give_get_settings', $settings);

 

 }

 

@@ -857,25 +857,25 @@ 
  *

  * @return array

  */

-function give_settings_array_insert( $array, $position, $insert ) {

-	if ( is_int( $position ) ) {

-		array_splice( $array, $position, 0, $insert );

+function give_settings_array_insert($array, $position, $insert) {

+	if (is_int($position)) {

+		array_splice($array, $position, 0, $insert);

 	} else {

 

-		foreach ( $array as $index => $subarray ) {

-			if ( isset( $subarray['id'] ) && $subarray['id'] == $position ) {

+		foreach ($array as $index => $subarray) {

+			if (isset($subarray['id']) && $subarray['id'] == $position) {

 				$pos = $index;

 			}

 		}

 

-		if ( ! isset( $pos ) ) {

+		if ( ! isset($pos)) {

 			return $array;

 		}

 

 		$array = array_merge(

-			array_slice( $array, 0, $pos ),

+			array_slice($array, 0, $pos),

 			$insert,

-			array_slice( $array, $pos )

+			array_slice($array, $pos)

 		);

 	}

 

@@ -898,7 +898,7 @@ 
  *

  * @return void

  */

-function give_enabled_gateways_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_enabled_gateways_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$field_description = $field_type_object->field->args['desc'];

@@ -906,21 +906,21 @@ 
 

 	echo '<ul class="cmb2-checkbox-list cmb2-list">';

 

-	foreach ( $gateways as $key => $option ) :

+	foreach ($gateways as $key => $option) :

 

-		if ( is_array( $escaped_value ) && array_key_exists( $key, $escaped_value ) ) {

+		if (is_array($escaped_value) && array_key_exists($key, $escaped_value)) {

 			$enabled = '1';

 		} else {

 			$enabled = null;

 		}

 

-		echo '<li><input name="' . $id . '[' . $key . ']" id="' . $id . '[' . $key . ']" type="checkbox" value="1" ' . checked( '1', $enabled, false ) . '/>&nbsp;';

-		echo '<label for="' . $id . '[' . $key . ']">' . $option['admin_label'] . '</label></li>';

+		echo '<li><input name="'.$id.'['.$key.']" id="'.$id.'['.$key.']" type="checkbox" value="1" '.checked('1', $enabled, false).'/>&nbsp;';

+		echo '<label for="'.$id.'['.$key.']">'.$option['admin_label'].'</label></li>';

 

 	endforeach;

 

-	if ( $field_description ) {

-		echo '<p class="cmb2-metabox-description">' . $field_description . '</p>';

+	if ($field_description) {

+		echo '<p class="cmb2-metabox-description">'.$field_description.'</p>';

 	}

 

 	echo '</ul>';

@@ -939,31 +939,31 @@ 
  *

  * @return void

  */

-function give_default_gateway_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_default_gateway_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$field_description = $field_type_object->field->args['desc'];

 	$gateways          = give_get_enabled_payment_gateways();

 

-	echo '<select class="cmb2_select" name="' . $id . '" id="' . $id . '">';

+	echo '<select class="cmb2_select" name="'.$id.'" id="'.$id.'">';

 

 	//Add a field to the Give Form admin single post view of this field

-	if ( $field_type_object->field->object_type === 'post' ) {

-		echo '<option value="global">' . __( 'Global Default', 'give' ) . '</option>';

+	if ($field_type_object->field->object_type === 'post') {

+		echo '<option value="global">'.__('Global Default', 'give').'</option>';

 	}

 

-	foreach ( $gateways as $key => $option ) :

+	foreach ($gateways as $key => $option) :

 

-		$selected = isset( $escaped_value ) ? selected( $key, $escaped_value, false ) : '';

+		$selected = isset($escaped_value) ? selected($key, $escaped_value, false) : '';

 

 

-		echo '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';

+		echo '<option value="'.esc_attr($key).'"'.$selected.'>'.esc_html($option['admin_label']).'</option>';

 

 	endforeach;

 

 	echo '</select>';

 

-	echo '<p class="cmb2-metabox-description">' . $field_description . '</p>';

+	echo '<p class="cmb2-metabox-description">'.$field_description.'</p>';

 

 }

 

@@ -978,13 +978,13 @@ 
  *

  * @return void

  */

-function give_title_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_title_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$title             = $field_type_object->field->args['name'];

 	$field_description = $field_type_object->field->args['desc'];

 

-	echo '<hr>' . $field_description;

+	echo '<hr>'.$field_description;

 

 }

 

@@ -999,7 +999,7 @@ 
  *

  * @return void

  */

-function give_description_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_description_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$title             = $field_type_object->field->args['name'];

@@ -1019,25 +1019,25 @@ 
  * @see: https://github.com/WebDevStudios/CMB2/wiki/Adding-your-own-field-types

  * @return array An array of options that matches the CMB2 options array

  */

-function give_cmb2_get_post_options( $query_args, $force = false ) {

+function give_cmb2_get_post_options($query_args, $force = false) {

 

-	$post_options = array( '' => '' ); // Blank option

+	$post_options = array('' => ''); // Blank option

 

-	if ( ( ! isset( $_GET['page'] ) || 'give-settings' != $_GET['page'] ) && ! $force ) {

+	if (( ! isset($_GET['page']) || 'give-settings' != $_GET['page']) && ! $force) {

 		return $post_options;

 	}

 

-	$args = wp_parse_args( $query_args, array(

+	$args = wp_parse_args($query_args, array(

 		'post_type'   => 'page',

 		'numberposts' => 10,

-	) );

+	));

 

-	$posts = get_posts( $args );

+	$posts = get_posts($args);

 

-	if ( $posts ) {

-		foreach ( $posts as $post ) {

+	if ($posts) {

+		foreach ($posts as $post) {

 

-			$post_options[ $post->ID ] = $post->post_title;

+			$post_options[$post->ID] = $post->post_title;

 

 		}

 	}

@@ -1054,14 +1054,14 @@ 
  * @since 1.0

  */

 

-add_filter( 'cmb2_get_metabox_form_format', 'give_modify_cmb2_form_output', 10, 3 );

+add_filter('cmb2_get_metabox_form_format', 'give_modify_cmb2_form_output', 10, 3);

 

-function give_modify_cmb2_form_output( $form_format, $object_id, $cmb ) {

+function give_modify_cmb2_form_output($form_format, $object_id, $cmb) {

 

 	//only modify the give settings form

-	if ( 'give_settings' == $object_id && 'options_page' == $cmb->cmb_id ) {

+	if ('give_settings' == $object_id && 'options_page' == $cmb->cmb_id) {

 

-		return '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="give_settings_saved" value="true"><input type="hidden" name="object_id" value="%2$s">%3$s<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="' . __( 'Save Settings', 'give' ) . '" class="button-primary"></div></form>';

+		return '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="give_settings_saved" value="true"><input type="hidden" name="object_id" value="%2$s">%3$s<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="'.__('Save Settings', 'give').'" class="button-primary"></div></form>';

 	}

 

 	return $form_format;

@@ -1079,35 +1079,35 @@ 
  *

  * @return void

  */

-if ( ! function_exists( 'give_license_key_callback' ) ) {

-	function give_license_key_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+if ( ! function_exists('give_license_key_callback')) {

+	function give_license_key_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 		$id                = $field_type_object->field->args['id'];

 		$field_description = $field_type_object->field->args['desc'];

-		$license_status    = get_option( $field_type_object->field->args['options']['is_valid_license_option'] );

+		$license_status    = get_option($field_type_object->field->args['options']['is_valid_license_option']);

 		$field_classes     = 'regular-text give-license-field';

-		$type              = empty( $escaped_value ) ? 'text' : 'password';

+		$type              = empty($escaped_value) ? 'text' : 'password';

 

-		if ( $license_status === 'valid' ) {

+		if ($license_status === 'valid') {

 			$field_classes .= ' give-license-active';

 		}

 

-		$html = $field_type_object->input( array(

+		$html = $field_type_object->input(array(

 			'class' => $field_classes,

 			'type'  => $type

-		) );

+		));

 

 		//License is active so show deactivate button

-		if ( $license_status === 'valid' ) {

-			$html .= '<input type="submit" class="button-secondary give-license-deactivate" name="' . $id . '_deactivate" value="' . __( 'Deactivate License', 'give' ) . '"/>';

+		if ($license_status === 'valid') {

+			$html .= '<input type="submit" class="button-secondary give-license-deactivate" name="'.$id.'_deactivate" value="'.__('Deactivate License', 'give').'"/>';

 		} else {

 			//This license is not valid so delete it

-			give_delete_option( $id );

+			give_delete_option($id);

 		}

 

-		$html .= '<label for="give_settings[' . $id . ']"> ' . $field_description . '</label>';

+		$html .= '<label for="give_settings['.$id.']"> '.$field_description.'</label>';

 

-		wp_nonce_field( $id . '-nonce', $id . '-nonce' );

+		wp_nonce_field($id.'-nonce', $id.'-nonce');

 

 		echo $html;

 	}

@@ -1122,13 +1122,13 @@ 
  */

 function give_api_callback() {

 

-	if ( ! current_user_can( 'manage_give_settings' ) ) {

+	if ( ! current_user_can('manage_give_settings')) {

 		return;

 	}

 

-	do_action( 'give_tools_api_keys_before' );

+	do_action('give_tools_api_keys_before');

 

-	require_once GIVE_PLUGIN_DIR . 'includes/admin/class-api-keys-table.php';

+	require_once GIVE_PLUGIN_DIR.'includes/admin/class-api-keys-table.php';

 

 	$api_keys_table = new Give_API_Keys_Table();

 	$api_keys_table->prepare_items();

@@ -1136,7 +1136,7 @@ 
 	?>

 	<p>

 		<?php printf(

-			__( 'API keys allow users to use the <a href="%s">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%s">Zapier</a>.', 'give' ),

+			__('API keys allow users to use the <a href="%s">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%s">Zapier</a>.', 'give'),

 			'https://givewp.com/documentation/give-api-reference/',

 			'https://givewp.com/addons/zapier/'

 		); ?>

@@ -1149,10 +1149,10 @@ 
 	</style>

 	<?php

 

-	do_action( 'give_tools_api_keys_after' );

+	do_action('give_tools_api_keys_after');

 }

 

-add_action( 'give_settings_tab_api_keys', 'give_api_callback' );

+add_action('give_settings_tab_api_keys', 'give_api_callback');

 

 /**

  * Hook Callback

@@ -1165,8 +1165,8 @@ 
  *

  * @return void

  */

-function give_hook_callback( $args ) {

-	do_action( 'give_' . $args['id'] );

+function give_hook_callback($args) {

+	do_action('give_'.$args['id']);

 }

 

 /**

@@ -1176,10 +1176,10 @@ 
  *

  */

 

-if ( file_exists( WP_PLUGIN_DIR . '/cmb2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once WP_PLUGIN_DIR . '/cmb2/init.php';

-} elseif ( file_exists( GIVE_PLUGIN_DIR . '/includes/libraries/cmb2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/cmb2/init.php';

-} elseif ( file_exists( GIVE_PLUGIN_DIR . '/includes/libraries/CMB2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/CMB2/init.php';

+if (file_exists(WP_PLUGIN_DIR.'/cmb2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once WP_PLUGIN_DIR.'/cmb2/init.php';

+} elseif (file_exists(GIVE_PLUGIN_DIR.'/includes/libraries/cmb2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/cmb2/init.php';

+} elseif (file_exists(GIVE_PLUGIN_DIR.'/includes/libraries/CMB2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/CMB2/init.php';

 }
\ No newline at end of file

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 +57 added lines, -57 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;
 	}
 
 	/**
@@ -177,31 +177,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;
 				}
 
@@ -227,7 +227,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;
 	}
 
 	/**
@@ -237,7 +237,7 @@ 
 	 * @since  1.0
 	 * @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
 		give_log_views();
 	}
@@ -261,14 +261,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
 				);
 			}
@@ -296,14 +296,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 +62 added lines, -62 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,24 +64,24 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $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 '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];
 		}
 	}
 
@@ -94,12 +94,12 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'ID'         => __( 'Log ID', 'give' ),
-			'user_id'    => __( 'User', 'give' ),
+			'ID'         => __('Log ID', 'give'),
+			'user_id'    => __('User', 'give'),
 			'form'       => give_get_forms_label_singular(),
-			'amount'     => __( 'Item Amount', 'give' ),
-			'payment_id' => __( 'Payment ID', 'give' ),
-			'date'       => __( 'Date', 'give' )
+			'amount'     => __('Item Amount', 'give'),
+			'payment_id' => __('Payment ID', 'give'),
+			'date'       => __('Date', 'give')
 		);
 
 		return $columns;
@@ -113,7 +113,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;
 	}
 
 	/**
@@ -124,7 +124,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;
 	}
 
 	/**
@@ -135,7 +135,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;
 	}
 
 	/**
@@ -146,7 +146,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;
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 
 		$meta_query = array();
 
-		if ( $user ) {
+		if ($user) {
 			// Show only logs from a specific user
 			$meta_query[] = array(
 				'key'   => '_give_log_user_id',
@@ -172,8 +172,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';
@@ -182,32 +182,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,
@@ -228,7 +228,7 @@ 
 	 * @since  1.0
 	 * @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
 		give_log_views();
 	}
@@ -241,22 +241,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>';
 		}
@@ -274,11 +274,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(
@@ -288,26 +288,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;
@@ -336,15 +336,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)
 			)
 		);
 	}