WordImpress / Give

give.php

Indentation +3 added lines, -3 removed lines

@@ -358,9 +358,9 @@
 			require_once GIVE_PLUGIN_DIR . 'includes/emails/template.php';

 			require_once GIVE_PLUGIN_DIR . 'includes/emails/actions.php';

 

-            if( defined( 'WP_CLI' ) && WP_CLI ) {

-                require_once GIVE_PLUGIN_DIR . 'includes/class-give-cli-commands.php';

-            }

+			if( defined( 'WP_CLI' ) && WP_CLI ) {

+				require_once GIVE_PLUGIN_DIR . 'includes/class-give-cli-commands.php';

+			}

 

 			if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {

 

includes/class-give-cli-commands.php

Indentation +5 added lines, -5 removed lines

@@ -326,7 +326,7 @@ 
 	 * @subcommand	donors
 	 */
 	public function donors( $args, $assoc_args ) {
-	    global $wp_query;
+		global $wp_query;
 		$donor_id    = isset( $assoc_args ) && array_key_exists( 'id', $assoc_args )      ? absint( $assoc_args['id'] ) : false;
 		$email       = isset( $assoc_args ) && array_key_exists( 'email', $assoc_args )   ? $assoc_args['email']        : false;
 		$name        = isset( $assoc_args ) && array_key_exists( 'name', $assoc_args )    ? $assoc_args['name']         : '';
@@ -492,7 +492,7 @@ 
 	 * @subcommand	donations
 	 */
 	public function donations( $args, $assoc_args ) {
-	    global $wp_query;
+		global $wp_query;
 		$number = isset( $assoc_args ) && array_key_exists( 'number', $assoc_args ) ? $assoc_args['number'] : 10;
 
 		// Cache previous number query var.
@@ -716,9 +716,9 @@ 
 	 * @return	mixed
 	 */
 	private function color_message( $heading, $message = '', $colon = true, $color = 'g' ) {
-	    // Add colon.
-	    if ( $colon ) {
-	        $heading = $heading . ': ';
+		// Add colon.
+		if ( $colon ) {
+			$heading = $heading . ': ';
 		}
 		return WP_CLI::colorize( "%{$color}" . $heading . '%n' ) . $message;
 	}

includes/template-functions.php

Indentation +14 added lines, -14 removed lines

@@ -45,22 +45,22 @@ 
  * @param string $default_path  Default path. Default is empty.
  */
 function give_get_template( $template_name, $args = array(), $template_path = '', $default_path = '' ) {
-    if ( ! empty( $args ) && is_array( $args ) ) {
-        extract( $args );
-    }
+	if ( ! empty( $args ) && is_array( $args ) ) {
+		extract( $args );
+	}
 
-    $template_names = array( $template_name . '.php' );
+	$template_names = array( $template_name . '.php' );
 
-    $located = give_locate_template( $template_names, $template_path, $default_path );
+	$located = give_locate_template( $template_names, $template_path, $default_path );
 
-    if ( ! file_exists( $located ) ) {
+	if ( ! file_exists( $located ) ) {
 		/* translators: %s: the template */
-        give_output_error( sprintf( __( 'The %s template was not found.', 'give' ), $located ), true );
-        return;
-    }
+		give_output_error( sprintf( __( 'The %s template was not found.', 'give' ), $located ), true );
+		return;
+	}
 
-    // Allow 3rd party plugin filter template file from their plugin.
-    $located = apply_filters( 'give_get_template', $located, $template_name, $args, $template_path, $default_path );
+	// Allow 3rd party plugin filter template file from their plugin.
+	$located = apply_filters( 'give_get_template', $located, $template_name, $args, $template_path, $default_path );
 
 	/**
 	 * Fires in give template, before the file is included.
@@ -74,9 +74,9 @@ 
 	 * @param string $located       Template file filter by 3rd party plugin.
 	 * @param array  $args          Passed arguments.
 	 */
-    do_action( 'give_before_template_part', $template_name, $template_path, $located, $args );
+	do_action( 'give_before_template_part', $template_name, $template_path, $located, $args );
 
-    include( $located );
+	include( $located );
 
 	/**
 	 * Fires in give template, after the file is included.
@@ -90,7 +90,7 @@ 
 	 * @param string $located       Template file filter by 3rd party plugin.
 	 * @param array  $args          Passed arguments.
 	 */
-    do_action( 'give_after_template_part', $template_name, $template_path, $located, $args );
+	do_action( 'give_after_template_part', $template_name, $template_path, $located, $args );
 }
 
 /**

includes/login-register.php

Indentation +22 added lines, -22 removed lines

@@ -33,20 +33,20 @@ 
 		$login_redirect = add_query_arg('give-login-success', 'true', give_get_current_page_url());
 	}
 
-    if ( empty( $logout_redirect ) ) {
-        $logout_redirect = add_query_arg( 'give-logout-success', 'true', give_get_current_page_url() );
-    }
+	if ( empty( $logout_redirect ) ) {
+		$logout_redirect = add_query_arg( 'give-logout-success', 'true', give_get_current_page_url() );
+	}
 
 
-    // Add user_logout action to logout url.
-    $logout_redirect = add_query_arg(
-        array(
-            'give_action'       => 'user_logout',
-            'give_logout_nonce' => wp_create_nonce( 'give-logout-nonce' ),
-            'give_logout_redirect' => urlencode( $logout_redirect )
-        ),
-        home_url('/')
-    );
+	// Add user_logout action to logout url.
+	$logout_redirect = add_query_arg(
+		array(
+			'give_action'       => 'user_logout',
+			'give_logout_nonce' => wp_create_nonce( 'give-logout-nonce' ),
+			'give_logout_redirect' => urlencode( $logout_redirect )
+		),
+		home_url('/')
+	);
 
 	$give_login_redirect = $login_redirect;
 	$give_logout_redirect = $logout_redirect;
@@ -136,31 +136,31 @@ 
  * @return void
  */
 function give_process_user_logout( $data ) {
-    if ( wp_verify_nonce( $data['give_logout_nonce'], 'give-logout-nonce' ) && is_user_logged_in() ) {
+	if ( wp_verify_nonce( $data['give_logout_nonce'], 'give-logout-nonce' ) && is_user_logged_in() ) {
 
-        // Prevent occurring of any custom action on wp_logout.
-        remove_all_actions( 'wp_logout' );
+		// Prevent occurring of any custom action on wp_logout.
+		remove_all_actions( 'wp_logout' );
 
 		/**
 		 * Fires before processing user logout.
 		 *
 		 * @since 1.0
 		 */
-        do_action( 'give_before_user_logout' );
+		do_action( 'give_before_user_logout' );
 
-        // Logout user.
-        wp_logout();
+		// Logout user.
+		wp_logout();
 
 		/**
 		 * Fires after processing user logout.
 		 *
 		 * @since 1.0
 		 */
-        do_action( 'give_after_user_logout' );
+		do_action( 'give_after_user_logout' );
 
-        wp_redirect( $data['give_logout_redirect'] );
-        give_die();
-    }
+		wp_redirect( $data['give_logout_redirect'] );
+		give_die();
+	}
 }
 
 add_action( 'give_user_logout', 'give_process_user_logout' );

includes/admin/payments/actions.php

Indentation +64 added lines, -64 removed lines

@@ -37,7 +37,7 @@ 
 	// Retrieve the payment ID
 	$payment_id = absint( $data['give_payment_id'] );
 
-    /* @var Give_Payment $payment */
+	/* @var Give_Payment $payment */
 	$payment    = new Give_Payment( $payment_id );
 
 	// Retrieve existing payment meta
@@ -160,23 +160,23 @@ 
 
 		if ( 'publish' == $status ) {
 
-            // Reduce previous user donation count and amount.
-            $previous_customer->decrease_purchase_count();
-            $previous_customer->decrease_value( $curr_total );
+			// Reduce previous user donation count and amount.
+			$previous_customer->decrease_purchase_count();
+			$previous_customer->decrease_value( $curr_total );
 
-            // If donation was completed adjust stats of new customers.
-            $customer->increase_purchase_count();
+			// If donation was completed adjust stats of new customers.
+			$customer->increase_purchase_count();
 			$customer->increase_value( $new_total );
 		}
 
 		$payment->customer_id = $customer->id;
 	} else{
 
-	    if( 'publish' === $status ){
-            // Update user donation stat.
-            $customer->update_donation_value( $curr_total, $new_total );
-        }
-    }
+		if( 'publish' === $status ){
+			// Update user donation stat.
+			$customer->update_donation_value( $curr_total, $new_total );
+		}
+	}
 
 	// Set new meta values
 	$payment->user_id    = $customer->user_id;
@@ -217,76 +217,76 @@ 
 
 	$payment->save();
 
-    // Get new give form ID.
-    $new_form_id = absint( $data['forms'] );
-    $current_form_id = absint( $payment->get_meta( '_give_payment_form_id' ) );
+	// Get new give form ID.
+	$new_form_id = absint( $data['forms'] );
+	$current_form_id = absint( $payment->get_meta( '_give_payment_form_id' ) );
 
-    // We are adding payment transfer code in last to remove any conflict with above functionality.
-    // For example: above code will automatically handle form stat (increase/decrease) when payment status changes.
-    /* Check if user want to transfer current payment to new give form id. */
-    if( $new_form_id != $current_form_id  ) {
+	// We are adding payment transfer code in last to remove any conflict with above functionality.
+	// For example: above code will automatically handle form stat (increase/decrease) when payment status changes.
+	/* Check if user want to transfer current payment to new give form id. */
+	if( $new_form_id != $current_form_id  ) {
 
-        // Get new give form title.
-        $new_form_title = get_the_title( $new_form_id );
+		// Get new give form title.
+		$new_form_title = get_the_title( $new_form_id );
 
-        // Update new give form data in payment data.
-        $payment_meta = $payment->get_meta();
-        $payment_meta['form_title'] = $new_form_title;
-        $payment_meta['form_id']    = $new_form_id;
+		// Update new give form data in payment data.
+		$payment_meta = $payment->get_meta();
+		$payment_meta['form_title'] = $new_form_title;
+		$payment_meta['form_id']    = $new_form_id;
 
-        // Update price id post meta data for set donation form.
-        if( ! give_has_variable_prices( $new_form_id ) ) {
-            $payment_meta['price_id'] = '';
-        }
+		// Update price id post meta data for set donation form.
+		if( ! give_has_variable_prices( $new_form_id ) ) {
+			$payment_meta['price_id'] = '';
+		}
 
-        // Update payment give form meta data.
-        $payment->update_meta( '_give_payment_form_id', $new_form_id );
-        $payment->update_meta( '_give_payment_form_title', $new_form_title );
-        $payment->update_meta( '_give_payment_meta', $payment_meta );
+		// Update payment give form meta data.
+		$payment->update_meta( '_give_payment_form_id', $new_form_id );
+		$payment->update_meta( '_give_payment_form_title', $new_form_title );
+		$payment->update_meta( '_give_payment_meta', $payment_meta );
 
-        // Update price id payment metadata.
-        if( ! give_has_variable_prices( $new_form_id ) ) {
-            $payment->update_meta( '_give_payment_price_id', '' );
-        }
+		// Update price id payment metadata.
+		if( ! give_has_variable_prices( $new_form_id ) ) {
+			$payment->update_meta( '_give_payment_price_id', '' );
+		}
 
 
-        // If donation was completed, adjust stats of forms
-        if ( 'publish' == $status ) {
+		// If donation was completed, adjust stats of forms
+		if ( 'publish' == $status ) {
 
-            // Decrease sale of old give form. For other payment status 
-            $current_form = new Give_Donate_Form( $current_form_id );
-            $current_form->decrease_sales();
-            $current_form->decrease_earnings( $curr_total );
+			// Decrease sale of old give form. For other payment status 
+			$current_form = new Give_Donate_Form( $current_form_id );
+			$current_form->decrease_sales();
+			$current_form->decrease_earnings( $curr_total );
             
-            // Increase sale of new give form.
-            $new_form = new Give_Donate_Form($new_form_id);
-            $new_form->increase_sales();
-            $new_form->increase_earnings($new_total);
-        }
+			// Increase sale of new give form.
+			$new_form = new Give_Donate_Form($new_form_id);
+			$new_form->increase_sales();
+			$new_form->increase_earnings($new_total);
+		}
 
-        // Re setup payment to update new meta value in object.
-        $payment->update_payment_setup( $payment->ID );
-    }
+		// Re setup payment to update new meta value in object.
+		$payment->update_payment_setup( $payment->ID );
+	}
 
-    // Update price id if current form is variable form.
-    if( ! empty( $data['give-variable-price'] ) && give_has_variable_prices( $payment->form_id ) ) {
+	// Update price id if current form is variable form.
+	if( ! empty( $data['give-variable-price'] ) && give_has_variable_prices( $payment->form_id ) ) {
 
-        // Get payment meta data.
-        $payment_meta = $payment->get_meta();
+		// Get payment meta data.
+		$payment_meta = $payment->get_meta();
 
-        // Set payment id to empty string if variable price id is negative ( i.e. custom amount feature enabled ).
-        $data['give-variable-price'] = ( 'custom' === $data['give-variable-price'] ) ? 'custom' : ( 0 < $data['give-variable-price'] ) ? $data['give-variable-price'] : '';
+		// Set payment id to empty string if variable price id is negative ( i.e. custom amount feature enabled ).
+		$data['give-variable-price'] = ( 'custom' === $data['give-variable-price'] ) ? 'custom' : ( 0 < $data['give-variable-price'] ) ? $data['give-variable-price'] : '';
 
-        // Update payment meta data.
-        $payment_meta['price_id'] = $data['give-variable-price'];
+		// Update payment meta data.
+		$payment_meta['price_id'] = $data['give-variable-price'];
 
-        // Update payment give form meta data.
-        $payment->update_meta( '_give_payment_price_id', $data['give-variable-price'] );
-        $payment->update_meta( '_give_payment_meta', $payment_meta );
+		// Update payment give form meta data.
+		$payment->update_meta( '_give_payment_price_id', $data['give-variable-price'] );
+		$payment->update_meta( '_give_payment_meta', $payment_meta );
 
-        // Re setup payment to update new meta value in object.
-        $payment->update_payment_setup( $payment->ID );
-    }
+		// Re setup payment to update new meta value in object.
+		$payment->update_payment_setup( $payment->ID );
+	}
 
 	/**
 	 * Fires after updating edited donation.

includes/admin/class-give-settings.php

Indentation +171 added lines, -171 removed lines

@@ -1169,26 +1169,26 @@ 
  * @return void

  */

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

-    /* @var CMB2_Types $field_type_object*/

+	/* @var CMB2_Types $field_type_object*/

 

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

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

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

 	$license              = $field_type_object->field->args['options']['license'];

-    $license_key          = $escaped_value;

-    $is_license_key       = apply_filters( 'give_is_license_key', ( is_object( $license ) && ! empty( $license ) ) );

-    $is_valid_license     = apply_filters( 'give_is_valid_license', ( $is_license_key && property_exists( $license, 'license' ) && 'valid' === $license->license ) );

-    $shortname            = $field_type_object->field->args['options']['shortname'];

+	$license_key          = $escaped_value;

+	$is_license_key       = apply_filters( 'give_is_license_key', ( is_object( $license ) && ! empty( $license ) ) );

+	$is_valid_license     = apply_filters( 'give_is_valid_license', ( $is_license_key && property_exists( $license, 'license' ) && 'valid' === $license->license ) );

+	$shortname            = $field_type_object->field->args['options']['shortname'];

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

 	$type                 = empty( $escaped_value ) || ! $is_valid_license ? 'text' : 'password';

-    $custom_html          = '';

-    $value                = $escaped_value;

-    $messages             = array();

-    $class                = '';

-    $account_page_link    = $field_type_object->field->args['options']['account_url'];

-    $checkout_page_link   = $field_type_object->field->args['options']['checkout_url'];

-    $addon_name           = $field_type_object->field->args['options']['item_name'];

-    $license_status       = null;

-    $is_in_subscription   = null;

+	$custom_html          = '';

+	$value                = $escaped_value;

+	$messages             = array();

+	$class                = '';

+	$account_page_link    = $field_type_object->field->args['options']['account_url'];

+	$checkout_page_link   = $field_type_object->field->args['options']['checkout_url'];

+	$addon_name           = $field_type_object->field->args['options']['item_name'];

+	$license_status       = null;

+	$is_in_subscription   = null;

 

 	// By default query on edd api url will return license object which contain status and message property, this can break below functionality.

 	// To combat that check if status is set to error or not, if yes then set $is_license_key to false.

@@ -1197,142 +1197,142 @@ 
 	}

 

 

-    // Check if current license is part of subscription or not.

-    $subscriptions = get_option( 'give_subscriptions' );

-

-    if( $is_license_key && $subscriptions ) {

-        foreach ( $subscriptions as $subscription ) {

-            if( in_array( $license_key, $subscription['licenses'] ) ) {

-                $is_in_subscription = $subscription['id'];

-                break;

-            }

-        }

-    }

-

-

-    if( $is_license_key ) {

-        if( $is_in_subscription ) {

-            $subscription_expires = strtotime( $subscriptions[$is_in_subscription]['expires'] );

-            $subscription_status  = __( 'renew', 'give' );

-

-            if( ( 'active' !== $subscriptions[$is_in_subscription]['status'] ) ){

-                $subscription_status = __( 'expire', 'give' );

-            }

-

-            if( $subscription_expires < current_time( 'timestamp', 1 ) ) {

-                $messages[] = sprintf(

-                    __( 'Your subscription (<a href="%s" target="_blank">#%d</a>) expired. Please <a href="%s" target="_blank" title="Renew your license key">renew your license key</a>', 'give' ),

-                    urldecode( $subscriptions[$is_in_subscription]['invoice_url'] ),

-                    $subscriptions[$is_in_subscription]['payment_id'],

-                    $checkout_page_link . '?edd_license_key=' . $subscriptions[$is_in_subscription]['license_key'] . '&utm_campaign=admin&utm_source=licenses&utm_medium=expired'

-                );

-                $license_status = 'license-expired';

-            } elseif( strtotime( '- 7 days', $subscription_expires ) < current_time( 'timestamp', 1 ) ) {

-                $messages[] = sprintf(

-                    __( 'Your subscription (<a href="%s" target="_blank">#%d</a>) will %s in %s.', 'give' ),

-                    urldecode( $subscriptions[$is_in_subscription]['invoice_url'] ),

-                    $subscriptions[$is_in_subscription]['payment_id'],

-                    $subscription_status,

-                    human_time_diff( current_time( 'timestamp', 1 ), strtotime( $subscriptions[$is_in_subscription]['expires'] ) )

-                );

-                $license_status = 'license-expires-soon';

-            } else {

-                $messages[] = sprintf(

-                    __( 'Your subscription (<a href="%s" target="_blank">#%d</a>) will %s on %s.', 'give' ),

-                    urldecode( $subscriptions[$is_in_subscription]['invoice_url'] ),

-                    $subscriptions[$is_in_subscription]['payment_id'],

-                    $subscription_status,

-                    date_i18n( get_option( 'date_format' ), strtotime( $subscriptions[$is_in_subscription]['expires'], current_time( 'timestamp' ) ) )

-                );

-                $license_status = 'license-expiration-date';

-            }

-

-

-        } elseif ( empty( $license->success ) && property_exists( $license, 'error' ) ) {

-

-            // activate_license 'invalid' on anything other than valid, so if there was an error capture it

-            switch(   $license->error ) {

-                case 'expired' :

+	// Check if current license is part of subscription or not.

+	$subscriptions = get_option( 'give_subscriptions' );

+

+	if( $is_license_key && $subscriptions ) {

+		foreach ( $subscriptions as $subscription ) {

+			if( in_array( $license_key, $subscription['licenses'] ) ) {

+				$is_in_subscription = $subscription['id'];

+				break;

+			}

+		}

+	}

+

+

+	if( $is_license_key ) {

+		if( $is_in_subscription ) {

+			$subscription_expires = strtotime( $subscriptions[$is_in_subscription]['expires'] );

+			$subscription_status  = __( 'renew', 'give' );

+

+			if( ( 'active' !== $subscriptions[$is_in_subscription]['status'] ) ){

+				$subscription_status = __( 'expire', 'give' );

+			}

+

+			if( $subscription_expires < current_time( 'timestamp', 1 ) ) {

+				$messages[] = sprintf(

+					__( 'Your subscription (<a href="%s" target="_blank">#%d</a>) expired. Please <a href="%s" target="_blank" title="Renew your license key">renew your license key</a>', 'give' ),

+					urldecode( $subscriptions[$is_in_subscription]['invoice_url'] ),

+					$subscriptions[$is_in_subscription]['payment_id'],

+					$checkout_page_link . '?edd_license_key=' . $subscriptions[$is_in_subscription]['license_key'] . '&utm_campaign=admin&utm_source=licenses&utm_medium=expired'

+				);

+				$license_status = 'license-expired';

+			} elseif( strtotime( '- 7 days', $subscription_expires ) < current_time( 'timestamp', 1 ) ) {

+				$messages[] = sprintf(

+					__( 'Your subscription (<a href="%s" target="_blank">#%d</a>) will %s in %s.', 'give' ),

+					urldecode( $subscriptions[$is_in_subscription]['invoice_url'] ),

+					$subscriptions[$is_in_subscription]['payment_id'],

+					$subscription_status,

+					human_time_diff( current_time( 'timestamp', 1 ), strtotime( $subscriptions[$is_in_subscription]['expires'] ) )

+				);

+				$license_status = 'license-expires-soon';

+			} else {

+				$messages[] = sprintf(

+					__( 'Your subscription (<a href="%s" target="_blank">#%d</a>) will %s on %s.', 'give' ),

+					urldecode( $subscriptions[$is_in_subscription]['invoice_url'] ),

+					$subscriptions[$is_in_subscription]['payment_id'],

+					$subscription_status,

+					date_i18n( get_option( 'date_format' ), strtotime( $subscriptions[$is_in_subscription]['expires'], current_time( 'timestamp' ) ) )

+				);

+				$license_status = 'license-expiration-date';

+			}

+

+

+		} elseif ( empty( $license->success ) && property_exists( $license, 'error' ) ) {

+

+			// activate_license 'invalid' on anything other than valid, so if there was an error capture it

+			switch(   $license->error ) {

+				case 'expired' :

 					error_log(print_r( $license->error, true) . "\n", 3, WP_CONTENT_DIR . '/debug_new.log');

-                    $class = $license->error;

-                    $messages[] = sprintf(

-                        __( 'Your license key expired on %s. Please <a href="%s" target="_blank" title="Renew your license key">renew your license key</a>.', 'give' ),

-                        date_i18n( get_option( 'date_format' ), strtotime( $license->expires, current_time( 'timestamp' ) ) ),

-                        $checkout_page_link . '?edd_license_key=' . $value . '&utm_campaign=admin&utm_source=licenses&utm_medium=expired'

-                    );

-                    $license_status = 'license-' . $class;

-                    break;

-

-                case 'missing' :

-                    $class = $license->error;

-                    $messages[] = sprintf(

-                        __( 'Invalid license. Please <a href="%s" target="_blank" title="Visit account page">visit your account page</a> and verify it.', 'give' ),

-                        $account_page_link . '?utm_campaign=admin&utm_source=licenses&utm_medium=missing'

-                    );

-                    $license_status = 'license-' . $class;

-                    break;

-

-                case 'invalid' :

-                    $class = $license->error;

-                    $messages[] = sprintf(

-                        __( 'Your %s is not active for this URL. Please <a href="%s" target="_blank" title="Visit account page">visit your account page</a> to manage your license key URLs.', 'give' ),

-                        $addon_name,

-                        $account_page_link . '?utm_campaign=admin&utm_source=licenses&utm_medium=invalid'

-                    );

-                    $license_status = 'license-' . $class;

-                    break;

-

-                case 'site_inactive' :

-                    $class = $license->error;

-                    $messages[] = sprintf(

-                        __( 'Your %s is not active for this URL. Please <a href="%s" target="_blank" title="Visit account page">visit your account page</a> to manage your license key URLs.', 'give' ),

-                        $addon_name,

-                        $account_page_link . '?utm_campaign=admin&utm_source=licenses&utm_medium=invalid'

-                    );

-                    $license_status = 'license-' . $class;

-                    break;

-

-                case 'item_name_mismatch' :

-                    $class = $license->error;

-                    $messages[] = sprintf( __( 'This license %s does not belong to %s.', 'give' ), $value, $addon_name );

-                    $license_status = 'license-' . $class;

-                    break;

-

-                case 'no_activations_left':

-                    $class = $license->error;

-                    $messages[] = sprintf( __( 'Your license key has reached it\'s activation limit. <a href="%s">View possible upgrades</a> now.', 'give' ), $account_page_link );

-                    $license_status = 'license-' . $class;

-                    break;

-            }

-        } else {

-            switch( $license->license ) {

-                case 'valid' :

-                default:

-                    $class = 'valid';

-                    $now        = current_time( 'timestamp' );

-                    $expiration = strtotime( $license->expires, current_time( 'timestamp' ) );

-

-                    if( 'lifetime' === $license->expires ) {

-                        $messages[] = __( 'License key never expires.', 'give' );

-                        $license_status = 'license-lifetime-notice';

-                    } elseif( $expiration > $now && $expiration - $now < ( DAY_IN_SECONDS * 30 ) ) {

-                        $messages[] = sprintf(

-                            __( 'Your license key expires soon! It expires on %s. <a href="%s" target="_blank" title="Renew license">Renew your license key</a>.', 'give' ),

-                            date_i18n( get_option( 'date_format' ), strtotime( $license->expires, current_time( 'timestamp' ) ) ),

-                            $checkout_page_link . '?edd_license_key=' . $value . '&utm_campaign=admin&utm_source=licenses&utm_medium=renew'

-                        );

-                        $license_status = 'license-expires-soon';

-                    } else {

-                        $messages[] = sprintf(

-                            __( 'Your license key expires on %s.', 'give' ),

-                            date_i18n( get_option( 'date_format' ), strtotime( $license->expires, current_time( 'timestamp' ) ) )

-                        );

-                        $license_status = 'license-expiration-date';

-                    }

-                    break;

-            }

-        }

-    } else{

+					$class = $license->error;

+					$messages[] = sprintf(

+						__( 'Your license key expired on %s. Please <a href="%s" target="_blank" title="Renew your license key">renew your license key</a>.', 'give' ),

+						date_i18n( get_option( 'date_format' ), strtotime( $license->expires, current_time( 'timestamp' ) ) ),

+						$checkout_page_link . '?edd_license_key=' . $value . '&utm_campaign=admin&utm_source=licenses&utm_medium=expired'

+					);

+					$license_status = 'license-' . $class;

+					break;

+

+				case 'missing' :

+					$class = $license->error;

+					$messages[] = sprintf(

+						__( 'Invalid license. Please <a href="%s" target="_blank" title="Visit account page">visit your account page</a> and verify it.', 'give' ),

+						$account_page_link . '?utm_campaign=admin&utm_source=licenses&utm_medium=missing'

+					);

+					$license_status = 'license-' . $class;

+					break;

+

+				case 'invalid' :

+					$class = $license->error;

+					$messages[] = sprintf(

+						__( 'Your %s is not active for this URL. Please <a href="%s" target="_blank" title="Visit account page">visit your account page</a> to manage your license key URLs.', 'give' ),

+						$addon_name,

+						$account_page_link . '?utm_campaign=admin&utm_source=licenses&utm_medium=invalid'

+					);

+					$license_status = 'license-' . $class;

+					break;

+

+				case 'site_inactive' :

+					$class = $license->error;

+					$messages[] = sprintf(

+						__( 'Your %s is not active for this URL. Please <a href="%s" target="_blank" title="Visit account page">visit your account page</a> to manage your license key URLs.', 'give' ),

+						$addon_name,

+						$account_page_link . '?utm_campaign=admin&utm_source=licenses&utm_medium=invalid'

+					);

+					$license_status = 'license-' . $class;

+					break;

+

+				case 'item_name_mismatch' :

+					$class = $license->error;

+					$messages[] = sprintf( __( 'This license %s does not belong to %s.', 'give' ), $value, $addon_name );

+					$license_status = 'license-' . $class;

+					break;

+

+				case 'no_activations_left':

+					$class = $license->error;

+					$messages[] = sprintf( __( 'Your license key has reached it\'s activation limit. <a href="%s">View possible upgrades</a> now.', 'give' ), $account_page_link );

+					$license_status = 'license-' . $class;

+					break;

+			}

+		} else {

+			switch( $license->license ) {

+				case 'valid' :

+				default:

+					$class = 'valid';

+					$now        = current_time( 'timestamp' );

+					$expiration = strtotime( $license->expires, current_time( 'timestamp' ) );

+

+					if( 'lifetime' === $license->expires ) {

+						$messages[] = __( 'License key never expires.', 'give' );

+						$license_status = 'license-lifetime-notice';

+					} elseif( $expiration > $now && $expiration - $now < ( DAY_IN_SECONDS * 30 ) ) {

+						$messages[] = sprintf(

+							__( 'Your license key expires soon! It expires on %s. <a href="%s" target="_blank" title="Renew license">Renew your license key</a>.', 'give' ),

+							date_i18n( get_option( 'date_format' ), strtotime( $license->expires, current_time( 'timestamp' ) ) ),

+							$checkout_page_link . '?edd_license_key=' . $value . '&utm_campaign=admin&utm_source=licenses&utm_medium=renew'

+						);

+						$license_status = 'license-expires-soon';

+					} else {

+						$messages[] = sprintf(

+							__( 'Your license key expires on %s.', 'give' ),

+							date_i18n( get_option( 'date_format' ), strtotime( $license->expires, current_time( 'timestamp' ) ) )

+						);

+						$license_status = 'license-expiration-date';

+					}

+					break;

+			}

+		}

+	} else{

 		$class = 'empty';

 		$messages[] = sprintf(

 			__( 'To receive updates, please enter your valid %s license key.', 'give' ),

@@ -1342,7 +1342,7 @@ 
 	}

 

 

-    // Add class for input field if license is active.

+	// Add class for input field if license is active.

 	if ( $is_valid_license ) {

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

 	}

@@ -1355,12 +1355,12 @@ 
 

 	// If license is active so show deactivate button

 	if ( $is_valid_license ) {

-        // Get input filed html.

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

-            'class' => $field_classes,

-            'type'  => $type,

-            'readonly' => 'readonly',

-        ) );

+		// Get input filed html.

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

+			'class' => $field_classes,

+			'type'  => $type,

+			'readonly' => 'readonly',

+		) );

 

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

 	}

