WordImpress / Give

includes/shortcodes.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
 		//validate display_style and float_labels value
 		if ( ( $key == 'display_style' && ! in_array( $value, array( 'onpage', 'reveal', 'modal' ) ) )
-		     || ( $key == 'float_labels' && ! in_array( $value, array( 'enabled', 'disabled' ) ) )
+			 || ( $key == 'float_labels' && ! in_array( $value, array( 'enabled', 'disabled' ) ) )
 		) {
 
 			$atts[ $key ] = '';

Spacing +108 added lines, -108 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,28 +25,28 @@ 
  */
 function give_donation_history() {
 
-	$email_access = give_get_option( 'email_access' );
+	$email_access = give_get_option('email_access');
 
 	//Is user logged in? Does a session exist? Does an email-access token exist?
-	if ( is_user_logged_in() || Give()->session->get_session_expiration() !== false || ( $email_access == 'on' && Give()->email_access->token_exists ) ) {
+	if (is_user_logged_in() || Give()->session->get_session_expiration() !== false || ($email_access == 'on' && Give()->email_access->token_exists)) {
 		ob_start();
-		give_get_template_part( 'history', 'donations' );
+		give_get_template_part('history', 'donations');
 
 		return ob_get_clean();
 	} //Is Email-based access enabled?
-	elseif ( $email_access == 'on' ) {
+	elseif ($email_access == 'on') {
 
 		ob_start();
-		give_get_template_part( 'email', 'login-form' );
+		give_get_template_part('email', 'login-form');
 
 		return ob_get_clean();
 	} else {
-		$message = __( 'You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give' );
-		echo apply_filters( 'give_donation_history_nonuser_message', give_output_error( $message, false ), $message );
+		$message = __('You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give');
+		echo apply_filters('give_donation_history_nonuser_message', give_output_error($message, false), $message);
 	}
 }
 
-add_shortcode( 'donation_history', 'give_donation_history' );
+add_shortcode('donation_history', 'give_donation_history');
 
 /**
  * Donation Form Shortcode
@@ -60,53 +60,53 @@ 
  *
  * @return string
  */
-function give_form_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_form_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'id'            => '',
 		'show_title'    => true,
 		'show_goal'     => true,
 		'show_content'  => '',
 		'float_labels'  => '',
 		'display_style' => '',
-	), $atts, 'give_form' );
+	), $atts, 'give_form');
 
-	foreach ( $atts as $key => $value ) {
+	foreach ($atts as $key => $value) {
 		//convert shortcode_atts values to booleans
-		if ( $key == 'show_title' ) {
-			$atts[ $key ] = filter_var( $atts[ $key ], FILTER_VALIDATE_BOOLEAN );
-		} elseif ( $key == 'show_goal' ) {
-			$atts[ $key ] = filter_var( $atts[ $key ], FILTER_VALIDATE_BOOLEAN );
+		if ($key == 'show_title') {
+			$atts[$key] = filter_var($atts[$key], FILTER_VALIDATE_BOOLEAN);
+		} elseif ($key == 'show_goal') {
+			$atts[$key] = filter_var($atts[$key], FILTER_VALIDATE_BOOLEAN);
 		}
 
 		//validate show_content value
-		if ( $key == 'show_content' ) {
-			if ( ! in_array( $value, array( 'none', 'above', 'below' ) ) ) {
-				$atts[ $key ] = '';
-			} else if ( $value == 'above' ) {
-				$atts[ $key ] = 'give_pre_form';
-			} else if ( $value == 'below' ) {
-				$atts[ $key ] = 'give_post_form';
+		if ($key == 'show_content') {
+			if ( ! in_array($value, array('none', 'above', 'below'))) {
+				$atts[$key] = '';
+			} else if ($value == 'above') {
+				$atts[$key] = 'give_pre_form';
+			} else if ($value == 'below') {
+				$atts[$key] = 'give_post_form';
 			}
 		}
 
 		//validate display_style and float_labels value
-		if ( ( $key == 'display_style' && ! in_array( $value, array( 'onpage', 'reveal', 'modal' ) ) )
-		     || ( $key == 'float_labels' && ! in_array( $value, array( 'enabled', 'disabled' ) ) )
+		if (($key == 'display_style' && ! in_array($value, array('onpage', 'reveal', 'modal')))
+		     || ($key == 'float_labels' && ! in_array($value, array('enabled', 'disabled')))
 		) {
 
-			$atts[ $key ] = '';
+			$atts[$key] = '';
 		}
 	}
 
 	//get the Give Form
 	ob_start();
-	give_get_donation_form( $atts );
+	give_get_donation_form($atts);
 	$final_output = ob_get_clean();
 
-	return apply_filters( 'give_donate_form', $final_output, $atts );
+	return apply_filters('give_donate_form', $final_output, $atts);
 }
 
-add_shortcode( 'give_form', 'give_form_shortcode' );
+add_shortcode('give_form', 'give_form_shortcode');
 
 /**
  * Donation Form Goal Shortcode
@@ -120,37 +120,37 @@ 
  *
  * @return string
  */
-function give_goal_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_goal_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'id'        => '',
 		'show_text' => true,
 		'show_bar'  => true,
-	), $atts, 'give_goal' );
+	), $atts, 'give_goal');
 
 
 	//get the Give Form
 	ob_start();
 
 	//Sanity check 1: ensure there is an ID Provided
-	if ( empty( $atts['id'] ) ) {
-		give_output_error( __( 'Error: No Donation form ID for the shortcode provided.', 'give' ), true );
+	if (empty($atts['id'])) {
+		give_output_error(__('Error: No Donation form ID for the shortcode provided.', 'give'), true);
 	}
 
 	//Sanity check 2: Check that this form even has Goals enabled
-	$goal_option = get_post_meta( $atts['id'], '_give_goal_option', true );
-	if ( empty( $goal_option ) || $goal_option !== 'yes' ) {
-		give_output_error( __( 'Error: This form does not have Goals enabled.', 'give' ), true );
+	$goal_option = get_post_meta($atts['id'], '_give_goal_option', true);
+	if (empty($goal_option) || $goal_option !== 'yes') {
+		give_output_error(__('Error: This form does not have Goals enabled.', 'give'), true);
 	} else {
 		//Passed all sanity checks: output Goal
-		give_show_goal_progress( $atts['id'], $atts );
+		give_show_goal_progress($atts['id'], $atts);
 	}
 
 	$final_output = ob_get_clean();
 
-	return apply_filters( 'give_goal_shortcode_output', $final_output, $atts );
+	return apply_filters('give_goal_shortcode_output', $final_output, $atts);
 }
 
-add_shortcode( 'give_goal', 'give_goal_shortcode' );
+add_shortcode('give_goal', 'give_goal_shortcode');
 
 
 /**
@@ -167,15 +167,15 @@ 
  * @uses  give_login_form()
  * @return string
  */
-function give_login_form_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_login_form_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'redirect' => '',
-	), $atts, 'give_login' );
+	), $atts, 'give_login');
 
-	return give_login_form( $atts['redirect'] );
+	return give_login_form($atts['redirect']);
 }
 
-add_shortcode( 'give_login', 'give_login_form_shortcode' );
+add_shortcode('give_login', 'give_login_form_shortcode');
 
 /**
  * Register Shortcode
@@ -190,15 +190,15 @@ 
  * @uses  give_register_form()
  * @return string
  */
-function give_register_form_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_register_form_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'redirect' => '',
-	), $atts, 'give_register' );
+	), $atts, 'give_register');
 
-	return give_register_form( $atts['redirect'] );
+	return give_register_form($atts['redirect']);
 }
 
-add_shortcode( 'give_register', 'give_register_form_shortcode' );
+add_shortcode('give_register', 'give_register_form_shortcode');
 
 
 /**
@@ -213,61 +213,61 @@ 
  *
  * @return string
  */
