AyeCode / invoicing

includes/gateways/paypal.php

Braces +6 added lines, -3 removed lines

@@ -1,6 +1,8 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 add_action( 'wpinv_paypal_cc_form', '__return_false' );
 add_filter( 'wpinv_paypal_support_subscription', '__return_true' );
@@ -307,8 +309,9 @@ 
 	}
 
 	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
+	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) ) {
+			return;
+	}
 
 	$defaults = array(
 		'txn_type'       => '',

Indentation +255 added lines, -255 removed lines

@@ -219,262 +219,262 @@ 
 add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
 
 function wpinv_process_paypal_ipn() {
-	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
-		return;
-	}
-
-	// Set initial post data to empty string
-	$post_data = '';
-
-	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
-	} else {
-		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
-	}
-	// Start the encoded data collection with notification command
-	$encoded_data = 'cmd=_notify-validate';
-
-	// Get current arg separator
-	$arg_separator = wpinv_get_php_arg_separator_output();
-
-	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
-		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
-	} else {
-		// Check if POST is empty
-		if ( empty( $_POST ) ) {
-			// Nothing to do
-			return;
-		} else {
-			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
-				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
-			}
-		}
-	}
-
-	// Convert collected post data to an array
-	wp_parse_str( $encoded_data, $encoded_data_array );
-
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
-
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
-		}
-	}
-
-	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
-
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
-		// Validate the IPN
-
-		$remote_post_vars      = array(
-			'method'           => 'POST',
-			'timeout'          => 45,
-			'redirection'      => 5,
-			'httpversion'      => '1.1',
-			'blocking'         => true,
-			'headers'          => array(
-				'host'         => 'www.paypal.com',
-				'connection'   => 'close',
-				'content-type' => 'application/x-www-form-urlencoded',
-				'post'         => '/cgi-bin/webscr HTTP/1.1',
-
-			),
-			'sslverify'        => false,
-			'body'             => $encoded_data_array
-		);
-
-		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
-
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Something went wrong
-		}
-
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
-			return; // Response not okay
-		}
-	}
-
-	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
-		return;
-
-	$defaults = array(
-		'txn_type'       => '',
-		'payment_status' => ''
-	);
-
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
-
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+    // Check the request method is POST
+    if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+        return;
+    }
+
+    // Set initial post data to empty string
+    $post_data = '';
+
+    // Fallback just in case post_max_size is lower than needed
+    if ( ini_get( 'allow_url_fopen' ) ) {
+        $post_data = file_get_contents( 'php://input' );
+    } else {
+        // If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
+        ini_set( 'post_max_size', '12M' );
+    }
+    // Start the encoded data collection with notification command
+    $encoded_data = 'cmd=_notify-validate';
+
+    // Get current arg separator
+    $arg_separator = wpinv_get_php_arg_separator_output();
+
+    // Verify there is a post_data
+    if ( $post_data || strlen( $post_data ) > 0 ) {
+        // Append the data
+        $encoded_data .= $arg_separator.$post_data;
+    } else {
+        // Check if POST is empty
+        if ( empty( $_POST ) ) {
+            // Nothing to do
+            return;
+        } else {
+            // Loop through each POST
+            foreach ( $_POST as $key => $value ) {
+                // Encode the value and append the data
+                $encoded_data .= $arg_separator."$key=" . urlencode( $value );
+            }
+        }
+    }
+
+    // Convert collected post data to an array
+    wp_parse_str( $encoded_data, $encoded_data_array );
+
+    foreach ( $encoded_data_array as $key => $value ) {
+        if ( false !== strpos( $key, 'amp;' ) ) {
+            $new_key = str_replace( '&', '&', $key );
+            $new_key = str_replace( 'amp;', '&' , $new_key );
+
+            unset( $encoded_data_array[ $key ] );
+            $encoded_data_array[ $new_key ] = $value;
+        }
+    }
+
+    // Get the PayPal redirect uri
+    $paypal_redirect = wpinv_get_paypal_redirect( true );
+
+    if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+        // Validate the IPN
+
+        $remote_post_vars      = array(
+            'method'           => 'POST',
+            'timeout'          => 45,
+            'redirection'      => 5,
+            'httpversion'      => '1.1',
+            'blocking'         => true,
+            'headers'          => array(
+                'host'         => 'www.paypal.com',
+                'connection'   => 'close',
+                'content-type' => 'application/x-www-form-urlencoded',
+                'post'         => '/cgi-bin/webscr HTTP/1.1',
+
+            ),
+            'sslverify'        => false,
+            'body'             => $encoded_data_array
+        );
+
+        // Get response
+        $api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+
+        if ( is_wp_error( $api_response ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Something went wrong
+        }
+
+        if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+            return; // Response not okay
+        }
+    }
+
+    // Check if $post_data_array has been populated
+    if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+        return;
+
+    $defaults = array(
+        'txn_type'       => '',
+        'payment_status' => ''
+    );
+
+    $encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+
+    $invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-	wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
-
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
-		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
-	} else {
-		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
-	}
-	exit;
+    wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
+    wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
+
+    if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+        // Allow PayPal IPN types to be processed separately
+        do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+    } else {
+        // Fallback to web accept just in case the txn_type isn't present
+        do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+    }
+    exit;
 }
 add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
 
 function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
-		return;
-	}
-
-	if( empty( $invoice_id ) ) {
-		return;
-	}
-
-	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
-	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
-
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
-		return; // this isn't a PayPal standard IPN
-	}
-
-	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
-		return;
-	}
-
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
-		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
-		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
-
-		// Setup and store the customer's details
-		$user_info = array(
-			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
-			'discount'   => '',
-		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
-
-		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
-	}
-
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
-		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
-	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
-			return; // Only paid payments once
-		}
-
-		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
-
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
-			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
-			return;
-		}
-
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
-			// Look for possible pending reasons, such as an echeck
-			$note = '';
-
-			switch( strtolower( $data['pending_reason'] ) ) {
-				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
-					break;
+    if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+        return;
+    }
+
+    if( empty( $invoice_id ) ) {
+        return;
+    }
+
+    // Collect payment details
+    $purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+    $paypal_amount  = $data['mc_gross'];
+    $payment_status = strtolower( $data['payment_status'] );
+    $currency_code  = strtolower( $data['mc_currency'] );
+    $business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
+    $payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+
+    if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+        return; // this isn't a PayPal standard IPN
+    }
+
+    // Verify payment recipient
+    if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    // Verify payment currency
+    if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
+        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+        wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+        wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
+        return;
+    }
+
+    if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+        // This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
+        // No email associated with purchase, so store from PayPal
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+
+        // Setup and store the customer's details
+        $user_info = array(
+            'user_id'    => '-1',
+            'email'      => sanitize_text_field( $data['payer_email'] ),
+            'first_name' => sanitize_text_field( $data['first_name'] ),
+            'last_name'  => sanitize_text_field( $data['last_name'] ),
+            'discount'   => '',
+        );
+        $user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
+        $user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
+        $user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
+        $user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
+        $user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+
+        $payment_meta['user_info'] = $user_info;
+        wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+    }
+
+    if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+        // Process a refund
+        wpinv_process_paypal_refund( $data, $invoice_id );
+    } else {
+        if ( get_post_status( $invoice_id ) == 'publish' ) {
+            return; // Only paid payments once
+        }
+
+        // Retrieve the total purchase amount (before PayPal)
+        $payment_amount = wpinv_payment_total( $invoice_id );
+
+        if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+            // The prices don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+        if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+            // Purchase keys don't match
+            wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
+            wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
+            wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
+            return;
+        }
+
+        if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
+            wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
+            wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
+            wpinv_update_payment_status( $invoice_id, 'publish' );
+        } else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+            // Look for possible pending reasons, such as an echeck
+            $note = '';
+
+            switch( strtolower( $data['pending_reason'] ) ) {
+                case 'echeck' :
+                    $note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+                    break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+                    break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
-					break;
+                    $note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+                    break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
-					break;
+                    $note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+                    break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
-					break;
+                    $note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+                    break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
-					break;
+                    $note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+                    break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
-					break;
-
-				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
-					break;
-			}
-
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
-			}
-		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
-		}
-	}
+                    $note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+                    break;
+
+                case 'other' :
+                    $note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+                    break;
+            }
+
+            if ( ! empty( $note ) ) {
+                wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
+            }
+        } else {
+            wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
+        }
+    }
 }
 add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
 
@@ -668,34 +668,34 @@ 
 }
 
 function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
-	// Collect payment details
+    // Collect payment details
 
-	if( empty( $invoice_id ) ) {
-		return;
-	}
+    if( empty( $invoice_id ) ) {
+        return;
+    }
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
-		return; // Only refund payments once
-	}
+    if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+        return; // Only refund payments once
+    }
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
-	$refund_amount  = $data['mc_gross'] * -1;
+    $payment_amount = wpinv_payment_total( $invoice_id );
+    $refund_amount  = $data['mc_gross'] * -1;
 
-	do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
+    do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
 
-		do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
+        do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
 
-		return; // This is a partial refund
-	}
+        return; // This is a partial refund
+    }
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
+    wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
 