@@ -1368,27 +1368,27 @@ 
 	// Field description.

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

 

-    // If no messages found then inform user that to get updated in future register yourself.

-    if ( empty( $messages ) ) {

-        $messages[] = apply_filters( "{$shortname}_default_addon_notice", esc_html__( 'To receive updates, please enter your valid Software Licensing license key.', 'give' ) );

-    }

+	// If no messages found then inform user that to get updated in future register yourself.

+	if ( empty( $messages ) ) {

+		$messages[] = apply_filters( "{$shortname}_default_addon_notice", esc_html__( 'To receive updates, please enter your valid Software Licensing license key.', 'give' ) );

+	}

 

-    foreach( $messages as $message ) {

-        $custom_html .= '<div class="give-license-notice give-' . $license_status . '">';

-        $custom_html .= '<p>' . $message . '</p>';

-        $custom_html .= '</div>';

-    }

+	foreach( $messages as $message ) {

+		$custom_html .= '<div class="give-license-notice give-' . $license_status . '">';

+		$custom_html .= '<p>' . $message . '</p>';

+		$custom_html .= '</div>';

+	}

 

 

 

-    // Field html.

-    $custom_html = apply_filters('give_license_key_field_html', $input_field_html.$custom_html, $field_type_object );

+	// Field html.