-function give_receipt_shortcode( $atts, $content = null ) {
+function give_receipt_shortcode($atts, $content = null) {
 
 	global $give_receipt_args, $payment;
 
-	$give_receipt_args = shortcode_atts( array(
-		'error'          => esc_html__( 'Sorry, you are missing the payment key to view this donation receipt.', 'give' ),
+	$give_receipt_args = shortcode_atts(array(
+		'error'          => esc_html__('Sorry, you are missing the payment key to view this donation receipt.', 'give'),
 		'price'          => true,
 		'date'           => true,
 		'payment_key'    => false,
 		'payment_method' => true,
 		'payment_id'     => true
-	), $atts, 'give_receipt' );
+	), $atts, 'give_receipt');
 
 	//set $session var
 	$session = give_get_purchase_session();
 
 	//set payment key var
-	if ( isset( $_GET['payment_key'] ) ) {
-		$payment_key = urldecode( $_GET['payment_key'] );
-	} elseif ( $session ) {
+	if (isset($_GET['payment_key'])) {
+		$payment_key = urldecode($_GET['payment_key']);
+	} elseif ($session) {
 		$payment_key = $session['purchase_key'];
-	} elseif ( $give_receipt_args['payment_key'] ) {
+	} elseif ($give_receipt_args['payment_key']) {
 		$payment_key = $give_receipt_args['payment_key'];
 	}
 
-	$email_access = give_get_option( 'email_access' );
+	$email_access = give_get_option('email_access');
 
 	// No payment_key found & Email Access is Turned on:
-	if ( ! isset( $payment_key ) && $email_access == 'on' && ! Give()->email_access->token_exists ) {
+	if ( ! isset($payment_key) && $email_access == 'on' && ! Give()->email_access->token_exists) {
 
 		ob_start();
 
-		give_get_template_part( 'email-login-form' );
+		give_get_template_part('email-login-form');
 
 		return ob_get_clean();
 
-	} elseif ( ! isset( $payment_key ) ) {
+	} elseif ( ! isset($payment_key)) {
 
-		return give_output_error( $give_receipt_args['error'], false, 'error' );
+		return give_output_error($give_receipt_args['error'], false, 'error');
 
 	}
 
-	$payment_id    = give_get_purchase_id_by_key( $payment_key );
-	$user_can_view = give_can_view_receipt( $payment_key );
+	$payment_id    = give_get_purchase_id_by_key($payment_key);
+	$user_can_view = give_can_view_receipt($payment_key);
 
 	// Key was provided, but user is logged out. Offer them the ability to login and view the receipt
-	if ( ! $user_can_view && $email_access == 'on' && ! Give()->email_access->token_exists ) {
+	if ( ! $user_can_view && $email_access == 'on' && ! Give()->email_access->token_exists) {
 
 		ob_start();
 
-		give_get_template_part( 'email-login-form' );
+		give_get_template_part('email-login-form');
 
 		return ob_get_clean();
 
-	} elseif ( ! $user_can_view ) {
+	} elseif ( ! $user_can_view) {
 
 		global $give_login_redirect;
 
@@ -275,9 +275,9 @@ 
 
 		ob_start();
 
-		give_output_error( apply_filters( 'give_must_be_logged_in_error_message', esc_html__( 'You must be logged in to view this donation payment receipt.', 'give' ) ) );
+		give_output_error(apply_filters('give_must_be_logged_in_error_message', esc_html__('You must be logged in to view this donation payment receipt.', 'give')));
 
-		give_get_template_part( 'shortcode', 'login' );
+		give_get_template_part('shortcode', 'login');
 
 		$login_form = ob_get_clean();
 
@@ -294,13 +294,13 @@ 
 	 * Or if user is logged in and the user can view sensitive shop data
 	 *
 	 */
-	if ( ! apply_filters( 'give_user_can_view_receipt', $user_can_view, $give_receipt_args ) ) {
-		return give_output_error( $give_receipt_args['error'], false, 'error' );
+	if ( ! apply_filters('give_user_can_view_receipt', $user_can_view, $give_receipt_args)) {
+		return give_output_error($give_receipt_args['error'], false, 'error');
 	}
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'receipt' );
+	give_get_template_part('shortcode', 'receipt');
 
 	$display = ob_get_clean();
 
@@ -309,7 +309,7 @@ 
 
 }
 
-add_shortcode( 'give_receipt', 'give_receipt_shortcode' );
+add_shortcode('give_receipt', 'give_receipt_shortcode');
 
 /**
  * Profile Editor Shortcode
@@ -329,18 +329,18 @@ 
  *
  * @return string Output generated from the profile editor
  */
-function give_profile_editor_shortcode( $atts, $content = null ) {
+function give_profile_editor_shortcode($atts, $content = null) {
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'profile-editor' );
+	give_get_template_part('shortcode', 'profile-editor');
 
 	$display = ob_get_clean();
 
 	return $display;
 }
 
-add_shortcode( 'give_profile_editor', 'give_profile_editor_shortcode' );
+add_shortcode('give_profile_editor', 'give_profile_editor_shortcode');
 
 /**
  * Process Profile Updater Form
@@ -353,30 +353,30 @@ 
  *
  * @return false
  */
-function give_process_profile_editor_updates( $data ) {
+function give_process_profile_editor_updates($data) {
 	// Profile field change request
-	if ( empty( $_POST['give_profile_editor_submit'] ) && ! is_user_logged_in() ) {
+	if (empty($_POST['give_profile_editor_submit']) && ! is_user_logged_in()) {
 		return false;
 	}
 
 	// Nonce security
-	if ( ! wp_verify_nonce( $data['give_profile_editor_nonce'], 'give-profile-editor-nonce' ) ) {
+	if ( ! wp_verify_nonce($data['give_profile_editor_nonce'], 'give-profile-editor-nonce')) {
 		return false;
 	}
 
 	$user_id       = get_current_user_id();
-	$old_user_data = get_userdata( $user_id );
-
-	$display_name = isset( $data['give_display_name'] ) ? sanitize_text_field( $data['give_display_name'] ) : $old_user_data->display_name;
-	$first_name   = isset( $data['give_first_name'] ) ? sanitize_text_field( $data['give_first_name'] ) : $old_user_data->first_name;
-	$last_name    = isset( $data['give_last_name'] ) ? sanitize_text_field( $data['give_last_name'] ) : $old_user_data->last_name;
-	$email        = isset( $data['give_email'] ) ? sanitize_email( $data['give_email'] ) : $old_user_data->user_email;
-	$line1        = ( isset( $data['give_address_line1'] ) ? sanitize_text_field( $data['give_address_line1'] ) : '' );
-	$line2        = ( isset( $data['give_address_line2'] ) ? sanitize_text_field( $data['give_address_line2'] ) : '' );
-	$city         = ( isset( $data['give_address_city'] ) ? sanitize_text_field( $data['give_address_city'] ) : '' );
-	$state        = ( isset( $data['give_address_state'] ) ? sanitize_text_field( $data['give_address_state'] ) : '' );
-	$zip          = ( isset( $data['give_address_zip'] ) ? sanitize_text_field( $data['give_address_zip'] ) : '' );
-	$country      = ( isset( $data['give_address_country'] ) ? sanitize_text_field( $data['give_address_country'] ) : '' );
+	$old_user_data = get_userdata($user_id);
+
+	$display_name = isset($data['give_display_name']) ? sanitize_text_field($data['give_display_name']) : $old_user_data->display_name;
+	$first_name   = isset($data['give_first_name']) ? sanitize_text_field($data['give_first_name']) : $old_user_data->first_name;
+	$last_name    = isset($data['give_last_name']) ? sanitize_text_field($data['give_last_name']) : $old_user_data->last_name;
+	$email        = isset($data['give_email']) ? sanitize_email($data['give_email']) : $old_user_data->user_email;
+	$line1        = (isset($data['give_address_line1']) ? sanitize_text_field($data['give_address_line1']) : '');
+	$line2        = (isset($data['give_address_line2']) ? sanitize_text_field($data['give_address_line2']) : '');
+	$city         = (isset($data['give_address_city']) ? sanitize_text_field($data['give_address_city']) : '');
+	$state        = (isset($data['give_address_state']) ? sanitize_text_field($data['give_address_state']) : '');
+	$zip          = (isset($data['give_address_zip']) ? sanitize_text_field($data['give_address_zip']) : '');
+	$country      = (isset($data['give_address_country']) ? sanitize_text_field($data['give_address_country']) : '');
 
 	$userdata = array(
 		'ID'           => $user_id,
@@ -396,45 +396,45 @@ 
 		'country' => $country
 	);
 
-	do_action( 'give_pre_update_user_profile', $user_id, $userdata );
+	do_action('give_pre_update_user_profile', $user_id, $userdata);
 
 	// New password
-	if ( ! empty( $data['give_new_user_pass1'] ) ) {
-		if ( $data['give_new_user_pass1'] !== $data['give_new_user_pass2'] ) {
-			give_set_error( 'password_mismatch', __( 'The passwords you entered do not match. Please try again.', 'give' ) );
+	if ( ! empty($data['give_new_user_pass1'])) {
+		if ($data['give_new_user_pass1'] !== $data['give_new_user_pass2']) {
+			give_set_error('password_mismatch', __('The passwords you entered do not match. Please try again.', 'give'));
 		} else {
 			$userdata['user_pass'] = $data['give_new_user_pass1'];
 		}
 	}
 
 	// Make sure the new email doesn't belong to another user
-	if ( $email != $old_user_data->user_email ) {
-		if ( email_exists( $email ) ) {
-			give_set_error( 'email_exists', __( 'The email you entered belongs to another user. Please use another.', 'give' ) );
+	if ($email != $old_user_data->user_email) {
+		if (email_exists($email)) {
+			give_set_error('email_exists', __('The email you entered belongs to another user. Please use another.', 'give'));
 		}
 	}
 
 	// Check for errors
 	$errors = give_get_errors();
 
-	if ( $errors ) {
+	if ($errors) {
 		// Send back to the profile editor if there are errors
-		wp_redirect( $data['give_redirect'] );
+		wp_redirect($data['give_redirect']);
 		give_die();
 	}
 
 	// Update the user
-	$meta    = update_user_meta( $user_id, '_give_user_address', $address );
-	$updated = wp_update_user( $userdata );
+	$meta    = update_user_meta($user_id, '_give_user_address', $address);
+	$updated = wp_update_user($userdata);
 
-	if ( $updated ) {
-		do_action( 'give_user_profile_updated', $user_id, $userdata );
-		wp_redirect( add_query_arg( 'updated', 'true', $data['give_redirect'] ) );
+	if ($updated) {
+		do_action('give_user_profile_updated', $user_id, $userdata);
+		wp_redirect(add_query_arg('updated', 'true', $data['give_redirect']));
 		give_die();
 	}
 
 	return false;
 }
 
-add_action( 'give_edit_user_profile', 'give_process_profile_editor_updates' );
+add_action('give_edit_user_profile', 'give_process_profile_editor_updates');
 

uninstall.php

Spacing +35 added lines, -35 removed lines

@@ -10,83 +10,83 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }
 
 // Load Give file
-include_once( 'give.php' );
+include_once('give.php');
 
 global $wpdb, $wp_roles;
 
 
-if ( give_get_option( 'uninstall_on_delete' ) === 'on' ) {
+if (give_get_option('uninstall_on_delete') === 'on') {
 
 	// Delete All the Custom Post Types
-	$give_taxonomies = array( 'form_category', 'form_tag', 'give_log_type', );
-	$give_post_types = array( 'give_forms', 'give_payment', 'give_log' );
-	foreach ( $give_post_types as $post_type ) {
+	$give_taxonomies = array('form_category', 'form_tag', 'give_log_type',);
+	$give_post_types = array('give_forms', 'give_payment', 'give_log');
+	foreach ($give_post_types as $post_type) {
 
-		$give_taxonomies = array_merge( $give_taxonomies, get_object_taxonomies( $post_type ) );
-		$items           = get_posts( array(
+		$give_taxonomies = array_merge($give_taxonomies, get_object_taxonomies($post_type));
+		$items           = get_posts(array(
 			'post_type'   => $post_type,
 			'post_status' => 'any',
-			'numberposts' => - 1,
+			'numberposts' => -1,
 			'fields'      => 'ids'
-		) );
+		));
 
-		if ( $items ) {
-			foreach ( $items as $item ) {
-				wp_delete_post( $item, true );
+		if ($items) {
+			foreach ($items as $item) {
+				wp_delete_post($item, true);
 			}
 		}
 	}
 
 	// Delete All the Terms & Taxonomies
-	foreach ( array_unique( array_filter( $give_taxonomies ) ) as $taxonomy ) {
+	foreach (array_unique(array_filter($give_taxonomies)) as $taxonomy) {
 
-		$terms = $wpdb->get_results( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ('%s') ORDER BY t.name ASC", $taxonomy ) );
+		$terms = $wpdb->get_results($wpdb->prepare("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ('%s') ORDER BY t.name ASC", $taxonomy));
 
 		// Delete Terms
-		if ( $terms ) {
-			foreach ( $terms as $term ) {
-				$wpdb->delete( $wpdb->term_taxonomy, array( 'term_taxonomy_id' => $term->term_taxonomy_id ) );
-				$wpdb->delete( $wpdb->terms, array( 'term_id' => $term->term_id ) );
+		if ($terms) {
+			foreach ($terms as $term) {
+				$wpdb->delete($wpdb->term_taxonomy, array('term_taxonomy_id' => $term->term_taxonomy_id));
+				$wpdb->delete($wpdb->terms, array('term_id' => $term->term_id));
 			}
 		}
 
 		// Delete Taxonomies
-		$wpdb->delete( $wpdb->term_taxonomy, array( 'taxonomy' => $taxonomy ), array( '%s' ) );
+		$wpdb->delete($wpdb->term_taxonomy, array('taxonomy' => $taxonomy), array('%s'));
 	}
 
 	// Delete the Plugin Pages
-	$give_created_pages = array( 'success_page', 'failure_page', 'history_page' );
-	foreach ( $give_created_pages as $p ) {
-		$page = give_get_option( $p, false );
-		if ( $page ) {
-			wp_delete_post( $page, true );
+	$give_created_pages = array('success_page', 'failure_page', 'history_page');
+	foreach ($give_created_pages as $p) {
+		$page = give_get_option($p, false);
+		if ($page) {
+			wp_delete_post($page, true);
 		}
 	}
 
 	// Delete all the Plugin Options
-	delete_option( 'give_settings' );
-	delete_option( 'give_version' );
+	delete_option('give_settings');
+	delete_option('give_version');
 
 	// Delete Capabilities
 	Give()->roles->remove_caps();
 
 	// Delete the Roles
-	$give_roles = array( 'give_manager', 'give_accountant', 'give_worker' );
-	foreach ( $give_roles as $role ) {
-		remove_role( $role );
+	$give_roles = array('give_manager', 'give_accountant', 'give_worker');
+	foreach ($give_roles as $role) {
+		remove_role($role);
 	}
 
 	// Remove all database tables
-	$wpdb->query( "DROP TABLE IF EXISTS " . $wpdb->prefix . "give_donors" );
-	$wpdb->query( "DROP TABLE IF EXISTS " . $wpdb->prefix . "give_customers" );
+	$wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."give_donors");
+	$wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."give_customers");
 
 	// Cleanup Cron Events
-	wp_clear_scheduled_hook( 'give_daily_scheduled_events' );
-	wp_clear_scheduled_hook( 'give_daily_cron' );
-	wp_clear_scheduled_hook( 'give_weekly_cron' );
+	wp_clear_scheduled_hook('give_daily_scheduled_events');
+	wp_clear_scheduled_hook('give_daily_cron');
+	wp_clear_scheduled_hook('give_weekly_cron');
 }

includes/formatting.php

Braces +3 added lines, -1 removed lines

@@ -142,8 +142,10 @@
 
 	if ( is_front_page() ) :
 		$page_url = home_url();
-	else :
+	else {
+		:
 		$page_url = 'http';
+	}
 
 		if ( isset( $_SERVER["HTTPS"] ) && $_SERVER["HTTPS"] == "on" ) {
 			$page_url .= "s";

Doc Comments +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
  * @param $field_args
  * @param $field
  *
- * @return bool
+ * @return false|null
  */
 function give_format_admin_multilevel_amount( $field_args, $field ) {
 

Spacing +65 added lines, -65 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,37 +25,37 @@ 
  *
  * @return string $amount Newly sanitized amount
  */
-function give_sanitize_amount( $amount ) {
+function give_sanitize_amount($amount) {
 	$is_negative   = false;
-	$thousands_sep = give_get_option( 'thousands_separator', ',' );
-	$decimal_sep   = give_get_option( 'decimal_separator', '.' );
+	$thousands_sep = give_get_option('thousands_separator', ',');
+	$decimal_sep   = give_get_option('decimal_separator', '.');
 
 	// Sanitize the amount
-	if ( $decimal_sep == ',' && false !== ( $found = strpos( $amount, $decimal_sep ) ) ) {
-		if ( ( $thousands_sep == '.' || $thousands_sep == ' ' ) && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-			$amount = str_replace( $thousands_sep, '', $amount );
-		} elseif ( empty( $thousands_sep ) && false !== ( $found = strpos( $amount, '.' ) ) ) {
-			$amount = str_replace( '.', '', $amount );
+	if ($decimal_sep == ',' && false !== ($found = strpos($amount, $decimal_sep))) {
+		if (($thousands_sep == '.' || $thousands_sep == ' ') && false !== ($found = strpos($amount, $thousands_sep))) {
+			$amount = str_replace($thousands_sep, '', $amount);
+		} elseif (empty($thousands_sep) && false !== ($found = strpos($amount, '.'))) {
+			$amount = str_replace('.', '', $amount);
 		}
 
-		$amount = str_replace( $decimal_sep, '.', $amount );
-	} elseif ( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-		$amount = str_replace( $thousands_sep, '', $amount );
+		$amount = str_replace($decimal_sep, '.', $amount);
+	} elseif ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+		$amount = str_replace($thousands_sep, '', $amount);
 	}
 
-	if ( $amount < 0 ) {
+	if ($amount < 0) {
 		$is_negative = true;
 	}
 
-	$amount   = preg_replace( '/[^0-9\.]/', '', $amount );
-	$decimals = apply_filters( 'give_sanitize_amount_decimals', 2, $amount );
-	$amount   = number_format( (double) $amount, $decimals, '.', '' );
+	$amount   = preg_replace('/[^0-9\.]/', '', $amount);
+	$decimals = apply_filters('give_sanitize_amount_decimals', 2, $amount);
+	$amount   = number_format((double) $amount, $decimals, '.', '');
 
-	if ( $is_negative ) {
+	if ($is_negative) {
 		$amount *= - 1;
 	}
 
-	return apply_filters( 'give_sanitize_amount', $amount );
+	return apply_filters('give_sanitize_amount', $amount);
 }
 
 /**
@@ -68,47 +68,47 @@ 
  *
  * @return string $amount Newly formatted amount or Price Not Available
  */
-function give_format_amount( $amount, $decimals = true ) {
+function give_format_amount($amount, $decimals = true) {
 
-	$thousands_sep = give_get_option( 'thousands_separator', ',' );
-	$decimal_sep   = give_get_option( 'decimal_separator', '.' );
+	$thousands_sep = give_get_option('thousands_separator', ',');
+	$decimal_sep   = give_get_option('decimal_separator', '.');
 
 	// Format the amount
-	if ( $decimal_sep == ',' && false !== ( $sep_found = strpos( $amount, $decimal_sep ) ) ) {
-		$whole  = substr( $amount, 0, $sep_found );
-		$part   = substr( $amount, $sep_found + 1, ( strlen( $amount ) - 1 ) );
-		$amount = $whole . '.' . $part;
+	if ($decimal_sep == ',' && false !== ($sep_found = strpos($amount, $decimal_sep))) {
+		$whole  = substr($amount, 0, $sep_found);
+		$part   = substr($amount, $sep_found + 1, (strlen($amount) - 1));
+		$amount = $whole.'.'.$part;
 	}
 
 	// Strip , from the amount (if set as the thousands separator)
-	if ( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-		$amount = str_replace( ',', '', $amount );
+	if ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+		$amount = str_replace(',', '', $amount);
 	}
 
 	// Strip . from the amount (if set as the thousands separator) AND , set to decimal separator
-	if ( $thousands_sep == '.' && $decimal_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-		$amount      = explode( '.', $amount );
-		$array_count = count( $amount );
-		if ( $decimals == true ) {
-			unset( $amount[ $array_count - 1 ] );
+	if ($thousands_sep == '.' && $decimal_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+		$amount      = explode('.', $amount);
+		$array_count = count($amount);
+		if ($decimals == true) {
+			unset($amount[$array_count - 1]);
 		}
-		$amount = implode( '', $amount );
+		$amount = implode('', $amount);
 	}
 
 	// Strip ' ' from the amount (if set as the thousands separator)
-	if ( $thousands_sep == ' ' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-		$amount = str_replace( ' ', '', $amount );
+	if ($thousands_sep == ' ' && false !== ($found = strpos($amount, $thousands_sep))) {
+		$amount = str_replace(' ', '', $amount);
 	}
 
-	if ( empty( $amount ) ) {
+	if (empty($amount)) {
 		$amount = 0;
 	}
 
-	$decimals = apply_filters( 'give_format_amount_decimals', $decimals ? 2 : 0, $amount );
+	$decimals = apply_filters('give_format_amount_decimals', $decimals ? 2 : 0, $amount);
 
-	$formatted = number_format( $amount, $decimals, $decimal_sep, $thousands_sep );
+	$formatted = number_format($amount, $decimals, $decimal_sep, $thousands_sep);
 
-	return apply_filters( 'give_format_amount', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep );
+	return apply_filters('give_format_amount', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep);
 }
 
 /**
@@ -121,13 +121,13 @@ 
  *
  * @return bool
  */
-function give_format_admin_multilevel_amount( $field_args, $field ) {
+function give_format_admin_multilevel_amount($field_args, $field) {
 
-	if ( empty( $field->value ) ) {
+	if (empty($field->value)) {
 		return false;
 	}
 
-	$field->value = give_format_amount( $field->value );
+	$field->value = give_format_amount($field->value);
 
 }
 
@@ -141,24 +141,24 @@ 
  *
  * @return mixed|string|void
  */
-function give_currency_filter( $price = '', $currency = '' ) {
+function give_currency_filter($price = '', $currency = '') {
 
-	if ( empty( $currency ) ) {
+	if (empty($currency)) {
 		$currency = give_get_currency();
 	}
 
-	$position = give_get_option( 'currency_position', 'before' );
+	$position = give_get_option('currency_position', 'before');
 
 	$negative = $price < 0;
 
-	if ( $negative ) {
-		$price = substr( $price, 1 ); // Remove proceeding "-" -
+	if ($negative) {
+		$price = substr($price, 1); // Remove proceeding "-" -
 	}
 
-	$symbol = give_currency_symbol( $currency );
+	$symbol = give_currency_symbol($currency);
 
-	if ( $position == 'before' ):
-		switch ( $currency ):
+	if ($position == 'before'):
+		switch ($currency):
 			case 'GBP' :
 			case 'BRL' :
 			case 'EUR' :
@@ -184,18 +184,18 @@ 
 			case 'DKK' :
 			case 'HUF' :
 			case 'ILS' :
-				$formatted = $symbol . $price;
+				$formatted = $symbol.$price;
 				break;
 			case 'NOK' :
-				$formatted = $symbol . ' ' . $price;
+				$formatted = $symbol.' '.$price;
 				break;
 			default :
-				$formatted = $currency . ' ' . $price;
+				$formatted = $currency.' '.$price;
 				break;
 		endswitch;
-		$formatted = apply_filters( 'give_' . strtolower( $currency ) . '_currency_filter_before', $formatted, $currency, $price );
+		$formatted = apply_filters('give_'.strtolower($currency).'_currency_filter_before', $formatted, $currency, $price);
 	else :
-		switch ( $currency ) :
+		switch ($currency) :
 			case 'GBP' :
 			case 'BRL' :
 			case 'EUR' :
@@ -220,18 +220,18 @@ 
 			case 'HUF' :
 			case 'MYR' :
 			case 'ILS' :
-				$formatted = $price . $symbol;
+				$formatted = $price.$symbol;
 				break;
 			default :
-				$formatted = $price . ' ' . $currency;
+				$formatted = $price.' '.$currency;
 				break;
 		endswitch;
-		$formatted = apply_filters( 'give_' . strtolower( $currency ) . '_currency_filter_after', $formatted, $currency, $price );
+		$formatted = apply_filters('give_'.strtolower($currency).'_currency_filter_after', $formatted, $currency, $price);
 	endif;
 
-	if ( $negative ) {
+	if ($negative) {
 		// Prepend the mins sign before the currency sign
-		$formatted = '-' . $formatted;
+		$formatted = '-'.$formatted;
 	}
 
 	return $formatted;
@@ -246,11 +246,11 @@ 
  *
  * @return int $decimals
  */
-function give_currency_decimal_filter( $decimals = 2 ) {
+function give_currency_decimal_filter($decimals = 2) {
 
 	$currency = give_get_currency();
 
-	switch ( $currency ) {
+	switch ($currency) {
 		case 'RIAL' :
 		case 'JPY' :
 		case 'TWD' :
@@ -260,8 +260,8 @@ 
 			break;
 	}
 
-	return apply_filters( 'give_currency_decimal_count', $decimals, $currency );
+	return apply_filters('give_currency_decimal_count', $decimals, $currency);
 }
 
-add_filter( 'give_sanitize_amount_decimals', 'give_currency_decimal_filter' );
-add_filter( 'give_format_amount_decimals', 'give_currency_decimal_filter' );
\ No newline at end of file
+add_filter('give_sanitize_amount_decimals', 'give_currency_decimal_filter');
+add_filter('give_format_amount_decimals', 'give_currency_decimal_filter');
\ No newline at end of file

includes/admin/welcome.php

Spacing +104 added lines, -104 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -35,9 +35,9 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'admin_menus' ) );
-		add_action( 'admin_head', array( $this, 'admin_head' ) );
-		add_action( 'admin_init', array( $this, 'welcome' ) );
+		add_action('admin_menu', array($this, 'admin_menus'));
+		add_action('admin_head', array($this, 'admin_head'));
+		add_action('admin_init', array($this, 'welcome'));
 	}
 
 	/**
@@ -51,38 +51,38 @@ 
 	public function admin_menus() {
 		// About Page
 		add_dashboard_page(
-			__( 'Welcome to Give', 'give' ),
-			__( 'Welcome to Give', 'give' ),
+			__('Welcome to Give', 'give'),
+			__('Welcome to Give', 'give'),
 			$this->minimum_capability,
 			'give-about',
-			array( $this, 'about_screen' )
+			array($this, 'about_screen')
 		);
 
 		// Changelog Page
 		add_dashboard_page(
-			__( 'Give Changelog', 'give' ),
-			__( 'Give Changelog', 'give' ),
+			__('Give Changelog', 'give'),
+			__('Give Changelog', 'give'),
 			$this->minimum_capability,
 			'give-changelog',
-			array( $this, 'changelog_screen' )
+			array($this, 'changelog_screen')
 		);
 
 		// Getting Started Page
 		add_dashboard_page(
-			__( 'Getting started with Give', 'give' ),
-			__( 'Getting started with Give', 'give' ),
+			__('Getting started with Give', 'give'),
+			__('Getting started with Give', 'give'),
 			$this->minimum_capability,
 			'give-getting-started',
-			array( $this, 'getting_started_screen' )
+			array($this, 'getting_started_screen')
 		);
 
 		// Credits Page
 		add_dashboard_page(
-			__( 'The people that build Give', 'give' ),
-			__( 'The people that build Give', 'give' ),
+			__('The people that build Give', 'give'),
+			__('The people that build Give', 'give'),
 			$this->minimum_capability,
 			'give-credits',
-			array( $this, 'credits_screen' )
+			array($this, 'credits_screen')
 		);
 	}
 
@@ -95,13 +95,13 @@ 
 	 */
 	public function admin_head() {
 
-		remove_submenu_page( 'index.php', 'give-about' );
-		remove_submenu_page( 'index.php', 'give-changelog' );
-		remove_submenu_page( 'index.php', 'give-getting-started' );
-		remove_submenu_page( 'index.php', 'give-credits' );
+		remove_submenu_page('index.php', 'give-about');
+		remove_submenu_page('index.php', 'give-changelog');
+		remove_submenu_page('index.php', 'give-getting-started');
+		remove_submenu_page('index.php', 'give-credits');
 
 		// Badge for welcome page
-		$badge_url = GIVE_PLUGIN_URL . 'assets/images/give-badge.png';
+		$badge_url = GIVE_PLUGIN_URL.'assets/images/give-badge.png';
 
 		?>
 		<style type="text/css" media="screen">
@@ -215,20 +215,20 @@ 
 	 * @return void
 	 */
 	public function tabs() {
-		$selected = isset( $_GET['page'] ) ? $_GET['page'] : 'give-about';
+		$selected = isset($_GET['page']) ? $_GET['page'] : 'give-about';
 		?>
 		<h1 class="nav-tab-wrapper">
-			<a class="nav-tab <?php echo $selected == 'give-about' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-about' ), 'index.php' ) ) ); ?>">
-				<?php _e( "About Give", 'give' ); ?>
+			<a class="nav-tab <?php echo $selected == 'give-about' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'give-about'), 'index.php'))); ?>">
+				<?php _e("About Give", 'give'); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'give-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-getting-started' ), 'index.php' ) ) ); ?>">
-				<?php _e( 'Getting Started', 'give' ); ?>
+			<a class="nav-tab <?php echo $selected == 'give-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'give-getting-started'), 'index.php'))); ?>">
+				<?php _e('Getting Started', 'give'); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'give-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-credits' ), 'index.php' ) ) ); ?>">
-				<?php _e( 'Credits', 'give' ); ?>
+			<a class="nav-tab <?php echo $selected == 'give-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'give-credits'), 'index.php'))); ?>">
+				<?php _e('Credits', 'give'); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'give-add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( null, 'index.php' ) ) . 'edit.php?post_type=give_forms&page=give-addons'; ?>">
-				<?php _e( 'Add-ons', 'give' ); ?>
+			<a class="nav-tab <?php echo $selected == 'give-add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(null, 'index.php')).'edit.php?post_type=give_forms&page=give-addons'; ?>">
+				<?php _e('Add-ons', 'give'); ?>
 			</a>
 		</h1>
 	<?php
@@ -242,20 +242,20 @@ 
 	 * @return void
 	 */
 	public function about_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
-			<h1 class="welcome-h1"><?php printf( __( 'Welcome to Give %s', 'give' ), $display_version ); ?></h1>
+			<h1 class="welcome-h1"><?php printf(__('Welcome to Give %s', 'give'), $display_version); ?></h1>
 
 			<?php give_social_media_elements() ?>
 
-			<div class="about-text"><?php printf( __( 'Thank you for activating or updating to the latest version of Give! If you\'re a first time user, welcome! You\'re well on your way to empowering your cause. </You>We encourage you to check out the <a href="%s" title="View the Give plugin documentation online" target="_blank">plugin documentation</a> and getting started guide below.', 'give' ), 'https://givewp.com/documenation/' ); ?></div>
+			<div class="about-text"><?php printf(__('Thank you for activating or updating to the latest version of Give! If you\'re a first time user, welcome! You\'re well on your way to empowering your cause. </You>We encourage you to check out the <a href="%s" title="View the Give plugin documentation online" target="_blank">plugin documentation</a> and getting started guide below.', 'give'), 'https://givewp.com/documenation/'); ?></div>
 
-			<p class="newsletter-intro"><?php _e( 'Be sure to sign up for the Give newsletter below to stay informed of important updates and news.', 'give' ); ?></p>
+			<p class="newsletter-intro"><?php _e('Be sure to sign up for the Give newsletter below to stay informed of important updates and news.', 'give'); ?></p>
 
 			<?php give_get_newsletter() ?>
 
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 
 
@@ -264,15 +264,15 @@ 
 			<div class="feature-section clearfix introduction">
 
 				<div class="video feature-section-item">
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/give-form-mockup.png' ?>" title="A Give donation form" alt="A Give donation form">
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/give-form-mockup.png' ?>" title="A Give donation form" alt="A Give donation form">
 
 				</div>
 
 				<div class="content feature-section-item last-feature">
 
-					<h3><?php _e( 'Give - Democratizing Generosity', 'give' ); ?></h3>
+					<h3><?php _e('Give - Democratizing Generosity', 'give'); ?></h3>
 
-					<p><?php _e( 'Give empowers you to easily accept donations and setup fundraising campaigns, directly within WordPress. We created Give to provide a better donation experience for you and your users. Robust, flexible, and intuitive, the plugin is built from the ground up to be the goto donation solution for WordPress. Create powerful donation forms, embed them throughout your website, start a campaign, and exceed your fundraising goals with Give. This plugin is actively developed and proudly supported by folks who are dedicated to helping you and your cause.', 'give' ); ?></p>
+					<p><?php _e('Give empowers you to easily accept donations and setup fundraising campaigns, directly within WordPress. We created Give to provide a better donation experience for you and your users. Robust, flexible, and intuitive, the plugin is built from the ground up to be the goto donation solution for WordPress. Create powerful donation forms, embed them throughout your website, start a campaign, and exceed your fundraising goals with Give. This plugin is actively developed and proudly supported by folks who are dedicated to helping you and your cause.', 'give'); ?></p>
 					<a href="https://givewp.com" target="_blank" class="button-secondary" title="Visit the Give Website">Learn More
 						<span class="dashicons dashicons-external"></span></a>
 
@@ -285,9 +285,9 @@ 
 
 				<div class="content feature-section-item">
 
-					<h3><?php _e( 'Getting to Know Give', 'give' ); ?></h3>
+					<h3><?php _e('Getting to Know Give', 'give'); ?></h3>
 
-					<p><?php _e( 'Before you get started with Give we suggest you take a look at the online documentation. There you will find the getting started guide which will help you get up and running quickly. If you have an question, issue or bug with the Core plugin please submit an issue on the Give website. We also welcome your feedback and feature requests. Welcome to Give. We hope you much success with your cause.', 'give' ); ?></p>
+					<p><?php _e('Before you get started with Give we suggest you take a look at the online documentation. There you will find the getting started guide which will help you get up and running quickly. If you have an question, issue or bug with the Core plugin please submit an issue on the Give website. We also welcome your feedback and feature requests. Welcome to Give. We hope you much success with your cause.', 'give'); ?></p>
 					<a href="https://givewp.com/documentation" target="_blank" class="button-secondary" title="Visit the Give Website">View Documentation
 						<span class="dashicons dashicons-external"></span></a>
 
@@ -295,7 +295,7 @@ 
 
 				<div class="content  feature-section-item last-feature">
 
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/give-logo-photo-mashup.png' ?>" title="Give" alt="Give">
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/give-logo-photo-mashup.png' ?>" title="Give" alt="Give">
 
 				</div>
 
@@ -315,18 +315,18 @@ 
 	 * @return void
 	 */
 	public function changelog_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
-			<h1><?php _e( 'Give Changelog', 'give' ); ?></h1>
+			<h1><?php _e('Give Changelog', 'give'); ?></h1>
 
-			<div class="about-text"><?php printf( __( 'Thank you for updating to the latest version! Give %s is ready to make your online store faster, safer, and better!', 'give' ), $display_version ); ?></div>
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="about-text"><?php printf(__('Thank you for updating to the latest version! Give %s is ready to make your online store faster, safer, and better!', 'give'), $display_version); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 			<?php $this->tabs(); ?>
 
 			<div class="changelog">
-				<h3><?php _e( 'Full Changelog', 'give' ); ?></h3>
+				<h3><?php _e('Full Changelog', 'give'); ?></h3>
 
 				<div class="feature-section">
 					<?php echo $this->parse_readme(); ?>
@@ -334,10 +334,10 @@ 
 			</div>
 
 			<div class="return-to-dashboard">
-				<a href="<?php echo esc_url( admin_url( add_query_arg( array(
+				<a href="<?php echo esc_url(admin_url(add_query_arg(array(
 					'post_type' => 'give_forms',
 					'page'      => 'give-settings'
-				), 'edit.php' ) ) ); ?>"><?php _e( 'Go to Give Settings', 'give' ); ?></a>
+				), 'edit.php'))); ?>"><?php _e('Go to Give Settings', 'give'); ?></a>
 			</div>
 		</div>
 	<?php
@@ -351,35 +351,35 @@ 
 	 * @return void
 	 */
 	public function getting_started_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap get-started">
-			<h1 class="welcome-h1"><?php printf( __( 'Give %s - Getting Started Guide', 'give' ), $display_version ); ?></h1>
+			<h1 class="welcome-h1"><?php printf(__('Give %s - Getting Started Guide', 'give'), $display_version); ?></h1>
 
 			<?php give_social_media_elements() ?>
 
-			<div class="about-text"><?php _e( 'Welcome to the getting started guide.', 'give' ); ?></div>
+			<div class="about-text"><?php _e('Welcome to the getting started guide.', 'give'); ?></div>
 
-			<p class="newsletter-intro"><?php _e( 'Don\'t forget to sign up for the newsletter!', 'give' ); ?>.</p>
+			<p class="newsletter-intro"><?php _e('Don\'t forget to sign up for the newsletter!', 'give'); ?>.</p>
 
 			<?php give_get_newsletter() ?>
 
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 			<?php $this->tabs(); ?>
 
 
-			<div class="about-text"><?php printf( __( 'Getting started with Give is easy! We put together this quick start guide to help first time users of the plugin. Our goal is to get you up and running in no time. Let\'s begin!', 'give' ), $display_version ); ?></div>
+			<div class="about-text"><?php printf(__('Getting started with Give is easy! We put together this quick start guide to help first time users of the plugin. Our goal is to get you up and running in no time. Let\'s begin!', 'give'), $display_version); ?></div>
 
 
 			<div class="feature-section clearfix">
 
 				<div class="content feature-section-item">
-					<h3><?php _e( 'STEP 1: Create a New Form', 'give' ); ?></h3>
+					<h3><?php _e('STEP 1: Create a New Form', 'give'); ?></h3>
 
-					<p><?php _e( 'Give is driven by it\'s powerful form building features. But it is not simply a "form". From the "Add New Form" page you\'ll be able to choose how and where you want to receive your donations. You\'ll be able to set the donation amounts. You even get to choose whether you want to create a whole page for your form, or embed it on a different page of your site.', 'give' ); ?></p>
+					<p><?php _e('Give is driven by it\'s powerful form building features. But it is not simply a "form". From the "Add New Form" page you\'ll be able to choose how and where you want to receive your donations. You\'ll be able to set the donation amounts. You even get to choose whether you want to create a whole page for your form, or embed it on a different page of your site.', 'give'); ?></p>
 
-					<p><?php _e( 'But all of these features begin simply by going to the menu and choosing "Add New Form."', 'give' ); ?></p>
+					<p><?php _e('But all of these features begin simply by going to the menu and choosing "Add New Form."', 'give'); ?></p>
 				</div>
 
 				<div class="content feature-section-item last-feature">
@@ -396,9 +396,9 @@ 
 				</div>
 
 				<div class="content feature-section-item last-feature">
-					<h3><?php _e( 'STEP 2: Choose Your Levels', 'give' ); ?></h3>
+					<h3><?php _e('STEP 2: Choose Your Levels', 'give'); ?></h3>
 
-					<p><?php _e( 'Each Form can be set to receive either a pre-determined amount or have multiple suggested levels of giving. Choosing "Multi-level Donation" opens up the levels section where you can add as many levels as you like with your own custom names and amounts.', 'give' ); ?></p>
+					<p><?php _e('Each Form can be set to receive either a pre-determined amount or have multiple suggested levels of giving. Choosing "Multi-level Donation" opens up the levels section where you can add as many levels as you like with your own custom names and amounts.', 'give'); ?></p>
 				</div>
 
 			</div>
@@ -407,11 +407,11 @@ 
 			<div class="feature-section clearfix">
 
 				<div class="content feature-section-item add-content">
-					<h3><?php _e( 'STEP 3: Landing Page or Shortcode Mode?', 'give' ); ?></h3>
+					<h3><?php _e('STEP 3: Landing Page or Shortcode Mode?', 'give'); ?></h3>
 
-					<p><?php _e( 'Every form you create in Give can either become it\'s own stand-alone page, or it can be inserted into any other page or post throughout your site as a Shortcode.', 'give' ); ?></p>
+					<p><?php _e('Every form you create in Give can either become it\'s own stand-alone page, or it can be inserted into any other page or post throughout your site as a Shortcode.', 'give'); ?></p>
 
-					<p><?php _e( 'You can choose these different modes by going to the "Form Content" section. From there, you can choose to add content before or after the Donation form on a page, or if you choose "None" perhaps you want to instead use the shortcode. You can find the shortcode in the top right column directly under the Publish/Save button. This feature gives you the most amount of flexibility with controlling your content on your website all within the same page.', 'give' ); ?></p>
+					<p><?php _e('You can choose these different modes by going to the "Form Content" section. From there, you can choose to add content before or after the Donation form on a page, or if you choose "None" perhaps you want to instead use the shortcode. You can find the shortcode in the top right column directly under the Publish/Save button. This feature gives you the most amount of flexibility with controlling your content on your website all within the same page.', 'give'); ?></p>
 				</div>
 
 				<div class="content feature-section-item last-feature">
@@ -428,9 +428,9 @@ 
 				</div>
 
 				<div class="content feature-section-item last-feature">
-					<h3><?php _e( 'STEP 4: Configure Your Display Options', 'give' ); ?></h3>
+					<h3><?php _e('STEP 4: Configure Your Display Options', 'give'); ?></h3>
 
-					<p><?php _e( 'Lastly, you can present the form in a lot of different ways. With the "Display Options" section you can configure how the credit card field appears, the submit button text, which Gateway you want to use, whether Guests (non-logged in users) can donate or not, and a log-in form.', 'give' ); ?></p>
+					<p><?php _e('Lastly, you can present the form in a lot of different ways. With the "Display Options" section you can configure how the credit card field appears, the submit button text, which Gateway you want to use, whether Guests (non-logged in users) can donate or not, and a log-in form.', 'give'); ?></p>
 				</div>
 
 
@@ -450,26 +450,26 @@ 
 	 * @return void
 	 */
 	public function credits_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
-			<h1 class="welcome-h1"><?php printf( __( 'Give %s - Credits', 'give' ), $display_version ); ?></h1>
+			<h1 class="welcome-h1"><?php printf(__('Give %s - Credits', 'give'), $display_version); ?></h1>
 
 			<?php give_social_media_elements() ?>
 
-			<div class="about-text"><?php printf( __( 'Thanks to all those who have contributed code directly or indirectly. ', 'give' ), $display_version ); ?></div>
+			<div class="about-text"><?php printf(__('Thanks to all those who have contributed code directly or indirectly. ', 'give'), $display_version); ?></div>
 
-			<div class="about-text"><?php _e( 'Welcome to the getting started guide.', 'give' ); ?></div>
+			<div class="about-text"><?php _e('Welcome to the getting started guide.', 'give'); ?></div>
 
 			<p class="newsletter-intro">Be sure to sign up for the Give newsletter below to stay informed of important updates and news.</p>
 
 			<?php give_get_newsletter() ?>
 
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 			<?php $this->tabs(); ?>
 
-			<p class="about-description"><?php _e( 'Give is created by a dedicated team of developers. If you are interested in contributing please visit the <a href="https://github.com/WordImpress/give" target="_blank">GitHub Repo</a>.', 'give' ); ?></p>
+			<p class="about-description"><?php _e('Give is created by a dedicated team of developers. If you are interested in contributing please visit the <a href="https://github.com/WordImpress/give" target="_blank">GitHub Repo</a>.', 'give'); ?></p>
 
 			<?php echo $this->contributors(); ?>
 		</div>
@@ -484,21 +484,21 @@ 
 	 * @return string $readme HTML formatted readme file
 	 */
 	public function parse_readme() {
-		$file = file_exists( GIVE_PLUGIN_DIR . 'readme.txt' ) ? GIVE_PLUGIN_DIR . 'readme.txt' : null;
+		$file = file_exists(GIVE_PLUGIN_DIR.'readme.txt') ? GIVE_PLUGIN_DIR.'readme.txt' : null;
 
-		if ( ! $file ) {
-			$readme = '<p>' . __( 'No valid changlog was found.', 'give' ) . '</p>';
+		if ( ! $file) {
+			$readme = '<p>'.__('No valid changlog was found.', 'give').'</p>';
 		} else {
-			$readme = file_get_contents( $file );
-			$readme = nl2br( esc_html( $readme ) );
-			$readme = explode( '== Changelog ==', $readme );
-			$readme = end( $readme );
-
-			$readme = preg_replace( '/`(.*?)`/', '<code>\\1</code>', $readme );
-			$readme = preg_replace( '/[\040]\*\*(.*?)\*\*/', ' <strong>\\1</strong>', $readme );
-			$readme = preg_replace( '/[\040]\*(.*?)\*/', ' <em>\\1</em>', $readme );
-			$readme = preg_replace( '/= (.*?) =/', '<h4>\\1</h4>', $readme );
-			$readme = preg_replace( '/\[(.*?)\]\((.*?)\)/', '<a href="\\2">\\1</a>', $readme );
+			$readme = file_get_contents($file);
+			$readme = nl2br(esc_html($readme));
+			$readme = explode('== Changelog ==', $readme);
+			$readme = end($readme);
+
+			$readme = preg_replace('/`(.*?)`/', '<code>\\1</code>', $readme);
+			$readme = preg_replace('/[\040]\*\*(.*?)\*\*/', ' <strong>\\1</strong>', $readme);
+			$readme = preg_replace('/[\040]\*(.*?)\*/', ' <em>\\1</em>', $readme);
+			$readme = preg_replace('/= (.*?) =/', '<h4>\\1</h4>', $readme);
+			$readme = preg_replace('/\[(.*?)\]\((.*?)\)/', '<a href="\\2">\\1</a>', $readme);
 		}
 
 		return $readme;
@@ -515,21 +515,21 @@ 
 	public function contributors() {
 		$contributors = $this->get_contributors();
 
-		if ( empty( $contributors ) ) {
+		if (empty($contributors)) {
 			return '';
 		}
 
 		$contributor_list = '<ul class="wp-people-group">';
 
-		foreach ( $contributors as $contributor ) {
+		foreach ($contributors as $contributor) {
 			$contributor_list .= '<li class="wp-person">';
-			$contributor_list .= sprintf( '<a href="%s" title="%s">',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( sprintf( __( 'View %s', 'give' ), $contributor->login ) )
+			$contributor_list .= sprintf('<a href="%s" title="%s">',
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html(sprintf(__('View %s', 'give'), $contributor->login))
 			);
-			$contributor_list .= sprintf( '<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url( $contributor->avatar_url ), esc_html( $contributor->login ) );
+			$contributor_list .= sprintf('<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url($contributor->avatar_url), esc_html($contributor->login));
 			$contributor_list .= '</a>';
-			$contributor_list .= sprintf( '<a class="web" href="%s">%s</a>', esc_url( 'https://github.com/' . $contributor->login ), esc_html( $contributor->login ) );
+			$contributor_list .= sprintf('<a class="web" href="%s">%s</a>', esc_url('https://github.com/'.$contributor->login), esc_html($contributor->login));
 			$contributor_list .= '</a>';
 			$contributor_list .= '</li>';
 		}
@@ -547,25 +547,25 @@ 
 	 * @return array $contributors List of contributors
 	 */
 	public function get_contributors() {
-		$contributors = get_transient( 'give_contributors' );
+		$contributors = get_transient('give_contributors');
 
-		if ( false !== $contributors ) {
+		if (false !== $contributors) {
 			return $contributors;
 		}
 
-		$response = wp_remote_get( 'https://api.github.com/repos/WordImpress/Give/contributors', array( 'sslverify' => false ) );
+		$response = wp_remote_get('https://api.github.com/repos/WordImpress/Give/contributors', array('sslverify' => false));
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
 			return array();
 		}
 
-		$contributors = json_decode( wp_remote_retrieve_body( $response ) );
+		$contributors = json_decode(wp_remote_retrieve_body($response));
 
-		if ( ! is_array( $contributors ) ) {
+		if ( ! is_array($contributors)) {
 			return array();
 		}
 
-		set_transient( 'give_contributors', $contributors, 3600 );
+		set_transient('give_contributors', $contributors, 3600);
 
 		return $contributors;
 	}
@@ -584,24 +584,24 @@ 
 
 
 		// Bail if no activation redirect
-		if ( ! get_transient( '_give_activation_redirect' ) ) {
+		if ( ! get_transient('_give_activation_redirect')) {
 			return;
 		}
 
 		// Delete the redirect transient
-		delete_transient( '_give_activation_redirect' );
+		delete_transient('_give_activation_redirect');
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-		$upgrade = get_option( 'give_version_upgraded_from' );
+		$upgrade = get_option('give_version_upgraded_from');
 
-		if ( ! $upgrade ) { // First time install
-			wp_safe_redirect( admin_url( 'index.php?page=give-about' ) );
+		if ( ! $upgrade) { // First time install
+			wp_safe_redirect(admin_url('index.php?page=give-about'));
 			exit;
-		} elseif( isset( $give_options['disable_welcome'] ) ) { // Welcome is disabled in settings
+		} elseif (isset($give_options['disable_welcome'])) { // Welcome is disabled in settings
 
 		} else { // Welcome is NOT disabled in settings
 			wp_safe_redirect(admin_url('index.php?page=give-about'));

includes/class-give-cron.php

Spacing +9 added lines, -9 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,8 +29,8 @@ 
 	 * @see   Give_Cron::weekly_events()
 	 */
 	public function __construct() {
-		add_filter( 'cron_schedules', array( $this, 'add_schedules' ) );
-		add_action( 'wp', array( $this, 'schedule_Events' ) );
+		add_filter('cron_schedules', array($this, 'add_schedules'));
+		add_action('wp', array($this, 'schedule_Events'));
 	}
 
 	/**
@@ -42,11 +42,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function add_schedules( $schedules = array() ) {
+	public function add_schedules($schedules = array()) {
 		// Adds once weekly to the existing schedules.
 		$schedules['weekly'] = array(
 			'interval' => 604800,
-			'display'  => __( 'Once Weekly', 'easy-digital-downloads' )
+			'display'  => __('Once Weekly', 'easy-digital-downloads')
 		);
 
 		return $schedules;
@@ -72,8 +72,8 @@ 
 	 * @return void
 	 */
 	private function weekly_events() {
-		if ( ! wp_next_scheduled( 'give_weekly_scheduled_events' ) ) {
-			wp_schedule_event( current_time( 'timestamp' ), 'weekly', 'give_weekly_scheduled_events' );
+		if ( ! wp_next_scheduled('give_weekly_scheduled_events')) {
+			wp_schedule_event(current_time('timestamp'), 'weekly', 'give_weekly_scheduled_events');
 		}
 	}
 
@@ -85,8 +85,8 @@ 
 	 * @return void
 	 */
 	private function daily_events() {
-		if ( ! wp_next_scheduled( 'give_daily_scheduled_events' ) ) {
-			wp_schedule_event( current_time( 'timestamp' ), 'daily', 'give_daily_scheduled_events' );
+		if ( ! wp_next_scheduled('give_daily_scheduled_events')) {
+			wp_schedule_event(current_time('timestamp'), 'daily', 'give_daily_scheduled_events');
 		}
 	}
 

includes/class-give-roles.php

Indentation +3 added lines, -3 removed lines

@@ -71,9 +71,9 @@
 		) );
 
 		add_role( 'give_accountant', __( 'Give Accountant', 'give' ), array(
-		    'read'                   => true,
-		    'edit_posts'             => false,
-		    'delete_posts'           => false
+			'read'                   => true,
+			'edit_posts'             => false,
+			'delete_posts'           => false
 		) );
 
 		add_role( 'give_worker', __( 'Give Worker', 'give' ), array(

Spacing +57 added lines, -57 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	public function __construct() {
 
-		add_filter( 'give_map_meta_cap', array( $this, 'meta_caps' ), 10, 4 );
+		add_filter('give_map_meta_cap', array($this, 'meta_caps'), 10, 4);
 	}
 
 	/**
@@ -39,7 +39,7 @@ 
 	 * @return void
 	 */
 	public function add_roles() {
-		add_role( 'give_manager', __( 'Give Manager', 'give' ), array(
+		add_role('give_manager', __('Give Manager', 'give'), array(
 			'read'                   => true,
 			'edit_posts'             => true,
 			'delete_posts'           => true,
@@ -68,20 +68,20 @@ 
 			'publish_posts'          => true,
 			'read_private_pages'     => true,
 			'read_private_posts'     => true
-		) );
+		));
 
-		add_role( 'give_accountant', __( 'Give Accountant', 'give' ), array(
+		add_role('give_accountant', __('Give Accountant', 'give'), array(
 		    'read'                   => true,
 		    'edit_posts'             => false,
 		    'delete_posts'           => false
-		) );
+		));
 
-		add_role( 'give_worker', __( 'Give Worker', 'give' ), array(
+		add_role('give_worker', __('Give Worker', 'give'), array(
 			'read'                   => true,
 			'edit_posts'             => false,
 			'upload_files'           => true,
 			'delete_posts'           => false
-		) );
+		));
 
 	}
 
@@ -96,38 +96,38 @@ 
 	public function add_caps() {
 		global $wp_roles;
 
-		if ( class_exists('WP_Roles') ) {
-			if ( ! isset( $wp_roles ) ) {
+		if (class_exists('WP_Roles')) {
+			if ( ! isset($wp_roles)) {
 				$wp_roles = new WP_Roles();
 			}
 		}
 
-		if ( is_object( $wp_roles ) ) {
-			$wp_roles->add_cap( 'give_manager', 'view_give_reports' );
-			$wp_roles->add_cap( 'give_manager', 'view_give_sensitive_data' );
-			$wp_roles->add_cap( 'give_manager', 'export_give_reports' );
-			$wp_roles->add_cap( 'give_manager', 'manage_give_settings' );
+		if (is_object($wp_roles)) {
+			$wp_roles->add_cap('give_manager', 'view_give_reports');
+			$wp_roles->add_cap('give_manager', 'view_give_sensitive_data');
+			$wp_roles->add_cap('give_manager', 'export_give_reports');
+			$wp_roles->add_cap('give_manager', 'manage_give_settings');
 
-			$wp_roles->add_cap( 'administrator', 'view_give_reports' );
-			$wp_roles->add_cap( 'administrator', 'view_give_sensitive_data' );
-			$wp_roles->add_cap( 'administrator', 'export_give_reports' );
-			$wp_roles->add_cap( 'administrator', 'manage_give_settings' );
+			$wp_roles->add_cap('administrator', 'view_give_reports');
+			$wp_roles->add_cap('administrator', 'view_give_sensitive_data');
+			$wp_roles->add_cap('administrator', 'export_give_reports');
+			$wp_roles->add_cap('administrator', 'manage_give_settings');
 
 			// Add the main post type capabilities
 			$capabilities = $this->get_core_caps();
-			foreach ( $capabilities as $cap_group ) {
-				foreach ( $cap_group as $cap ) {
-					$wp_roles->add_cap( 'administrator', $cap );
-					$wp_roles->add_cap( 'give_manager', $cap );
-					$wp_roles->add_cap( 'give_worker', $cap );
+			foreach ($capabilities as $cap_group) {
+				foreach ($cap_group as $cap) {
+					$wp_roles->add_cap('administrator', $cap);
+					$wp_roles->add_cap('give_manager', $cap);
+					$wp_roles->add_cap('give_worker', $cap);
 				}
 			}
 
-			$wp_roles->add_cap( 'give_accountant', 'edit_give_forms' );
-			$wp_roles->add_cap( 'give_accountant', 'read_private_forms' );
-			$wp_roles->add_cap( 'give_accountant', 'view_give_reports' );
-			$wp_roles->add_cap( 'give_accountant', 'export_give_reports' );
-			$wp_roles->add_cap( 'give_accountant', 'edit_give_payments' );
+			$wp_roles->add_cap('give_accountant', 'edit_give_forms');
+			$wp_roles->add_cap('give_accountant', 'read_private_forms');
+			$wp_roles->add_cap('give_accountant', 'view_give_reports');
+			$wp_roles->add_cap('give_accountant', 'export_give_reports');
+			$wp_roles->add_cap('give_accountant', 'edit_give_payments');
 
 		}
 	}
@@ -142,10 +142,10 @@ 
 	public function get_core_caps() {
 		$capabilities = array();
 
-		$capability_types = array( 'give_form', 'give_payment' );
+		$capability_types = array('give_form', 'give_payment');
 
-		foreach ( $capability_types as $capability_type ) {
-			$capabilities[ $capability_type ] = array(
+		foreach ($capability_types as $capability_type) {
+			$capabilities[$capability_type] = array(
 				// Post type
 				"edit_{$capability_type}",
 				"read_{$capability_type}",
@@ -182,22 +182,22 @@ 
 	 * @since  1.0
 	 * @return array $caps
 	 */
-	public function meta_caps( $caps, $cap, $user_id, $args ) {
+	public function meta_caps($caps, $cap, $user_id, $args) {
 
-		switch( $cap ) {
+		switch ($cap) {
 
 			case 'view_give_forms_stats' :
 				
-				if( empty( $args[0] ) ) {
+				if (empty($args[0])) {
 					break;
 				}
 				
-				$form = get_post( $args[0] );
-				if ( empty( $form ) ) {
+				$form = get_post($args[0]);
+				if (empty($form)) {
 					break;
 				}
 
-				if( user_can( $user_id, 'view_give_reports' ) || $user_id == $form->post_author ) {
+				if (user_can($user_id, 'view_give_reports') || $user_id == $form->post_author) {
 					$caps = array();
 				}
 
@@ -219,41 +219,41 @@ 
 		
 		global $wp_roles;
 
-		if ( class_exists( 'WP_Roles' ) ) {
-			if ( ! isset( $wp_roles ) ) {
+		if (class_exists('WP_Roles')) {
+			if ( ! isset($wp_roles)) {
 				$wp_roles = new WP_Roles();
 			}
 		}
 
-		if ( is_object( $wp_roles ) ) {
+		if (is_object($wp_roles)) {
 			/** Give Manager Capabilities */
-			$wp_roles->remove_cap( 'give_manager', 'view_give_reports' );
-			$wp_roles->remove_cap( 'give_manager', 'view_give_sensitive_data' );
-			$wp_roles->remove_cap( 'give_manager', 'export_give_reports' );
-			$wp_roles->remove_cap( 'give_manager', 'manage_give_settings' );
+			$wp_roles->remove_cap('give_manager', 'view_give_reports');
+			$wp_roles->remove_cap('give_manager', 'view_give_sensitive_data');
+			$wp_roles->remove_cap('give_manager', 'export_give_reports');
+			$wp_roles->remove_cap('give_manager', 'manage_give_settings');
 
 			/** Site Administrator Capabilities */
-			$wp_roles->remove_cap( 'administrator', 'view_give_reports' );
-			$wp_roles->remove_cap( 'administrator', 'view_give_sensitive_data' );
-			$wp_roles->remove_cap( 'administrator', 'export_give_reports' );
-			$wp_roles->remove_cap( 'administrator', 'manage_give_settings' );
+			$wp_roles->remove_cap('administrator', 'view_give_reports');
+			$wp_roles->remove_cap('administrator', 'view_give_sensitive_data');
+			$wp_roles->remove_cap('administrator', 'export_give_reports');
+			$wp_roles->remove_cap('administrator', 'manage_give_settings');
 
 			/** Remove the Main Post Type Capabilities */
 			$capabilities = $this->get_core_caps();
 
-			foreach ( $capabilities as $cap_group ) {
-				foreach ( $cap_group as $cap ) {
-					$wp_roles->remove_cap( 'give_manager', $cap );
-					$wp_roles->remove_cap( 'administrator', $cap );
-					$wp_roles->remove_cap( 'give_worker', $cap );
+			foreach ($capabilities as $cap_group) {
+				foreach ($cap_group as $cap) {
+					$wp_roles->remove_cap('give_manager', $cap);
+					$wp_roles->remove_cap('administrator', $cap);
+					$wp_roles->remove_cap('give_worker', $cap);
 				}
 			}
 
 			/** Shop Accountant Capabilities */
-			$wp_roles->remove_cap( 'give_accountant', 'edit_give_forms' );
-			$wp_roles->remove_cap( 'give_accountant', 'read_private_forms' );
-			$wp_roles->remove_cap( 'give_accountant', 'view_give_reports' );
-			$wp_roles->remove_cap( 'give_accountant', 'export_give_reports' );
+			$wp_roles->remove_cap('give_accountant', 'edit_give_forms');
+			$wp_roles->remove_cap('give_accountant', 'read_private_forms');
+			$wp_roles->remove_cap('give_accountant', 'view_give_reports');
+			$wp_roles->remove_cap('give_accountant', 'export_give_reports');
 
 		}
 	}

includes/misc-functions.php

Indentation +8 added lines, -8 removed lines

@@ -727,10 +727,10 @@ 
 		}
 
 		if ( ! is_int( $params[1] )
-		     && ! is_float( $params[1] )
-		     && ! is_string( $params[1] )
-		     && $params[1] !== null
-		     && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
+			 && ! is_float( $params[1] )
+			 && ! is_string( $params[1] )
+			 && $params[1] !== null
+			 && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
 		) {
 			trigger_error( 'array_column(): The column key should be either a string or an integer', E_USER_WARNING );
 
@@ -738,10 +738,10 @@ 
 		}
 
 		if ( isset( $params[2] )
-		     && ! is_int( $params[2] )
-		     && ! is_float( $params[2] )
-		     && ! is_string( $params[2] )
-		     && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
+			 && ! is_int( $params[2] )
+			 && ! is_float( $params[2] )
+			 && ! is_string( $params[2] )
+			 && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
 		) {
 			trigger_error( 'array_column(): The index key should be either a string or an integer', E_USER_WARNING );
 

Doc Comments +8 added lines, -8 removed lines

@@ -323,7 +323,7 @@ 
  *
  * @since 1.0
  * @uses  Give()->session->get()
- * @return mixed array | false
+ * @return string array | false
  */
 function give_get_purchase_session() {
 	return Give()->session->get( 'give_purchase' );
@@ -360,7 +360,7 @@ 
  * Returns the webhost this site is using if possible
  *
  * @since 1.0
- * @return mixed string $host if detected, false otherwise
+ * @return string string $host if detected, false otherwise
  */
 function give_get_host() {
 	$host = false;
@@ -551,7 +551,7 @@ 
  *
  * @since 1.0
  *
- * @param unknown $n
+ * @param integer $n
  *
  * @return string Short month name
  */
@@ -681,9 +681,9 @@ 
 /**
  * Create SVG library function
  *
- * @param $icon
+ * @param string $icon
  *
- * @return mixed
+ * @return string
  */
 function give_svg_icons( $icon ) {
 
@@ -740,7 +740,7 @@ 
 	 *
 	 * @param array $input A multi-dimensional array (record set) from which to pull
 	 *                         a column of values.
-	 * @param mixed $columnKey The column of values to return. This value may be the
+	 * @param string $columnKey The column of values to return. This value may be the
 	 *                         integer key of the column you wish to retrieve, or it
 	 *                         may be the string key name for an associative array.
 	 * @param mixed $indexKey (Optional.) The column to use as the index/keys for
@@ -894,11 +894,11 @@ 
 	/**
 	 * cal_days_in_month
 	 *
-	 * @param $calendar
+	 * @param integer $calendar
 	 * @param $month
 	 * @param $year
 	 *
-	 * @return bool|string
+	 * @return string
 	 */
 	function cal_days_in_month( $calendar, $month, $year ) {
 		return date( 't', mktime( 0, 0, 0, $month, 1, $year ) );

Spacing +165 added lines, -165 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,9 +24,9 @@ 
 function give_is_test_mode() {
 	global $give_options;
 
-	$ret = ! empty( $give_options['test_mode'] );
+	$ret = ! empty($give_options['test_mode']);
 
-	return (bool) apply_filters( 'give_is_test_mode', $ret );
+	return (bool) apply_filters('give_is_test_mode', $ret);
 }
 
 /**
@@ -37,9 +37,9 @@ 
  */
 function give_get_currency() {
 	global $give_options;
-	$currency = isset( $give_options['currency'] ) ? $give_options['currency'] : 'USD';
+	$currency = isset($give_options['currency']) ? $give_options['currency'] : 'USD';
 
-	return apply_filters( 'give_currency', $currency );
+	return apply_filters('give_currency', $currency);
 }
 
 /**
@@ -51,9 +51,9 @@ 
  */
 function give_get_currency_position() {
 	global $give_options;
-	$currency_pos = isset( $give_options['currency_position'] ) ? $give_options['currency_position'] : 'before';
+	$currency_pos = isset($give_options['currency_position']) ? $give_options['currency_position'] : 'before';
 
-	return apply_filters( 'give_currency_position', $currency_pos );
+	return apply_filters('give_currency_position', $currency_pos);
 }
 
 
@@ -66,39 +66,39 @@ 
 
 function give_get_currencies() {
 	$currencies = array(
-		'USD'  => __( 'US Dollars ($)', 'give' ),
-		'EUR'  => __( 'Euros (€)', 'give' ),
-		'GBP'  => __( 'Pounds Sterling (£)', 'give' ),
-		'AUD'  => __( 'Australian Dollars ($)', 'give' ),
-		'BRL'  => __( 'Brazilian Real (R$)', 'give' ),
-		'CAD'  => __( 'Canadian Dollars ($)', 'give' ),
-		'CZK'  => __( 'Czech Koruna (Kč)', 'give' ),
-		'DKK'  => __( 'Danish Krone (kr)', 'give' ),
-		'HKD'  => __( 'Hong Kong Dollar ($)', 'give' ),
-		'HUF'  => __( 'Hungarian Forint (Ft)', 'give' ),
-		'ILS'  => __( 'Israeli Shekel (₪)', 'give' ),
-		'JPY'  => __( 'Japanese Yen (¥)', 'give' ),
-		'MYR'  => __( 'Malaysian Ringgits (RM)', 'give' ),
-		'MXN'  => __( 'Mexican Peso ($)', 'give' ),
-		'MAD'  => __( 'Moroccan Dirham (.د.م)', 'give' ),
-		'NZD'  => __( 'New Zealand Dollar ($)', 'give' ),
-		'NOK'  => __( 'Norwegian Krone (Kr.)', 'give' ),
-		'PHP'  => __( 'Philippine Pesos (₱)', 'give' ),
-		'PLN'  => __( 'Polish Zloty (zł)', 'give' ),
-		'SGD'  => __( 'Singapore Dollar ($)', 'give' ),
-		'KRW'  => __( 'South Korean Won (₩)', 'give' ),
-		'ZAR'  => __( 'South African Rand (R)', 'give' ),
-		'SEK'  => __( 'Swedish Krona (kr)', 'give' ),
-		'CHF'  => __( 'Swiss Franc (CHF)', 'give' ),
-		'TWD'  => __( 'Taiwan New Dollars (NT$)', 'give' ),
-		'THB'  => __( 'Thai Baht (฿)', 'give' ),
-		'INR'  => __( 'Indian Rupee (₹)', 'give' ),
-		'TRY'  => __( 'Turkish Lira (₺)', 'give' ),
-		'RIAL' => __( 'Iranian Rial (﷼)', 'give' ),
-		'RUB'  => __( 'Russian Rubles (руб)', 'give' )
+		'USD'  => __('US Dollars ($)', 'give'),
+		'EUR'  => __('Euros (€)', 'give'),
+		'GBP'  => __('Pounds Sterling (£)', 'give'),
+		'AUD'  => __('Australian Dollars ($)', 'give'),
+		'BRL'  => __('Brazilian Real (R$)', 'give'),
+		'CAD'  => __('Canadian Dollars ($)', 'give'),
+		'CZK'  => __('Czech Koruna (Kč)', 'give'),
+		'DKK'  => __('Danish Krone (kr)', 'give'),
+		'HKD'  => __('Hong Kong Dollar ($)', 'give'),
+		'HUF'  => __('Hungarian Forint (Ft)', 'give'),
+		'ILS'  => __('Israeli Shekel (₪)', 'give'),
+		'JPY'  => __('Japanese Yen (¥)', 'give'),
+		'MYR'  => __('Malaysian Ringgits (RM)', 'give'),
+		'MXN'  => __('Mexican Peso ($)', 'give'),
+		'MAD'  => __('Moroccan Dirham (.د.م)', 'give'),
+		'NZD'  => __('New Zealand Dollar ($)', 'give'),
+		'NOK'  => __('Norwegian Krone (Kr.)', 'give'),
+		'PHP'  => __('Philippine Pesos (₱)', 'give'),
+		'PLN'  => __('Polish Zloty (zł)', 'give'),
+		'SGD'  => __('Singapore Dollar ($)', 'give'),
+		'KRW'  => __('South Korean Won (₩)', 'give'),
+		'ZAR'  => __('South African Rand (R)', 'give'),
+		'SEK'  => __('Swedish Krona (kr)', 'give'),
+		'CHF'  => __('Swiss Franc (CHF)', 'give'),
+		'TWD'  => __('Taiwan New Dollars (NT$)', 'give'),
+		'THB'  => __('Thai Baht (฿)', 'give'),
+		'INR'  => __('Indian Rupee (₹)', 'give'),
+		'TRY'  => __('Turkish Lira (₺)', 'give'),
+		'RIAL' => __('Iranian Rial (﷼)', 'give'),
+		'RUB'  => __('Russian Rubles (руб)', 'give')
 	);
 
-	return apply_filters( 'give_currencies', $currencies );
+	return apply_filters('give_currencies', $currencies);
 }
 
 
@@ -113,12 +113,12 @@ 
  *
  * @return string           The symbol to use for the currency
  */
-function give_currency_symbol( $currency = '' ) {
+function give_currency_symbol($currency = '') {
 
-	if ( empty( $currency ) ) {
+	if (empty($currency)) {
 		$currency = give_get_currency();
 	}
-	switch ( $currency ) :
+	switch ($currency) :
 		case 'GBP' :
 			$symbol = '£';
 			break;
@@ -197,7 +197,7 @@ 
 	endswitch;
 
 
-	return apply_filters( 'give_currency_symbol', $symbol, $currency );
+	return apply_filters('give_currency_symbol', $symbol, $currency);
 }
 
 
@@ -209,13 +209,13 @@ 
  */
 function give_get_current_page_url() {
 
-	if ( is_front_page() ) {
-		$current_url = home_url( '/' );
+	if (is_front_page()) {
+		$current_url = home_url('/');
 	} else {
-		$current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . untrailingslashit( $_SERVER['REQUEST_URI'] ) );
+		$current_url = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].untrailingslashit($_SERVER['REQUEST_URI']));
 	}
 
-	return apply_filters( 'give_get_current_page_url', esc_url( $current_url ) );
+	return apply_filters('give_get_current_page_url', esc_url($current_url));
 }
 
 
@@ -236,15 +236,15 @@ 
 	 */
 	$gateways = give_get_enabled_payment_gateways();
 
-	if ( count( $gateways ) == 1 && ! isset( $gateways['paypal'] ) && ! isset( $gateways['manual'] ) ) {
+	if (count($gateways) == 1 && ! isset($gateways['paypal']) && ! isset($gateways['manual'])) {
 		$ret = true;
-	} else if ( count( $gateways ) == 1 ) {
+	} else if (count($gateways) == 1) {
 		$ret = false;
-	} else if ( count( $gateways ) == 2 && isset( $gateways['paypal'] ) && isset( $gateways['manual'] ) ) {
+	} else if (count($gateways) == 2 && isset($gateways['paypal']) && isset($gateways['manual'])) {
 		$ret = false;
 	}
 
-	return (bool) apply_filters( 'give_verify_credit_cards', $ret );
+	return (bool) apply_filters('give_verify_credit_cards', $ret);
 }
 
 /**
@@ -256,26 +256,26 @@ 
 function give_get_timezone_id() {
 
 	// if site timezone string exists, return it
-	if ( $timezone = get_option( 'timezone_string' ) ) {
+	if ($timezone = get_option('timezone_string')) {
 		return $timezone;
 	}
 
 	// get UTC offset, if it isn't set return UTC
-	if ( ! ( $utc_offset = 3600 * get_option( 'gmt_offset', 0 ) ) ) {
+	if ( ! ($utc_offset = 3600 * get_option('gmt_offset', 0))) {
 		return 'UTC';
 	}
 
 	// attempt to guess the timezone string from the UTC offset
-	$timezone = timezone_name_from_abbr( '', $utc_offset );
+	$timezone = timezone_name_from_abbr('', $utc_offset);
 
 	// last try, guess timezone string manually
-	if ( $timezone === false ) {
+	if ($timezone === false) {
 
-		$is_dst = date( 'I' );
+		$is_dst = date('I');
 
-		foreach ( timezone_abbreviations_list() as $abbr ) {
-			foreach ( $abbr as $city ) {
-				if ( $city['dst'] == $is_dst && $city['offset'] == $utc_offset ) {
+		foreach (timezone_abbreviations_list() as $abbr) {
+			foreach ($abbr as $city) {
+				if ($city['dst'] == $is_dst && $city['offset'] == $utc_offset) {
 					return $city['timezone_id'];
 				}
 			}
@@ -299,17 +299,17 @@ 
 
 	$ip = '127.0.0.1';
 
-	if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
+	if ( ! empty($_SERVER['HTTP_CLIENT_IP'])) {
 		//check ip from share internet
 		$ip = $_SERVER['HTTP_CLIENT_IP'];
-	} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
+	} elseif ( ! empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
 		//to check ip is pass from proxy
 		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-	} elseif ( ! empty( $_SERVER['REMOTE_ADDR'] ) ) {
+	} elseif ( ! empty($_SERVER['REMOTE_ADDR'])) {
 		$ip = $_SERVER['REMOTE_ADDR'];
 	}
 
-	return apply_filters( 'give_get_ip', $ip );
+	return apply_filters('give_get_ip', $ip);
 }
 
 
@@ -324,9 +324,9 @@ 
  *
  * @uses  Give()->session->set()
  */
-function give_set_purchase_session( $purchase_data = array() ) {
-	Give()->session->set( 'give_purchase', $purchase_data );
-	Give()->session->set( 'give_email', $purchase_data['user_email'] );
+function give_set_purchase_session($purchase_data = array()) {
+	Give()->session->set('give_purchase', $purchase_data);
+	Give()->session->set('give_email', $purchase_data['user_email']);
 }
 
 /**
@@ -340,7 +340,7 @@ 
  * @return mixed array | false
  */
 function give_get_purchase_session() {
-	return Give()->session->get( 'give_purchase' );
+	return Give()->session->get('give_purchase');
 }
 
 /**
@@ -355,14 +355,14 @@ 
  *
  * @return string
  */
-function give_get_purchase_summary( $purchase_data, $email = true ) {
+function give_get_purchase_summary($purchase_data, $email = true) {
 	$summary = '';
 
-	if ( $email ) {
-		$summary .= $purchase_data['user_email'] . ' - ';
+	if ($email) {
+		$summary .= $purchase_data['user_email'].' - ';
 	}
 
-	$summary .= get_the_title( $purchase_data['post_data']['give-form-id'] );
+	$summary .= get_the_title($purchase_data['post_data']['give-form-id']);
 
 	return $summary;
 }
@@ -379,31 +379,31 @@ 
 function give_get_host() {
 	$host = false;
 
-	if ( defined( 'WPE_APIKEY' ) ) {
+	if (defined('WPE_APIKEY')) {
 		$host = 'WP Engine';
-	} elseif ( defined( 'PAGELYBIN' ) ) {
+	} elseif (defined('PAGELYBIN')) {
 		$host = 'Pagely';
-	} elseif ( DB_HOST == 'localhost:/tmp/mysql5.sock' ) {
+	} elseif (DB_HOST == 'localhost:/tmp/mysql5.sock') {
 		$host = 'ICDSoft';
-	} elseif ( DB_HOST == 'mysqlv5' ) {
+	} elseif (DB_HOST == 'mysqlv5') {
 		$host = 'NetworkSolutions';
-	} elseif ( strpos( DB_HOST, 'ipagemysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipagemysql.com') !== false) {
 		$host = 'iPage';
-	} elseif ( strpos( DB_HOST, 'ipowermysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipowermysql.com') !== false) {
 		$host = 'IPower';
-	} elseif ( strpos( DB_HOST, '.gridserver.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.gridserver.com') !== false) {
 		$host = 'MediaTemple Grid';
-	} elseif ( strpos( DB_HOST, '.pair.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.pair.com') !== false) {
 		$host = 'pair Networks';
-	} elseif ( strpos( DB_HOST, '.stabletransit.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.stabletransit.com') !== false) {
 		$host = 'Rackspace Cloud';
-	} elseif ( strpos( DB_HOST, '.sysfix.eu' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.sysfix.eu') !== false) {
 		$host = 'SysFix.eu Power Hosting';
-	} elseif ( strpos( $_SERVER['SERVER_NAME'], 'Flywheel' ) !== false ) {
+	} elseif (strpos($_SERVER['SERVER_NAME'], 'Flywheel') !== false) {
 		$host = 'Flywheel';
 	} else {
 		// Adding a general fallback for data gathering
-		$host = 'DBH: ' . DB_HOST . ', SRV: ' . $_SERVER['SERVER_NAME'];
+		$host = 'DBH: '.DB_HOST.', SRV: '.$_SERVER['SERVER_NAME'];
 	}
 
 	return $host;
@@ -419,67 +419,67 @@ 
  *
  * @return bool true if host matches, false if not
  */
-function give_is_host( $host = false ) {
+function give_is_host($host = false) {
 
 	$return = false;
 
-	if ( $host ) {
-		$host = str_replace( ' ', '', strtolower( $host ) );
+	if ($host) {
+		$host = str_replace(' ', '', strtolower($host));
 
-		switch ( $host ) {
+		switch ($host) {
 			case 'wpengine':
-				if ( defined( 'WPE_APIKEY' ) ) {
+				if (defined('WPE_APIKEY')) {
 					$return = true;
 				}
 				break;
 			case 'pagely':
-				if ( defined( 'PAGELYBIN' ) ) {
+				if (defined('PAGELYBIN')) {
 					$return = true;
 				}
 				break;
 			case 'icdsoft':
-				if ( DB_HOST == 'localhost:/tmp/mysql5.sock' ) {
+				if (DB_HOST == 'localhost:/tmp/mysql5.sock') {
 					$return = true;
 				}
 				break;
 			case 'networksolutions':
-				if ( DB_HOST == 'mysqlv5' ) {
+				if (DB_HOST == 'mysqlv5') {
 					$return = true;
 				}
 				break;
 			case 'ipage':
-				if ( strpos( DB_HOST, 'ipagemysql.com' ) !== false ) {
+				if (strpos(DB_HOST, 'ipagemysql.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'ipower':
-				if ( strpos( DB_HOST, 'ipowermysql.com' ) !== false ) {
+				if (strpos(DB_HOST, 'ipowermysql.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'mediatemplegrid':
-				if ( strpos( DB_HOST, '.gridserver.com' ) !== false ) {
+				if (strpos(DB_HOST, '.gridserver.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'pairnetworks':
-				if ( strpos( DB_HOST, '.pair.com' ) !== false ) {
+				if (strpos(DB_HOST, '.pair.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'rackspacecloud':
-				if ( strpos( DB_HOST, '.stabletransit.com' ) !== false ) {
+				if (strpos(DB_HOST, '.stabletransit.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'sysfix.eu':
 			case 'sysfix.eupowerhosting':
-				if ( strpos( DB_HOST, '.sysfix.eu' ) !== false ) {
+				if (strpos(DB_HOST, '.sysfix.eu') !== false) {
 					$return = true;
 				}
 				break;
 			case 'flywheel':
-				if ( strpos( $_SERVER['SERVER_NAME'], 'Flywheel' ) !== false ) {
+				if (strpos($_SERVER['SERVER_NAME'], 'Flywheel') !== false) {
 					$return = true;
 				}
 				break;
@@ -512,20 +512,20 @@ 
  * @param string $replacement Optional. The function that should have been called
  * @param array $backtrace Optional. Contains stack backtrace of deprecated function
  */
-function _give_deprecated_function( $function, $version, $replacement = null, $backtrace = null ) {
-	do_action( 'give_deprecated_function_run', $function, $replacement, $version );
+function _give_deprecated_function($function, $version, $replacement = null, $backtrace = null) {
+	do_action('give_deprecated_function_run', $function, $replacement, $version);
 
-	$show_errors = current_user_can( 'manage_options' );
+	$show_errors = current_user_can('manage_options');
 
 	// Allow plugin to filter the output error trigger
-	if ( WP_DEBUG && apply_filters( 'give_deprecated_function_trigger_error', $show_errors ) ) {
-		if ( ! is_null( $replacement ) ) {
-			trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since Give version %2$s! Use %3$s instead.', 'give' ), $function, $version, $replacement ) );
-			trigger_error( print_r( $backtrace, 1 ) ); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+	if (WP_DEBUG && apply_filters('give_deprecated_function_trigger_error', $show_errors)) {
+		if ( ! is_null($replacement)) {
+			trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since Give version %2$s! Use %3$s instead.', 'give'), $function, $version, $replacement));
+			trigger_error(print_r($backtrace, 1)); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
 			// Alternatively we could dump this to a file.
 		} else {
-			trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since Give version %2$s with no alternative available.', 'give' ), $function, $version ) );
-			trigger_error( print_r( $backtrace, 1 ) );// Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+			trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since Give version %2$s with no alternative available.', 'give'), $function, $version));
+			trigger_error(print_r($backtrace, 1)); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
 			// Alternatively we could dump this to a file.
 		}
 	}
@@ -539,8 +539,8 @@ 
  * @return string $post_id
  */
 function give_get_admin_post_id() {
-	$post_id = isset( $_GET['post'] ) ? $_GET['post'] : null;
-	if ( ! $post_id && isset( $_POST['post_id'] ) ) {
+	$post_id = isset($_GET['post']) ? $_GET['post'] : null;
+	if ( ! $post_id && isset($_POST['post_id'])) {
 		$post_id = $_POST['post_id'];
 	}
 
@@ -554,7 +554,7 @@ 
  * @return string Arg separator output
  */
 function give_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
 
@@ -569,10 +569,10 @@ 
  *
  * @return string Short month name
  */
-function give_month_num_to_name( $n ) {
-	$timestamp = mktime( 0, 0, 0, $n, 1, 2005 );
+function give_month_num_to_name($n) {
+	$timestamp = mktime(0, 0, 0, $n, 1, 2005);
 
-	return date_i18n( "M", $timestamp );
+	return date_i18n("M", $timestamp);
 }
 
 
@@ -585,10 +585,10 @@ 
  *
  * @return bool Whether or not function is disabled.
  */
-function give_is_func_disabled( $function ) {
-	$disabled = explode( ',', ini_get( 'disable_functions' ) );
+function give_is_func_disabled($function) {
+	$disabled = explode(',', ini_get('disable_functions'));
 
-	return in_array( $function, $disabled );
+	return in_array($function, $disabled);
 }
 
 
@@ -603,7 +603,7 @@ 
 
 		<form action="//givewp.us3.list-manage.com/subscribe/post?u=3ccb75d68bda4381e2f45794c&amp;id=12a081aa13" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
 			<div class="give-newsletter-confirmation">
-				<p><?php _e( 'Thanks for Subscribing!', 'give' ); ?> :)</p>
+				<p><?php _e('Thanks for Subscribing!', 'give'); ?> :)</p>
 			</div>
 
 			<table class="form-table give-newsletter-form">
@@ -699,7 +699,7 @@ 
  *
  * @return mixed
  */
-function give_svg_icons( $icon ) {
+function give_svg_icons($icon) {
 
 	// Store your SVGs in an associative array
 	$svgs = array(
@@ -711,7 +711,7 @@ 
 	);
 
 	// Return the chosen icon's SVG string
-	return $svgs[ $icon ];
+	return $svgs[$icon];
 }
 
 /**
@@ -723,15 +723,15 @@ 
  *
  * @return mixed
  */
-function modify_nav_menu_meta_box_object( $post_type ) {
-	if ( isset( $post_type->name ) && $post_type->name == 'give_forms' ) {
+function modify_nav_menu_meta_box_object($post_type) {
+	if (isset($post_type->name) && $post_type->name == 'give_forms') {
 		$post_type->labels->name = 'Donation Forms';
 	}
 
 	return $post_type;
 }
 
-add_filter( 'nav_menu_meta_box_object', 'modify_nav_menu_meta_box_object' );
+add_filter('nav_menu_meta_box_object', 'modify_nav_menu_meta_box_object');
 
 
 /**
@@ -744,7 +744,7 @@ 
  * @license    http://opensource.org/licenses/MIT MIT
  */
 
-if ( ! function_exists( 'array_column' ) ) {
+if ( ! function_exists('array_column')) {
 	/**
 	 * Returns the values from a single column of the input array, identified by
 	 * the $columnKey.
@@ -763,56 +763,56 @@ 
 	 *
 	 * @return array
 	 */
-	function array_column( $input = null, $columnKey = null, $indexKey = null ) {
+	function array_column($input = null, $columnKey = null, $indexKey = null) {
 		// Using func_get_args() in order to check for proper number of
 		// parameters and trigger errors exactly as the built-in array_column()
 		// does in PHP 5.5.
 		$argc   = func_num_args();
 		$params = func_get_args();
 
-		if ( $argc < 2 ) {
-			trigger_error( "array_column() expects at least 2 parameters, {$argc} given", E_USER_WARNING );
+		if ($argc < 2) {
+			trigger_error("array_column() expects at least 2 parameters, {$argc} given", E_USER_WARNING);
 
 			return null;
 		}
 
-		if ( ! is_array( $params[0] ) ) {
+		if ( ! is_array($params[0])) {
 			trigger_error(
-				'array_column() expects parameter 1 to be array, ' . gettype( $params[0] ) . ' given',
+				'array_column() expects parameter 1 to be array, '.gettype($params[0]).' given',
 				E_USER_WARNING
 			);
 
 			return null;
 		}
 
-		if ( ! is_int( $params[1] )
-		     && ! is_float( $params[1] )
-		     && ! is_string( $params[1] )
+		if ( ! is_int($params[1])
+		     && ! is_float($params[1])
+		     && ! is_string($params[1])
 		     && $params[1] !== null
-		     && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
+		     && ! (is_object($params[1]) && method_exists($params[1], '__toString'))
 		) {
-			trigger_error( 'array_column(): The column key should be either a string or an integer', E_USER_WARNING );
+			trigger_error('array_column(): The column key should be either a string or an integer', E_USER_WARNING);
 
 			return false;
 		}
 
-		if ( isset( $params[2] )
-		     && ! is_int( $params[2] )
-		     && ! is_float( $params[2] )
-		     && ! is_string( $params[2] )
-		     && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
+		if (isset($params[2])
+		     && ! is_int($params[2])
+		     && ! is_float($params[2])
+		     && ! is_string($params[2])
+		     && ! (is_object($params[2]) && method_exists($params[2], '__toString'))
 		) {
-			trigger_error( 'array_column(): The index key should be either a string or an integer', E_USER_WARNING );
+			trigger_error('array_column(): The index key should be either a string or an integer', E_USER_WARNING);
 
 			return false;
 		}
 
 		$paramsInput     = $params[0];
-		$paramsColumnKey = ( $params[1] !== null ) ? (string) $params[1] : null;
+		$paramsColumnKey = ($params[1] !== null) ? (string) $params[1] : null;
 
 		$paramsIndexKey = null;
-		if ( isset( $params[2] ) ) {
-			if ( is_float( $params[2] ) || is_int( $params[2] ) ) {
+		if (isset($params[2])) {
+			if (is_float($params[2]) || is_int($params[2])) {
 				$paramsIndexKey = (int) $params[2];
 			} else {
 				$paramsIndexKey = (string) $params[2];
@@ -821,26 +821,26 @@ 
 
 		$resultArray = array();
 
-		foreach ( $paramsInput as $row ) {
+		foreach ($paramsInput as $row) {
 			$key    = $value = null;
 			$keySet = $valueSet = false;
 
-			if ( $paramsIndexKey !== null && array_key_exists( $paramsIndexKey, $row ) ) {
+			if ($paramsIndexKey !== null && array_key_exists($paramsIndexKey, $row)) {
 				$keySet = true;
-				$key    = (string) $row[ $paramsIndexKey ];
+				$key    = (string) $row[$paramsIndexKey];
 			}
 
-			if ( $paramsColumnKey === null ) {
+			if ($paramsColumnKey === null) {
 				$valueSet = true;
 				$value    = $row;
-			} elseif ( is_array( $row ) && array_key_exists( $paramsColumnKey, $row ) ) {
+			} elseif (is_array($row) && array_key_exists($paramsColumnKey, $row)) {
 				$valueSet = true;
-				$value    = $row[ $paramsColumnKey ];
+				$value    = $row[$paramsColumnKey];
 			}
 
-			if ( $valueSet ) {
-				if ( $keySet ) {
-					$resultArray[ $key ] = $value;
+			if ($valueSet) {
+				if ($keySet) {
+					$resultArray[$key] = $value;
 				} else {
 					$resultArray[] = $value;
 				}
@@ -862,40 +862,40 @@ 
  *
  * @return bool Whether the receipt is visible or not.
  */
-function give_can_view_receipt( $payment_key = '' ) {
+function give_can_view_receipt($payment_key = '') {
 
 	$return = false;
 
-	if ( empty( $payment_key ) ) {
+	if (empty($payment_key)) {
 		return $return;
 	}
 
 	global $give_receipt_args;
 
-	$give_receipt_args['id'] = give_get_purchase_id_by_key( $payment_key );
+	$give_receipt_args['id'] = give_get_purchase_id_by_key($payment_key);
 
-	$user_id = (int) give_get_payment_user_id( $give_receipt_args['id'] );
+	$user_id = (int) give_get_payment_user_id($give_receipt_args['id']);
 
-	$payment_meta = give_get_payment_meta( $give_receipt_args['id'] );
+	$payment_meta = give_get_payment_meta($give_receipt_args['id']);
 
-	if ( is_user_logged_in() ) {
-		if ( $user_id === (int) get_current_user_id() ) {
+	if (is_user_logged_in()) {
+		if ($user_id === (int) get_current_user_id()) {
 			$return = true;
-		} elseif ( wp_get_current_user()->user_email === give_get_payment_user_email( $give_receipt_args['id'] ) ) {
+		} elseif (wp_get_current_user()->user_email === give_get_payment_user_email($give_receipt_args['id'])) {
 			$return = true;
-		} elseif ( current_user_can( 'view_give_sensitive_data' ) ) {
+		} elseif (current_user_can('view_give_sensitive_data')) {
 			$return = true;
 		}
 	}
 
 	$session = give_get_purchase_session();
-	if ( ! empty( $session ) && ! is_user_logged_in() ) {
-		if ( $session['purchase_key'] === $payment_meta['key'] ) {
+	if ( ! empty($session) && ! is_user_logged_in()) {
+		if ($session['purchase_key'] === $payment_meta['key']) {
 			$return = true;
 		}
 	}
 
-	return (bool) apply_filters( 'give_can_view_receipt', $return, $payment_key );
+	return (bool) apply_filters('give_can_view_receipt', $return, $payment_key);
 
 }
 
@@ -904,7 +904,7 @@ 
  *
  * @description: Fallback in case the calendar extension is not loaded in PHP; Only supports Gregorian calendar
  */
-if ( ! function_exists( 'cal_days_in_month' ) ) {
+if ( ! function_exists('cal_days_in_month')) {
 	/**
 	 * cal_days_in_month
 	 *
@@ -914,7 +914,7 @@ 
 	 *
 	 * @return bool|string
 	 */
-	function cal_days_in_month( $calendar, $month, $year ) {
-		return date( 't', mktime( 0, 0, 0, $month, 1, $year ) );
+	function cal_days_in_month($calendar, $month, $year) {
+		return date('t', mktime(0, 0, 0, $month, 1, $year));
 	}
 }

includes/admin/upgrades/upgrade-functions.php

Spacing +57 added lines, -57 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,18 +25,18 @@ 
  */
 function give_show_upgrade_notices() {
 
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-upgrades' ) {
+	if (isset($_GET['page']) && $_GET['page'] == 'give-upgrades') {
 		return;
 	} // Don't show notices on the upgrades page
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
 	}
 
-	$give_version = preg_replace( '/[^0-9.].*/', '', $give_version );
+	$give_version = preg_replace('/[^0-9.].*/', '', $give_version);
 
 	/*
 	 *  NOTICE:
@@ -47,18 +47,18 @@ 
 	 */
 
 	//v1.3.2 Upgrades
-	if ( version_compare( $give_version, '1.3.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) {
+	if (version_compare($give_version, '1.3.2', '<') || ! give_has_upgrade_completed('upgrade_give_payment_customer_id')) {
 		printf(
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id'))
 		);
 	}
 
 	//v1.3.4 Upgrades //ensure the user has gone through 1.3.4
-	if ( version_compare( $give_version, '1.3.4', '<' ) || ( ! give_has_upgrade_completed( 'upgrade_give_offline_status' ) && give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) ) {
+	if (version_compare($give_version, '1.3.4', '<') || ( ! give_has_upgrade_completed('upgrade_give_offline_status') && give_has_upgrade_completed('upgrade_give_payment_customer_id'))) {
 		printf(
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status'))
 		);
 	}
 
@@ -68,7 +68,7 @@ 
 
 }
 
-add_action( 'admin_notices', 'give_show_upgrade_notices' );
+add_action('admin_notices', 'give_show_upgrade_notices');
 
 /**
  * Triggers all upgrade functions
@@ -80,26 +80,26 @@ 
  */
 function give_trigger_upgrades() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
-		add_option( 'give_version', $give_version );
+		add_option('give_version', $give_version);
 	}
 
-	update_option( 'give_version', GIVE_VERSION );
+	update_option('give_version', GIVE_VERSION);
 
-	if ( DOING_AJAX ) {
-		die( 'complete' );
+	if (DOING_AJAX) {
+		die('complete');
 	} // Let AJAX know that the upgrade is complete
 }
 
-add_action( 'wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades' );
+add_action('wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades');
 
 /**
  * Check if the upgrade routine has been run for a specific action
@@ -110,15 +110,15 @@ 
  *
  * @return bool                   If the action has been added to the completed actions array
  */
-function give_has_upgrade_completed( $upgrade_action = '' ) {
+function give_has_upgrade_completed($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
 	$completed_upgrades = give_get_completed_upgrades();
 
-	return in_array( $upgrade_action, $completed_upgrades );
+	return in_array($upgrade_action, $completed_upgrades);
 
 }
 
@@ -131,9 +131,9 @@ 
  *
  * @return bool                   If the function was successfully added
  */
-function give_set_upgrade_complete( $upgrade_action = '' ) {
+function give_set_upgrade_complete($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
@@ -141,9 +141,9 @@ 
 	$completed_upgrades[] = $upgrade_action;
 
 	// Remove any blanks, and only show uniques
-	$completed_upgrades = array_unique( array_values( $completed_upgrades ) );
+	$completed_upgrades = array_unique(array_values($completed_upgrades));
 
-	return update_option( 'give_completed_upgrades', $completed_upgrades );
+	return update_option('give_completed_upgrades', $completed_upgrades);
 }
 
 /**
@@ -154,9 +154,9 @@ 
  */
 function give_get_completed_upgrades() {
 
-	$completed_upgrades = get_option( 'give_completed_upgrades' );
+	$completed_upgrades = get_option('give_completed_upgrades');
 
-	if ( false === $completed_upgrades ) {
+	if (false === $completed_upgrades) {
 		$completed_upgrades = array();
 	}
 
@@ -175,30 +175,30 @@ 
  */
 function give_v132_upgrade_give_payment_customer_id() {
 	global $wpdb;
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	//UPDATE DB METAKEYS
 	$sql   = "UPDATE $wpdb->postmeta SET meta_key = '_give_payment_customer_id' WHERE meta_key = '_give_payment_donor_id'";
-	$query = $wpdb->query( $sql );
+	$query = $wpdb->query($sql);
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_payment_customer_id' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_payment_customer_id');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id' );
+add_action('give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id');
 
 /**
  * Upgrades the Offline Status
@@ -212,14 +212,14 @@ 
 
 	global $wpdb;
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	// Get abandoned offline payments
@@ -229,32 +229,32 @@ 
 	$where .= "AND ( p.post_status = 'abandoned' )";
 	$where .= "AND ( m.meta_key = '_give_payment_gateway' AND m.meta_value = 'offline' )";
 
-	$sql            = $select . $join . $where;
-	$found_payments = $wpdb->get_col( $sql );
+	$sql            = $select.$join.$where;
+	$found_payments = $wpdb->get_col($sql);
 
 
-	foreach ( $found_payments as $payment ) {
+	foreach ($found_payments as $payment) {
 
 		//Only change ones marked abandoned since our release last week
 		//because the admin may have marked some abandoned themselves
-		$modified_time = get_post_modified_time( 'U', false, $payment );
+		$modified_time = get_post_modified_time('U', false, $payment);
 
 		//1450124863 =  12/10/2015 20:42:25
-		if ( $modified_time >= 1450124863 ) {
+		if ($modified_time >= 1450124863) {
 
-			give_update_payment_status( $payment, 'pending' );
+			give_update_payment_status($payment, 'pending');
 
 		}
 
 	}
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_offline_status' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_offline_status');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status' );
+add_action('give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status');

includes/admin/add-ons.php

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,12 +25,12 @@ 
 function give_add_ons_page() {
 	ob_start(); ?>
 	<div class="wrap" id="give-add-ons">
-		<h2><?php _e( 'Give Add-ons', 'give' ); ?>
-			&nbsp;&mdash;&nbsp;<a href="https://givewp.com/addons/" class="button-primary give-view-addons-all" title="<?php _e( 'Browse All Add-ons', 'give' ); ?>" target="_blank"><?php _e( 'View All Add-ons', 'give' ); ?>
+		<h2><?php _e('Give Add-ons', 'give'); ?>
+			&nbsp;&mdash;&nbsp;<a href="https://givewp.com/addons/" class="button-primary give-view-addons-all" title="<?php _e('Browse All Add-ons', 'give'); ?>" target="_blank"><?php _e('View All Add-ons', 'give'); ?>
 				<span class="dashicons dashicons-external"></span></a>
 		</h2>
 
-		<p><?php _e( 'The following Add-ons extend the functionality of Give.', 'give' ); ?></p>
+		<p><?php _e('The following Add-ons extend the functionality of Give.', 'give'); ?></p>
 		<?php echo give_add_ons_get_feed(); ?>
 	</div>
 	<?php
@@ -48,18 +48,18 @@ 
 function give_add_ons_get_feed() {
 
 	$addons_debug = false; //set to true to debug
-	$cache        = get_transient( 'give_add_ons_feed' );
+	$cache        = get_transient('give_add_ons_feed');
 
-	if ( $cache === false || $addons_debug === true && WP_DEBUG === true ) {
-		$feed = wp_remote_get( 'https://givewp.com/downloads/feed/', array( 'sslverify' => false ) );
+	if ($cache === false || $addons_debug === true && WP_DEBUG === true) {
+		$feed = wp_remote_get('https://givewp.com/downloads/feed/', array('sslverify' => false));
 
-		if ( ! is_wp_error( $feed ) ) {
-			if ( isset( $feed['body'] ) && strlen( $feed['body'] ) > 0 ) {
-				$cache = wp_remote_retrieve_body( $feed );
-				set_transient( 'give_add_ons_feed', $cache, 3600 );
+		if ( ! is_wp_error($feed)) {
+			if (isset($feed['body']) && strlen($feed['body']) > 0) {
+				$cache = wp_remote_retrieve_body($feed);
+				set_transient('give_add_ons_feed', $cache, 3600);
 			}
 		} else {
-			$cache = '<div class="error"><p>' . __( 'There was an error retrieving the Give Add-ons list from the server. Please try again later.', 'give' ) . '</div>';
+			$cache = '<div class="error"><p>'.__('There was an error retrieving the Give Add-ons list from the server. Please try again later.', 'give').'</div>';
 		}
 	}