-	do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
+    do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
 }
 
 function wpinv_get_paypal_redirect( $ssl_check = false ) {

Spacing +282 added lines, -282 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_paypal_cc_form', '__return_false' );
-add_filter( 'wpinv_paypal_support_subscription', '__return_true' );
+add_action('wpinv_paypal_cc_form', '__return_false');
+add_filter('wpinv_paypal_support_subscription', '__return_true');
 
 
-function wpinv_paypal_gateway_description_sandbox_notice( $description, $gateway ) {
-    if ( 'paypal' == $gateway && wpinv_is_test_mode( 'paypal' ) ) {
+function wpinv_paypal_gateway_description_sandbox_notice($description, $gateway) {
+    if ('paypal' == $gateway && wpinv_is_test_mode('paypal')) {
         $description .= '<br>' . sprintf(
-            __( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
+            __('SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing'),
             '<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
             '</a>'
         );
@@ -17,11 +17,11 @@ 
     return $description;
 
 }
-add_filter( 'wpinv_gateway_description', 'wpinv_paypal_gateway_description_sandbox_notice', 10, 2 );
+add_filter('wpinv_gateway_description', 'wpinv_paypal_gateway_description_sandbox_notice', 10, 2);
 
-function wpinv_process_paypal_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_paypal_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
 
     // Collect payment data
@@ -39,24 +39,24 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
 
     // Check payment
-    if ( ! $invoice ) {
+    if (!$invoice) {
         // Record the error
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // Problems? send back
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     } else {
         // Only send to PayPal if the pending payment is created successfully
-        $listener_url = wpinv_get_ipn_url( 'paypal' );
+        $listener_url = wpinv_get_ipn_url('paypal');
 
         // Get the success url
-        $return_url = add_query_arg( array(
+        $return_url = add_query_arg(array(
                 'payment-confirm' => 'paypal',
                 'invoice-id'      => $invoice->ID,
                 'utm_nooverride'  => 1
-            ), get_permalink( wpinv_get_option( 'success_page', false ) ) );
+            ), get_permalink(wpinv_get_option('success_page', false)));
 
         // Get the PayPal redirect uri
         $paypal_redirect = wpinv_get_paypal_redirect();
@@ -65,7 +65,7 @@ 
         $paypal_args = array(
             'cmd'           => '_cart',
             'upload'        => '1',
-            'business'      => wpinv_get_option( 'paypal_email', false ),
+            'business'      => wpinv_get_option('paypal_email', false),
             'email'         => $invoice->get_email(),
             'first_name'    => $invoice->get_first_name(),
             'last_name'     => $invoice->get_last_name(),
@@ -74,88 +74,88 @@ 
             'shipping'      => '0',
             'no_note'       => '1',
             'currency_code' => $invoice->get_currency(),
-            'charset'       => get_bloginfo( 'charset' ),
+            'charset'       => get_bloginfo('charset'),
             'custom'        => $invoice->ID,
             'rm'            => is_ssl() ? 2 : 1,
-            'return'        => esc_url_raw( $return_url ),
+            'return'        => esc_url_raw($return_url),
             'cancel_return' => $invoice->get_checkout_payment_url(),
             'notify_url'    => $listener_url,
-            'cbt'           => get_bloginfo( 'name' ),
+            'cbt'           => get_bloginfo('name'),
             'bn'            => 'WPInvoicing_SP',
         );
 
         // Add cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {
                 $item['quantity'] = $item['quantity'] > 0 ? $item['quantity'] : 1;
-                $item_amount = wpinv_sanitize_amount( $item['subtotal'] / $item['quantity'], 2 );
+                $item_amount = wpinv_sanitize_amount($item['subtotal'] / $item['quantity'], 2);
 
-                if ( $item_amount <= 0 ) {
+                if ($item_amount <= 0) {
                     $item_amount = 0;
                 }
 
-                $paypal_args['item_number_' . $i ]      = $item['id'];
-                $paypal_args['item_name_' . $i ]        = stripslashes_deep( html_entity_decode( wpinv_get_cart_item_name( $item ), ENT_COMPAT, 'UTF-8' ) );
-                $paypal_args['quantity_' . $i ]         = $item['quantity'];
-                $paypal_args['amount_' . $i ]           = $item_amount;
-                $paypal_args['discount_amount_' . $i ]  = wpinv_sanitize_amount( $item['discount'], 2 );
+                $paypal_args['item_number_' . $i]      = $item['id'];
+                $paypal_args['item_name_' . $i]        = stripslashes_deep(html_entity_decode(wpinv_get_cart_item_name($item), ENT_COMPAT, 'UTF-8'));
+                $paypal_args['quantity_' . $i]         = $item['quantity'];
+                $paypal_args['amount_' . $i]           = $item_amount;
+                $paypal_args['discount_amount_' . $i]  = wpinv_sanitize_amount($item['discount'], 2);
 
                 $i++;
             }
         }
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() && $invoice->is_taxable() ) {
-            $paypal_args['tax_cart'] = wpinv_sanitize_amount( (float) $invoice->get_tax(), 2 );
+        if (wpinv_use_taxes() && $invoice->is_taxable()) {
+            $paypal_args['tax_cart'] = wpinv_sanitize_amount((float) $invoice->get_tax(), 2);
         }
 
-        $paypal_args = apply_filters( 'wpinv_paypal_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_args', $paypal_args, $purchase_data, $invoice);
 
         // Build query
-        $paypal_redirect .= http_build_query( $paypal_args );
+        $paypal_redirect .= http_build_query($paypal_args);
 
         // Fix for some sites that encode the entities
-        $paypal_redirect = str_replace( '&amp;', '&', $paypal_redirect );
+        $paypal_redirect = str_replace('&amp;', '&', $paypal_redirect);
 
         // Get rid of cart contents
         wpinv_empty_cart();
         
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
     }
 }
-add_action( 'wpinv_gateway_paypal', 'wpinv_process_paypal_payment' );
+add_action('wpinv_gateway_paypal', 'wpinv_process_paypal_payment');
 
-function wpinv_get_paypal_recurring_args( $paypal_args, $purchase_data, $invoice ) {
-    if ( $invoice->is_recurring() && $subscription = wpinv_get_subscription( $invoice->ID ) ) {
+function wpinv_get_paypal_recurring_args($paypal_args, $purchase_data, $invoice) {
+    if ($invoice->is_recurring() && $subscription = wpinv_get_subscription($invoice->ID)) {
 
-        $period             = strtoupper( substr( $subscription->period, 0, 1) );
+        $period             = strtoupper(substr($subscription->period, 0, 1));
         $interval           = $subscription->frequency;
         $bill_times         = (int) $subscription->bill_times;
         
-        $initial_amount     = wpinv_sanitize_amount( $invoice->get_total(), 2 );
-        $recurring_amount   = wpinv_sanitize_amount( $invoice->get_recurring_details( 'total' ), 2 );
+        $initial_amount     = wpinv_sanitize_amount($invoice->get_total(), 2);
+        $recurring_amount   = wpinv_sanitize_amount($invoice->get_recurring_details('total'), 2);
         
         $paypal_args['cmd'] = '_xclick-subscriptions';
         $paypal_args['sra'] = '1';
         $paypal_args['src'] = '1';
         
         // Set item description
-        $item_name                  = wpinv_get_cart_item_name( array( 'id' => $subscription->product_id ) );
-        $paypal_args['item_name']   = stripslashes_deep( html_entity_decode( $item_name, ENT_COMPAT, 'UTF-8' ) );
+        $item_name                  = wpinv_get_cart_item_name(array('id' => $subscription->product_id));
+        $paypal_args['item_name']   = stripslashes_deep(html_entity_decode($item_name, ENT_COMPAT, 'UTF-8'));
         $paypal_args['item_number'] = $subscription->product_id;
-        $item   = new WPInv_Item( $subscription->period );
+        $item = new WPInv_Item($subscription->period);
 
-        if ( $invoice->is_free_trial() && $item->has_free_trial() ) {
+        if ($invoice->is_free_trial() && $item->has_free_trial()) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $item->get_trial_interval();
             $paypal_args['t1']  = $item->get_trial_period();
             
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
-        } else if ( $initial_amount != $recurring_amount && $bill_times != 1 ) {
+        } else if ($initial_amount != $recurring_amount && $bill_times != 1) {
             $paypal_args['a1']  = $initial_amount;
             $paypal_args['p1']  = $interval;
             $paypal_args['t1']  = $period;
@@ -163,63 +163,63 @@ 
             // Set the recurring amount
             $paypal_args['a3']  = $recurring_amount;
             
-            if ( $bill_times > 1 ) {
+            if ($bill_times > 1) {
                 $bill_times--;
             }
         } else {
-            $paypal_args['a3']  = $initial_amount;
+            $paypal_args['a3'] = $initial_amount;
         }
         
         $paypal_args['p3']  = $interval;
         $paypal_args['t3']  = $period;
         
-        if ( $bill_times > 1 ) {
+        if ($bill_times > 1) {
             // Make sure it's not over the max of 52
-            $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+            $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
         }
                 
         // Remove cart items
         $i = 1;
-        if( is_array( $purchase_data['cart_details'] ) && ! empty( $purchase_data['cart_details'] ) ) {
-            foreach ( $purchase_data['cart_details'] as $item ) {                
-                if ( isset( $paypal_args['item_number_' . $i] ) ) {
-                    unset( $paypal_args['item_number_' . $i] );
+        if (is_array($purchase_data['cart_details']) && !empty($purchase_data['cart_details'])) {
+            foreach ($purchase_data['cart_details'] as $item) {                
+                if (isset($paypal_args['item_number_' . $i])) {
+                    unset($paypal_args['item_number_' . $i]);
                 }
-                if ( isset( $paypal_args['item_name_' . $i] ) ) {
-                    unset( $paypal_args['item_name_' . $i] );
+                if (isset($paypal_args['item_name_' . $i])) {
+                    unset($paypal_args['item_name_' . $i]);
                 }
-                if ( isset( $paypal_args['quantity_' . $i] ) ) {
-                    unset( $paypal_args['quantity_' . $i] );
+                if (isset($paypal_args['quantity_' . $i])) {
+                    unset($paypal_args['quantity_' . $i]);
                 }
-                if ( isset( $paypal_args['amount_' . $i] ) ) {
-                    unset( $paypal_args['amount_' . $i] );
+                if (isset($paypal_args['amount_' . $i])) {
+                    unset($paypal_args['amount_' . $i]);
                 }
-                if ( isset( $paypal_args['discount_amount_' . $i] ) ) {
-                    unset( $paypal_args['discount_amount_' . $i] );
+                if (isset($paypal_args['discount_amount_' . $i])) {
+                    unset($paypal_args['discount_amount_' . $i]);
                 }
 
                 $i++;
             }
         }
         
-        if ( isset( $paypal_args['tax_cart'] ) ) {
-            unset( $paypal_args['tax_cart'] );
+        if (isset($paypal_args['tax_cart'])) {
+            unset($paypal_args['tax_cart']);
         }
                 
-        if ( isset( $paypal_args['upload'] ) ) {
-            unset( $paypal_args['upload'] );
+        if (isset($paypal_args['upload'])) {
+            unset($paypal_args['upload']);
         }
         
-        $paypal_args = apply_filters( 'wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice );
+        $paypal_args = apply_filters('wpinv_paypal_recurring_args', $paypal_args, $purchase_data, $invoice);
     }
     
     return $paypal_args;
 }
-add_filter( 'wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3 );
+add_filter('wpinv_paypal_args', 'wpinv_get_paypal_recurring_args', 10, 3);
 
 function wpinv_process_paypal_ipn() {
 	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+	if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'POST') {
 		return;
 	}
 
@@ -227,11 +227,11 @@ 
 	$post_data = '';
 
 	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
+	if (ini_get('allow_url_fopen')) {
+		$post_data = file_get_contents('php://input');
 	} else {
 		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
+		ini_set('post_max_size', '12M');
 	}
 	// Start the encoded data collection with notification command
 	$encoded_data = 'cmd=_notify-validate';
@@ -240,43 +240,43 @@ 
 	$arg_separator = wpinv_get_php_arg_separator_output();
 
 	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
+	if ($post_data || strlen($post_data) > 0) {
 		// Append the data
-		$encoded_data .= $arg_separator.$post_data;
+		$encoded_data .= $arg_separator . $post_data;
 	} else {
 		// Check if POST is empty
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			// Nothing to do
 			return;
 		} else {
 			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
+			foreach ($_POST as $key => $value) {
 				// Encode the value and append the data
-				$encoded_data .= $arg_separator."$key=" . urlencode( $value );
+				$encoded_data .= $arg_separator . "$key=" . urlencode($value);
 			}
 		}
 	}
 
 	// Convert collected post data to an array
-	wp_parse_str( $encoded_data, $encoded_data_array );
+	wp_parse_str($encoded_data, $encoded_data_array);
 
-	foreach ( $encoded_data_array as $key => $value ) {
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&amp;', '&', $key );
-			$new_key = str_replace( 'amp;', '&' , $new_key );
+	foreach ($encoded_data_array as $key => $value) {
+		if (false !== strpos($key, 'amp;')) {
+			$new_key = str_replace('&amp;', '&', $key);
+			$new_key = str_replace('amp;', '&', $new_key);
 
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
+			unset($encoded_data_array[$key]);
+			$encoded_data_array[$new_key] = $value;
 		}
 	}
 
 	// Get the PayPal redirect uri
-	$paypal_redirect = wpinv_get_paypal_redirect( true );
+	$paypal_redirect = wpinv_get_paypal_redirect(true);
 
-	if ( !wpinv_get_option( 'disable_paypal_verification', false ) ) {
+	if (!wpinv_get_option('disable_paypal_verification', false)) {
 		// Validate the IPN
 
-		$remote_post_vars      = array(
+		$remote_post_vars = array(
 			'method'           => 'POST',
 			'timeout'          => 45,
 			'redirection'      => 5,
@@ -294,21 +294,21 @@ 
 		);
 
 		// Get response
-		$api_response = wp_remote_post( wpinv_get_paypal_redirect(), $remote_post_vars );
+		$api_response = wp_remote_post(wpinv_get_paypal_redirect(), $remote_post_vars);
 
-		if ( is_wp_error( $api_response ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if (is_wp_error($api_response)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Something went wrong
 		}
 
-		if ( $api_response['body'] !== 'VERIFIED' && wpinv_get_option( 'disable_paypal_verification', false ) ) {
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid IPN verification response. IPN data: %s', 'invoicing' ), json_encode( $api_response ) ) );
+		if ($api_response['body'] !== 'VERIFIED' && wpinv_get_option('disable_paypal_verification', false)) {
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid IPN verification response. IPN data: %s', 'invoicing'), json_encode($api_response)));
 			return; // Response not okay
 		}
 	}
 
 	// Check if $post_data_array has been populated
-	if ( !is_array( $encoded_data_array ) && !empty( $encoded_data_array ) )
+	if (!is_array($encoded_data_array) && !empty($encoded_data_array))
 		return;
 
 	$defaults = array(
@@ -316,265 +316,265 @@ 
 		'payment_status' => ''
 	);
 
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+	$encoded_data_array = wp_parse_args($encoded_data_array, $defaults);
 
-	$invoice_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+	$invoice_id = isset($encoded_data_array['custom']) ? absint($encoded_data_array['custom']) : 0;
     
-	wpinv_error_log( $encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__ );
-	wpinv_error_log( $encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__ );
+	wpinv_error_log($encoded_data_array['txn_type'], 'PayPal txn_type', __FILE__, __LINE__);
+	wpinv_error_log($encoded_data_array, 'PayPal IPN response', __FILE__, __LINE__);
 
-	if ( has_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'] ) ) {
+	if (has_action('wpinv_paypal_' . $encoded_data_array['txn_type'])) {
 		// Allow PayPal IPN types to be processed separately
-		do_action( 'wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_' . $encoded_data_array['txn_type'], $encoded_data_array, $invoice_id);
 	} else {
 		// Fallback to web accept just in case the txn_type isn't present
-		do_action( 'wpinv_paypal_web_accept', $encoded_data_array, $invoice_id );
+		do_action('wpinv_paypal_web_accept', $encoded_data_array, $invoice_id);
 	}
 	exit;
 }
-add_action( 'wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn' );
+add_action('wpinv_verify_paypal_ipn', 'wpinv_process_paypal_ipn');
 
-function wpinv_process_paypal_web_accept_and_cart( $data, $invoice_id ) {
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded' ) {
+function wpinv_process_paypal_web_accept_and_cart($data, $invoice_id) {
+	if ($data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && $data['payment_status'] != 'Refunded') {
 		return;
 	}
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
 	// Collect payment details
-	$purchase_key   = isset( $data['invoice'] ) ? $data['invoice'] : $data['item_number'];
+	$purchase_key   = isset($data['invoice']) ? $data['invoice'] : $data['item_number'];
 	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = wpinv_get_invoice_meta( $invoice_id );
+	$payment_status = strtolower($data['payment_status']);
+	$currency_code  = strtolower($data['mc_currency']);
+	$business_email = isset($data['business']) && is_email($data['business']) ? trim($data['business']) : trim($data['receiver_email']);
+	$payment_meta   = wpinv_get_invoice_meta($invoice_id);
 
-	if ( wpinv_get_payment_gateway( $invoice_id ) != 'paypal' ) {
+	if (wpinv_get_payment_gateway($invoice_id) != 'paypal') {
 		return; // this isn't a PayPal standard IPN
 	}
 
 	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( wpinv_get_option( 'paypal_email', false ) ) ) != 0 ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid business email in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid PayPal business email.', 'invoicing' ), '', '', true );
+	if (strcasecmp($business_email, trim(wpinv_get_option('paypal_email', false))) != 0) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid business email in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid PayPal business email.', 'invoicing'), '', '', true);
 		return;
 	}
 
 	// Verify payment currency
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
-		wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-		wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-		wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid currency in PayPal IPN.', 'invoicing' ), '', '', true );
+	if ($currency_code != strtolower($payment_meta['currency'])) {
+		wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+		wpinv_update_payment_status($invoice_id, 'wpi-failed');
+		wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid currency in PayPal IPN.', 'invoicing'), '', '', true);
 		return;
 	}
 
-	if ( !wpinv_get_payment_user_email( $invoice_id ) ) {
+	if (!wpinv_get_payment_user_email($invoice_id)) {
 		// This runs when a Buy Now purchase was made. It bypasses checkout so no personal info is collected until PayPal
 		// No email associated with purchase, so store from PayPal
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_email', $data['payer_email'] );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_email', $data['payer_email']);
 
 		// Setup and store the customer's details
 		$user_info = array(
 			'user_id'    => '-1',
-			'email'      => sanitize_text_field( $data['payer_email'] ),
-			'first_name' => sanitize_text_field( $data['first_name'] ),
-			'last_name'  => sanitize_text_field( $data['last_name'] ),
+			'email'      => sanitize_text_field($data['payer_email']),
+			'first_name' => sanitize_text_field($data['first_name']),
+			'last_name'  => sanitize_text_field($data['last_name']),
 			'discount'   => '',
 		);
-		$user_info['address'] = ! empty( $data['address_street']       ) ? sanitize_text_field( $data['address_street'] )       : false;
-		$user_info['city']    = ! empty( $data['address_city']         ) ? sanitize_text_field( $data['address_city'] )         : false;
-		$user_info['state']   = ! empty( $data['address_state']        ) ? sanitize_text_field( $data['address_state'] )        : false;
-		$user_info['country'] = ! empty( $data['address_country_code'] ) ? sanitize_text_field( $data['address_country_code'] ) : false;
-		$user_info['zip']     = ! empty( $data['address_zip']          ) ? sanitize_text_field( $data['address_zip'] )          : false;
+		$user_info['address'] = !empty($data['address_street']) ? sanitize_text_field($data['address_street']) : false;
+		$user_info['city']    = !empty($data['address_city']) ? sanitize_text_field($data['address_city']) : false;
+		$user_info['state']   = !empty($data['address_state']) ? sanitize_text_field($data['address_state']) : false;
+		$user_info['country'] = !empty($data['address_country_code']) ? sanitize_text_field($data['address_country_code']) : false;
+		$user_info['zip']     = !empty($data['address_zip']) ? sanitize_text_field($data['address_zip']) : false;
 
 		$payment_meta['user_info'] = $user_info;
-		wpinv_update_invoice_meta( $invoice_id, '_wpinv_payment_meta', $payment_meta );
+		wpinv_update_invoice_meta($invoice_id, '_wpinv_payment_meta', $payment_meta);
 	}
 
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
+	if ($payment_status == 'refunded' || $payment_status == 'reversed') {
 		// Process a refund
-		wpinv_process_paypal_refund( $data, $invoice_id );
+		wpinv_process_paypal_refund($data, $invoice_id);
 	} else {
-		if ( get_post_status( $invoice_id ) == 'publish' ) {
+		if (get_post_status($invoice_id) == 'publish') {
 			return; // Only paid payments once
 		}
 
 		// Retrieve the total purchase amount (before PayPal)
-		$payment_amount = wpinv_payment_total( $invoice_id );
+		$payment_amount = wpinv_payment_total($invoice_id);
 
-		if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+		if (number_format((float) $paypal_amount, 2) < number_format((float) $payment_amount, 2)) {
 			// The prices don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid payment amount in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid amount in PayPal IPN.', 'invoicing' ), '', '', true );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid payment amount in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid amount in PayPal IPN.', 'invoicing'), '', '', true);
 			return;
 		}
-		if ( $purchase_key != wpinv_get_payment_key( $invoice_id ) ) {
+		if ($purchase_key != wpinv_get_payment_key($invoice_id)) {
 			// Purchase keys don't match
-			wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid purchase key in IPN response. IPN data: %s', 'invoicing' ), json_encode( $data ) ), $invoice_id );
-			wpinv_update_payment_status( $invoice_id, 'wpi-failed' );
-			wpinv_insert_payment_note( $invoice_id, __( 'Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing' ), '', '', true );
+			wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid purchase key in IPN response. IPN data: %s', 'invoicing'), json_encode($data)), $invoice_id);
+			wpinv_update_payment_status($invoice_id, 'wpi-failed');
+			wpinv_insert_payment_note($invoice_id, __('Payment failed due to invalid purchase key in PayPal IPN.', 'invoicing'), '', '', true);
 			return;
 		}
 
-		if ( 'complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode( 'paypal' ) ) {
-			wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $data['txn_id'] ), '', '', true );
-			wpinv_set_payment_transaction_id( $invoice_id, $data['txn_id'] );
-			wpinv_update_payment_status( $invoice_id, 'publish' );
-		} else if ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+		if ('complete' == $payment_status || 'completed' == $payment_status || 'processed' == $payment_status || wpinv_is_test_mode('paypal')) {
+			wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $data['txn_id']), '', '', true);
+			wpinv_set_payment_transaction_id($invoice_id, $data['txn_id']);
+			wpinv_update_payment_status($invoice_id, 'publish');
+		} else if ('pending' == $payment_status && isset($data['pending_reason'])) {
 			// Look for possible pending reasons, such as an echeck
 			$note = '';
 
-			switch( strtolower( $data['pending_reason'] ) ) {
+			switch (strtolower($data['pending_reason'])) {
 				case 'echeck' :
-					$note = __( 'Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing' );
+					$note = __('Payment made via eCheck and will clear automatically in 5-8 days', 'invoicing');
 					break;
 				
                 case 'address' :
-					$note = __( 'Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment requires a confirmed customer address and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'intl' :
-					$note = __( 'Payment must be accepted manually through PayPal due to international account regulations', 'invoicing' );
+					$note = __('Payment must be accepted manually through PayPal due to international account regulations', 'invoicing');
 					break;
 				
                 case 'multi-currency' :
-					$note = __( 'Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing' );
+					$note = __('Payment received in non-shop currency and must be accepted manually through PayPal', 'invoicing');
 					break;
 				
                 case 'paymentreview' :
                 case 'regulatory_review' :
-					$note = __( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing' );
+					$note = __('Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations', 'invoicing');
 					break;
 				
                 case 'unilateral' :
-					$note = __( 'Payment was sent to non-confirmed or non-registered email address.', 'invoicing' );
+					$note = __('Payment was sent to non-confirmed or non-registered email address.', 'invoicing');
 					break;
 				
                 case 'upgrade' :
-					$note = __( 'PayPal account must be upgraded before this payment can be accepted', 'invoicing' );
+					$note = __('PayPal account must be upgraded before this payment can be accepted', 'invoicing');
 					break;
 				
                 case 'verify' :
-					$note = __( 'PayPal account is not verified. Verify account in order to accept this payment', 'invoicing' );
+					$note = __('PayPal account is not verified. Verify account in order to accept this payment', 'invoicing');
 					break;
 
 				case 'other' :
-					$note = __( 'Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing' );
+					$note = __('Payment is pending for unknown reasons. Contact PayPal support for assistance', 'invoicing');
 					break;
 			}
 
-			if ( ! empty( $note ) ) {
-				wpinv_insert_payment_note( $invoice_id, $note, '', '', true );
+			if (!empty($note)) {
+				wpinv_insert_payment_note($invoice_id, $note, '', '', true);
 			}
 		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ), '', '', true );
+			wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal IPN has been received with invalid payment status: %s', 'invoicing'), $payment_status), '', '', true);
 		}
 	}
 }
-add_action( 'wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2 );
+add_action('wpinv_paypal_web_accept', 'wpinv_process_paypal_web_accept_and_cart', 10, 2);
 
 // Process PayPal subscription sign ups
-add_action( 'wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup' );
+add_action('wpinv_paypal_subscr_signup', 'wpinv_process_paypal_subscr_signup');
 
 // Process PayPal subscription payments
-add_action( 'wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment' );
+add_action('wpinv_paypal_subscr_payment', 'wpinv_process_paypal_subscr_payment');
 
 // Process PayPal subscription cancellations
-add_action( 'wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel' );
+add_action('wpinv_paypal_subscr_cancel', 'wpinv_process_paypal_subscr_cancel');
 
 // Process PayPal subscription end of term notices
-add_action( 'wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot' );
+add_action('wpinv_paypal_subscr_eot', 'wpinv_process_paypal_subscr_eot');
 
 // Process PayPal payment failed
-add_action( 'wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed' );
+add_action('wpinv_paypal_subscr_failed', 'wpinv_process_paypal_subscr_failed');
 
 
 /**
  * Process the subscription started IPN.
  */
-function wpinv_process_paypal_subscr_signup( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
-    if( empty( $parent_invoice_id ) ) {
+function wpinv_process_paypal_subscr_signup($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
+    if (empty($parent_invoice_id)) {
         return;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return;
     }
 
-    if ( $invoice->is_free_trial() && !empty( $ipn_data['invoice'] ) ) {
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Invoice ID: %s', 'invoicing' ) , $ipn_data['invoice'] ), '', '', true);
-        if ( !empty( $ipn_data['txn_id'] ) ) {
-            wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['txn_id'] );
+    if ($invoice->is_free_trial() && !empty($ipn_data['invoice'])) {
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Invoice ID: %s', 'invoicing'), $ipn_data['invoice']), '', '', true);
+        if (!empty($ipn_data['txn_id'])) {
+            wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['txn_id']);
         }
     }
 
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
     
-    wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    wpinv_update_payment_status($parent_invoice_id, 'publish');
     sleep(1);
-    wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $ipn_data['subscr_id'] ), '', '', true );
-    update_post_meta($parent_invoice_id,'_wpinv_subscr_profile_id', $ipn_data['subscr_id']);
+    wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $ipn_data['subscr_id']), '', '', true);
+    update_post_meta($parent_invoice_id, '_wpinv_subscr_profile_id', $ipn_data['subscr_id']);
 
     $status     = 'trialling' == $subscription->status ? 'trialling' : 'active';
-    $diff_days  = absint( ( ( strtotime( $subscription->expiration ) - strtotime( $subscription->created ) ) / DAY_IN_SECONDS ) );
-    $created    = date_i18n( 'Y-m-d H:i:s' );
-    $expiration = date_i18n( 'Y-m-d 23:59:59', ( strtotime( $created ) + ( $diff_days * DAY_IN_SECONDS ) ) );
+    $diff_days  = absint(((strtotime($subscription->expiration) - strtotime($subscription->created)) / DAY_IN_SECONDS));
+    $created    = date_i18n('Y-m-d H:i:s');
+    $expiration = date_i18n('Y-m-d 23:59:59', (strtotime($created) + ($diff_days * DAY_IN_SECONDS)));
 
     // Retrieve pending subscription from database and update it's status to active and set proper profile ID
-    $subscription->update( array( 'profile_id' => $ipn_data['subscr_id'], 'status' => $status, 'created' => $created, 'expiration' => $expiration ) );
+    $subscription->update(array('profile_id' => $ipn_data['subscr_id'], 'status' => $status, 'created' => $created, 'expiration' => $expiration));
 }
 
 /**
  * Process the subscription payment received IPN.
  */
-function wpinv_process_paypal_subscr_payment( $ipn_data ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_process_paypal_subscr_payment($ipn_data) {
+    $parent_invoice_id = absint($ipn_data['custom']);
 
-    $parent_invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $parent_invoice ) ) {
+    $parent_invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($parent_invoice)) {
         return;
     }
 
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
 
-    $transaction_id = wpinv_get_payment_transaction_id( $parent_invoice_id );
+    $transaction_id = wpinv_get_payment_transaction_id($parent_invoice_id);
     $times_billed   = $subscription->get_times_billed();
-    $signup_date    = strtotime( $subscription->created );
-    $today          = date( 'Ynd', $signup_date ) == date( 'Ynd', strtotime( $ipn_data['payment_date'] ) );
+    $signup_date    = strtotime($subscription->created);
+    $today          = date('Ynd', $signup_date) == date('Ynd', strtotime($ipn_data['payment_date']));
 
     // Look to see if payment is same day as signup and we have set the transaction ID on the parent payment yet.
-    if ( (empty($times_billed) || $today) && ( !$transaction_id || $transaction_id == $parent_invoice_id ) ) {
-        wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    if ((empty($times_billed) || $today) && (!$transaction_id || $transaction_id == $parent_invoice_id)) {
+        wpinv_update_payment_status($parent_invoice_id, 'publish');
         sleep(1);
         
         // This is the very first payment
-        wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['txn_id'] );
-        wpinv_insert_payment_note( $parent_invoice_id, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ), '', '', true );
+        wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['txn_id']);
+        wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']), '', '', true);
         return;
     }
 
-    if ( wpinv_get_id_by_transaction_id( $ipn_data['txn_id'] ) ) {
+    if (wpinv_get_id_by_transaction_id($ipn_data['txn_id'])) {
         return; // Payment already recorded
     }
 
-    $currency_code = strtolower( $ipn_data['mc_currency'] );
+    $currency_code = strtolower($ipn_data['mc_currency']);
 
     // verify details
-    if ( $currency_code != strtolower( wpinv_get_currency() ) ) {
+    if ($currency_code != strtolower(wpinv_get_currency())) {
         // the currency code is invalid
-        wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Invalid currency in IPN response. IPN data: ', 'invoicing' ), json_encode( $ipn_data ) ) );
+        wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Invalid currency in IPN response. IPN data: ', 'invoicing'), json_encode($ipn_data)));
         return;
     }
 
@@ -584,11 +584,11 @@ 
         'gateway'        => 'paypal'
     );
     
-    $invoice_id = $subscription->add_payment( $args );
+    $invoice_id = $subscription->add_payment($args);
 
-    if ( $invoice_id > 0 ) {
-        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ), '', '', true );
-        wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal Subscription ID: %s', 'invoicing' ) , $ipn_data['subscr_id'] ), '', '', true );
+    if ($invoice_id > 0) {
+        wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']), '', '', true);
+        wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $ipn_data['subscr_id']), '', '', true);
 
         $subscription->renew();
     }
@@ -597,10 +597,10 @@ 
 /**
  * Process the subscription canceled IPN.
  */
-function wpinv_process_paypal_subscr_cancel( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_cancel($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -610,10 +610,10 @@ 
 /**
  * Process the subscription expired IPN.
  */
-function wpinv_process_paypal_subscr_eot( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_eot($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
@@ -623,40 +623,40 @@ 
 /**
  * Process the subscription payment failed IPN.
  */
-function wpinv_process_paypal_subscr_failed( $ipn_data ) {
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
+function wpinv_process_paypal_subscr_failed($ipn_data) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
 
-    if( false === $subscription ) {
+    if (false === $subscription) {
         return;
     }
 
     $subscription->failing();
 
-    do_action( 'wpinv_recurring_payment_failed', $subscription );
+    do_action('wpinv_recurring_payment_failed', $subscription);
 }
 
 /**
  * Retrieve the subscription this IPN notice is for.
  */
-function wpinv_get_paypal_subscription( $ipn_data = array() ) {
-    $parent_invoice_id = absint( $ipn_data['custom'] );
+function wpinv_get_paypal_subscription($ipn_data = array()) {
+    $parent_invoice_id = absint($ipn_data['custom']);
 
-    if( empty( $parent_invoice_id ) ) {
+    if (empty($parent_invoice_id)) {
         return false;
     }
 
-    $invoice = wpinv_get_invoice( $parent_invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($parent_invoice_id);
+    if (empty($invoice)) {
         return false;
     }
 
-    $subscription = new WPInv_Subscription( $ipn_data['subscr_id'], true );
+    $subscription = new WPInv_Subscription($ipn_data['subscr_id'], true);
 
-    if ( ! ( ! empty( $subscription ) && $subscription->id > 0 ) ) {
-        $subscription = wpinv_get_subscription( $parent_invoice_id );
+    if (!(!empty($subscription) && $subscription->id > 0)) {
+        $subscription = wpinv_get_subscription($parent_invoice_id);
 
-        if ( ! empty( $subscription ) && $subscription->id > 0 ) {
-            $subscription->update( array( 'profile_id' => sanitize_text_field( $ipn_data['subscr_id'] ) ) );
+        if (!empty($subscription) && $subscription->id > 0) {
+            $subscription->update(array('profile_id' => sanitize_text_field($ipn_data['subscr_id'])));
         } else {
             return false;
         }
@@ -666,152 +666,152 @@ 
 
 }
 
-function wpinv_process_paypal_refund( $data, $invoice_id = 0 ) {
+function wpinv_process_paypal_refund($data, $invoice_id = 0) {
 	// Collect payment details
 
-	if( empty( $invoice_id ) ) {
+	if (empty($invoice_id)) {
 		return;
 	}
 
-	if ( get_post_status( $invoice_id ) == 'wpi-refunded' ) {
+	if (get_post_status($invoice_id) == 'wpi-refunded') {
 		return; // Only refund payments once
 	}
 
-	$payment_amount = wpinv_payment_total( $invoice_id );
+	$payment_amount = wpinv_payment_total($invoice_id);
 	$refund_amount  = $data['mc_gross'] * -1;
 
-	do_action( 'wpinv_paypal_refund_request', $data, $invoice_id );
+	do_action('wpinv_paypal_refund_request', $data, $invoice_id);
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing' ), (float)$refund_amount . ' '. $data['mc_currency'], $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
+	if (number_format((float) $refund_amount, 2) < number_format((float) $payment_amount, 2)) {
+		wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal partial refund of %s processed for transaction #%s for reason: %s', 'invoicing'), (float) $refund_amount . ' ' . $data['mc_currency'], $data['parent_txn_id'], $data['reason_code']), '', '', true);
 
-		do_action( 'wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount );
+		do_action('wpinv_paypal_invoice_partially_refunded', $data, $invoice_id, $refund_amount);
 
 		return; // This is a partial refund
 	}
 
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Payment #%s Refunded for reason: %s', 'invoicing' ), $data['parent_txn_id'], $data['reason_code'] ), '', '', true );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ), '', '', true );
-	wpinv_update_payment_status( $invoice_id, 'wpi-refunded' );
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Payment #%s Refunded for reason: %s', 'invoicing'), $data['parent_txn_id'], $data['reason_code']), '', '', true);
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Refund Transaction ID: %s', 'invoicing'), $data['txn_id']), '', '', true);
+	wpinv_update_payment_status($invoice_id, 'wpi-refunded');
 
-	do_action( 'wpinv_paypal_invoice_fully_refunded', $data, $invoice_id );
+	do_action('wpinv_paypal_invoice_fully_refunded', $data, $invoice_id);
 }
 
-function wpinv_get_paypal_redirect( $ssl_check = false ) {
-    return apply_filters( 'wpinv_paypal_uri', wpinv_is_test_mode( 'paypal' ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?' );
+function wpinv_get_paypal_redirect($ssl_check = false) {
+    return apply_filters('wpinv_paypal_uri', wpinv_is_test_mode('paypal') ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?');
 }
 
-function wpinv_paypal_success_page_content( $content ) {
+function wpinv_paypal_success_page_content($content) {
     global $wpi_invoice;
     
     $session = wpinv_get_checkout_session();
 
-    if ( empty( $_GET['invoice-id'] ) && empty( $session['invoice_key'] )  ) {
+    if (empty($_GET['invoice-id']) && empty($session['invoice_key'])) {
         return $content;
     }
 
-    $invoice_id = ! empty( $_GET['invoice-id'] ) ? absint( $_GET['invoice-id'] ) : wpinv_get_invoice_id_by_key( $session['invoice_key'] );
+    $invoice_id = !empty($_GET['invoice-id']) ? absint($_GET['invoice-id']) : wpinv_get_invoice_id_by_key($session['invoice_key']);
 
-    if ( empty(  $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return $content;
     }
 
-    $wpi_invoice = wpinv_get_invoice( $invoice_id );
+    $wpi_invoice = wpinv_get_invoice($invoice_id);
     
-    if ( ! empty( $wpi_invoice ) && 'wpi-pending' == $wpi_invoice->status ) {
+    if (!empty($wpi_invoice) && 'wpi-pending' == $wpi_invoice->status) {
         // Payment is still pending so show processing indicator to fix the Race Condition, issue #
         ob_start();
-        wpinv_get_template_part( 'wpinv-payment-processing' );
+        wpinv_get_template_part('wpinv-payment-processing');
         $content = ob_get_clean();
     }
 
     return $content;
 }
-add_filter( 'wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content' );
+add_filter('wpinv_payment_confirm_paypal', 'wpinv_paypal_success_page_content');
 
-function wpinv_paypal_get_transaction_id( $invoice_id ) {
+function wpinv_paypal_get_transaction_id($invoice_id) {
     $transaction_id = '';
-    $notes = wpinv_get_invoice_notes( $invoice_id );
+    $notes = wpinv_get_invoice_notes($invoice_id);
 
-    foreach ( $notes as $note ) {
-        if ( preg_match( '/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match ) ) {
+    foreach ($notes as $note) {
+        if (preg_match('/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match)) {
             $transaction_id = $match[1];
             continue;
         }
     }
 
-    return apply_filters( 'wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id );
+    return apply_filters('wpinv_paypal_set_transaction_id', $transaction_id, $invoice_id);
 }
-add_filter( 'wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1 );
+add_filter('wpinv_payment_get_transaction_id-paypal', 'wpinv_paypal_get_transaction_id', 10, 1);
 
-function wpinv_paypal_link_transaction_id( $transaction_id, $invoice_id, $invoice ) {
-    if ( $transaction_id == $invoice_id ) {
+function wpinv_paypal_link_transaction_id($transaction_id, $invoice_id, $invoice) {
+    if ($transaction_id == $invoice_id) {
         $transaction_link = $transaction_id;
     } else {
-        if ( ! empty( $invoice ) && ! empty( $invoice->mode ) ) {
+        if (!empty($invoice) && !empty($invoice->mode)) {
             $mode = $invoice->mode;
         } else {
-            $mode = wpinv_is_test_mode( 'paypal' ) ? 'test' : 'live';
+            $mode = wpinv_is_test_mode('paypal') ? 'test' : 'live';
         }
 
         $sandbox = $mode == 'test' ? '.sandbox' : '';
         $transaction_url = 'https://www' . $sandbox . '.paypal.com/webscr?cmd=_history-details-from-hub&id=' . $transaction_id;
 
-        $transaction_link = '<a href="' . esc_url( $transaction_url ) . '" target="_blank">' . $transaction_id . '</a>';
+        $transaction_link = '<a href="' . esc_url($transaction_url) . '" target="_blank">' . $transaction_id . '</a>';
     }
 
-    return apply_filters( 'wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $transaction_id, $invoice );
+    return apply_filters('wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $transaction_id, $invoice);
 }
-add_filter( 'wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3 );
+add_filter('wpinv_payment_details_transaction_id-paypal', 'wpinv_paypal_link_transaction_id', 10, 3);
 
-function wpinv_paypal_profile_id_link( $profile_id, $subscription ) {
+function wpinv_paypal_profile_id_link($profile_id, $subscription) {
     $link = $profile_id;
 
-    if ( ! empty( $profile_id ) && ! empty( $subscription ) && ( $invoice_id = $subscription->get_original_payment_id() ) ) {
-        $invoice = wpinv_get_invoice( $invoice_id );
+    if (!empty($profile_id) && !empty($subscription) && ($invoice_id = $subscription->get_original_payment_id())) {
+        $invoice = wpinv_get_invoice($invoice_id);
 
-        if ( ! empty( $invoice ) && ! empty( $invoice->mode ) ) {
+        if (!empty($invoice) && !empty($invoice->mode)) {
             $mode = $invoice->mode;
         } else {
-            $mode = wpinv_is_test_mode( 'paypal' ) ? 'test' : 'live';
+            $mode = wpinv_is_test_mode('paypal') ? 'test' : 'live';
         }
 
         $sandbox = $mode == 'test' ? '.sandbox' : '';
         $url = 'https://www' . $sandbox . '.paypal.com/cgi-bin/webscr?cmd=_profile-recurring-payments&encrypted_profile_id=' . $profile_id;
 
-        $link = '<a href="' . esc_url( $url ) . '" target="_blank">' . $profile_id . '</a>';
+        $link = '<a href="' . esc_url($url) . '" target="_blank">' . $profile_id . '</a>';
     }
     
-    return apply_filters( 'wpinv_paypal_profile_id_link', $link, $profile_id, $subscription );
+    return apply_filters('wpinv_paypal_profile_id_link', $link, $profile_id, $subscription);
 }
-add_filter( 'wpinv_subscription_profile_link_paypal', 'wpinv_paypal_profile_id_link', 10, 2 );
+add_filter('wpinv_subscription_profile_link_paypal', 'wpinv_paypal_profile_id_link', 10, 2);
 
-function wpinv_paypal_transaction_id_link( $transaction_id, $subscription ) {
-    if ( ! empty( $transaction_id ) && ! empty( $subscription ) && ( $invoice_id = $subscription->get_original_payment_id() ) ) {
-        $invoice = wpinv_get_invoice( $invoice_id );
+function wpinv_paypal_transaction_id_link($transaction_id, $subscription) {
+    if (!empty($transaction_id) && !empty($subscription) && ($invoice_id = $subscription->get_original_payment_id())) {
+        $invoice = wpinv_get_invoice($invoice_id);
 
-        if ( ! empty( $invoice ) ) {
-            return wpinv_paypal_link_transaction_id( $transaction_id, $invoice_id, $invoice );
+        if (!empty($invoice)) {
+            return wpinv_paypal_link_transaction_id($transaction_id, $invoice_id, $invoice);
         }        
     }
     
     return $transaction_id;
 }
-add_filter( 'wpinv_subscription_transaction_link_paypal', 'wpinv_paypal_transaction_id_link', 10, 2 );
+add_filter('wpinv_subscription_transaction_link_paypal', 'wpinv_paypal_transaction_id_link', 10, 2);
 
 function wpinv_is_paypal_valid_for_use() {
-    return in_array( wpinv_get_currency(), apply_filters( 'wpinv_paypal_supported_currencies', array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' ) ) );
+    return in_array(wpinv_get_currency(), apply_filters('wpinv_paypal_supported_currencies', array('AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR')));
 }
 
-function wpinv_check_paypal_currency_support( $gateway_list ) {
-    if ( isset( $gateway_list['paypal'] ) && ! wpinv_is_paypal_valid_for_use() ) {
-        unset( $gateway_list['paypal'] );
+function wpinv_check_paypal_currency_support($gateway_list) {
+    if (isset($gateway_list['paypal']) && !wpinv_is_paypal_valid_for_use()) {
+        unset($gateway_list['paypal']);
     }
     return $gateway_list;
 }
-add_filter( 'wpinv_enabled_payment_gateways', 'wpinv_check_paypal_currency_support', 10, 1 );
+add_filter('wpinv_enabled_payment_gateways', 'wpinv_check_paypal_currency_support', 10, 1);
 
-function wpinv_gateway_paypal_button_label( $label ) {
-    return __( 'Proceed to PayPal', 'invoicing' );
+function wpinv_gateway_paypal_button_label($label) {
+    return __('Proceed to PayPal', 'invoicing');
 }
-add_filter( 'wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1 );
\ No newline at end of file
+add_filter('wpinv_gateway_paypal_button_label', 'wpinv_gateway_paypal_button_label', 10, 1);
\ No newline at end of file

includes/wpinv-address-functions.php

Braces +12 added lines, -8 removed lines

@@ -95,20 +95,24 @@
     }
 
     if ( !empty( $user_info ) ) {
-        if( empty( $address['first_name'] ) )
-            $address['first_name'] = $user_info->first_name;
+        if( empty( $address['first_name'] ) ) {
+                    $address['first_name'] = $user_info->first_name;
+        }
         
-        if( empty( $address['last_name'] ) )
-            $address['last_name'] = $user_info->last_name;
+        if( empty( $address['last_name'] ) ) {
+                    $address['last_name'] = $user_info->last_name;
+        }
     }
     
     $address['name'] = trim( trim( $address['first_name'] . ' ' . $address['last_name'] ), "," );
     
-    if( empty( $address['state'] ) && $with_default )
-        $address['state'] = wpinv_get_default_state();
+    if( empty( $address['state'] ) && $with_default ) {
+            $address['state'] = wpinv_get_default_state();
+    }
 
-    if( empty( $address['country'] ) && $with_default )
-        $address['country'] = wpinv_get_default_country();
+    if( empty( $address['country'] ) && $with_default ) {
+            $address['country'] = wpinv_get_default_country();
+    }
 
 
     return $address;

Indentation +88 added lines, -88 removed lines

@@ -13,9 +13,9 @@ 
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+    $country = wpinv_get_option( 'default_country', 'UK' );
 
-	return apply_filters( 'wpinv_default_country', $country );
+    return apply_filters( 'wpinv_default_country', $country );
 }
 
 /**
@@ -26,7 +26,7 @@ 
  */
 function wpinv_sanitize_country( $country ) {
 
-	// Enure the country is specified
+    // Enure the country is specified
     if ( empty( $country ) ) {
         $country = wpinv_get_default_country();
     }
@@ -56,9 +56,9 @@ 
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', false );
+    $state = wpinv_get_option( 'default_state', false );
 
-	return apply_filters( 'wpinv_default_state', $state );
+    return apply_filters( 'wpinv_default_state', $state );
 }
 
 function wpinv_state_name( $state_code = '', $country_code = '' ) {
@@ -166,11 +166,11 @@ 
 
     $country = wpinv_sanitize_country( $country );
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
-			return $continent_code;
-		}
-	}
+    foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
+        if ( false !== array_search( $country, $countries, true ) ) {
+            return $continent_code;
+        }
+    }
 
     return '';
     
@@ -462,30 +462,30 @@ 
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
-		$_POST['country'] = wpinv_get_default_country();
-	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+    if( empty( $_POST['country'] ) ) {
+        $_POST['country'] = wpinv_get_default_country();
+    }
+    $states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+    if( !empty( $states ) ) {
+        $sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
         
         $args = array(
-			'name'    => $sanitized_field_name,
-			'id'      => $sanitized_field_name,
-			'class'   => $sanitized_field_name . 'custom-select wpinv-select wpi_select2',
-			'options' => array_merge( array( '' => '' ), $states ),
-			'show_option_all'  => false,
-			'show_option_none' => false
-		);
-
-		$response = wpinv_html_select( $args );
-
-	} else {
-		$response = 'nostates';
-	}
+            'name'    => $sanitized_field_name,
+            'id'      => $sanitized_field_name,
+            'class'   => $sanitized_field_name . 'custom-select wpinv-select wpi_select2',
+            'options' => array_merge( array( '' => '' ), $states ),
+            'show_option_all'  => false,
+            'show_option_none' => false
+        );
+
+        $response = wpinv_html_select( $args );
+
+    } else {
+        $response = 'nostates';
+    }
 
-	return $response;
+    return $response;
 }
 
 function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
@@ -503,46 +503,46 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
-			array(
-				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
-				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
-				'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
-				'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
-				'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
-				'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
-				'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
-				'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
-				'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
-				'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
-				'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
-				'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
-				'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
-				'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
-				'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
-				'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
-				'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
-				'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
-				'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
-			)
-		);
+        return apply_filters( 'wpinv_localisation_address_formats',
+            array(
+                'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
+                'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
+                'AT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'BE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CA'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{state_code}}  {{zip}}\n{{country}}",
+                'CH'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'CL'      => "{{company}}\n{{name}}\n{{address}}\n{{state}}\n{{zip}} {{city}}\n{{country}}",
+                'CN'      => "{{country}} {{zip}}\n{{state}}, {{city}}, {{address}}\n{{company}}\n{{name}}",
+                'CZ'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'EE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'DK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'FR'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city_upper}}\n{{country}}",
+                'HK'      => "{{company}}\n{{first_name}} {{last_name_upper}}\n{{address}}\n{{city_upper}}\n{{state_upper}}\n{{country}}",
+                'HU'      => "{{name}}\n{{company}}\n{{city}}\n{{address}}\n{{zip}}\n{{country}}",
+                'IN'      => "{{company}}\n{{name}}\n{{address}}\n{{city}} {{zip}}\n{{state}}, {{country}}",
+                'IS'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'IT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}}\n{{city}}\n{{state_upper}}\n{{country}}",
+                'JP'      => "{{zip}}\n{{state}} {{city}} {{address}}\n{{company}}\n{{last_name}} {{first_name}}\n{{country}}",
+                'TW'      => "{{company}}\n{{last_name}} {{first_name}}\n{{address}}\n{{state}}, {{city}} {{zip}}\n{{country}}",
+                'LI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'NZ'      => "{{name}}\n{{company}}\n{{address}}\n{{city}} {{zip}}\n{{country}}",
+                'NO'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PL'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'PT'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SK'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'RS'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'SI'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'ES'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}}\n{{state}}\n{{country}}",
+                'SE'      => "{{company}}\n{{name}}\n{{address}}\n{{zip}} {{city}}\n{{country}}",
+                'TR'      => "{{name}}\n{{company}}\n{{address}}\n{{zip}} {{city}} {{state}}\n{{country}}",
+                'UG'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}, {{country}}",
+                'US'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}, {{state_code}} {{zip}}\n{{country}}",
+                'VN'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{country}}",
+            )
+        );
 }
 
 /**
@@ -559,21 +559,21 @@ 
     }
 
     // Get all formats.
-	$formats = wpinv_get_address_formats();
+    $formats = wpinv_get_address_formats();
 
-	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+    // Get format for the specified country.
+    $format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
     
     /**
-	 * Filters the address format to use on Invoices.
+     * Filters the address format to use on Invoices.
      * 
      * New lines will be replaced by a `br` element. Double new lines will be replaced by a paragraph. HTML tags are allowed.
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param string $format  The address format to use.
+     *
+     * @since 1.0.13
+     *
+     * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
-	 */
+     */
     return apply_filters( 'wpinv_get_full_address_format', $format, $country );
 }
 
@@ -594,8 +594,8 @@ 
         'country'           => '',
         'zip'               => '',
         'first_name'        => '',
-		'last_name'         => '',
-		'company'           => '',
+        'last_name'         => '',
+        'company'           => '',
     );
 
     $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
@@ -616,14 +616,14 @@ 
     $args['country_code']= $country;
 
     /**
-	 * Filters the address format replacements to use on Invoices.
+     * Filters the address format replacements to use on Invoices.
      * 
-	 *
-	 * @since 1.0.13
-	 *
-	 * @param array $replacements  The address replacements to use.
+     *
+     * @since 1.0.13
+     *
+     * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
-	 */
+     */
     $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
 
     $return = array();
@@ -646,5 +646,5 @@ 
  * @return string
  */
 function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+    return trim( $line, ', ' );
 }
\ No newline at end of file

Spacing +112 added lines, -112 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 
 function wpinv_get_default_country() {
-	$country = wpinv_get_option( 'default_country', 'UK' );
+	$country = wpinv_get_option('default_country', 'UK');
 
-	return apply_filters( 'wpinv_default_country', $country );
+	return apply_filters('wpinv_default_country', $country);
 }
 
 /**
@@ -24,59 +24,59 @@ 
  * @param string $country The country code to sanitize
  * @return array
  */
-function wpinv_sanitize_country( $country ) {
+function wpinv_sanitize_country($country) {
 
 	// Enure the country is specified
-    if ( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
-    return trim( wpinv_utf8_strtoupper( $country ) );
+    return trim(wpinv_utf8_strtoupper($country));
 
 }
 
-function wpinv_is_base_country( $country ) {
+function wpinv_is_base_country($country) {
     $base_country = wpinv_get_default_country();
     
-    if ( $base_country === 'UK' ) {
+    if ($base_country === 'UK') {
         $base_country = 'GB';
     }
-    if ( $country == 'UK' ) {
+    if ($country == 'UK') {
         $country = 'GB';
     }
 
-    return ( $country && $country === $base_country ) ? true : false;
+    return ($country && $country === $base_country) ? true : false;
 }
 
-function wpinv_country_name( $country_code = '' ) { 
+function wpinv_country_name($country_code = '') { 
     $countries = wpinv_get_country_list();
     $country_code = $country_code == 'UK' ? 'GB' : $country_code;
-    $country = isset( $countries[$country_code] ) ? $countries[$country_code] : $country_code;
+    $country = isset($countries[$country_code]) ? $countries[$country_code] : $country_code;
 
-    return apply_filters( 'wpinv_country_name', $country, $country_code );
+    return apply_filters('wpinv_country_name', $country, $country_code);
 }
 
 function wpinv_get_default_state() {
-	$state = wpinv_get_option( 'default_state', false );
+	$state = wpinv_get_option('default_state', false);
 
-	return apply_filters( 'wpinv_default_state', $state );
+	return apply_filters('wpinv_default_state', $state);
 }
 
-function wpinv_state_name( $state_code = '', $country_code = '' ) {
+function wpinv_state_name($state_code = '', $country_code = '') {
     $state = $state_code;
     
-    if ( !empty( $country_code ) ) {
-        $states = wpinv_get_country_states( $country_code );
+    if (!empty($country_code)) {
+        $states = wpinv_get_country_states($country_code);
         
-        $state = !empty( $states ) && isset( $states[$state_code] ) ? $states[$state_code] : $state;
+        $state = !empty($states) && isset($states[$state_code]) ? $states[$state_code] : $state;
     }
 
-    return apply_filters( 'wpinv_state_name', $state, $state_code, $country_code );
+    return apply_filters('wpinv_state_name', $state, $state_code, $country_code);
 }
 
 function wpinv_store_address() {
-    $address = wpinv_get_option( 'store_address', '' );
+    $address = wpinv_get_option('store_address', '');
 
-    return apply_filters( 'wpinv_store_address', $address );
+    return apply_filters('wpinv_store_address', $address);
 }
 
 /**
@@ -84,7 +84,7 @@ 
  * 
  * @param WPInv_Invoice $invoice
  */
-function getpaid_save_invoice_user_address( $invoice ) {
+function getpaid_save_invoice_user_address($invoice) {
 
     $address_fields = array(
         'first_name',
@@ -99,23 +99,23 @@ 
         'zip'
     );
 
-    foreach ( $address_fields as $field ) {
+    foreach ($address_fields as $field) {
         $method = "get_{$field}";
         $value = $invoice->$method();
 
         // Only save if it is not empty.
-        if ( ! empty( $value ) ) {
-            update_user_meta( $invoice->get_user_id(), '_wpinv_' . $field, $value );
+        if (!empty($value)) {
+            update_user_meta($invoice->get_user_id(), '_wpinv_' . $field, $value);
         }
     }
 
 }
 
-function wpinv_get_user_address( $user_id = 0, $with_default = true ) {
+function wpinv_get_user_address($user_id = 0, $with_default = true) {
     global $wpi_userID;
     
-    if( empty( $user_id ) ) {
-        $user_id = !empty( $wpi_userID ) ? $wpi_userID : get_current_user_id();
+    if (empty($user_id)) {
+        $user_id = !empty($wpi_userID) ? $wpi_userID : get_current_user_id();
     }
     
     $address_fields = array(
@@ -131,29 +131,29 @@ 
         'zip',
     );
     
-    $user_info = get_userdata( $user_id );
+    $user_info = get_userdata($user_id);
     
     $address = array();
     $address['user_id'] = $user_id;
-    $address['email'] = !empty( $user_info ) ? $user_info->user_email : '';
-    foreach ( $address_fields as $field ) {
-        $address[$field] = get_user_meta( $user_id, '_wpinv_' . $field, true );
+    $address['email'] = !empty($user_info) ? $user_info->user_email : '';
+    foreach ($address_fields as $field) {
+        $address[$field] = get_user_meta($user_id, '_wpinv_' . $field, true);
     }
 
-    if ( !empty( $user_info ) ) {
-        if( empty( $address['first_name'] ) )
+    if (!empty($user_info)) {
+        if (empty($address['first_name']))
             $address['first_name'] = $user_info->first_name;
         
-        if( empty( $address['last_name'] ) )
+        if (empty($address['last_name']))
             $address['last_name'] = $user_info->last_name;
     }
     
-    $address['name'] = trim( trim( $address['first_name'] . ' ' . $address['last_name'] ), "," );
+    $address['name'] = trim(trim($address['first_name'] . ' ' . $address['last_name']), ",");
     
-    if( empty( $address['state'] ) && $with_default )
+    if (empty($address['state']) && $with_default)
         $address['state'] = wpinv_get_default_state();
 
-    if( empty( $address['country'] ) && $with_default )
+    if (empty($address['country']) && $with_default)
         $address['country'] = wpinv_get_default_country();
 
 
@@ -167,16 +167,16 @@ 
  * @param string $return What to return.
  * @return array
  */
-function wpinv_get_continents( $return = 'all' ) {
+function wpinv_get_continents($return = 'all') {
 
-    $continents = wpinv_get_data( 'continents' );
+    $continents = wpinv_get_data('continents');
 
-    switch( $return ) {
+    switch ($return) {
         case 'name' :
-            return wp_list_pluck( $continents, 'name' );
+            return wp_list_pluck($continents, 'name');
             break;
         case 'countries' :
-            return wp_list_pluck( $continents, 'countries' );
+            return wp_list_pluck($continents, 'countries');
             break;
         default :
             return $continents;
@@ -192,12 +192,12 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return string
  */
-function wpinv_get_continent_code_for_country( $country = false ) {
+function wpinv_get_continent_code_for_country($country = false) {
 
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
     
-	foreach ( wpinv_get_continents( 'countries' ) as $continent_code => $countries ) {
-		if ( false !== array_search( $country, $countries, true ) ) {
+	foreach (wpinv_get_continents('countries') as $continent_code => $countries) {
+		if (false !== array_search($country, $countries, true)) {
 			return $continent_code;
 		}
 	}
@@ -213,13 +213,13 @@ 
  * @param string $country Country code. If no code is specified, defaults to the default country.
  * @return array
  */
-function wpinv_get_country_calling_code( $country = null) {
+function wpinv_get_country_calling_code($country = null) {
 
-    $country = wpinv_sanitize_country( $country );
-    $codes   = wpinv_get_data( 'phone-codes' );
-    $code    = isset( $codes[ $country ] ) ? $codes[ $country ] : '';
+    $country = wpinv_sanitize_country($country);
+    $codes   = wpinv_get_data('phone-codes');
+    $code    = isset($codes[$country]) ? $codes[$country] : '';
 
-    if ( is_array( $code ) ) {
+    if (is_array($code)) {
         return $code[0];
     }
     return $code;
@@ -232,8 +232,8 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_list( $first_empty = false ) {
-    return wpinv_maybe_add_empty_option( apply_filters( 'wpinv_countries', wpinv_get_data( 'countries' ) ), $first_empty );
+function wpinv_get_country_list($first_empty = false) {
+    return wpinv_maybe_add_empty_option(apply_filters('wpinv_countries', wpinv_get_data('countries')), $first_empty);
 }
 
 /**
@@ -243,22 +243,22 @@ 
  * @param bool $first_empty Whether or not the first item in the list should be empty
  * @return array
  */
-function wpinv_get_country_states( $country = null, $first_empty = false ) {
+function wpinv_get_country_states($country = null, $first_empty = false) {
     
     // Prepare the country.
-    $country = wpinv_sanitize_country( $country );
+    $country = wpinv_sanitize_country($country);
 
     // Fetch all states.
-    $all_states = wpinv_get_data( 'states' );
+    $all_states = wpinv_get_data('states');
 
     // Fetch the specified country's states.
-    $states     = isset( $all_states[ $country ] ) ? $all_states[ $country ] : array() ;
-    $states     = apply_filters( "wpinv_{$country}_states", $states );
-    $states     = apply_filters( 'wpinv_country_states', $states, $country );
+    $states     = isset($all_states[$country]) ? $all_states[$country] : array();
+    $states     = apply_filters("wpinv_{$country}_states", $states);
+    $states     = apply_filters('wpinv_country_states', $states, $country);
 
-    asort( $states );
+    asort($states);
      
-    return wpinv_maybe_add_empty_option( $states, $first_empty );
+    return wpinv_maybe_add_empty_option($states, $first_empty);
 }
 
 /**
@@ -268,7 +268,7 @@ 
  * @return array
  */
 function wpinv_get_us_states_list() {
-    return apply_filters( 'wpinv_usa_states', wpinv_get_country_states( 'US' ) );
+    return apply_filters('wpinv_usa_states', wpinv_get_country_states('US'));
 }
 
 /**
@@ -278,7 +278,7 @@ 
  * @return array
  */
 function wpinv_get_canada_states_list() {
-    return apply_filters( 'wpinv_canada_provinces', wpinv_get_country_states( 'CA' ) );
+    return apply_filters('wpinv_canada_provinces', wpinv_get_country_states('CA'));
 }
 
 /**
@@ -288,7 +288,7 @@ 
  * @return array
  */
 function wpinv_get_australia_states_list() {
-    return apply_filters( 'wpinv_australia_states', wpinv_get_country_states( 'AU' ) );
+    return apply_filters('wpinv_australia_states', wpinv_get_country_states('AU'));
 }
 
 /**
@@ -298,7 +298,7 @@ 
  * @return array
  */
 function wpinv_get_bangladesh_states_list() {
-    return apply_filters( 'wpinv_bangladesh_states', wpinv_get_country_states( 'BD' ) );
+    return apply_filters('wpinv_bangladesh_states', wpinv_get_country_states('BD'));
 }
 
 /**
@@ -308,7 +308,7 @@ 
  * @return array
  */
 function wpinv_get_brazil_states_list() {
-    return apply_filters( 'wpinv_brazil_states', wpinv_get_country_states( 'BR' ) );
+    return apply_filters('wpinv_brazil_states', wpinv_get_country_states('BR'));
 }
 
 /**
@@ -318,7 +318,7 @@ 
  * @return array
  */
 function wpinv_get_bulgaria_states_list() {
-    return apply_filters( 'wpinv_bulgaria_states', wpinv_get_country_states( 'BG' ) );
+    return apply_filters('wpinv_bulgaria_states', wpinv_get_country_states('BG'));
 }
 
 /**
@@ -328,7 +328,7 @@ 
  * @return array
  */
 function wpinv_get_hong_kong_states_list() {
-    return apply_filters( 'wpinv_hong_kong_states', wpinv_get_country_states( 'HK' ) );
+    return apply_filters('wpinv_hong_kong_states', wpinv_get_country_states('HK'));
 }
 
 /**
@@ -338,7 +338,7 @@ 
  * @return array
  */
 function wpinv_get_hungary_states_list() {
-    return apply_filters( 'wpinv_hungary_states', wpinv_get_country_states( 'HU' ) );
+    return apply_filters('wpinv_hungary_states', wpinv_get_country_states('HU'));
 }
 
 /**
@@ -348,7 +348,7 @@ 
  * @return array
  */
 function wpinv_get_japan_states_list() {
-    return apply_filters( 'wpinv_japan_states', wpinv_get_country_states( 'JP' ) );
+    return apply_filters('wpinv_japan_states', wpinv_get_country_states('JP'));
 }
 
 /**
@@ -358,7 +358,7 @@ 
  * @return array
  */
 function wpinv_get_china_states_list() {
-    return apply_filters( 'wpinv_china_states', wpinv_get_country_states( 'CN' ) );
+    return apply_filters('wpinv_china_states', wpinv_get_country_states('CN'));
 }
 
 /**
@@ -368,7 +368,7 @@ 
  * @return array
  */
 function wpinv_get_new_zealand_states_list() {
-    return apply_filters( 'wpinv_new_zealand_states', wpinv_get_country_states( 'NZ' ) );
+    return apply_filters('wpinv_new_zealand_states', wpinv_get_country_states('NZ'));
 }
 
 /**
@@ -378,7 +378,7 @@ 
  * @return array
  */
 function wpinv_get_peru_states_list() {
-    return apply_filters( 'wpinv_peru_states', wpinv_get_country_states( 'PE' ) );
+    return apply_filters('wpinv_peru_states', wpinv_get_country_states('PE'));
 }
 
 /**
@@ -388,7 +388,7 @@ 
  * @return array
  */
 function wpinv_get_indonesia_states_list() {
-    return apply_filters( 'wpinv_indonesia_states', wpinv_get_country_states( 'ID' ) );
+    return apply_filters('wpinv_indonesia_states', wpinv_get_country_states('ID'));
 }
 
 /**
@@ -398,7 +398,7 @@ 
  * @return array
  */
 function wpinv_get_india_states_list() {
-    return apply_filters( 'wpinv_india_states', wpinv_get_country_states( 'IN' ) );
+    return apply_filters('wpinv_india_states', wpinv_get_country_states('IN'));
 }
 
 /**
@@ -408,7 +408,7 @@ 
  * @return array
  */
 function wpinv_get_iran_states_list() {
-    return apply_filters( 'wpinv_iran_states', wpinv_get_country_states( 'IR' ) );
+    return apply_filters('wpinv_iran_states', wpinv_get_country_states('IR'));
 }
 
 /**
@@ -418,7 +418,7 @@ 
  * @return array
  */
 function wpinv_get_italy_states_list() {
-    return apply_filters( 'wpinv_italy_states', wpinv_get_country_states( 'IT' ) );
+    return apply_filters('wpinv_italy_states', wpinv_get_country_states('IT'));
 }
 
 /**
@@ -428,7 +428,7 @@ 
  * @return array
  */
 function wpinv_get_malaysia_states_list() {
-    return apply_filters( 'wpinv_malaysia_states', wpinv_get_country_states( 'MY' ) );
+    return apply_filters('wpinv_malaysia_states', wpinv_get_country_states('MY'));
 }
 
 /**
@@ -438,7 +438,7 @@ 
  * @return array
  */
 function wpinv_get_mexico_states_list() {
-    return apply_filters( 'wpinv_mexico_states', wpinv_get_country_states( 'MX' ) );
+    return apply_filters('wpinv_mexico_states', wpinv_get_country_states('MX'));
 }
 
 /**
@@ -448,7 +448,7 @@ 
  * @return array
  */
 function wpinv_get_nepal_states_list() {
-    return apply_filters( 'wpinv_nepal_states', wpinv_get_country_states( 'NP' ) );
+    return apply_filters('wpinv_nepal_states', wpinv_get_country_states('NP'));
 }
 
 /**
@@ -458,7 +458,7 @@ 
  * @return array
  */
 function wpinv_get_south_africa_states_list() {
-    return apply_filters( 'wpinv_south_africa_states', wpinv_get_country_states( 'ZA' ) );
+    return apply_filters('wpinv_south_africa_states', wpinv_get_country_states('ZA'));
 }
 
 /**
@@ -468,7 +468,7 @@ 
  * @return array
  */
 function wpinv_get_thailand_states_list() {
-    return apply_filters( 'wpinv_thailand_states', wpinv_get_country_states( 'TH' ) );
+    return apply_filters('wpinv_thailand_states', wpinv_get_country_states('TH'));
 }
 
 /**
@@ -478,7 +478,7 @@ 
  * @return array
  */
 function wpinv_get_turkey_states_list() {
-    return apply_filters( 'wpinv_turkey_states', wpinv_get_country_states( 'TR' ) );
+    return apply_filters('wpinv_turkey_states', wpinv_get_country_states('TR'));
 }
 
 /**
@@ -488,28 +488,28 @@ 
  * @return array
  */
 function wpinv_get_spain_states_list() {
-    return apply_filters( 'wpinv_spain_states', wpinv_get_country_states( 'ES' ) );
+    return apply_filters('wpinv_spain_states', wpinv_get_country_states('ES'));
 }
 
 function wpinv_get_states_field() {
-	if( empty( $_POST['country'] ) ) {
+	if (empty($_POST['country'])) {
 		$_POST['country'] = wpinv_get_default_country();
 	}
-	$states = wpinv_get_country_states( sanitize_text_field( $_POST['country'] ) );
+	$states = wpinv_get_country_states(sanitize_text_field($_POST['country']));
 
-	if( !empty( $states ) ) {
-		$sanitized_field_name = sanitize_text_field( $_POST['field_name'] );
+	if (!empty($states)) {
+		$sanitized_field_name = sanitize_text_field($_POST['field_name']);
         
         $args = array(
 			'name'    => $sanitized_field_name,
 			'id'      => $sanitized_field_name,
 			'class'   => $sanitized_field_name . 'custom-select wpinv-select wpi_select2',
-			'options' => array_merge( array( '' => '' ), $states ),
+			'options' => array_merge(array('' => ''), $states),
 			'show_option_all'  => false,
 			'show_option_none' => false
 		);
 
-		$response = wpinv_html_select( $args );
+		$response = wpinv_html_select($args);
 
 	} else {
 		$response = 'nostates';
@@ -518,10 +518,10 @@ 
 	return $response;
 }
 
-function wpinv_default_billing_country( $country = '', $user_id = 0 ) {
-    $country = !empty( $country ) ? $country : wpinv_get_default_country();
+function wpinv_default_billing_country($country = '', $user_id = 0) {
+    $country = !empty($country) ? $country : wpinv_get_default_country();
     
-    return apply_filters( 'wpinv_default_billing_country', $country, $user_id );
+    return apply_filters('wpinv_default_billing_country', $country, $user_id);
 }
 
 /**
@@ -533,7 +533,7 @@ 
  */
 function wpinv_get_address_formats() {
 
-		return apply_filters( 'wpinv_localisation_address_formats',
+		return apply_filters('wpinv_localisation_address_formats',
 			array(
 				'default' => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}}\n{{zip}}\n{{country}}",
 				'AU'      => "{{name}}\n{{company}}\n{{address}}\n{{city}}\n{{state}} {{zip}}\n{{country}}",
@@ -582,9 +582,9 @@ 
  * @see `wpinv_get_invoice_address_replacements`
  * @return string
  */
-function wpinv_get_full_address_format( $country = false) {
+function wpinv_get_full_address_format($country = false) {
 
-    if( empty( $country ) ) {
+    if (empty($country)) {
         $country = wpinv_get_default_country();
     }
 
@@ -592,7 +592,7 @@ 
 	$formats = wpinv_get_address_formats();
 
 	// Get format for the specified country.
-	$format = ( $country && isset( $formats[ $country ] ) ) ? $formats[ $country ] : $formats['default'];
+	$format = ($country && isset($formats[$country])) ? $formats[$country] : $formats['default'];
     
     /**
 	 * Filters the address format to use on Invoices.
@@ -604,7 +604,7 @@ 
 	 * @param string $format  The address format to use.
      * @param string $country The country who's address format is being retrieved.
 	 */
-    return apply_filters( 'wpinv_get_full_address_format', $format, $country );
+    return apply_filters('wpinv_get_full_address_format', $format, $country);
 }
 
 /**
@@ -615,7 +615,7 @@ 
  * @param array $billing_details customer's billing details
  * @return array
  */
-function wpinv_get_invoice_address_replacements( $billing_details ) {
+function wpinv_get_invoice_address_replacements($billing_details) {
 
     $default_args = array(
         'address'           => '',
@@ -628,22 +628,22 @@ 
 		'company'           => '',
     );
 
-    $args    = map_deep( wp_parse_args( $billing_details, $default_args ), 'trim' );
+    $args    = map_deep(wp_parse_args($billing_details, $default_args), 'trim');
     $state   = $args['state'];
     $country = $args['country'];
 
     // Handle full country name.
-    $full_country = empty( $country ) ? $country : wpinv_country_name( $country );
+    $full_country = empty($country) ? $country : wpinv_country_name($country);
 
     // Handle full state name.
-    $full_state   = ( $country && $state ) ?  wpinv_state_name( $state, $country ) : $state;
+    $full_state   = ($country && $state) ?  wpinv_state_name($state, $country) : $state;
 
     $args['postcode']    = $args['zip'];
     $args['name']        = $args['first_name'] . ' ' . $args['last_name'];
     $args['state']       = $full_state;
     $args['state_code']  = $state;
     $args['country']     = $full_country;
-    $args['country_code']= $country;
+    $args['country_code'] = $country;
 
     /**
 	 * Filters the address format replacements to use on Invoices.
@@ -654,14 +654,14 @@ 
 	 * @param array $replacements  The address replacements to use.
      * @param array $billing_details  The billing details to use.
 	 */
-    $replacements = apply_filters( 'wpinv_get_invoice_address_replacements', $args, $billing_details );
+    $replacements = apply_filters('wpinv_get_invoice_address_replacements', $args, $billing_details);
 
     $return = array();
 
-    foreach( $replacements as $key => $value ) {
-        $value  = is_scalar( $value ) ? trim( sanitize_text_field( $value ) ) : '';
+    foreach ($replacements as $key => $value) {
+        $value = is_scalar($value) ? trim(sanitize_text_field($value)) : '';
         $return['{{' . $key . '}}'] = $value;
-        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper( $value );
+        $return['{{' . $key . '_upper}}'] = wpinv_utf8_strtoupper($value);
     }
 
     return $return;
@@ -675,6 +675,6 @@ 
  * @since 1.0.14
  * @return string
  */
-function wpinv_trim_formatted_address_line( $line ) {
-	return trim( $line, ', ' );
+function wpinv_trim_formatted_address_line($line) {
+	return trim($line, ', ');
 }
\ No newline at end of file

templates/emails/wpinv-email-user_note.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
     die('-1');
+}
 
 do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
 

Spacing +10 added lines, -10 removed lines

@@ -1,22 +1,22 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_before_note_details', $invoice, $email_type, $sent_to_admin, $customer_note );
+do_action('wpinv_email_before_note_details', $invoice, $email_type, $sent_to_admin, $customer_note);
 
-if ( ! empty( $message_body ) ) {
-    echo wpautop( wptexturize( $message_body ) );
+if (!empty($message_body)) {
+    echo wpautop(wptexturize($message_body));
 }
 
-do_action( 'wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_invoice_items', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_billing_details', $invoice, $email_type, $sent_to_admin);
 
-do_action( 'wpinv_email_after_note_details', $invoice, $email_type, $sent_to_admin, $customer_note );
+do_action('wpinv_email_after_note_details', $invoice, $email_type, $sent_to_admin, $customer_note);
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

templates/emails/wpinv-email-overdue.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
     die('-1');
+}
 
 do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
 

Spacing +5 added lines, -5 removed lines

@@ -1,12 +1,12 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
-if ( ! empty( $message_body ) ) {
-    echo wpautop( wptexturize( $message_body ) );
+if (!empty($message_body)) {
+    echo wpautop(wptexturize($message_body));
 }
 
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
\ No newline at end of file
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);
\ No newline at end of file

templates/wpinv-invoice-history.php

Indentation +36 added lines, -36 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( !( $user_id = get_current_user_id() ) ) {
@@ -30,7 +30,7 @@ 
 
 		<tbody>
 			<?php foreach ( $user_invoices->invoices as $invoice ) {
-				?>
+                ?>
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
 					<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
 						<td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
@@ -53,31 +53,31 @@ 
 
 							<?php elseif ( 'invoice-actions' === $column_id ) : ?>
 								<?php
-									$actions = array(
-										'pay'    => array(
-											'url'  => $invoice->get_checkout_payment_url(),
-											'name' => __( 'Pay Now', 'invoicing' ),
+                                    $actions = array(
+                                        'pay'    => array(
+                                            'url'  => $invoice->get_checkout_payment_url(),
+                                            'name' => __( 'Pay Now', 'invoicing' ),
                                             'class' => 'btn-success'
-										),
+                                        ),
                                         'print'   => array(
-											'url'  => $invoice->get_view_url(),
-											'name' => __( 'Print', 'invoicing' ),
+                                            'url'  => $invoice->get_view_url(),
+                                            'name' => __( 'Print', 'invoicing' ),
                                             'class' => 'btn-primary',
                                             'attrs' => 'target="_blank"'
-										)
-									);
+                                        )
+                                    );
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
-									}
+                                    if ( ! $invoice->needs_payment() ) {
+                                        unset( $actions['pay'] );
+                                    }
 
-									if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-										foreach ( $actions as $key => $action ) {
-											$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
+                                    if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
+                                        foreach ( $actions as $key => $action ) {
+                                            $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
                                             echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
-										}
-									}
-								?>
+                                        }
+                                    }
+                                ?>
 							<?php endif; ?>
 						</td>
 					<?php endforeach; ?>
@@ -91,22 +91,22 @@ 
 	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
 		<div class="invoicing-Pagination">
 			<?php
-			$big = 999999;
-
-			if (get_query_var('paged'))
-				$current_page = get_query_var('paged');
-			elseif (get_query_var('page'))
-				$current_page = get_query_var('page');
-			else
-				$current_page = 1;
-
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-				'format'  => '?paged=%#%',
-				'current' => max( 1, $current_page ),
-				'total'   => $user_invoices->max_num_pages,
-			) );
-			?>
+            $big = 999999;
+
+            if (get_query_var('paged'))
+                $current_page = get_query_var('paged');
+            elseif (get_query_var('page'))
+                $current_page = get_query_var('page');
+            else
+                $current_page = 1;
+
+            echo paginate_links( array(
+                'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                'format'  => '?paged=%#%',
+                'current' => max( 1, $current_page ),
+                'total'   => $user_invoices->max_num_pages,
+            ) );
+            ?>
 		</div>
 	<?php endif; ?>
 

Braces +7 added lines, -6 removed lines

@@ -93,12 +93,13 @@
 			<?php
 			$big = 999999;
 
-			if (get_query_var('paged'))
-				$current_page = get_query_var('paged');
-			elseif (get_query_var('page'))
-				$current_page = get_query_var('page');
-			else
-				$current_page = 1;
+			if (get_query_var('paged')) {
+							$current_page = get_query_var('paged');
+			} elseif (get_query_var('page')) {
+							$current_page = get_query_var('page');
+			} else {
+							$current_page = 1;
+			}
 
 			echo paginate_links( array(
 				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),

Spacing +43 added lines, -43 removed lines

@@ -1,83 +1,83 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( !( $user_id = get_current_user_id() ) ) {
+if (!($user_id = get_current_user_id())) {
     ?>
-    <div class="wpinv-empty alert alert-error"><?php _e( 'You are not allowed to access this section', 'invoicing' ) ;?></div>
+    <div class="wpinv-empty alert alert-error"><?php _e('You are not allowed to access this section', 'invoicing'); ?></div>
     <?php
     return;
 }
 
 global $current_page;
-$current_page   = empty( $current_page ) ? 1 : absint( $current_page );
-$query          = apply_filters( 'wpinv_user_invoices_query', array( 'user' => $user_id, 'page' => $current_page, 'paginate' => true, 'orderby' => 'invoice_date' ) );
-$user_invoices  = wpinv_get_invoices( $query );
+$current_page   = empty($current_page) ? 1 : absint($current_page);
+$query          = apply_filters('wpinv_user_invoices_query', array('user' => $user_id, 'page' => $current_page, 'paginate' => true, 'orderby' => 'invoice_date'));
+$user_invoices  = wpinv_get_invoices($query);
 $has_invoices   = 0 < $user_invoices->total;
     
-do_action( 'wpinv_before_user_invoices', $has_invoices ); ?>
+do_action('wpinv_before_user_invoices', $has_invoices); ?>
 
-<?php if ( $has_invoices ) { ?>
+<?php if ($has_invoices) { ?>
 	<table class="table table-bordered table-hover table-responsive wpi-user-invoices">
 		<thead>
 			<tr>
-				<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-					<th class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>"><span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span></th>
+				<?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+					<th class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>"><span class="nobr"><?php echo esc_html($column_name['title']); ?></span></th>
 				<?php endforeach; ?>
 			</tr>
 		</thead>
 
 		<tbody>
-			<?php foreach ( $user_invoices->invoices as $invoice ) {
+			<?php foreach ($user_invoices->invoices as $invoice) {
 				?>
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
-					<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-						<td class="<?php echo esc_attr( $column_id ); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : '');?>" data-title="<?php echo esc_attr( $column_name['title'] ); ?>">
-							<?php if ( has_action( 'wpinv_user_invoices_column_' . $column_id ) ) : ?>
-								<?php do_action( 'wpinv_user_invoices_column_' . $column_id, $invoice ); ?>
-
-							<?php elseif ( 'invoice-number' === $column_id ) : ?>
-								<a href="<?php echo esc_url( $invoice->get_view_url() ); ?>">
-									<?php echo _x( '#', 'hash before invoice number', 'invoicing' ) . $invoice->get_number(); ?>
+					<?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+						<td class="<?php echo esc_attr($column_id); ?> <?php echo (!empty($column_name['class']) ? $column_name['class'] : ''); ?>" data-title="<?php echo esc_attr($column_name['title']); ?>">
+							<?php if (has_action('wpinv_user_invoices_column_' . $column_id)) : ?>
+								<?php do_action('wpinv_user_invoices_column_' . $column_id, $invoice); ?>
+
+							<?php elseif ('invoice-number' === $column_id) : ?>
+								<a href="<?php echo esc_url($invoice->get_view_url()); ?>">
+									<?php echo _x('#', 'hash before invoice number', 'invoicing') . $invoice->get_number(); ?>
 								</a>
 
-							<?php elseif ( 'created-date' === $column_id ) : $date = wpinv_get_date_created( $invoice->ID ); $dateYMD = wpinv_get_date_created( $invoice->ID, 'Y-m-d H:i:s' ); ?>
-								<time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+							<?php elseif ('created-date' === $column_id) : $date = wpinv_get_date_created($invoice->ID); $dateYMD = wpinv_get_date_created($invoice->ID, 'Y-m-d H:i:s'); ?>
+								<time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-							<?php elseif ( 'payment-date' === $column_id ) : $date = wpinv_get_invoice_date( $invoice->ID, '', false ); $dateYMD = wpinv_get_invoice_date( $invoice->ID, 'Y-m-d H:i:s', false ); ?>
-								<time datetime="<?php echo strtotime( $dateYMD ); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
+							<?php elseif ('payment-date' === $column_id) : $date = wpinv_get_invoice_date($invoice->ID, '', false); $dateYMD = wpinv_get_invoice_date($invoice->ID, 'Y-m-d H:i:s', false); ?>
+								<time datetime="<?php echo strtotime($dateYMD); ?>" title="<?php echo $dateYMD; ?>"><?php echo $date; ?></time>
 
-							<?php elseif ( 'invoice-status' === $column_id ) : ?>
-								<?php echo wpinv_invoice_status_label( $invoice_status, $invoice->get_status( true ) ) ; ?>
+							<?php elseif ('invoice-status' === $column_id) : ?>
+								<?php echo wpinv_invoice_status_label($invoice_status, $invoice->get_status(true)); ?>
 
-							<?php elseif ( 'invoice-total' === $column_id ) : ?>
-								<?php echo $invoice->get_total( true ); ?>
+							<?php elseif ('invoice-total' === $column_id) : ?>
+								<?php echo $invoice->get_total(true); ?>
 
-							<?php elseif ( 'invoice-actions' === $column_id ) : ?>
+							<?php elseif ('invoice-actions' === $column_id) : ?>
 								<?php
 									$actions = array(
 										'pay'    => array(
 											'url'  => $invoice->get_checkout_payment_url(),
-											'name' => __( 'Pay Now', 'invoicing' ),
+											'name' => __('Pay Now', 'invoicing'),
                                             'class' => 'btn-success'
 										),
                                         'print'   => array(
 											'url'  => $invoice->get_view_url(),
-											'name' => __( 'Print', 'invoicing' ),
+											'name' => __('Print', 'invoicing'),
                                             'class' => 'btn-primary',
                                             'attrs' => 'target="_blank"'
 										)
 									);
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
+									if (!$invoice->needs_payment()) {
+										unset($actions['pay']);
 									}
 
-									if ( $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice ) ) {
-										foreach ( $actions as $key => $action ) {
+									if ($actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice)) {
+										foreach ($actions as $key => $action) {
 											$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-                                            echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+                                            echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
 										}
 									}
 								?>
@@ -89,9 +89,9 @@ 
 		</tbody>
 	</table>
 
-	<?php do_action( 'wpinv_before_user_invoices_pagination' ); ?>
+	<?php do_action('wpinv_before_user_invoices_pagination'); ?>
 
-	<?php if ( 1 < $user_invoices->max_num_pages ) : ?>
+	<?php if (1 < $user_invoices->max_num_pages) : ?>
 		<div class="invoicing-Pagination">
 			<?php
 			$big = 999999;
@@ -103,20 +103,20 @@ 
 			else
 				$current_page = 1;
 
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+			echo paginate_links(array(
+				'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 				'format'  => '?paged=%#%',
-				'current' => max( 1, $current_page ),
+				'current' => max(1, $current_page),
 				'total'   => $user_invoices->max_num_pages,
-			) );
+			));
 			?>
 		</div>
 	<?php endif; ?>
 
 <?php } else { ?>
 	<div class="wpinv-empty alert-info">
-		<?php _e( 'No invoice has been made yet.', 'invoicing' ); ?>
+		<?php _e('No invoice has been made yet.', 'invoicing'); ?>
 	</div>
 <?php } ?>
 
-<?php do_action( 'wpinv_after_user_invoices', $has_invoices ); ?>
+<?php do_action('wpinv_after_user_invoices', $has_invoices); ?>

templates/wpinv-invalid-access.php

Spacing +17 added lines, -17 removed lines

@@ -1,56 +1,56 @@
 <?php 
-if ( !defined('ABSPATH') ) {
+if (!defined('ABSPATH')) {
     exit;
 }
-do_action( 'wpinv_invalid_invoice_before_display' ); ?><!DOCTYPE html>
+do_action('wpinv_invalid_invoice_before_display'); ?><!DOCTYPE html>
 <html <?php language_attributes(); ?>>
 <head>
     <meta charset="UTF-8">
     <title><?php wp_title() ?></title>
-    <meta charset="<?php bloginfo( 'charset' ); ?>" />
+    <meta charset="<?php bloginfo('charset'); ?>" />
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="robots" content="noindex,nofollow">
-    <?php do_action( 'wpinv_invalid_invoice_head' ); ?>
+    <?php do_action('wpinv_invalid_invoice_head'); ?>
 </head>
 <body class="body wpinv wpinv-print wpinv-invalid-invoice">
-    <?php do_action( 'wpinv_invalid_invoice_body_start' ); ?>
+    <?php do_action('wpinv_invalid_invoice_body_start'); ?>
     <div class="container wpinv-wrap">
         <!-- ///// Start Header -->
         <htmlpageheader name="wpinv-pdf-header">
-            <?php do_action( 'wpinv_invalid_invoice_before_header' ); ?>
+            <?php do_action('wpinv_invalid_invoice_before_header'); ?>
             <div class="row wpinv-header">
                 <div class="col-xs-12 wpinv-business">
-                    <a target="_blank" href="<?php echo esc_url( wpinv_get_business_website() ); ?>">
-                        <?php if ( $logo = wpinv_get_business_logo() ) { ?>
-                        <img class="logo" src="<?php echo esc_url( $logo ); ?>">
+                    <a target="_blank" href="<?php echo esc_url(wpinv_get_business_website()); ?>">
+                        <?php if ($logo = wpinv_get_business_logo()) { ?>
+                        <img class="logo" src="<?php echo esc_url($logo); ?>">
                         <?php } else { ?>
-                        <h1><?php echo esc_html( wpinv_get_business_name() ); ?></h1>
+                        <h1><?php echo esc_html(wpinv_get_business_name()); ?></h1>
                         <?php } ?>
                     </a>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invalid_invoice_after_header' ); ?>
+            <?php do_action('wpinv_invalid_invoice_after_header'); ?>
         </htmlpageheader>
         <!-- End Header ///// -->
         
-        <?php do_action( 'wpinv_invalid_invoice_before_content' ); ?>
+        <?php do_action('wpinv_invalid_invoice_before_content'); ?>
 
-        <?php do_action( 'wpinv_invalid_invoice_content' ); ?>
+        <?php do_action('wpinv_invalid_invoice_content'); ?>
         
-        <?php do_action( 'wpinv_invalid_invoice_after_content' ); ?>
+        <?php do_action('wpinv_invalid_invoice_after_content'); ?>
         
         <!-- ///// Start Footer -->
         <htmlpagefooter name="wpinv-pdf-footer">
-            <?php do_action( 'wpinv_invalid_invoice_before_footer' ); ?>
+            <?php do_action('wpinv_invalid_invoice_before_footer'); ?>
             <div class="row wpinv-footer">
                 <div class="col-sm-12">
                     <div class="footer-text"><?php echo wpinv_get_business_footer(); ?></div>
                 </div>
             </div>
-            <?php do_action( 'wpinv_invalid_invoice_after_footer' ); ?>
+            <?php do_action('wpinv_invalid_invoice_after_footer'); ?>
         </htmlpagefooter>
         <!-- End Footer ///// -->
     </div>
-    <?php do_action( 'wpinv_invalid_invoice_body_end' ); ?>
+    <?php do_action('wpinv_invalid_invoice_body_end'); ?>
 </body>
 </html>
\ No newline at end of file

includes/class-wpinv-subscriptions-db.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 /**
  * The Subscriptions DB Class

Spacing +154 added lines, -154 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * The Subscriptions DB Class
@@ -68,8 +68,8 @@ 
             'transaction_id'    => '',
             'parent_payment_id' => 0,
             'product_id'        => 0,
-            'created'           => date( 'Y-m-d H:i:s' ),
-            'expiration'        => date( 'Y-m-d H:i:s' ),
+            'created'           => date('Y-m-d H:i:s'),
+            'expiration'        => date('Y-m-d H:i:s'),
             'trial_period'      => '',
             'status'            => '',
             'profile_id'        => '',
@@ -82,11 +82,11 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function get_subscriptions( $args = array() ) {
+    public function get_subscriptions($args = array()) {
         global $wpdb;
 
         $defaults = array(
-            'number'       => get_option( 'posts_per_page' ),
+            'number'       => get_option('posts_per_page'),
             'offset'       => 0,
             'search'       => '',
             'customer_id'  => 0,
@@ -94,21 +94,21 @@ 
             'order'        => 'DESC'
         );
 
-        $args  = wp_parse_args( $args, $defaults );
+        $args = wp_parse_args($args, $defaults);
 
-        if( $args['number'] < 1 ) {
+        if ($args['number'] < 1) {
             $args['number'] = 999999999999;
         }
 
         $where = ' WHERE 1=1 ';
 
         // specific customers
-        if( ! empty( $args['id'] ) ) {
+        if (!empty($args['id'])) {
 
-            if( is_array( $args['id'] ) ) {
-                $ids = implode( ',', array_map('intval', $args['id'] ) );
+            if (is_array($args['id'])) {
+                $ids = implode(',', array_map('intval', $args['id']));
             } else {
-                $ids = intval( $args['id'] );
+                $ids = intval($args['id']);
             }
 
             $where .= " AND `id` IN( {$ids} ) ";
@@ -116,12 +116,12 @@ 
         }
 
         // Specific products
-        if( ! empty( $args['product_id'] ) ) {
+        if (!empty($args['product_id'])) {
 
-            if( is_array( $args['product_id'] ) ) {
-                $product_ids = implode( ',', array_map('intval', $args['product_id'] ) );
+            if (is_array($args['product_id'])) {
+                $product_ids = implode(',', array_map('intval', $args['product_id']));
             } else {
-                $product_ids = intval( $args['product_id'] );
+                $product_ids = intval($args['product_id']);
             }
 
             $where .= " AND `product_id` IN( {$product_ids} ) ";
@@ -129,12 +129,12 @@ 
         }
 
         // Specific parent payments
-        if( ! empty( $args['parent_payment_id'] ) ) {
+        if (!empty($args['parent_payment_id'])) {
 
-            if( is_array( $args['parent_payment_id'] ) ) {
-                $parent_payment_ids = implode( ',', array_map('intval', $args['parent_payment_id'] ) );
+            if (is_array($args['parent_payment_id'])) {
+                $parent_payment_ids = implode(',', array_map('intval', $args['parent_payment_id']));
             } else {
-                $parent_payment_ids = intval( $args['parent_payment_id'] );
+                $parent_payment_ids = intval($args['parent_payment_id']);
             }
 
             $where .= " AND `parent_payment_id` IN( {$parent_payment_ids} ) ";
@@ -142,12 +142,12 @@ 
         }
 
         // Specific transaction IDs
-        if( ! empty( $args['transaction_id'] ) ) {
+        if (!empty($args['transaction_id'])) {
 
-            if( is_array( $args['transaction_id'] ) ) {
-                $transaction_ids = implode( "','", array_map('sanitize_text_field', $args['transaction_id'] ) );
+            if (is_array($args['transaction_id'])) {
+                $transaction_ids = implode("','", array_map('sanitize_text_field', $args['transaction_id']));
             } else {
-                $transaction_ids = sanitize_text_field( $args['transaction_id'] );
+                $transaction_ids = sanitize_text_field($args['transaction_id']);
             }
 
             $where .= " AND `transaction_id` IN ( '{$transaction_ids}' ) ";
@@ -155,12 +155,12 @@ 
         }
 
         // Subscriptoins for specific customers
-        if( ! empty( $args['customer_id'] ) ) {
+        if (!empty($args['customer_id'])) {
 
-            if( is_array( $args['customer_id'] ) ) {
-                $customer_ids = implode( ',', array_map('intval', $args['customer_id'] ) );
+            if (is_array($args['customer_id'])) {
+                $customer_ids = implode(',', array_map('intval', $args['customer_id']));
             } else {
-                $customer_ids = intval( $args['customer_id'] );
+                $customer_ids = intval($args['customer_id']);
             }
 
             $where .= " AND `customer_id` IN( {$customer_ids} ) ";
@@ -168,12 +168,12 @@ 
         }
 
         // Subscriptions for specific profile IDs
-        if( ! empty( $args['profile_id'] ) ) {
+        if (!empty($args['profile_id'])) {
 
-            if( is_array( $args['profile_id'] ) ) {
-                $profile_ids = implode( "','", array_map('sanitize_text_field', $args['profile_id'] ) );
+            if (is_array($args['profile_id'])) {
+                $profile_ids = implode("','", array_map('sanitize_text_field', $args['profile_id']));
             } else {
-                $profile_ids = sanitize_text_field( $args['profile_id'] );
+                $profile_ids = sanitize_text_field($args['profile_id']);
             }
 
             $where .= " AND `profile_id` IN( '{$profile_ids}' ) ";
@@ -181,12 +181,12 @@ 
         }
 
         // Subscriptions for specific statuses
-        if( ! empty( $args['status'] ) ) {
+        if (!empty($args['status'])) {
 
-            if( is_array( $args['status'] ) ) {
-                $statuses = implode( "','", array_map( 'sanitize_text_field', $args['status'] ) );
+            if (is_array($args['status'])) {
+                $statuses = implode("','", array_map('sanitize_text_field', $args['status']));
             } else {
-                $statuses = sanitize_text_field( $args['status'] );
+                $statuses = sanitize_text_field($args['status']);
             }
 
             $where .= " AND `status` IN( '{$statuses}' ) ";
@@ -194,21 +194,21 @@ 
         }
 
         // Subscriptions created for a specific date or in a date range
-        if( ! empty( $args['date'] ) ) {
+        if (!empty($args['date'])) {
 
-            if( is_array( $args['date'] ) ) {
+            if (is_array($args['date'])) {
 
-                if( ! empty( $args['date']['start'] ) ) {
+                if (!empty($args['date']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
 
                     $where .= " AND `created` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['date']['end'] ) ) {
+                if (!empty($args['date']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
                     $where .= " AND `created` <= '{$end}'";
 
@@ -216,9 +216,9 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['date'] ) );
-                $month = date( 'm', strtotime( $args['date'] ) );
-                $day   = date( 'd', strtotime( $args['date'] ) );
+                $year  = date('Y', strtotime($args['date']));
+                $month = date('m', strtotime($args['date']));
+                $day   = date('d', strtotime($args['date']));
 
                 $where .= " AND $year = YEAR ( created ) AND $month = MONTH ( created ) AND $day = DAY ( created )";
             }
@@ -226,21 +226,21 @@ 
         }
 
         // Subscriptions with a specific expiration date or in an expiration date range
-        if( ! empty( $args['expiration'] ) ) {
+        if (!empty($args['expiration'])) {
 
-            if( is_array( $args['expiration'] ) ) {
+            if (is_array($args['expiration'])) {
 
-                if( ! empty( $args['expiration']['start'] ) ) {
+                if (!empty($args['expiration']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['expiration']['start']));
 
                     $where .= " AND `expiration` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['expiration']['end'] ) ) {
+                if (!empty($args['expiration']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['expiration']['end']));
 
                     $where .= " AND `expiration` <= '{$end}'";
 
@@ -248,73 +248,73 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['expiration'] ) );
-                $month = date( 'm', strtotime( $args['expiration'] ) );
-                $day   = date( 'd', strtotime( $args['expiration'] ) );
+                $year  = date('Y', strtotime($args['expiration']));
+                $month = date('m', strtotime($args['expiration']));
+                $day   = date('d', strtotime($args['expiration']));
 
                 $where .= " AND $year = YEAR ( expiration ) AND $month = MONTH ( expiration ) AND $day = DAY ( expiration )";
             }
 
         }
 
-        if ( ! empty( $args['search'] ) ) {
+        if (!empty($args['search'])) {
 
-            if( false !== strpos( 'id:', $args['search'] ) ) {
+            if (false !== strpos('id:', $args['search'])) {
 
-                $args['search'] = trim( str_replace( 'id:', '', $args['search'] ) );
-                $where .= " AND `id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('id:', '', $args['search']));
+                $where .= " AND `id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'txn:' ) ) {
+            } else if (false !== strpos($args['search'], 'txn:')) {
 
-                $args['search'] = trim( str_replace( 'txn:', '', $args['search'] ) );
-                $where .= " AND `transaction_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('txn:', '', $args['search']));
+                $where .= " AND `transaction_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'profile_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'profile_id:')) {
 
-                $args['search'] = trim( str_replace( 'profile_id:', '', $args['search'] ) );
-                $where .= " AND `profile_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('profile_id:', '', $args['search']));
+                $where .= " AND `profile_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'product_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'product_id:')) {
 
-                $args['search'] = trim( str_replace( 'product_id:', '', $args['search'] ) );
-                $where .= " AND `product_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('product_id:', '', $args['search']));
+                $where .= " AND `product_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'customer_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'customer_id:')) {
 
-                $args['search'] = trim( str_replace( 'customer_id:', '', $args['search'] ) );
-                $where .= " AND `customer_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('customer_id:', '', $args['search']));
+                $where .= " AND `customer_id` = '" . esc_sql($args['search']) . "'";
 
             } else {
 
-                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `profile_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `transaction_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `product_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `id` = '" . esc_sql( $args['search'] ) . "' )";
+                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `profile_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `transaction_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `product_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `id` = '" . esc_sql($args['search']) . "' )";
 
             }
 
         }
 
-        $args['orderby'] = ! array_key_exists( $args['orderby'], $this->get_columns() ) ? 'id' : $args['orderby'];
+        $args['orderby'] = !array_key_exists($args['orderby'], $this->get_columns()) ? 'id' : $args['orderby'];
 
-        if( 'amount' == $args['orderby'] ) {
+        if ('amount' == $args['orderby']) {
             $args['orderby'] = 'amount+0';
         }
 
-        $cache_key = md5( 'wpinv_subscriptions_' . serialize( $args ) );
+        $cache_key = md5('wpinv_subscriptions_' . serialize($args));
 
-        $subscriptions = wp_cache_get( $cache_key, 'subscriptions' );
+        $subscriptions = wp_cache_get($cache_key, 'subscriptions');
 
-        $args['orderby'] = esc_sql( $args['orderby'] );
-        $args['order']   = esc_sql( $args['order'] );
+        $args['orderby'] = esc_sql($args['orderby']);
+        $args['order']   = esc_sql($args['order']);
 
-        if( $subscriptions === false ) {
-            $subscriptions = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint( $args['offset'] ), absint( $args['number'] ) ), OBJECT );
+        if ($subscriptions === false) {
+            $subscriptions = $wpdb->get_results($wpdb->prepare("SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint($args['offset']), absint($args['number'])), OBJECT);
 
-            if( ! empty( $subscriptions ) ) {
+            if (!empty($subscriptions)) {
 
-                foreach( $subscriptions as $key => $subscription ) {
-                    $subscriptions[ $key ] = new WPInv_Subscription( $subscription );
+                foreach ($subscriptions as $key => $subscription) {
+                    $subscriptions[$key] = new WPInv_Subscription($subscription);
                 }
 
-                wp_cache_set( $cache_key, $subscriptions, 'subscriptions', 3600 );
+                wp_cache_set($cache_key, $subscriptions, 'subscriptions', 3600);
 
             }
 
@@ -329,19 +329,19 @@ 
      * @access  public
      * @since   1.0.0
      */
-    public function count( $args = array() ) {
+    public function count($args = array()) {
 
         global $wpdb;
 
         $where = ' WHERE 1=1 ';
 
         // specific customers
-        if( ! empty( $args['id'] ) ) {
+        if (!empty($args['id'])) {
 
-            if( is_array( $args['id'] ) ) {
-                $ids = implode( ',', array_map('intval', $args['id'] ) );
+            if (is_array($args['id'])) {
+                $ids = implode(',', array_map('intval', $args['id']));
             } else {
-                $ids = intval( $args['id'] );
+                $ids = intval($args['id']);
             }
 
             $where .= " AND `id` IN( {$ids} ) ";
@@ -349,12 +349,12 @@ 
         }
 
         // Specific products
-        if( ! empty( $args['product_id'] ) ) {
+        if (!empty($args['product_id'])) {
 
-            if( is_array( $args['product_id'] ) ) {
-                $product_ids = implode( ',', array_map('intval', $args['product_id'] ) );
+            if (is_array($args['product_id'])) {
+                $product_ids = implode(',', array_map('intval', $args['product_id']));
             } else {
-                $product_ids = intval( $args['product_id'] );
+                $product_ids = intval($args['product_id']);
             }
 
             $where .= " AND `product_id` IN( {$product_ids} ) ";
@@ -362,12 +362,12 @@ 
         }
 
         // Specific parent payments
-        if( ! empty( $args['parent_payment_id'] ) ) {
+        if (!empty($args['parent_payment_id'])) {
 
-            if( is_array( $args['parent_payment_id'] ) ) {
-                $parent_payment_ids = implode( ',', array_map('intval', $args['parent_payment_id'] ) );
+            if (is_array($args['parent_payment_id'])) {
+                $parent_payment_ids = implode(',', array_map('intval', $args['parent_payment_id']));
             } else {
-                $parent_payment_ids = intval( $args['parent_payment_id'] );
+                $parent_payment_ids = intval($args['parent_payment_id']);
             }
 
             $where .= " AND `parent_payment_id` IN( {$parent_payment_ids} ) ";
@@ -375,12 +375,12 @@ 
         }
 
         // Subscriptoins for specific customers
-        if( ! empty( $args['customer_id'] ) ) {
+        if (!empty($args['customer_id'])) {
 
-            if( is_array( $args['customer_id'] ) ) {
-                $customer_ids = implode( ',', array_map('intval', $args['customer_id'] ) );
+            if (is_array($args['customer_id'])) {
+                $customer_ids = implode(',', array_map('intval', $args['customer_id']));
             } else {
-                $customer_ids = intval( $args['customer_id'] );
+                $customer_ids = intval($args['customer_id']);
             }
 
             $where .= " AND `customer_id` IN( {$customer_ids} ) ";
@@ -388,12 +388,12 @@ 
         }
 
         // Subscriptions for specific profile IDs
-        if( ! empty( $args['profile_id'] ) ) {
+        if (!empty($args['profile_id'])) {
 
-            if( is_array( $args['profile_id'] ) ) {
-                $profile_ids = implode( ',', array_map('intval', $args['profile_id'] ) );
+            if (is_array($args['profile_id'])) {
+                $profile_ids = implode(',', array_map('intval', $args['profile_id']));
             } else {
-                $profile_ids = intval( $args['profile_id'] );
+                $profile_ids = intval($args['profile_id']);
             }
 
             $where .= " AND `profile_id` IN( {$profile_ids} ) ";
@@ -401,12 +401,12 @@ 
         }
 
         // Specific transaction IDs
-        if( ! empty( $args['transaction_id'] ) ) {
+        if (!empty($args['transaction_id'])) {
 
-            if( is_array( $args['transaction_id'] ) ) {
-                $transaction_ids = implode( ',', array_map('sanitize_text_field', $args['transaction_id'] ) );
+            if (is_array($args['transaction_id'])) {
+                $transaction_ids = implode(',', array_map('sanitize_text_field', $args['transaction_id']));
             } else {
-                $transaction_ids = sanitize_text_field( $args['transaction_id'] );
+                $transaction_ids = sanitize_text_field($args['transaction_id']);
             }
 
             $where .= " AND `transaction_id` IN( {$transaction_ids} ) ";
@@ -414,10 +414,10 @@ 
         }
 
         // Subscriptions for specific statuses
-        if( ! empty( $args['status'] ) ) {
+        if (!empty($args['status'])) {
 
-            if( is_array( $args['status'] ) ) {
-                $statuses = implode( ',', $args['status'] );
+            if (is_array($args['status'])) {
+                $statuses = implode(',', $args['status']);
                 $where  .= " AND `status` IN( {$statuses} ) ";
             } else {
                 $statuses = $args['status'];
@@ -429,21 +429,21 @@ 
         }
 
         // Subscriptions created for a specific date or in a date range
-        if( ! empty( $args['date'] ) ) {
+        if (!empty($args['date'])) {
 
-            if( is_array( $args['date'] ) ) {
+            if (is_array($args['date'])) {
 
-                if( ! empty( $args['date']['start'] ) ) {
+                if (!empty($args['date']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
 
                     $where .= " AND `created` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['date']['end'] ) ) {
+                if (!empty($args['date']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
                     $where .= " AND `created` <= '{$end}'";
 
@@ -451,9 +451,9 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['date'] ) );
-                $month = date( 'm', strtotime( $args['date'] ) );
-                $day   = date( 'd', strtotime( $args['date'] ) );
+                $year  = date('Y', strtotime($args['date']));
+                $month = date('m', strtotime($args['date']));
+                $day   = date('d', strtotime($args['date']));
 
                 $where .= " AND $year = YEAR ( created ) AND $month = MONTH ( created ) AND $day = DAY ( created )";
             }
@@ -461,21 +461,21 @@ 
         }
 
         // Subscriptions with a specific expiration date or in an expiration date range
-        if( ! empty( $args['expiration'] ) ) {
+        if (!empty($args['expiration'])) {
 
-            if( is_array( $args['expiration'] ) ) {
+            if (is_array($args['expiration'])) {
 
-                if( ! empty( $args['expiration']['start'] ) ) {
+                if (!empty($args['expiration']['start'])) {
 
-                    $start = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['start'] ) );
+                    $start = date('Y-m-d H:i:s', strtotime($args['expiration']['start']));
 
                     $where .= " AND `expiration` >= '{$start}'";
 
                 }
 
-                if( ! empty( $args['expiration']['end'] ) ) {
+                if (!empty($args['expiration']['end'])) {
 
-                    $end = date( 'Y-m-d H:i:s', strtotime( $args['expiration']['end'] ) );
+                    $end = date('Y-m-d H:i:s', strtotime($args['expiration']['end']));
 
                     $where .= " AND `expiration` <= '{$end}'";
 
@@ -483,64 +483,64 @@ 
 
             } else {
 
-                $year  = date( 'Y', strtotime( $args['expiration'] ) );
-                $month = date( 'm', strtotime( $args['expiration'] ) );
-                $day   = date( 'd', strtotime( $args['expiration'] ) );
+                $year  = date('Y', strtotime($args['expiration']));
+                $month = date('m', strtotime($args['expiration']));
+                $day   = date('d', strtotime($args['expiration']));
 
                 $where .= " AND $year = YEAR ( expiration ) AND $month = MONTH ( expiration ) AND $day = DAY ( expiration )";
             }
 
         }
 
-        if ( ! empty( $args['search'] ) ) {
+        if (!empty($args['search'])) {
 
-            if( false !== strpos( 'id:', $args['search'] ) ) {
+            if (false !== strpos('id:', $args['search'])) {
 
-                $args['search'] = trim( str_replace( 'id:', '', $args['search'] ) );
-                $where .= " AND `id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('id:', '', $args['search']));
+                $where .= " AND `id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'txn:' ) ) {
+            } else if (false !== strpos($args['search'], 'txn:')) {
 
-                $args['search'] = trim( str_replace( 'txn:', '', $args['search'] ) );
-                $where .= " AND `transaction_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('txn:', '', $args['search']));
+                $where .= " AND `transaction_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'profile_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'profile_id:')) {
 
-                $args['search'] = trim( str_replace( 'profile_id:', '', $args['search'] ) );
-                $where .= " AND `profile_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('profile_id:', '', $args['search']));
+                $where .= " AND `profile_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'product_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'product_id:')) {
 
-                $args['search'] = trim( str_replace( 'product_id:', '', $args['search'] ) );
-                $where .= " AND `product_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('product_id:', '', $args['search']));
+                $where .= " AND `product_id` = '" . esc_sql($args['search']) . "'";
 
-            } else if( false !== strpos( $args['search'], 'customer_id:' ) ) {
+            } else if (false !== strpos($args['search'], 'customer_id:')) {
 
-                $args['search'] = trim( str_replace( 'customer_id:', '', $args['search'] ) );
-                $where .= " AND `customer_id` = '" . esc_sql( $args['search'] ) . "'";
+                $args['search'] = trim(str_replace('customer_id:', '', $args['search']));
+                $where .= " AND `customer_id` = '" . esc_sql($args['search']) . "'";
 
             } else {
 
-                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `profile_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `transaction_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `product_id` LIKE '%%" . esc_sql( $args['search'] ) . "%%' OR `id` = '" . esc_sql( $args['search'] ) . "' )";
+                $where .= " AND ( `parent_payment_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `profile_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `transaction_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `product_id` LIKE '%%" . esc_sql($args['search']) . "%%' OR `id` = '" . esc_sql($args['search']) . "' )";
 
             }
 
         }
 
-        $cache_key = md5( 'wpinv_subscriptions_count' . serialize( $args ) );
+        $cache_key = md5('wpinv_subscriptions_count' . serialize($args));
 
-        $count = wp_cache_get( $cache_key, 'subscriptions' );
+        $count = wp_cache_get($cache_key, 'subscriptions');
 
-        if( $count === false ) {
+        if ($count === false) {
 
             $sql   = "SELECT COUNT($this->primary_key) FROM " . $this->table_name . "{$where};";
-            $count = $wpdb->get_var( $sql );
+            $count = $wpdb->get_var($sql);
 
-            wp_cache_set( $cache_key, $count, 'subscriptions', 3600 );
+            wp_cache_set($cache_key, $count, 'subscriptions', 3600);
 
         }
 
-        return absint( $count );
+        return absint($count);
 
     }
 
@@ -553,7 +553,7 @@ 
     public function create_table() {
         global $wpdb;
 
-        require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
         $sql = "CREATE TABLE " . $this->table_name . " (
         id bigint(20) NOT NULL AUTO_INCREMENT,
@@ -578,9 +578,9 @@ 
         KEY customer_and_status ( customer_id, status)
         ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-        dbDelta( $sql );
+        dbDelta($sql);
 
-        update_option( $this->table_name . '_db_version', $this->version );
+        update_option($this->table_name . '_db_version', $this->version);
     }
 
 }
\ No newline at end of file

includes/class-wpinv-db.php

Indentation +232 added lines, -232 removed lines

@@ -5,237 +5,237 @@
 
 abstract class Wpinv_DB {
 
-	/**
-	 * The name of our database table
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public $table_name;
-
-	/**
-	 * The version of our database table
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public $version;
-
-	/**
-	 * The name of the primary column
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public $primary_key;
-
-	/**
-	 * Get things started
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 */
-	public function __construct() {}
-
-	/**
-	 * Whitelist of columns
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  array
-	 */
-	public function get_columns() {
-		return array();
-	}
-
-	/**
-	 * Default column values
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  array
-	 */
-	public function get_column_defaults() {
-		return array();
-	}
-
-	/**
-	 * Retrieve a row by the primary key
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  object
-	 */
-	public function get( $row_id ) {
-		global $wpdb;
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
-	}
-
-	/**
-	 * Retrieve a row by a specific column / value
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  object
-	 */
-	public function get_by( $column, $row_id ) {
-		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
-	}
-
-	/**
-	 * Retrieve a specific column's value by the primary key
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  string
-	 */
-	public function get_column( $column, $row_id ) {
-		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
-	}
-
-	/**
-	 * Retrieve a specific column's value by the the specified column / value
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  string
-	 */
-	public function get_column_by( $column, $column_where, $column_value ) {
-		global $wpdb;
-		$column_where = esc_sql( $column_where );
-		$column       = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
-	}
-
-	/**
-	 * Insert a new row
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  int
-	 */
-	public function insert( $data, $type = '' ) {
-		global $wpdb;
-
-		// Set default values
-		$data = wp_parse_args( $data, $this->get_column_defaults() );
-
-		do_action( 'wpinv_pre_insert_' . $type, $data );
-
-		// Initialise column format array
-		$column_formats = $this->get_columns();
-
-		// Force fields to lower case
-		$data = array_change_key_case( $data );
-
-		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
-
-		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
-
-		$wpdb->insert( $this->table_name, $data, $column_formats );
-		$wpdb_insert_id = $wpdb->insert_id;
-
-		do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
-
-		return $wpdb_insert_id;
-	}
-
-	/**
-	 * Update a row
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  bool
-	 */
-	public function update( $row_id, $data = array(), $where = '' ) {
-
-		global $wpdb;
-
-		// Row ID must be positive integer
-		$row_id = absint( $row_id );
-
-		if( empty( $row_id ) ) {
-			return false;
-		}
-
-		if( empty( $where ) ) {
-			$where = $this->primary_key;
-		}
-
-		// Initialise column format array
-		$column_formats = $this->get_columns();
-
-		// Force fields to lower case
-		$data = array_change_key_case( $data );
-
-		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
-
-		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
-
-		if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Delete a row identified by the primary key
-	 *
-	 * @access  public
-	 * @since   1.0.0
-	 * @return  bool
-	 */
-	public function delete( $row_id = 0 ) {
-
-		global $wpdb;
-
-		// Row ID must be positive integer
-		$row_id = absint( $row_id );
-
-		if( empty( $row_id ) ) {
-			return false;
-		}
-
-		if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Check if the given table exists
-	 *
-	 * @since  2.4
-	 * @param  string $table The table name
-	 * @return bool          If the table name exists
-	 */
-	public function table_exists( $table ) {
-		global $wpdb;
-		$table = sanitize_text_field( $table );
-
-		return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
-	}
-
-	/**
-	 * Check if the table was ever installed
-	 *
-	 * @since  2.4
-	 * @return bool Returns if the customers table was installed and upgrade routine run
-	 */
-	public function installed() {
-		return $this->table_exists( $this->table_name );
-	}
+    /**
+     * The name of our database table
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public $table_name;
+
+    /**
+     * The version of our database table
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public $version;
+
+    /**
+     * The name of the primary column
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public $primary_key;
+
+    /**
+     * Get things started
+     *
+     * @access  public
+     * @since   1.0.0
+     */
+    public function __construct() {}
+
+    /**
+     * Whitelist of columns
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  array
+     */
+    public function get_columns() {
+        return array();
+    }
+
+    /**
+     * Default column values
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  array
+     */
+    public function get_column_defaults() {
+        return array();
+    }
+
+    /**
+     * Retrieve a row by the primary key
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  object
+     */
+    public function get( $row_id ) {
+        global $wpdb;
+        return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+    }
+
+    /**
+     * Retrieve a row by a specific column / value
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  object
+     */
+    public function get_by( $column, $row_id ) {
+        global $wpdb;
+        $column = esc_sql( $column );
+        return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
+    }
+
+    /**
+     * Retrieve a specific column's value by the primary key
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  string
+     */
+    public function get_column( $column, $row_id ) {
+        global $wpdb;
+        $column = esc_sql( $column );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+    }
+
+    /**
+     * Retrieve a specific column's value by the the specified column / value
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  string
+     */
+    public function get_column_by( $column, $column_where, $column_value ) {
+        global $wpdb;
+        $column_where = esc_sql( $column_where );
+        $column       = esc_sql( $column );
+        return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
+    }
+
+    /**
+     * Insert a new row
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  int
+     */
+    public function insert( $data, $type = '' ) {
+        global $wpdb;
+
+        // Set default values
+        $data = wp_parse_args( $data, $this->get_column_defaults() );
+
+        do_action( 'wpinv_pre_insert_' . $type, $data );
+
+        // Initialise column format array
+        $column_formats = $this->get_columns();
+
+        // Force fields to lower case
+        $data = array_change_key_case( $data );
+
+        // White list columns
+        $data = array_intersect_key( $data, $column_formats );
+
+        // Reorder $column_formats to match the order of columns given in $data
+        $data_keys = array_keys( $data );
+        $column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+
+        $wpdb->insert( $this->table_name, $data, $column_formats );
+        $wpdb_insert_id = $wpdb->insert_id;
+
+        do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
+
+        return $wpdb_insert_id;
+    }
+
+    /**
+     * Update a row
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  bool
+     */
+    public function update( $row_id, $data = array(), $where = '' ) {
+
+        global $wpdb;
+
+        // Row ID must be positive integer
+        $row_id = absint( $row_id );
+
+        if( empty( $row_id ) ) {
+            return false;
+        }
+
+        if( empty( $where ) ) {
+            $where = $this->primary_key;
+        }
+
+        // Initialise column format array
+        $column_formats = $this->get_columns();
+
+        // Force fields to lower case
+        $data = array_change_key_case( $data );
+
+        // White list columns
+        $data = array_intersect_key( $data, $column_formats );
+
+        // Reorder $column_formats to match the order of columns given in $data
+        $data_keys = array_keys( $data );
+        $column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+
+        if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Delete a row identified by the primary key
+     *
+     * @access  public
+     * @since   1.0.0
+     * @return  bool
+     */
+    public function delete( $row_id = 0 ) {
+
+        global $wpdb;
+
+        // Row ID must be positive integer
+        $row_id = absint( $row_id );
+
+        if( empty( $row_id ) ) {
+            return false;
+        }
+
+        if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if the given table exists
+     *
+     * @since  2.4
+     * @param  string $table The table name
+     * @return bool          If the table name exists
+     */
+    public function table_exists( $table ) {
+        global $wpdb;
+        $table = sanitize_text_field( $table );
+
+        return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
+    }
+
+    /**
+     * Check if the table was ever installed
+     *
+     * @since  2.4
+     * @return bool Returns if the customers table was installed and upgrade routine run
+     */
+    public function installed() {
+        return $this->table_exists( $this->table_name );
+    }
 
 }

Spacing +39 added lines, -39 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 abstract class Wpinv_DB {
 
@@ -66,9 +66,9 @@ 
 	 * @since   1.0.0
 	 * @return  object
 	 */
-	public function get( $row_id ) {
+	public function get($row_id) {
 		global $wpdb;
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -78,10 +78,10 @@ 
 	 * @since   1.0.0
 	 * @return  object
 	 */
-	public function get_by( $column, $row_id ) {
+	public function get_by($column, $row_id) {
 		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id ) );
+		$column = esc_sql($column);
+		return $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $column = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -91,10 +91,10 @@ 
 	 * @since   1.0.0
 	 * @return  string
 	 */
-	public function get_column( $column, $row_id ) {
+	public function get_column($column, $row_id) {
 		global $wpdb;
-		$column = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id ) );
+		$column = esc_sql($column);
+		return $wpdb->get_var($wpdb->prepare("SELECT $column FROM $this->table_name WHERE $this->primary_key = %s LIMIT 1;", $row_id));
 	}
 
 	/**
@@ -104,11 +104,11 @@ 
 	 * @since   1.0.0
 	 * @return  string
 	 */
-	public function get_column_by( $column, $column_where, $column_value ) {
+	public function get_column_by($column, $column_where, $column_value) {
 		global $wpdb;
-		$column_where = esc_sql( $column_where );
-		$column       = esc_sql( $column );
-		return $wpdb->get_var( $wpdb->prepare( "SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value ) );
+		$column_where = esc_sql($column_where);
+		$column       = esc_sql($column);
+		return $wpdb->get_var($wpdb->prepare("SELECT $column FROM $this->table_name WHERE $column_where = %s LIMIT 1;", $column_value));
 	}
 
 	/**
@@ -118,31 +118,31 @@ 
 	 * @since   1.0.0
 	 * @return  int
 	 */
-	public function insert( $data, $type = '' ) {
+	public function insert($data, $type = '') {
 		global $wpdb;
 
 		// Set default values
-		$data = wp_parse_args( $data, $this->get_column_defaults() );
+		$data = wp_parse_args($data, $this->get_column_defaults());
 
-		do_action( 'wpinv_pre_insert_' . $type, $data );
+		do_action('wpinv_pre_insert_' . $type, $data);
 
 		// Initialise column format array
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		$wpdb->insert( $this->table_name, $data, $column_formats );
+		$wpdb->insert($this->table_name, $data, $column_formats);
 		$wpdb_insert_id = $wpdb->insert_id;
 
-		do_action( 'wpinv_post_insert_' . $type, $wpdb_insert_id, $data );
+		do_action('wpinv_post_insert_' . $type, $wpdb_insert_id, $data);
 
 		return $wpdb_insert_id;
 	}
@@ -154,18 +154,18 @@ 
 	 * @since   1.0.0
 	 * @return  bool
 	 */
-	public function update( $row_id, $data = array(), $where = '' ) {
+	public function update($row_id, $data = array(), $where = '') {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if( empty( $where ) ) {
+		if (empty($where)) {
 			$where = $this->primary_key;
 		}
 
@@ -173,16 +173,16 @@ 
 		$column_formats = $this->get_columns();
 
 		// Force fields to lower case
-		$data = array_change_key_case( $data );
+		$data = array_change_key_case($data);
 
 		// White list columns
-		$data = array_intersect_key( $data, $column_formats );
+		$data = array_intersect_key($data, $column_formats);
 
 		// Reorder $column_formats to match the order of columns given in $data
-		$data_keys = array_keys( $data );
-		$column_formats = array_merge( array_flip( $data_keys ), $column_formats );
+		$data_keys = array_keys($data);
+		$column_formats = array_merge(array_flip($data_keys), $column_formats);
 
-		if ( false === $wpdb->update( $this->table_name, $data, array( $where => $row_id ), $column_formats ) ) {
+		if (false === $wpdb->update($this->table_name, $data, array($where => $row_id), $column_formats)) {
 			return false;
 		}
 
@@ -196,18 +196,18 @@ 
 	 * @since   1.0.0
 	 * @return  bool
 	 */
-	public function delete( $row_id = 0 ) {
+	public function delete($row_id = 0) {
 
 		global $wpdb;
 
 		// Row ID must be positive integer
-		$row_id = absint( $row_id );
+		$row_id = absint($row_id);
 
-		if( empty( $row_id ) ) {
+		if (empty($row_id)) {
 			return false;
 		}
 
-		if ( false === $wpdb->query( $wpdb->prepare( "DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id ) ) ) {
+		if (false === $wpdb->query($wpdb->prepare("DELETE FROM $this->table_name WHERE $this->primary_key = %d", $row_id))) {
 			return false;
 		}
 
@@ -221,11 +221,11 @@ 
 	 * @param  string $table The table name
 	 * @return bool          If the table name exists
 	 */
-	public function table_exists( $table ) {
+	public function table_exists($table) {
 		global $wpdb;
-		$table = sanitize_text_field( $table );
+		$table = sanitize_text_field($table);
 
-		return $wpdb->get_var( $wpdb->prepare( "SHOW TABLES LIKE '%s'", $table ) ) === $table;
+		return $wpdb->get_var($wpdb->prepare("SHOW TABLES LIKE '%s'", $table)) === $table;
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 * @return bool Returns if the customers table was installed and upgrade routine run
 	 */
 	public function installed() {
-		return $this->table_exists( $this->table_name );
+		return $this->table_exists($this->table_name);
 	}
 
 }

Braces +3 added lines, -1 removed lines

@@ -1,7 +1,9 @@
 <?php
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 abstract class Wpinv_DB {
 

includes/admin/class-wpinv-subscriptions-list-table.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 
 // Load WP_List_Table if not loaded

Indentation +349 added lines, -349 removed lines

@@ -13,7 +13,7 @@ 
 
 // Load WP_List_Table if not loaded
 if( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -23,102 +23,102 @@ 
  */
 class WPInv_Subscription_Reports_Table extends WP_List_Table {
 
-	/**
-	 * Number of results to show per page
-	 *
-	 * @since       1.0.0
-	 */
-
-	public $per_page        = 20;
-	public $total_count     = 0;
-	public $active_count    = 0;
-	public $pending_count   = 0;
-	public $expired_count   = 0;
-	public $completed_count = 0;
-	public $trialling_count  = 0;
-	public $cancelled_count = 0;
-	public $failing_count   = 0;
-
-	/**
-	 * Get things started
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      void
-	 */
-	function __construct(){
-		global $status, $page;
-
-		// Set parent defaults
-		parent::__construct( array(
-			'singular'  => 'subscription',
-			'plural'    => 'subscriptions',
-			'ajax'      => false
-		) );
-
-		$this->get_subscription_counts();
-
-	}
-
-	/**
-	 * Retrieve the view types
-	 *
-	 * @access public
-	 * @since 1.0.0
-	 * @return array $views All the views available
-	 */
-	public function get_views() {
-
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
-		$active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
-		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
-		$completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
-		$trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
-		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
-
-		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
-			'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
-			'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
-			'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
-			'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
-			'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
-		);
-
-		return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
-	}
-
-	/**
-	 * Show the search field
-	 *
-	 * @since 2.5
-	 * @access public
-	 *
-	 * @param string $text Label for the search box
-	 * @param string $input_id ID of the search box
-	 *
-	 * @return void
-	 */
-	public function search_box( $text, $input_id ) {
-
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
-			return;
-		}
-
-		$input_id = $input_id . '-search-input';
-
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
-		}
-
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
-		}
+    /**
+     * Number of results to show per page
+     *
+     * @since       1.0.0
+     */
+
+    public $per_page        = 20;
+    public $total_count     = 0;
+    public $active_count    = 0;
+    public $pending_count   = 0;
+    public $expired_count   = 0;
+    public $completed_count = 0;
+    public $trialling_count  = 0;
+    public $cancelled_count = 0;
+    public $failing_count   = 0;
+
+    /**
+     * Get things started
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      void
+     */
+    function __construct(){
+        global $status, $page;
+
+        // Set parent defaults
+        parent::__construct( array(
+            'singular'  => 'subscription',
+            'plural'    => 'subscriptions',
+            'ajax'      => false
+        ) );
+
+        $this->get_subscription_counts();
+
+    }
+
+    /**
+     * Retrieve the view types
+     *
+     * @access public
+     * @since 1.0.0
+     * @return array $views All the views available
+     */
+    public function get_views() {
+
+        $current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
+        $total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
+        $active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
+        $pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
+        $expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
+        $completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
+        $trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
+        $cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
+        $failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
+
+        $views = array(
+            'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
+            'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
+            'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
+            'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
+            'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
+            'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
+            'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
+            'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
+        );
+
+        return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
+    }
+
+    /**
+     * Show the search field
+     *
+     * @since 2.5
+     * @access public
+     *
+     * @param string $text Label for the search box
+     * @param string $input_id ID of the search box
+     *
+     * @return void
+     */
+    public function search_box( $text, $input_id ) {
+
+        if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+            return;
+        }
+
+        $input_id = $input_id . '-search-input';
+
+        if ( ! empty( $_REQUEST['orderby'] ) ) {
+            echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+        }
+
+        if ( ! empty( $_REQUEST['order'] ) ) {
+            echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+        }
 ?>
 		<p class="search-box">
 			<?php do_action( 'wpinv_recurring_subscription_search_box' ); ?>
@@ -127,18 +127,18 @@ 
 			<?php submit_button( $text, 'button', false, false, array('ID' => 'search-submit') ); ?><br/>
 		</p>
 <?php
-	}
-
-	/**
-	 * Render most columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_default( $item, $column_name ) {
-		return $item->$column_name;
-	}
+    }
+
+    /**
+     * Render most columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_default( $item, $column_name ) {
+        return $item->$column_name;
+    }
 
     /**
      * Subscription id column
@@ -151,244 +151,244 @@ 
         return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" target="_blank">' . $item->id . '</a>';
     }
 
-	/**
-	 * Customer column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_customer_id( $item ) {
-		$subscriber = get_userdata( $item->customer_id );
-		$customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
-
-		return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
-	}
-
-	/**
-	 * Status column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_status( $item ) {
-		return $item->get_status_label();
-	}
-
-	/**
-	 * Period column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_period( $item ) {
-
-		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
-
-		return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
-	}
-
-	/**
-	 * Billing Times column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_bill_times( $item ) {
-		return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
-	}
-
-	/**
-	 * Initial Amount column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_initial_amount( $item ) {
-		return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
-	}
-
-	/**
-	 * Renewal date column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_renewal_date( $item ) {
-		return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
-	}
-
-	/**
-	 * Payment column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_parent_payment_id( $item ) {
-		return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
-	}
-
-	/**
-	 * Product ID column
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	function column_product_id( $item ) {
-		return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
-	}
-
-	/**
-	 * Render the edit column
-	 *
-	 * @access      private
-	 * @since       2.0
-	 * @return      string
-	 */
-	function column_actions( $item ) {
-		return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
-	}
-
-
-	/**
-	 * Retrieve the table columns
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      array
-	 */
-
-	function get_columns(){
-		$columns = array(
-			'sub_id'            => __( 'ID', 'invoicing' ),
-			'customer_id'       => __( 'Customer', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'period'            => __( 'Billing Cycle', 'invoicing' ),
-			'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
-			'bill_times'        => __( 'Times Billed', 'invoicing' ),
-			'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
-			'parent_payment_id' => __( 'Invoice', 'invoicing' ),
-			'product_id'        => __( 'Item', 'invoicing' ),
-			'actions'           => __( 'Actions', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpinv_report_subscription_columns', $columns );
-	}
-
-	/**
-	 * Retrieve the current page number
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @return      int
-	 */
-	function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
-	}
-
-	/**
-	 * Retrieve the subscription counts
-	 *
-	 * @access public
-	 * @since 1.4
-	 * @return void
-	 */
-	public function get_subscription_counts() {
-
-		global $wp_query;
-
-		$db = new WPInv_Subscriptions_DB;
-
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-
-		$this->total_count     = $db->count();
-		$this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
-		$this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
-		$this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
-		$this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
-		$this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
-		$this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
-		$this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
-
-	}
-
-	/**
-	 * Setup the final data for the table
-	 *
-	 * @access      private
-	 * @since       1.0.0
-	 * @uses        $this->_column_headers
-	 * @uses        $this->items
-	 * @uses        $this->get_columns()
-	 * @uses        $this->get_sortable_columns()
-	 * @uses        $this->get_pagenum()
-	 * @uses        $this->set_pagination_args()
-	 * @return      array
-	 */
-	function prepare_items() {
-
-		$columns  = $this->get_columns();
-		$hidden   = array(); // No hidden columns
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
-		$sortable = $this->get_sortable_columns();
-
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-
-		$current_page = $this->get_pagenum();
-
-		$db     = new WPInv_Subscriptions_DB;
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
-		$args   = array(
-			'number' => $this->per_page,
-			'offset' => $this->per_page * ( $this->get_paged() - 1 ),
-			'search' => $search
-		);
-
-		if ( 'any' !== $status ) {
-			$args['status'] = $status;
-		}
-
-		$this->items = $db->get_subscriptions( $args );
-
-		switch ( $status ) {
-			case 'active':
-				$total_items = $this->active_count;
-				break;
-			case 'pending':
-				$total_items = $this->pending_count;
-				break;
-			case 'expired':
-				$total_items = $this->expired_count;
-				break;
-			case 'cancelled':
-				$total_items = $this->cancelled_count;
-				break;
-			case 'failing':
-				$total_items = $this->failing_count;
-				break;
-			case 'trialling':
-				$total_items = $this->trialling_count;
-				break;
-			case 'completed':
-				$total_items = $this->completed_count;
-				break;
-			case 'any':
-			default:
-				$total_items = $this->total_count;
-				break;
-		}
-
-		$this->set_pagination_args( array(
-			'total_items' => $total_items,
-			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page )
-		) );
-	}
+    /**
+     * Customer column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_customer_id( $item ) {
+        $subscriber = get_userdata( $item->customer_id );
+        $customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
+
+        return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
+    }
+
+    /**
+     * Status column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_status( $item ) {
+        return $item->get_status_label();
+    }
+
+    /**
+     * Period column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_period( $item ) {
+
+        $period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
+
+        return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
+    }
+
+    /**
+     * Billing Times column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_bill_times( $item ) {
+        return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
+    }
+
+    /**
+     * Initial Amount column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_initial_amount( $item ) {
+        return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
+    }
+
+    /**
+     * Renewal date column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_renewal_date( $item ) {
+        return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
+    }
+
+    /**
+     * Payment column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_parent_payment_id( $item ) {
+        return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
+    }
+
+    /**
+     * Product ID column
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      string
+     */
+    function column_product_id( $item ) {
+        return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
+    }
+
+    /**
+     * Render the edit column
+     *
+     * @access      private
+     * @since       2.0
+     * @return      string
+     */
+    function column_actions( $item ) {
+        return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
+    }
+
+
+    /**
+     * Retrieve the table columns
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      array
+     */
+
+    function get_columns(){
+        $columns = array(
+            'sub_id'            => __( 'ID', 'invoicing' ),
+            'customer_id'       => __( 'Customer', 'invoicing' ),
+            'status'            => __( 'Status', 'invoicing' ),
+            'period'            => __( 'Billing Cycle', 'invoicing' ),
+            'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
+            'bill_times'        => __( 'Times Billed', 'invoicing' ),
+            'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
+            'parent_payment_id' => __( 'Invoice', 'invoicing' ),
+            'product_id'        => __( 'Item', 'invoicing' ),
+            'actions'           => __( 'Actions', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpinv_report_subscription_columns', $columns );
+    }
+
+    /**
+     * Retrieve the current page number
+     *
+     * @access      private
+     * @since       1.0.0
+     * @return      int
+     */
+    function get_paged() {
+        return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+    }
+
+    /**
+     * Retrieve the subscription counts
+     *
+     * @access public
+     * @since 1.4
+     * @return void
+     */
+    public function get_subscription_counts() {
+
+        global $wp_query;
+
+        $db = new WPInv_Subscriptions_DB;
+
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+
+        $this->total_count     = $db->count();
+        $this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
+        $this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
+        $this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
+        $this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
+        $this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
+        $this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
+        $this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
+
+    }
+
+    /**
+     * Setup the final data for the table
+     *
+     * @access      private
+     * @since       1.0.0
+     * @uses        $this->_column_headers
+     * @uses        $this->items
+     * @uses        $this->get_columns()
+     * @uses        $this->get_sortable_columns()
+     * @uses        $this->get_pagenum()
+     * @uses        $this->set_pagination_args()
+     * @return      array
+     */
+    function prepare_items() {
+
+        $columns  = $this->get_columns();
+        $hidden   = array(); // No hidden columns
+        $status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+        $sortable = $this->get_sortable_columns();
+
+        $this->_column_headers = array( $columns, $hidden, $sortable );
+
+        $current_page = $this->get_pagenum();
+
+        $db     = new WPInv_Subscriptions_DB;
+        $search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+        $args   = array(
+            'number' => $this->per_page,
+            'offset' => $this->per_page * ( $this->get_paged() - 1 ),
+            'search' => $search
+        );
+
+        if ( 'any' !== $status ) {
+            $args['status'] = $status;
+        }
+
+        $this->items = $db->get_subscriptions( $args );
+
+        switch ( $status ) {
+            case 'active':
+                $total_items = $this->active_count;
+                break;
+            case 'pending':
+                $total_items = $this->pending_count;
+                break;
+            case 'expired':
+                $total_items = $this->expired_count;
+                break;
+            case 'cancelled':
+                $total_items = $this->cancelled_count;
+                break;
+            case 'failing':
+                $total_items = $this->failing_count;
+                break;
+            case 'trialling':
+                $total_items = $this->trialling_count;
+                break;
+            case 'completed':
+                $total_items = $this->completed_count;
+                break;
+            case 'any':
+            default:
+                $total_items = $this->total_count;
+                break;
+        }
+
+        $this->set_pagination_args( array(
+            'total_items' => $total_items,
+            'per_page'    => $this->per_page,
+            'total_pages' => ceil( $total_items / $this->per_page )
+        ) );
+    }
 }

Spacing +83 added lines, -83 removed lines

@@ -8,11 +8,11 @@ 
 
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 
 // Load WP_List_Table if not loaded
-if( ! class_exists( 'WP_List_Table' ) ) {
+if (!class_exists('WP_List_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
@@ -35,7 +35,7 @@ 
 	public $pending_count   = 0;
 	public $expired_count   = 0;
 	public $completed_count = 0;
-	public $trialling_count  = 0;
+	public $trialling_count = 0;
 	public $cancelled_count = 0;
 	public $failing_count   = 0;
 
@@ -46,15 +46,15 @@ 
 	 * @since       1.0.0
 	 * @return      void
 	 */
-	function __construct(){
+	function __construct() {
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
+		parent::__construct(array(
 			'singular'  => 'subscription',
 			'plural'    => 'subscriptions',
 			'ajax'      => false
-		) );
+		));
 
 		$this->get_subscription_counts();
 
@@ -69,28 +69,28 @@ 
 	 */
 	public function get_views() {
 
-		$current         = isset( $_GET['status'] ) ? $_GET['status'] : '';
-		$total_count     = '&nbsp;<span class="count">(' . $this->total_count    . ')</span>';
+		$current         = isset($_GET['status']) ? $_GET['status'] : '';
+		$total_count     = '&nbsp;<span class="count">(' . $this->total_count . ')</span>';
 		$active_count    = '&nbsp;<span class="count">(' . $this->active_count . ')</span>';
 		$pending_count   = '&nbsp;<span class="count">(' . $this->pending_count . ')</span>';
-		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count  . ')</span>';
+		$expired_count   = '&nbsp;<span class="count">(' . $this->expired_count . ')</span>';
 		$completed_count = '&nbsp;<span class="count">(' . $this->completed_count . ')</span>';
-		$trialling_count  = '&nbsp;<span class="count">(' . $this->trialling_count   . ')</span>';
-		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count   . ')</span>';
-		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count   . ')</span>';
+		$trialling_count = '&nbsp;<span class="count">(' . $this->trialling_count . ')</span>';
+		$cancelled_count = '&nbsp;<span class="count">(' . $this->cancelled_count . ')</span>';
+		$failing_count   = '&nbsp;<span class="count">(' . $this->failing_count . ')</span>';
 
 		$views = array(
-			'all'       => sprintf( '<a href="%s"%s>%s</a>', remove_query_arg( array( 'status', 'paged' ) ), $current === 'all' || $current == '' ? ' class="current"' : '', __('All','invoicing' ) . $total_count ),
-			'active'    => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'active', 'paged' => FALSE ) ), $current === 'active' ? ' class="current"' : '', __('Active','invoicing' ) . $active_count ),
-			'pending'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'pending', 'paged' => FALSE ) ), $current === 'pending' ? ' class="current"' : '', __('Pending','invoicing' ) . $pending_count ),
-			'expired'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'expired', 'paged' => FALSE ) ), $current === 'expired' ? ' class="current"' : '', __('Expired','invoicing' ) . $expired_count ),
-			'completed' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'completed', 'paged' => FALSE ) ), $current === 'completed' ? ' class="current"' : '', __('Completed','invoicing' ) . $completed_count ),
-			'trialling'  => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'trialling', 'paged' => FALSE ) ), $current === 'trialling' ? ' class="current"' : '', __('Trialling','invoicing' ) . $trialling_count ),
-			'cancelled' => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'cancelled', 'paged' => FALSE ) ), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled','invoicing' ) . $cancelled_count ),
-			'failing'   => sprintf( '<a href="%s"%s>%s</a>', add_query_arg( array( 'status' => 'failing', 'paged' => FALSE ) ), $current === 'failing' ? ' class="current"' : '', __('Failing','invoicing' ) . $failing_count ),
+			'all'       => sprintf('<a href="%s"%s>%s</a>', remove_query_arg(array('status', 'paged')), $current === 'all' || $current == '' ? ' class="current"' : '', __('All', 'invoicing') . $total_count),
+			'active'    => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'active', 'paged' => FALSE)), $current === 'active' ? ' class="current"' : '', __('Active', 'invoicing') . $active_count),
+			'pending'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'pending', 'paged' => FALSE)), $current === 'pending' ? ' class="current"' : '', __('Pending', 'invoicing') . $pending_count),
+			'expired'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'expired', 'paged' => FALSE)), $current === 'expired' ? ' class="current"' : '', __('Expired', 'invoicing') . $expired_count),
+			'completed' => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'completed', 'paged' => FALSE)), $current === 'completed' ? ' class="current"' : '', __('Completed', 'invoicing') . $completed_count),
+			'trialling'  => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'trialling', 'paged' => FALSE)), $current === 'trialling' ? ' class="current"' : '', __('Trialling', 'invoicing') . $trialling_count),
+			'cancelled' => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'cancelled', 'paged' => FALSE)), $current === 'cancelled' ? ' class="current"' : '', __('Cancelled', 'invoicing') . $cancelled_count),
+			'failing'   => sprintf('<a href="%s"%s>%s</a>', add_query_arg(array('status' => 'failing', 'paged' => FALSE)), $current === 'failing' ? ' class="current"' : '', __('Failing', 'invoicing') . $failing_count),
 		);
 
-		return apply_filters( 'wpinv_recurring_subscriptions_table_views', $views );
+		return apply_filters('wpinv_recurring_subscriptions_table_views', $views);
 	}
 
 	/**
@@ -104,27 +104,27 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
+	public function search_box($text, $input_id) {
 
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+		if (empty($_REQUEST['s']) && !$this->has_items()) {
 			return;
 		}
 
 		$input_id = $input_id . '-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if (!empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="' . esc_attr($_REQUEST['orderby']) . '" />';
 		}
 
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if (!empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="' . esc_attr($_REQUEST['order']) . '" />';
 		}
 ?>
 		<p class="search-box">
-			<?php do_action( 'wpinv_recurring_subscription_search_box' ); ?>
+			<?php do_action('wpinv_recurring_subscription_search_box'); ?>
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-			<?php submit_button( $text, 'button', false, false, array('ID' => 'search-submit') ); ?><br/>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?><br/>
 		</p>
 <?php
 	}
@@ -136,7 +136,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_default( $item, $column_name ) {
+	function column_default($item, $column_name) {
 		return $item->$column_name;
 	}
 
@@ -147,8 +147,8 @@ 
      * @since       1.0.0
      * @return      string
      */
-    function column_sub_id( $item ) {
-        return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" target="_blank">' . $item->id . '</a>';
+    function column_sub_id($item) {
+        return '<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $item->id)) . '" target="_blank">' . $item->id . '</a>';
     }
 
 	/**
@@ -158,11 +158,11 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_customer_id( $item ) {
-		$subscriber = get_userdata( $item->customer_id );
-		$customer   = ! empty( $subscriber->display_name ) ? $subscriber->display_name : $subscriber->user_email;
+	function column_customer_id($item) {
+		$subscriber = get_userdata($item->customer_id);
+		$customer   = !empty($subscriber->display_name) ? $subscriber->display_name : $subscriber->user_email;
 
-		return '<a href="' . esc_url( get_edit_user_link( $item->customer_id ) ) . '" target="_blank">' . $customer . '</a>';
+		return '<a href="' . esc_url(get_edit_user_link($item->customer_id)) . '" target="_blank">' . $customer . '</a>';
 	}
 
 	/**
@@ -172,7 +172,7 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_status( $item ) {
+	function column_status($item) {
 		return $item->get_status_label();
 	}
 
@@ -183,11 +183,11 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_period( $item ) {
+	function column_period($item) {
 
-		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency( $item->period,$item->frequency );
+		$period = WPInv_Subscriptions::wpinv_get_pretty_subscription_frequency($item->period, $item->frequency);
 
-		return wpinv_price( wpinv_format_amount( $item->recurring_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) ) . ' / ' . $period;
+		return wpinv_price(wpinv_format_amount($item->recurring_amount), wpinv_get_invoice_currency_code($item->parent_payment_id)) . ' / ' . $period;
 	}
 
 	/**
@@ -197,8 +197,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_bill_times( $item ) {
-		return $item->get_times_billed() . ' / ' . ( ( $item->bill_times == 0 ) ? 'Until Cancelled' : $item->bill_times );
+	function column_bill_times($item) {
+		return $item->get_times_billed() . ' / ' . (($item->bill_times == 0) ? 'Until Cancelled' : $item->bill_times);
 	}
 
 	/**
@@ -208,8 +208,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_initial_amount( $item ) {
-		return wpinv_price( wpinv_format_amount( $item->initial_amount ), wpinv_get_invoice_currency_code( $item->parent_payment_id ) );
+	function column_initial_amount($item) {
+		return wpinv_price(wpinv_format_amount($item->initial_amount), wpinv_get_invoice_currency_code($item->parent_payment_id));
 	}
 
 	/**
@@ -219,8 +219,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_renewal_date( $item ) {
-		return $renewal_date = ! empty( $item->expiration ) ? date_i18n( get_option( 'date_format' ), strtotime( $item->expiration ) ) : __( 'N/A', 'invoicing' );
+	function column_renewal_date($item) {
+		return $renewal_date = !empty($item->expiration) ? date_i18n(get_option('date_format'), strtotime($item->expiration)) : __('N/A', 'invoicing');
 	}
 
 	/**
@@ -230,8 +230,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_parent_payment_id( $item ) {
-		return '<a href="' . get_edit_post_link( $item->parent_payment_id ) . '" target="_blank">' . wpinv_get_invoice_number( $item->parent_payment_id ) . '</a>';
+	function column_parent_payment_id($item) {
+		return '<a href="' . get_edit_post_link($item->parent_payment_id) . '" target="_blank">' . wpinv_get_invoice_number($item->parent_payment_id) . '</a>';
 	}
 
 	/**
@@ -241,8 +241,8 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	function column_product_id( $item ) {
-		return '<a href="' . esc_url( admin_url( 'post.php?action=edit&post=' . $item->product_id ) ) . '" target="_blank">' . get_the_title( $item->product_id ) . '</a>';
+	function column_product_id($item) {
+		return '<a href="' . esc_url(admin_url('post.php?action=edit&post=' . $item->product_id)) . '" target="_blank">' . get_the_title($item->product_id) . '</a>';
 	}
 
 	/**
@@ -252,8 +252,8 @@ 
 	 * @since       2.0
 	 * @return      string
 	 */
-	function column_actions( $item ) {
-		return '<a href="' . esc_url( admin_url( 'admin.php?page=wpinv-subscriptions&id=' . $item->id ) ) . '" title="' . esc_attr( __( 'View or edit subscription', 'invoicing' ) ) . '" target="_blank">' . __( 'View', 'invoicing' ) . '</a>';
+	function column_actions($item) {
+		return '<a href="' . esc_url(admin_url('admin.php?page=wpinv-subscriptions&id=' . $item->id)) . '" title="' . esc_attr(__('View or edit subscription', 'invoicing')) . '" target="_blank">' . __('View', 'invoicing') . '</a>';
 	}
 
 
@@ -265,21 +265,21 @@ 
 	 * @return      array
 	 */
 
-	function get_columns(){
+	function get_columns() {
 		$columns = array(
-			'sub_id'            => __( 'ID', 'invoicing' ),
-			'customer_id'       => __( 'Customer', 'invoicing' ),
-			'status'            => __( 'Status', 'invoicing' ),
-			'period'            => __( 'Billing Cycle', 'invoicing' ),
-			'initial_amount'    => __( 'Initial Amount', 'invoicing' ),
-			'bill_times'        => __( 'Times Billed', 'invoicing' ),
-			'renewal_date'      => __( 'Renewal Date', 'invoicing' ),
-			'parent_payment_id' => __( 'Invoice', 'invoicing' ),
-			'product_id'        => __( 'Item', 'invoicing' ),
-			'actions'           => __( 'Actions', 'invoicing' ),
+			'sub_id'            => __('ID', 'invoicing'),
+			'customer_id'       => __('Customer', 'invoicing'),
+			'status'            => __('Status', 'invoicing'),
+			'period'            => __('Billing Cycle', 'invoicing'),
+			'initial_amount'    => __('Initial Amount', 'invoicing'),
+			'bill_times'        => __('Times Billed', 'invoicing'),
+			'renewal_date'      => __('Renewal Date', 'invoicing'),
+			'parent_payment_id' => __('Invoice', 'invoicing'),
+			'product_id'        => __('Item', 'invoicing'),
+			'actions'           => __('Actions', 'invoicing'),
 		);
 
-		return apply_filters( 'wpinv_report_subscription_columns', $columns );
+		return apply_filters('wpinv_report_subscription_columns', $columns);
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 	 * @return      int
 	 */
 	function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -306,16 +306,16 @@ 
 
 		$db = new WPInv_Subscriptions_DB;
 
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+		$search = !empty($_GET['s']) ? sanitize_text_field($_GET['s']) : '';
 
 		$this->total_count     = $db->count();
-		$this->active_count    = $db->count( array( 'status' => 'active', 'search' => $search ) );
-		$this->pending_count   = $db->count( array( 'status' => 'pending', 'search' => $search ) );
-		$this->expired_count   = $db->count( array( 'status' => 'expired', 'search' => $search ) );
-		$this->trialling_count  = $db->count( array( 'status' => 'trialling', 'search' => $search ) );
-		$this->cancelled_count = $db->count( array( 'status' => 'cancelled', 'search' => $search ) );
-		$this->completed_count = $db->count( array( 'status' => 'completed', 'search' => $search ) );
-		$this->failing_count   = $db->count( array( 'status' => 'failing', 'search' => $search ) );
+		$this->active_count    = $db->count(array('status' => 'active', 'search' => $search));
+		$this->pending_count   = $db->count(array('status' => 'pending', 'search' => $search));
+		$this->expired_count   = $db->count(array('status' => 'expired', 'search' => $search));
+		$this->trialling_count = $db->count(array('status' => 'trialling', 'search' => $search));
+		$this->cancelled_count = $db->count(array('status' => 'cancelled', 'search' => $search));
+		$this->completed_count = $db->count(array('status' => 'completed', 'search' => $search));
+		$this->failing_count   = $db->count(array('status' => 'failing', 'search' => $search));
 
 	}
 
@@ -336,28 +336,28 @@ 
 
 		$columns  = $this->get_columns();
 		$hidden   = array(); // No hidden columns
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+		$status   = isset($_GET['status']) ? $_GET['status'] : 'any';
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$current_page = $this->get_pagenum();
 
 		$db     = new WPInv_Subscriptions_DB;
-		$search = ! empty( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : '';
+		$search = !empty($_GET['s']) ? sanitize_text_field($_GET['s']) : '';
 		$args   = array(
 			'number' => $this->per_page,
-			'offset' => $this->per_page * ( $this->get_paged() - 1 ),
+			'offset' => $this->per_page * ($this->get_paged() - 1),
 			'search' => $search
 		);
 
-		if ( 'any' !== $status ) {
+		if ('any' !== $status) {
 			$args['status'] = $status;
 		}
 
-		$this->items = $db->get_subscriptions( $args );
+		$this->items = $db->get_subscriptions($args);
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'active':
 				$total_items = $this->active_count;
 				break;
@@ -385,10 +385,10 @@ 
 				break;
 		}
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page )
-		) );
+			'total_pages' => ceil($total_items / $this->per_page)
+		));
 	}
 }