+	$custom_html = apply_filters('give_license_key_field_html', $input_field_html.$custom_html, $field_type_object );

 

-    // Nonce.

+	// Nonce.

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

 

-    // Print field html.

-    echo '<div>' . $custom_html . '</div>';

+	// Print field html.

+	echo '<div>' . $custom_html . '</div>';

 }

 

 

includes/admin/admin-actions.php

Indentation +34 added lines, -34 removed lines

@@ -23,52 +23,52 @@
  */
 function give_hide_subscription_notices() {
 
-    // Hide subscription notices permanently.
-    if ( ! empty( $_GET['_give_hide_license_notices_permanently'] ) ) {
-        global $current_user;
+	// Hide subscription notices permanently.
+	if ( ! empty( $_GET['_give_hide_license_notices_permanently'] ) ) {
+		global $current_user;
 
-        // check previously disabled notice ids.
-        $already_dismiss_notices = ( $already_dismiss_notices = get_user_meta( $current_user->ID, '_give_hide_license_notices_permanently', true ) )
-            ? $already_dismiss_notices
-            : array();
+		// check previously disabled notice ids.
+		$already_dismiss_notices = ( $already_dismiss_notices = get_user_meta( $current_user->ID, '_give_hide_license_notices_permanently', true ) )
+			? $already_dismiss_notices
+			: array();
 
-        // Get notice id.
-        $notice_id = sanitize_text_field( $_GET['_give_hide_license_notices_permanently'] );
+		// Get notice id.
+		$notice_id = sanitize_text_field( $_GET['_give_hide_license_notices_permanently'] );
 
-        if( ! in_array( $notice_id, $already_dismiss_notices ) ) {
-            $already_dismiss_notices[] = $notice_id;
-        }
+		if( ! in_array( $notice_id, $already_dismiss_notices ) ) {
+			$already_dismiss_notices[] = $notice_id;
+		}
 
-        // Store subscription ids.
-        update_user_meta( $current_user->ID, '_give_hide_license_notices_permanently', $already_dismiss_notices );
+		// Store subscription ids.
+		update_user_meta( $current_user->ID, '_give_hide_license_notices_permanently', $already_dismiss_notices );
 
-        // Redirect user.
-        wp_safe_redirect( remove_query_arg( '_give_hide_license_notices_permanently', $_SERVER['REQUEST_URI'] ) );
-        exit();
-    }
+		// Redirect user.
+		wp_safe_redirect( remove_query_arg( '_give_hide_license_notices_permanently', $_SERVER['REQUEST_URI'] ) );
+		exit();
+	}
 
-    // Hide subscription notices shortly.
-    if ( ! empty( $_GET['_give_hide_license_notices_shortly'] ) ) {
-        global $current_user;
+	// Hide subscription notices shortly.
+	if ( ! empty( $_GET['_give_hide_license_notices_shortly'] ) ) {
+		global $current_user;
 
-        // Get notice id.
-        $notice_id = sanitize_text_field( $_GET['_give_hide_license_notices_shortly'] );
+		// Get notice id.
+		$notice_id = sanitize_text_field( $_GET['_give_hide_license_notices_shortly'] );
 
-        // Transient key name.
-        $transient_key = "_give_hide_license_notices_shortly_{$current_user->ID}_{$notice_id}";
+		// Transient key name.
+		$transient_key = "_give_hide_license_notices_shortly_{$current_user->ID}_{$notice_id}";
 
-        if( get_transient( $transient_key ) ) {
-            return;
-        }
+		if( get_transient( $transient_key ) ) {
+			return;
+		}
 
 
-        // Hide notice for 24 hours.
-        set_transient( $transient_key, true, 24 * HOUR_IN_SECONDS );
+		// Hide notice for 24 hours.
+		set_transient( $transient_key, true, 24 * HOUR_IN_SECONDS );
 
-        // Redirect user.
-        wp_safe_redirect( remove_query_arg( '_give_hide_license_notices_shortly', $_SERVER['REQUEST_URI'] ) );
-        exit();
-    }
+		// Redirect user.
+		wp_safe_redirect( remove_query_arg( '_give_hide_license_notices_shortly', $_SERVER['REQUEST_URI'] ) );
+		exit();
+	}
 }
 
 add_action( 'admin_init', 'give_hide_subscription_notices' );
\ No newline at end of file

includes/admin/upgrades/upgrade-functions.php

Indentation +78 added lines, -78 removed lines

@@ -411,83 +411,83 @@
  * @since 1.7
  */
 function give_upgrade_addon_license_data(){
-    global $give_options;
-
-    $api_url = 'https://givewp.com/give-sl-api/';
-
-    // Get addons license key.
-    $addons = array();
-    foreach ( $give_options as $key => $value ) {
-        if( false !== strpos( $key, '_license_key' ) ) {
-            $addons[$key] = $value;
-        }
-    }
-
-    // Bailout: We do not have any addon license data to upgrade.
-    if( empty( $addons ) ) {
-        return false;
-    }
+	global $give_options;
+
+	$api_url = 'https://givewp.com/give-sl-api/';
+
+	// Get addons license key.
+	$addons = array();
+	foreach ( $give_options as $key => $value ) {
+		if( false !== strpos( $key, '_license_key' ) ) {
+			$addons[$key] = $value;
+		}
+	}
+
+	// Bailout: We do not have any addon license data to upgrade.
+	if( empty( $addons ) ) {
+		return false;
+	}
     
-    foreach ( $addons as $key => $addon_license ) {
-
-        // Get addon shortname.
-        $shortname = str_replace( '_license_key', '', $key );
-
-        // Addon license option name.
-        $addon_license_option_name = $shortname . '_license_active';
-
-        // bailout if license is empty.
-        if( empty( $addon_license ) ) {
-            delete_option( $addon_license_option_name );
-            continue;
-        }
-
-        // Get addon name.
-        $addon_name = array();
-        $addon_name_parts = explode( '_', str_replace( 'give_', '', $shortname ) );
-        foreach ( $addon_name_parts as $name_part ) {
-
-            // Fix addon name
-            switch ( $name_part ) {
-                case 'authorizenet' :
-                    $name_part = 'authorize.net';
-                    break;
-            }
-
-            $addon_name[] = ucfirst( $name_part );
-        }
-
-        $addon_name = implode( ' ', $addon_name );
-
-        // Data to send to the API
-        $api_params = array(
-            'edd_action' => 'activate_license', //never change from "edd_" to "give_"!
-            'license'    => $addon_license,
-            'item_name'  => urlencode( $addon_name ),
-            'url'        => home_url()
-        );
-
-        // Call the API
-        $response = wp_remote_post(
-            $api_url,
-            array(
-                'timeout'   => 15,
-                'sslverify' => false,
-                'body'      => $api_params
-            )
-        );
-
-        // Make sure there are no errors
-        if ( is_wp_error( $response ) ) {
-            delete_option( $addon_license_option_name );
-            continue;
-        }
-
-        // Tell WordPress to look for updates
-        set_site_transient( 'update_plugins', null );
-
-        // Decode license data
-        $license_data = json_decode( wp_remote_retrieve_body( $response ) );
-        update_option( $addon_license_option_name, $license_data );
-    }
+	foreach ( $addons as $key => $addon_license ) {
+
+		// Get addon shortname.
+		$shortname = str_replace( '_license_key', '', $key );
+
+		// Addon license option name.
+		$addon_license_option_name = $shortname . '_license_active';
+
+		// bailout if license is empty.
+		if( empty( $addon_license ) ) {
+			delete_option( $addon_license_option_name );
+			continue;
+		}
+
+		// Get addon name.
+		$addon_name = array();
+		$addon_name_parts = explode( '_', str_replace( 'give_', '', $shortname ) );
+		foreach ( $addon_name_parts as $name_part ) {
+
+			// Fix addon name
+			switch ( $name_part ) {
+				case 'authorizenet' :
+					$name_part = 'authorize.net';
+					break;
+			}
+
+			$addon_name[] = ucfirst( $name_part );
+		}
+
+		$addon_name = implode( ' ', $addon_name );
+
+		// Data to send to the API
+		$api_params = array(
+			'edd_action' => 'activate_license', //never change from "edd_" to "give_"!
+			'license'    => $addon_license,
+			'item_name'  => urlencode( $addon_name ),
+			'url'        => home_url()
+		);
+
+		// Call the API
+		$response = wp_remote_post(
+			$api_url,
+			array(
+				'timeout'   => 15,
+				'sslverify' => false,
+				'body'      => $api_params
+			)
+		);
+
+		// Make sure there are no errors
+		if ( is_wp_error( $response ) ) {
+			delete_option( $addon_license_option_name );
+			continue;
+		}
+
+		// Tell WordPress to look for updates
+		set_site_transient( 'update_plugins', null );
+
+		// Decode license data
+		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
+		update_option( $addon_license_option_name, $license_data );
+	}
 }
\ No newline at end of file

includes/admin/EDD_SL_Plugin_Updater.php

Indentation +272 added lines, -272 removed lines

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