AyeCode / invoicing

includes/admin/wpinv-upgrade-functions.php

Spacing +13 added lines, -13 removed lines

@@ -11,37 +11,37 @@
  * @since 1.0.0
 */
 function wpinv_automatic_upgrade() {
-    $wpi_version = get_option( 'wpinv_version' );
+    $wpi_version = get_option('wpinv_version');
     
-    if ( $wpi_version == WPINV_VERSION ) {
+    if ($wpi_version == WPINV_VERSION) {
         return;
     }
     
-    if ( version_compare( $wpi_version, '0.0.5', '<' ) ) {
+    if (version_compare($wpi_version, '0.0.5', '<')) {
         wpinv_v005_upgrades();
     }
     
-    update_option( 'wpinv_version', WPINV_VERSION );
+    update_option('wpinv_version', WPINV_VERSION);
 }
-add_action( 'admin_init', 'wpinv_automatic_upgrade' );
+add_action('admin_init', 'wpinv_automatic_upgrade');
 
 function wpinv_v005_upgrades() {
     global $wpdb;
     
     // Invoices status
-    $wpdb->query( "UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+    $wpdb->query("UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
     
     // Item meta key changes
     $query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-    $results = $wpdb->get_results( $query );
+    $results = $wpdb->get_results($query);
     
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
         
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->post_id );
+        foreach ($results as $row) {
+            clean_post_cache($row->post_id);
         }
     }
 }
\ No newline at end of file

includes/gateways/paypal.php

Spacing +259 added lines, -259 removed lines

@@ -1,13 +1,13 @@ 
 <?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_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
@@ -21,34 +21,34 @@ 
         'user_info'     => $purchase_data['user_info'],
         'cart_details'  => $purchase_data['cart_details'],
         'gateway'       => 'paypal',
-        'status'        => !empty( $purchase_data['buy_now'] ) ? 'private' : 'pending'
+        'status'        => !empty($purchase_data['buy_now']) ? 'private' : 'pending'
     );
 
     // 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 ) ), $payment );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed before sending buyer to PayPal. Payment data: %s', 'invoicing'), json_encode($payment_data)), $payment);
         // 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
-            ), get_permalink( wpinv_get_option( 'success_page', false ) ) );
+            ), get_permalink(wpinv_get_option('success_page', false)));
 
         // Get the PayPal redirect uri
-        $paypal_redirect = trailingslashit( wpinv_get_paypal_redirect() ) . '?';
+        $paypal_redirect = trailingslashit(wpinv_get_paypal_redirect()) . '?';
 
         // Setup PayPal arguments
         $paypal_args = array(
-            '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(),
@@ -57,13 +57,13 @@ 
             'shipping'      => '0',
             'no_note'       => '1',
             'currency_code' => wpinv_get_currency(),
-            'charset'       => get_bloginfo( 'charset' ),
+            'charset'       => get_bloginfo('charset'),
             'custom'        => $invoice->ID,
             'rm'            => '2',
             'return'        => $return_url,
-            'cancel_return' => wpinv_get_failed_transaction_uri( '?invoice-id=' . $invoice->ID ),
+            'cancel_return' => wpinv_get_failed_transaction_uri('?invoice-id=' . $invoice->ID),
             'notify_url'    => $listener_url,
-            'cbt'           => get_bloginfo( 'name' ),
+            'cbt'           => get_bloginfo('name'),
             'bn'            => 'WPInvoicing_SP',
 	        'lc'            => 'US' // this will force paypal site to english
         );
@@ -79,57 +79,57 @@ 
             'upload' => '1'
         );
 
-        $paypal_args = array_merge( $paypal_extra_args, $paypal_args );
+        $paypal_args = array_merge($paypal_extra_args, $paypal_args);
 
         // 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() ) {
-            $paypal_args['tax_cart'] = wpinv_sanitize_amount( (float)$invoice->get_tax(), 2 );
+        if (wpinv_use_taxes()) {
+            $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() && $item_id = $invoice->get_recurring() ) {
-        $item   = new WPInv_Item( $item_id );
+function wpinv_get_paypal_recurring_args($paypal_args, $purchase_data, $invoice) {
+    if ($invoice->is_recurring() && $item_id = $invoice->get_recurring()) {
+        $item = new WPInv_Item($item_id);
         
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             return $paypal_args;
         }
 
@@ -137,24 +137,24 @@ 
         $interval           = $item->get_recurring_interval();
         $bill_times         = (int)$item->get_recurring_limit();
         
-        $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
-        $paypal_args['item_name']   = stripslashes_deep( html_entity_decode( wpinv_get_cart_item_name( array( 'id' => $item->ID ) ), ENT_COMPAT, 'UTF-8' ) );
+        $paypal_args['item_name'] = stripslashes_deep(html_entity_decode(wpinv_get_cart_item_name(array('id' => $item->ID)), ENT_COMPAT, 'UTF-8'));
         
-        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;
@@ -162,63 +162,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;
 	}
 
@@ -226,11 +226,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';
@@ -239,43 +239,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
-	parse_str( $encoded_data, $encoded_data_array );
+	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,
@@ -293,21 +293,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(
@@ -315,215 +315,215 @@ 
 		'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['txn_type'], 'PayPal txn_type', __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' ) );
+	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'));
 		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' ) );
+	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'));
 		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' ) );
+			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'));
 			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' ) );
+			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'));
 			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'] ) );
-			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']));
+			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 );
+			if (!empty($note)) {
+				wpinv_insert_payment_note($invoice_id, $note);
 			}
 		} else {
-			wpinv_insert_payment_note( $invoice_id, wp_sprintf( __( 'PayPal IPN has been received with invalid payment status: %s', 'invoicing' ), $payment_status ) );
+			wpinv_insert_payment_note($invoice_id, wp_sprintf(__('PayPal IPN has been received with invalid payment status: %s', 'invoicing'), $payment_status));
 		}
 	}
 }
-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'] ) );
-        wpinv_set_payment_transaction_id( $parent_invoice_id, $ipn_data['invoice'] );
+    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']));
+        wpinv_set_payment_transaction_id($parent_invoice_id, $ipn_data['invoice']);
     }
     
-    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'] ) );
+    wpinv_insert_payment_note($parent_invoice_id, sprintf(__('PayPal Subscription ID: %s', 'invoicing'), $ipn_data['subscr_id']));
     
-    $subscription = wpinv_get_paypal_subscription( $ipn_data );
-    if ( false === $subscription ) {
+    $subscription = wpinv_get_paypal_subscription($ipn_data);
+    if (false === $subscription) {
         return;
     }
 
-    $cart_details   = $invoice->cart_details;
+    $cart_details = $invoice->cart_details;
 
-    if ( !empty( $cart_details ) ) {
-        foreach ( $cart_details as $cart_item ) {
-            $item = new WPInv_Item( $cart_item['id'] );
+    if (!empty($cart_details)) {
+        foreach ($cart_details as $cart_item) {
+            $item = new WPInv_Item($cart_item['id']);
             
             $status = $invoice->is_free_trial() && $item->has_free_trial() ? 'trialing' : 'active';
             
@@ -532,15 +532,15 @@ 
                 'status'            => $status,
                 'period'            => $item->get_recurring_period(),
                 'initial_amount'    => $invoice->get_total(),
-                'recurring_amount'  => $invoice->get_recurring_details( 'total' ),
+                'recurring_amount'  => $invoice->get_recurring_details('total'),
                 'interval'          => $item->get_recurring_interval(),
                 'bill_times'        => $item->get_recurring_limit(),
-                'expiration'        => $invoice->get_new_expiration( $cart_item['id'] ),
+                'expiration'        => $invoice->get_new_expiration($cart_item['id']),
                 'profile_id'        => $ipn_data['subscr_id'],
-                'created'           => date_i18n( 'Y-m-d H:i:s', strtotime( $ipn_data['subscr_date'] ) )
+                'created'           => date_i18n('Y-m-d H:i:s', strtotime($ipn_data['subscr_date']))
             );
             
-            if ( $item->has_free_trial() ) {
+            if ($item->has_free_trial()) {
                 $args['trial_period']      = $item->get_trial_period();
                 $args['trial_interval']    = $item->get_trial_interval();
             } else {
@@ -549,7 +549,7 @@ 
             }
             
 
-            $subscription->update_subscription( $args );
+            $subscription->update_subscription($args);
         }
     }
 }
@@ -557,39 +557,39 @@ 
 /**
  * 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']);
     
-    $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 );
-    $signup_date    = strtotime( $subscription->get_subscription_created() );
-    $today          = date_i18n( 'Y-m-d', $signup_date ) == date_i18n( 'Y-m-d', strtotime( $ipn_data['payment_date'] ) );
+    $transaction_id = wpinv_get_payment_transaction_id($parent_invoice_id);
+    $signup_date    = strtotime($subscription->get_subscription_created());
+    $today          = date_i18n('Y-m-d', $signup_date) == date_i18n('Y-m-d', 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 ( $today && ( !$transaction_id || $transaction_id == $parent_invoice_id ) ) {
-        wpinv_update_payment_status( $parent_invoice_id, 'publish' );
+    if ($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'] ) );
+        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']));
         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;
     }
 
@@ -598,11 +598,11 @@ 
         'transaction_id' => $ipn_data['txn_id']
     );
     
-    $invoice = wpinv_recurring_add_subscription_payment( $parent_invoice_id, $args );
+    $invoice = wpinv_recurring_add_subscription_payment($parent_invoice_id, $args);
     
-    if ( !empty( $invoice ) ) {
+    if (!empty($invoice)) {
         sleep(1);
-        wpinv_insert_payment_note( $invoice->ID, sprintf( __( 'PayPal Transaction ID: %s', 'invoicing' ) , $ipn_data['txn_id'] ) );
+        wpinv_insert_payment_note($invoice->ID, sprintf(__('PayPal Transaction ID: %s', 'invoicing'), $ipn_data['txn_id']));
 
         $invoice->renew_subscription();
     }
@@ -611,10 +611,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;
     }
 
@@ -624,10 +624,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;
     }
 
@@ -637,45 +637,45 @@ 
 /**
  * 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_subscription();
 
-    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 = wpinv_get_subscription( $ipn_data['subscr_id'], true );
+    $subscription = wpinv_get_subscription($ipn_data['subscr_id'], true);
 
-    if ( empty( $subscription ) ) {
-        $subs         = wpinv_get_subscriptions( array( 'parent_invoice_id' => $parent_invoice_id, 'numberposts' => 1 ) );
-        $subscription = reset( $subs );
+    if (empty($subscription)) {
+        $subs         = wpinv_get_subscriptions(array('parent_invoice_id' => $parent_invoice_id, 'numberposts' => 1));
+        $subscription = reset($subs);
 
-        if ( $subscription && $subscription->ID > 0 ) {
+        if ($subscription && $subscription->ID > 0) {
             // Update the profile ID so it is set for future renewals
-            $subscription->update_subscription( array( 'profile_id' => sanitize_text_field( $ipn_data['subscr_id'] ) ) );
+            $subscription->update_subscription(array('profile_id' => sanitize_text_field($ipn_data['subscr_id'])));
         } else {
             $subscription = $invoice;
-            $subscription->update_subscription( array( 'profile_id' => sanitize_text_field( $ipn_data['subscr_id'] ) ) );
+            $subscription->update_subscription(array('profile_id' => sanitize_text_field($ipn_data['subscr_id'])));
             // No subscription found with a matching payment ID, bail
             //return false;
         }
@@ -685,39 +685,39 @@ 
 
 }
 
-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;
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
-		wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Partial PayPal refund processed: %s', 'invoicing' ), $data['parent_txn_id'] ) );
+	if (number_format((float)$refund_amount, 2) < number_format((float)$payment_amount, 2)) {
+		wpinv_insert_payment_note($invoice_id, sprintf(__('Partial PayPal refund processed: %s', 'invoicing'), $data['parent_txn_id']));
 		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'] ) );
-	wpinv_insert_payment_note( $invoice_id, sprintf( __( 'PayPal Refund Transaction ID: %s', 'invoicing' ), $data['txn_id'] ) );
-	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']));
+	wpinv_insert_payment_note($invoice_id, sprintf(__('PayPal Refund Transaction ID: %s', 'invoicing'), $data['txn_id']));
+	wpinv_update_payment_status($invoice_id, 'wpi-refunded');
 }
 
-function wpinv_get_paypal_redirect( $ssl_check = false ) {
-    if ( is_ssl() || ! $ssl_check ) {
+function wpinv_get_paypal_redirect($ssl_check = false) {
+    if (is_ssl() || !$ssl_check) {
         $protocol = 'https://';
     } else {
         $protocol = 'http://';
     }
 
     // Check the current payment mode
-    if ( wpinv_is_test_mode( 'paypal' ) ) {
+    if (wpinv_is_test_mode('paypal')) {
         // Test mode
         $paypal_uri = $protocol . 'www.sandbox.paypal.com/cgi-bin/webscr';
     } else {
@@ -725,67 +725,67 @@ 
         $paypal_uri = $protocol . 'www.paypal.com/cgi-bin/webscr';
     }
 
-    return apply_filters( 'wpinv_paypal_uri', $paypal_uri );
+    return apply_filters('wpinv_paypal_uri', $paypal_uri);
 }
 
-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 ) && 'pending' == $wpi_invoice->status ) {
+    if (!empty($wpi_invoice) && '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 ( $invoice->is_free_trial() || $transaction_id == $invoice_id ) { // Free trial does not have transaction at PayPal.
+function wpinv_paypal_link_transaction_id($transaction_id, $invoice_id, $invoice) {
+    if ($invoice->is_free_trial() || $transaction_id == $invoice_id) { // Free trial does not have transaction at PayPal.
         $transaction_url = $invoice->get_view_url();
     } else {
-        $sandbox = wpinv_is_test_mode( 'paypal' ) ? '.sandbox' : '';
+        $sandbox = wpinv_is_test_mode('paypal') ? '.sandbox' : '';
         $transaction_url = 'https://www' . $sandbox . '.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&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, $invoice );
+    return apply_filters('wpinv_paypal_link_payment_details_transaction_id', $transaction_link, $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_gateway_paypal_button_label($label) {
-    return __( 'Proceed to PayPal', 'invoicing' );
+    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/gateways/authorizenet.php

Spacing +211 added lines, -211 removed lines

@@ -1,60 +1,60 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_filter( 'wpinv_authorizenet_support_subscription', '__return_true' );
+add_filter('wpinv_authorizenet_support_subscription', '__return_true');
 
-function wpinv_authorizenet_cc_form( $invoice_id ) {
-    $invoice = wpinv_get_invoice( $invoice_id );
-    $cc_owner = !empty( $invoice ) ? esc_attr( $invoice->get_user_full_name() ) : '';
+function wpinv_authorizenet_cc_form($invoice_id) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    $cc_owner = !empty($invoice) ? esc_attr($invoice->get_user_full_name()) : '';
     ?>
     <div id="authorizenet_cc_form" class="form-horizontal wpi-cc-form panel panel-default">
-        <div class="panel-heading"><h3 class="panel-title"><?php _e( 'Card Details', 'invoicing' ) ;?></h3></div>
+        <div class="panel-heading"><h3 class="panel-title"><?php _e('Card Details', 'invoicing'); ?></h3></div>
         <div class="panel-body">
             <div class="form-group required">
-              <label for="auth-input-cc-owner" class="col-sm-4 control-label"><?php _e( 'Card Owner', 'invoicing' ) ;?></label>
+              <label for="auth-input-cc-owner" class="col-sm-4 control-label"><?php _e('Card Owner', 'invoicing'); ?></label>
               <div class="col-sm-8">
-                <input type="text" class="form-control" id="auth-input-cc-owner" placeholder="<?php esc_attr_e( 'Card Owner', 'invoicing' ) ;?>" value="<?php echo $cc_owner;?>" name="authorizenet[cc_owner]">
+                <input type="text" class="form-control" id="auth-input-cc-owner" placeholder="<?php esc_attr_e('Card Owner', 'invoicing'); ?>" value="<?php echo $cc_owner; ?>" name="authorizenet[cc_owner]">
               </div>
             </div>
             <div class="form-group required">
-              <label for="auth-input-cc-number" class="col-sm-4 control-label"><?php _e( 'Card Number', 'invoicing' ) ;?></label>
+              <label for="auth-input-cc-number" class="col-sm-4 control-label"><?php _e('Card Number', 'invoicing'); ?></label>
               <div class="col-sm-8">
-                <input type="text" class="form-control" id="auth-input-cc-number" placeholder="<?php esc_attr_e( 'Card Number', 'invoicing' ) ;?>" value="" name="authorizenet[cc_number]">
+                <input type="text" class="form-control" id="auth-input-cc-number" placeholder="<?php esc_attr_e('Card Number', 'invoicing'); ?>" value="" name="authorizenet[cc_number]">
               </div>
             </div>
             <div class="form-group required">
-              <label for="auth-input-cc-expire-date" class="col-sm-4 control-label"><?php _e( 'Card Expiry Date', 'invoicing' ) ;?></label>
+              <label for="auth-input-cc-expire-date" class="col-sm-4 control-label"><?php _e('Card Expiry Date', 'invoicing'); ?></label>
               <div class="col-sm-2">
                 <select class="form-control" id="auth-input-cc-expire-date" name="authorizenet[cc_expire_month]">
-                    <?php for ( $i = 1; $i <= 12; $i++ ) { $value = str_pad( $i, 2, '0', STR_PAD_LEFT ); ?>
-                    <option value="<?php echo $value;?>"><?php echo $value;?></option>
+                    <?php for ($i = 1; $i <= 12; $i++) { $value = str_pad($i, 2, '0', STR_PAD_LEFT); ?>
+                    <option value="<?php echo $value; ?>"><?php echo $value; ?></option>
                     <?php } ?>
                 </select>
                </div>
                <div class="col-sm-2">
                 <select class="form-control" name="authorizenet[cc_expire_year]">
-                    <?php $year = date( 'Y' ); for ( $i = $year; $i <= ( $year + 10 ); $i++ ) { ?>
-                    <option value="<?php echo $i;?>"><?php echo $i;?></option>
+                    <?php $year = date('Y'); for ($i = $year; $i <= ($year + 10); $i++) { ?>
+                    <option value="<?php echo $i; ?>"><?php echo $i; ?></option>
                     <?php } ?>
                 </select>
               </div>
             </div>
             <div class="form-group required">
-              <label for="auth-input-cc-cvv2" class="col-sm-4 control-label"><?php _e( 'Card Security Code (CVV2)', 'invoicing' ) ;?></label>
+              <label for="auth-input-cc-cvv2" class="col-sm-4 control-label"><?php _e('Card Security Code (CVV2)', 'invoicing'); ?></label>
               <div class="col-sm-8">
-                <input type="text" class="form-control" id="auth-input-cc-cvv2" placeholder="<?php esc_attr_e( 'Card Security Code (CVV2)', 'invoicing' ) ;?>" value="" name="authorizenet[cc_cvv2]"">
+                <input type="text" class="form-control" id="auth-input-cc-cvv2" placeholder="<?php esc_attr_e('Card Security Code (CVV2)', 'invoicing'); ?>" value="" name="authorizenet[cc_cvv2]"">
               </div>
             </div>
       </div>
     </div>
     <?php
 }
-add_action( 'wpinv_authorizenet_cc_form', 'wpinv_authorizenet_cc_form', 10, 1 );
+add_action('wpinv_authorizenet_cc_form', 'wpinv_authorizenet_cc_form', 10, 1);
 
-function wpinv_process_authorizenet_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_authorizenet_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
@@ -72,10 +72,10 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
 
-    if ( !empty( $invoice ) ) {
-        $authorizenet_card  = !empty( $_POST['authorizenet'] ) ? $_POST['authorizenet'] : array();
+    if (!empty($invoice)) {
+        $authorizenet_card  = !empty($_POST['authorizenet']) ? $_POST['authorizenet'] : array();
         $card_defaults      = array(
             'cc_owner'          => $invoice->get_user_full_name(),
             'cc_number'         => false,
@@ -83,174 +83,174 @@ 
             'cc_expire_year'    => false,
             'cc_cvv2'           => false,
         );
-        $authorizenet_card = wp_parse_args( $authorizenet_card, $card_defaults );
+        $authorizenet_card = wp_parse_args($authorizenet_card, $card_defaults);
         
-        if ( empty( $authorizenet_card['cc_owner'] ) ) {
-            wpinv_set_error( 'empty_card_name', __( 'You must enter the name on your card!', 'invoicing'));
+        if (empty($authorizenet_card['cc_owner'])) {
+            wpinv_set_error('empty_card_name', __('You must enter the name on your card!', 'invoicing'));
         }
-        if ( empty( $authorizenet_card['cc_number'] ) ) {
-            wpinv_set_error( 'empty_card', __( 'You must enter a card number!', 'invoicing'));
+        if (empty($authorizenet_card['cc_number'])) {
+            wpinv_set_error('empty_card', __('You must enter a card number!', 'invoicing'));
         }
-        if ( empty( $authorizenet_card['cc_expire_month'] ) ) {
-            wpinv_set_error( 'empty_month', __( 'You must enter an card expiration month!', 'invoicing'));
+        if (empty($authorizenet_card['cc_expire_month'])) {
+            wpinv_set_error('empty_month', __('You must enter an card expiration month!', 'invoicing'));
         }
-        if ( empty( $authorizenet_card['cc_expire_year'] ) ) {
-            wpinv_set_error( 'empty_year', __( 'You must enter an card expiration year!', 'invoicing'));
+        if (empty($authorizenet_card['cc_expire_year'])) {
+            wpinv_set_error('empty_year', __('You must enter an card expiration year!', 'invoicing'));
         }
-        if ( empty( $authorizenet_card['cc_cvv2'] ) ) {
-            wpinv_set_error( 'empty_cvv2', __( 'You must enter a valid CVV2!', 'invoicing' ) );
+        if (empty($authorizenet_card['cc_cvv2'])) {
+            wpinv_set_error('empty_cvv2', __('You must enter a valid CVV2!', 'invoicing'));
         }
         
         $errors = wpinv_get_errors();
     
-        if ( empty( $errors ) ) {
+        if (empty($errors)) {
             $invoice_id = $invoice->ID;
             $quantities_enabled = wpinv_item_quantities_enabled();
             $use_taxes          = wpinv_use_taxes();
             
             $authorizeAIM = wpinv_authorizenet_AIM();
-            $authorizeAIM->first_name       = wpinv_utf8_substr( $invoice->get_first_name(), 0, 50 );
-            $authorizeAIM->last_name        = wpinv_utf8_substr( $invoice->get_last_name(), 0, 50 );
-            $authorizeAIM->company          = wpinv_utf8_substr( $invoice->company, 0, 50 );
-            $authorizeAIM->address          = wpinv_utf8_substr( wp_strip_all_tags( $invoice->get_address(), true ), 0, 60 );
-            $authorizeAIM->city             = wpinv_utf8_substr( $invoice->city, 0, 40 );
-            $authorizeAIM->state            = wpinv_utf8_substr( $invoice->state, 0, 40 );
-            $authorizeAIM->zip              = wpinv_utf8_substr( $invoice->zip, 0, 40 );
-            $authorizeAIM->country          = wpinv_utf8_substr( $invoice->country, 0, 60 );
-            $authorizeAIM->phone            = wpinv_utf8_substr( $invoice->phone, 0, 25 );
-            $authorizeAIM->email            = wpinv_utf8_substr( $invoice->get_email(), 0, 255 );
-            $authorizeAIM->amount           = wpinv_sanitize_amount( $invoice->get_total() );
-            $authorizeAIM->card_num         = str_replace( ' ', '', sanitize_text_field( $authorizenet_card['cc_number'] ) );
-            $authorizeAIM->exp_date         = sanitize_text_field( $authorizenet_card['cc_expire_month'] ) . sanitize_text_field( $authorizenet_card['cc_expire_year'] );
-            $authorizeAIM->card_code        = sanitize_text_field( $authorizenet_card['cc_cvv2'] );
+            $authorizeAIM->first_name       = wpinv_utf8_substr($invoice->get_first_name(), 0, 50);
+            $authorizeAIM->last_name        = wpinv_utf8_substr($invoice->get_last_name(), 0, 50);
+            $authorizeAIM->company          = wpinv_utf8_substr($invoice->company, 0, 50);
+            $authorizeAIM->address          = wpinv_utf8_substr(wp_strip_all_tags($invoice->get_address(), true), 0, 60);
+            $authorizeAIM->city             = wpinv_utf8_substr($invoice->city, 0, 40);
+            $authorizeAIM->state            = wpinv_utf8_substr($invoice->state, 0, 40);
+            $authorizeAIM->zip              = wpinv_utf8_substr($invoice->zip, 0, 40);
+            $authorizeAIM->country          = wpinv_utf8_substr($invoice->country, 0, 60);
+            $authorizeAIM->phone            = wpinv_utf8_substr($invoice->phone, 0, 25);
+            $authorizeAIM->email            = wpinv_utf8_substr($invoice->get_email(), 0, 255);
+            $authorizeAIM->amount           = wpinv_sanitize_amount($invoice->get_total());
+            $authorizeAIM->card_num         = str_replace(' ', '', sanitize_text_field($authorizenet_card['cc_number']));
+            $authorizeAIM->exp_date         = sanitize_text_field($authorizenet_card['cc_expire_month']) . sanitize_text_field($authorizenet_card['cc_expire_year']);
+            $authorizeAIM->card_code        = sanitize_text_field($authorizenet_card['cc_cvv2']);
             $authorizeAIM->invoice_num      = $invoice->ID;
             
             $item_desc = array();
-            foreach ( $invoice->get_cart_details() as $item ) {            
-                $quantity       = $quantities_enabled && !empty( $item['quantity'] ) && $item['quantity'] > 0 ? $item['quantity'] : 1;
-                $item_name      = wpinv_utf8_substr( $item['name'], 0, 31 );
-                $item_desc[]    = $item_name . ' (' . $quantity . 'x ' . wpinv_price( wpinv_format_amount( $item['item_price'] ) ) . ')';
+            foreach ($invoice->get_cart_details() as $item) {            
+                $quantity       = $quantities_enabled && !empty($item['quantity']) && $item['quantity'] > 0 ? $item['quantity'] : 1;
+                $item_name      = wpinv_utf8_substr($item['name'], 0, 31);
+                $item_desc[]    = $item_name . ' (' . $quantity . 'x ' . wpinv_price(wpinv_format_amount($item['item_price'])) . ')';
                 
-                $authorizeAIM->addLineItem( $item['id'], $item_name, '', $quantity, $item['item_price'], ( $use_taxes && !empty( $item['tax'] ) && $item['tax'] > 0 ? 'Y' : 'N' ) );
+                $authorizeAIM->addLineItem($item['id'], $item_name, '', $quantity, $item['item_price'], ($use_taxes && !empty($item['tax']) && $item['tax'] > 0 ? 'Y' : 'N'));
             }
             
-            $item_desc = '#' . $invoice->get_number() . ': ' . implode( ', ', $item_desc );
+            $item_desc = '#' . $invoice->get_number() . ': ' . implode(', ', $item_desc);
             
-            if ( $use_taxes && $invoice->get_tax() > 0 ) {
-                $authorizeAIM->tax  = $invoice->get_tax();
+            if ($use_taxes && $invoice->get_tax() > 0) {
+                $authorizeAIM->tax = $invoice->get_tax();
                 
-                $item_desc .= ', ' . wp_sprintf( __( 'Tax: %s', 'invoicing' ), $invoice->get_tax( true ) );
+                $item_desc .= ', ' . wp_sprintf(__('Tax: %s', 'invoicing'), $invoice->get_tax(true));
             }
             
-            if ( $invoice->get_discount() > 0 ) {
-                $item_desc .= ', ' . wp_sprintf( __( 'Discount: %s', 'invoicing' ), $invoice->get_discount( true ) );
+            if ($invoice->get_discount() > 0) {
+                $item_desc .= ', ' . wp_sprintf(__('Discount: %s', 'invoicing'), $invoice->get_discount(true));
             }
             
-            $item_description = wpinv_utf8_substr( $item_desc, 0, 255 );
-            $item_description = html_entity_decode( $item_desc , ENT_QUOTES, 'UTF-8' );
+            $item_description = wpinv_utf8_substr($item_desc, 0, 255);
+            $item_description = html_entity_decode($item_desc, ENT_QUOTES, 'UTF-8');
             
-            $authorizeAIM->description  = wpinv_utf8_substr( $item_description, 0, 255 );
+            $authorizeAIM->description = wpinv_utf8_substr($item_description, 0, 255);
             
             $is_recurring = $invoice->is_recurring(); // Recurring payment.
             
-            if ( $is_recurring ) {
+            if ($is_recurring) {
                 $authorizeAIM->recurring_billing = true;
             }
             
             try {
-                if ( $is_recurring ) {
+                if ($is_recurring) {
                     $response = $authorizeAIM->authorizeOnly();
                 } else {
                     $response = $authorizeAIM->authorizeAndCapture();
                 }
                 
-                if ( $response->approved || $response->held ) {
-                    if ( $response->approved ) {
-                        wpinv_update_payment_status( $invoice_id, 'publish' );
+                if ($response->approved || $response->held) {
+                    if ($response->approved) {
+                        wpinv_update_payment_status($invoice_id, 'publish');
                     }
-                    wpinv_set_payment_transaction_id( $invoice_id, $response->transaction_id );
+                    wpinv_set_payment_transaction_id($invoice_id, $response->transaction_id);
                     
-                    $message = wp_sprintf( __( 'Authorize.Net Payment: %s with transaction id %s using %s and authorization code %s', 'invoicing' ), $response->response_reason_text, $response->transaction_id, strtoupper( $response->transaction_type ), $response->authorization_code );
+                    $message = wp_sprintf(__('Authorize.Net Payment: %s with transaction id %s using %s and authorization code %s', 'invoicing'), $response->response_reason_text, $response->transaction_id, strtoupper($response->transaction_type), $response->authorization_code);
                     
-                    wpinv_insert_payment_note( $invoice_id, $message );
+                    wpinv_insert_payment_note($invoice_id, $message);
                     
-                    do_action( 'wpinv_authorizenet_handle_response', $response, $invoice, $authorizenet_card );
+                    do_action('wpinv_authorizenet_handle_response', $response, $invoice, $authorizenet_card);
                     
                     wpinv_clear_errors();
                     wpinv_empty_cart();
                     
-                    wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+                    wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
                 } else {
-                    if ( !empty( $response->response_reason_text ) ) {
-                        $error = __( $response->response_reason_text, 'invoicing' );
-                    } else if ( !empty( $response->error_message ) ) {
-                        $error = __( $response->error_message, 'invoicing' );
+                    if (!empty($response->response_reason_text)) {
+                        $error = __($response->response_reason_text, 'invoicing');
+                    } else if (!empty($response->error_message)) {
+                        $error = __($response->error_message, 'invoicing');
                     } else {
-                        $error = wp_sprintf( __( 'Error data: %s', 'invoicing' ), print_r( $response, true ) );
+                        $error = wp_sprintf(__('Error data: %s', 'invoicing'), print_r($response, true));
                     } 
                     
-                    $error = wp_sprintf( __( 'Authorize.Net payment error occurred. %s', 'invoicing' ), $error );
+                    $error = wp_sprintf(__('Authorize.Net payment error occurred. %s', 'invoicing'), $error);
                     
-                    wpinv_set_error( 'payment_error', $error );
-                    wpinv_record_gateway_error( $error, $response );
-                    wpinv_insert_payment_note( $invoice_id, $error );
+                    wpinv_set_error('payment_error', $error);
+                    wpinv_record_gateway_error($error, $response);
+                    wpinv_insert_payment_note($invoice_id, $error);
                     
-                    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']);
                 }
-            } catch ( AuthorizeNetException $e ) {
-                wpinv_set_error( 'request_error', $e->getMessage() );
-                wpinv_record_gateway_error( wp_sprintf( __( 'Authorize.Net payment error occurred. %s', 'invoicing' ), $e->getMessage() ) );
-                wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+            } catch (AuthorizeNetException $e) {
+                wpinv_set_error('request_error', $e->getMessage());
+                wpinv_record_gateway_error(wp_sprintf(__('Authorize.Net payment error occurred. %s', 'invoicing'), $e->getMessage()));
+                wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
             }
         } else {
-            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 {
-        wpinv_record_gateway_error( wp_sprintf( __( 'Authorize.Net payment error occurred. Payment creation failed while processing a Authorize.net payment. Payment data: %s', 'invoicing' ), print_r( $payment_data, true ) ), $invoice );
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_record_gateway_error(wp_sprintf(__('Authorize.Net payment error occurred. Payment creation failed while processing a Authorize.net payment. Payment data: %s', 'invoicing'), print_r($payment_data, true)), $invoice);
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_authorizenet', 'wpinv_process_authorizenet_payment' );
+add_action('wpinv_gateway_authorizenet', 'wpinv_process_authorizenet_payment');
 
-function wpinv_authorizenet_cancel_subscription( $subscription_id = '' ) {
-    if ( empty( $subscription_id ) ) {
+function wpinv_authorizenet_cancel_subscription($subscription_id = '') {
+    if (empty($subscription_id)) {
         return false;
     }
     
     try {
         $authnetXML = wpinv_authorizenet_XML();
-        $authnetXML->ARBCancelSubscriptionRequest( array( 'subscriptionId' => $subscription_id ) );
+        $authnetXML->ARBCancelSubscriptionRequest(array('subscriptionId' => $subscription_id));
 
         return $authnetXML->isSuccessful();
-    } catch( Exception $e ) {
-        wpinv_error_log( $e->getMessage(), __( 'Authorize.Net cancel subscription', 'invoicing' ) );
+    } catch (Exception $e) {
+        wpinv_error_log($e->getMessage(), __('Authorize.Net cancel subscription', 'invoicing'));
     }
     
     return false;
 }
 
-function wpinv_authorizenet_valid_ipn( $md5_hash, $transaction_id, $amount ) {
-    $authorizenet_md5_hash = wpinv_get_option( 'authorizenet_md5_hash' );
-    if ( empty( $authorizenet_md5_hash ) ) {
+function wpinv_authorizenet_valid_ipn($md5_hash, $transaction_id, $amount) {
+    $authorizenet_md5_hash = wpinv_get_option('authorizenet_md5_hash');
+    if (empty($authorizenet_md5_hash)) {
         return true;
     }
     
-    $compare_md5 = strtoupper( md5( $authorizenet_md5_hash . $transaction_id . $amount ) );
+    $compare_md5 = strtoupper(md5($authorizenet_md5_hash . $transaction_id . $amount));
     
-    return hash_equals( $compare_md5, $md5_hash );
+    return hash_equals($compare_md5, $md5_hash);
 }
 
 function wpinv_authorizenet_AIM() {
-    if ( !class_exists( 'AuthorizeNetException' ) ) {
-        require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/gateways/authorizenet/anet_php_sdk/AuthorizeNet.php';
+    if (!class_exists('AuthorizeNetException')) {
+        require_once plugin_dir_path(WPINV_PLUGIN_FILE) . 'includes/gateways/authorizenet/anet_php_sdk/AuthorizeNet.php';
     }
     
-    $authorizeAIM = new AuthorizeNetAIM( wpinv_get_option( 'authorizenet_login_id' ), wpinv_get_option( 'authorizenet_transaction_key' ) );
+    $authorizeAIM = new AuthorizeNetAIM(wpinv_get_option('authorizenet_login_id'), wpinv_get_option('authorizenet_transaction_key'));
     
-    if ( wpinv_is_test_mode( 'authorizenet' ) ) {
-        $authorizeAIM->setSandbox( true );
+    if (wpinv_is_test_mode('authorizenet')) {
+        $authorizeAIM->setSandbox(true);
     } else {
-        $authorizeAIM->setSandbox( false );
+        $authorizeAIM->setSandbox(false);
     }
     
     $authorizeAIM->customer_ip = wpinv_get_ip();
@@ -259,164 +259,164 @@ 
 }
 
 function wpinv_authorizenet_XML() {
-    if ( !class_exists( 'AuthnetXML' ) ) {
-        require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/gateways/authorizenet/Authorize.Net-XML/AuthnetXML.class.php';
+    if (!class_exists('AuthnetXML')) {
+        require_once plugin_dir_path(WPINV_PLUGIN_FILE) . 'includes/gateways/authorizenet/Authorize.Net-XML/AuthnetXML.class.php';
     }
     
-    $authnetXML = new AuthnetXML( wpinv_get_option( 'authorizenet_login_id' ), wpinv_get_option( 'authorizenet_transaction_key' ), (bool)wpinv_is_test_mode( 'authorizenet' ) );
+    $authnetXML = new AuthnetXML(wpinv_get_option('authorizenet_login_id'), wpinv_get_option('authorizenet_transaction_key'), (bool)wpinv_is_test_mode('authorizenet'));
     
     return $authnetXML;
 }
 
-function wpinv_authorizenet_handle_response( $response, $invoice, $card_info = array() ) {
-    if ( empty( $response ) || empty( $invoice ) ) {
+function wpinv_authorizenet_handle_response($response, $invoice, $card_info = array()) {
+    if (empty($response) || empty($invoice)) {
         return false;
     }
     
-    if ( $invoice->is_recurring() && !empty( $response->approved ) ) {
-        $subscription = wpinv_authorizenet_create_new_subscription( $invoice, $response, $card_info );
+    if ($invoice->is_recurring() && !empty($response->approved)) {
+        $subscription = wpinv_authorizenet_create_new_subscription($invoice, $response, $card_info);
 
-        if ( !empty( $subscription ) && $subscription->isSuccessful() ) {
-            do_action( 'wpinv_recurring_post_create_subscription', $subscription, $invoice, 'authorizenet' );
+        if (!empty($subscription) && $subscription->isSuccessful()) {
+            do_action('wpinv_recurring_post_create_subscription', $subscription, $invoice, 'authorizenet');
             
-            wpinv_authorizenet_subscription_record_signup( $subscription, $invoice );
+            wpinv_authorizenet_subscription_record_signup($subscription, $invoice);
             
-            do_action( 'wpinv_recurring_post_record_signup', $subscription, $invoice, 'authorizenet' );
+            do_action('wpinv_recurring_post_record_signup', $subscription, $invoice, 'authorizenet');
         } else {
-            if ( isset( $subscription->messages->message ) ) {
+            if (isset($subscription->messages->message)) {
                 $error = $subscription->messages->message->code . ': ' . $subscription->messages->message->text;
-                wpinv_set_error( 'wpinv_authorize_recurring_error', $error, 'invoicing' );
+                wpinv_set_error('wpinv_authorize_recurring_error', $error, 'invoicing');
             } else {
-                $error = __( 'Your subscription cannot be created due to an error.', 'invoicing' );
-                wpinv_set_error( 'wpinv_authorize_recurring_error', $error );
+                $error = __('Your subscription cannot be created due to an error.', 'invoicing');
+                wpinv_set_error('wpinv_authorize_recurring_error', $error);
             }
             
-            wpinv_record_gateway_error( $error, $subscription );
+            wpinv_record_gateway_error($error, $subscription);
             
-            wpinv_insert_payment_note( $invoice->ID, wp_sprintf( __( 'Authorize.Net subscription error occurred. %s', 'invoicing' ), $error ) );
+            wpinv_insert_payment_note($invoice->ID, wp_sprintf(__('Authorize.Net subscription error occurred. %s', 'invoicing'), $error));
         }
     }
 }
-add_action( 'wpinv_authorizenet_handle_response', 'wpinv_authorizenet_handle_response', 10, 3 );
+add_action('wpinv_authorizenet_handle_response', 'wpinv_authorizenet_handle_response', 10, 3);
 
-function wpinv_authorizenet_create_new_subscription( $invoice, $response = array(), $card_info = array() ) {
-    if ( empty( $invoice ) ) {
+function wpinv_authorizenet_create_new_subscription($invoice, $response = array(), $card_info = array()) {
+    if (empty($invoice)) {
         return false;
     }
     
-    $params = wpinv_authorizenet_generate_subscription_params( $invoice, $card_info, $response );
+    $params = wpinv_authorizenet_generate_subscription_params($invoice, $card_info, $response);
     
     try {
         $authnetXML = wpinv_authorizenet_XML();
-        $authnetXML->ARBCreateSubscriptionRequest( $params );
-    } catch( Exception $e ) {
+        $authnetXML->ARBCreateSubscriptionRequest($params);
+    } catch (Exception $e) {
         $authnetXML = array();
-        wpinv_error_log( $e->getMessage(), __( 'Authorize.Net cancel subscription', 'invoicing' ) );
+        wpinv_error_log($e->getMessage(), __('Authorize.Net cancel subscription', 'invoicing'));
     }
     
     return $authnetXML;
 }
 
-function wpinv_authorizenet_generate_subscription_params( $invoice, $card_info = array(), $response = array() ) {
-    if ( empty( $invoice ) ) {
+function wpinv_authorizenet_generate_subscription_params($invoice, $card_info = array(), $response = array()) {
+    if (empty($invoice)) {
         return false;
     }
     
-    $subscription_item = $invoice->get_recurring( true );
-    if ( empty( $subscription_item ) ) {
+    $subscription_item = $invoice->get_recurring(true);
+    if (empty($subscription_item)) {
         return false;
     }
     
-    $card_details       = wpinv_authorizenet_generate_card_info( $card_info );
+    $card_details       = wpinv_authorizenet_generate_card_info($card_info);
     $subscription_name  = $invoice->get_subscription_name();
-    $initial_amount     = wpinv_round_amount( $invoice->get_total() );
-    $recurring_amount   = wpinv_round_amount( $invoice->get_recurring_details( 'total' ) );
+    $initial_amount     = wpinv_round_amount($invoice->get_total());
+    $recurring_amount   = wpinv_round_amount($invoice->get_recurring_details('total'));
     $interval           = $subscription_item->get_recurring_interval();
     $period             = $subscription_item->get_recurring_period();
     $bill_times         = (int)$subscription_item->get_recurring_limit();
     $bill_times         = $bill_times > 0 ? $bill_times : 9999;
     
-    $time_period        = wpinv_authorizenet_get_time_period( $interval, $period );
+    $time_period        = wpinv_authorizenet_get_time_period($interval, $period);
     $interval           = $time_period['interval'];
     $period             = $time_period['period'];
     
     $current_tz = date_default_timezone_get();
-    date_default_timezone_set( 'America/Denver' ); // Set same timezone as Authorize's server (Mountain Time) to prevent conflicts.
-    $today = date( 'Y-m-d' );
-    date_default_timezone_set( $current_tz );
+    date_default_timezone_set('America/Denver'); // Set same timezone as Authorize's server (Mountain Time) to prevent conflicts.
+    $today = date('Y-m-d');
+    date_default_timezone_set($current_tz);
     
     $free_trial = $invoice->is_free_trial();
-    if ( $free_trial && $subscription_item->has_free_trial() ) {
+    if ($free_trial && $subscription_item->has_free_trial()) {
         $trial_interval    = $subscription_item->get_trial_interval();
-        $trial_period      = $subscription_item->get_trial_period( true );
+        $trial_period      = $subscription_item->get_trial_period(true);
     }
     
     $subscription = array();
     $subscription['name'] = $subscription_name;
     
     $subscription['paymentSchedule'] = array(
-        'interval'         => array( 'length' => $interval, 'unit' => $period ),
+        'interval'         => array('length' => $interval, 'unit' => $period),
         'startDate'        => $today,
         'totalOccurrences' => $bill_times,
-        'trialOccurrences' => $free_trial || ( $initial_amount != $recurring_amount ) ? 1 : 0,
+        'trialOccurrences' => $free_trial || ($initial_amount != $recurring_amount) ? 1 : 0,
     );
     
     $subscription['amount'] = $recurring_amount;
     $subscription['trialAmount'] = $initial_amount;
-    $subscription['payment'] = array( 'creditCard' => $card_details );
-    $subscription['order'] = array( 'invoiceNumber' => $invoice->ID, 'description' => '#' . $invoice->get_number() );
-    $subscription['customer'] = array( 'id' => $invoice->get_user_id(), 'email' => $invoice->get_email(), 'phoneNumber' => $invoice->phone );
+    $subscription['payment'] = array('creditCard' => $card_details);
+    $subscription['order'] = array('invoiceNumber' => $invoice->ID, 'description' => '#' . $invoice->get_number());
+    $subscription['customer'] = array('id' => $invoice->get_user_id(), 'email' => $invoice->get_email(), 'phoneNumber' => $invoice->phone);
     
     $subscription['billTo'] = array(
         'firstName' => $invoice->get_first_name(),
         'lastName'  => $invoice->get_last_name(),
         'company'   => $invoice->company,
-        'address'   => wp_strip_all_tags( $invoice->get_address(), true ),
+        'address'   => wp_strip_all_tags($invoice->get_address(), true),
         'city'      => $invoice->city,
         'state'     => $invoice->state,
         'zip'       => $invoice->zip,
         'country'   => $invoice->country,
     );
     
-    $params = array( 'subscription' => $subscription );
+    $params = array('subscription' => $subscription);
     
-    return apply_filters( 'wpinv_authorizenet_generate_subscription_params', $params, $invoice, $card_info, $response );
+    return apply_filters('wpinv_authorizenet_generate_subscription_params', $params, $invoice, $card_info, $response);
 }
 
-function wpinv_authorizenet_generate_card_info( $card_info = array() ) {
-    $card_defaults      = array(
+function wpinv_authorizenet_generate_card_info($card_info = array()) {
+    $card_defaults = array(
         'cc_owner'          => null,
         'cc_number'         => null,
         'cc_expire_month'   => null,
         'cc_expire_year'    => null,
         'cc_cvv2'           => null,
     );
-    $card_info = wp_parse_args( $card_info, $card_defaults );
+    $card_info = wp_parse_args($card_info, $card_defaults);
         
     $card_details = array(
-        'cardNumber'     => str_replace( ' ', '', sanitize_text_field( $card_info['cc_number'] ) ),
-        'expirationDate' => sanitize_text_field( $card_info['cc_expire_month'] ) . sanitize_text_field( $card_info['cc_expire_year'] ),
-        'cardCode'       => sanitize_text_field( $card_info['cc_cvv2'] ),
+        'cardNumber'     => str_replace(' ', '', sanitize_text_field($card_info['cc_number'])),
+        'expirationDate' => sanitize_text_field($card_info['cc_expire_month']) . sanitize_text_field($card_info['cc_expire_year']),
+        'cardCode'       => sanitize_text_field($card_info['cc_cvv2']),
     );
 
     return $card_details;
 }
 
-function wpinv_authorizenet_subscription_record_signup( $subscription, $invoice ) {
-    if ( empty( $invoice ) || empty( $subscription ) ) {
+function wpinv_authorizenet_subscription_record_signup($subscription, $invoice) {
+    if (empty($invoice) || empty($subscription)) {
         return false;
     }
     
-    $subscription_item = $invoice->get_recurring( true );
-    if ( empty( $subscription_item ) ) {
+    $subscription_item = $invoice->get_recurring(true);
+    if (empty($subscription_item)) {
         return false;
     }
     
     $invoice_id         = $invoice->ID;
     $subscriptionId     = (array)$subscription->subscriptionId;
-    $subscription_id    = !empty( $subscriptionId[0] ) ? $subscriptionId[0] : $invoice_id;
+    $subscription_id    = !empty($subscriptionId[0]) ? $subscriptionId[0] : $invoice_id;
 
-    wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Authorize.Net Subscription ID: %s', 'invoicing' ) , $subscription_id ) );
+    wpinv_insert_payment_note($invoice_id, sprintf(__('Authorize.Net Subscription ID: %s', 'invoicing'), $subscription_id));
     
     $status = $invoice->is_free_trial() && $subscription_item->has_free_trial() ? 'trialing' : 'active';
     
@@ -424,16 +424,16 @@ 
         'profile_id'        => $subscription_id,
         'item_id'           => $subscription_item->ID,
         'initial_amount'    => $invoice->get_total(),
-        'recurring_amount'  => $invoice->get_recurring_details( 'total' ),
+        'recurring_amount'  => $invoice->get_recurring_details('total'),
         'period'            => $subscription_item->get_recurring_period(),
         'interval'          => $subscription_item->get_recurring_interval(),
         'bill_times'        => $subscription_item->get_recurring_limit(),
-        'expiration'        => $invoice->get_new_expiration( $subscription_item->ID ),
+        'expiration'        => $invoice->get_new_expiration($subscription_item->ID),
         'status'            => $status,
-        'created'           => current_time( 'mysql', 0 )
+        'created'           => current_time('mysql', 0)
     );
     
-    if ( $invoice->is_free_trial() && $subscription_item->has_free_trial() ) {
+    if ($invoice->is_free_trial() && $subscription_item->has_free_trial()) {
         $args['trial_period']      = $subscription_item->get_trial_period();
         $args['trial_interval']    = $subscription_item->get_trial_interval();
     } else {
@@ -441,58 +441,58 @@ 
         $args['trial_interval']    = 0;
     }
     
-    return $invoice->update_subscription( $args );
+    return $invoice->update_subscription($args);
 }
 
-function wpinv_authorizenet_validate_checkout( $valid_data, $post ) {
-    if ( !empty( $post['wpi-gateway'] ) && $post['wpi-gateway'] == 'authorizenet' ) {
+function wpinv_authorizenet_validate_checkout($valid_data, $post) {
+    if (!empty($post['wpi-gateway']) && $post['wpi-gateway'] == 'authorizenet') {
         $error = false;
         
-        if ( empty( $post['authorizenet']['cc_owner'] ) ) {
+        if (empty($post['authorizenet']['cc_owner'])) {
             $error = true;
-            wpinv_set_error( 'empty_card_name', __( 'You must enter the name on your card!', 'invoicing'));
+            wpinv_set_error('empty_card_name', __('You must enter the name on your card!', 'invoicing'));
         }
-        if ( empty( $post['authorizenet']['cc_number'] ) ) {
+        if (empty($post['authorizenet']['cc_number'])) {
             $error = true;
-            wpinv_set_error( 'empty_card', __( 'You must enter a card number!', 'invoicing'));
+            wpinv_set_error('empty_card', __('You must enter a card number!', 'invoicing'));
         }
-        if ( empty( $post['authorizenet']['cc_expire_month'] ) ) {
+        if (empty($post['authorizenet']['cc_expire_month'])) {
             $error = true;
-            wpinv_set_error( 'empty_month', __( 'You must enter an card expiration month!', 'invoicing'));
+            wpinv_set_error('empty_month', __('You must enter an card expiration month!', 'invoicing'));
         }
-        if ( empty( $post['authorizenet']['cc_expire_year'] ) ) {
+        if (empty($post['authorizenet']['cc_expire_year'])) {
             $error = true;
-            wpinv_set_error( 'empty_year', __( 'You must enter an card expiration year!', 'invoicing'));
+            wpinv_set_error('empty_year', __('You must enter an card expiration year!', 'invoicing'));
         }
-        if ( empty( $post['authorizenet']['cc_cvv2'] ) ) {
+        if (empty($post['authorizenet']['cc_cvv2'])) {
             $error = true;
-            wpinv_set_error( 'empty_cvv2', __( 'You must enter a valid CVV2!', 'invoicing' ) );
+            wpinv_set_error('empty_cvv2', __('You must enter a valid CVV2!', 'invoicing'));
         }
         
-        if ( $error ) {
+        if ($error) {
             return;
         }
         
         $invoice = wpinv_get_invoice_cart();
         
-        if ( !empty( $invoice ) && $subscription_item = $invoice->get_recurring( true ) ) {
-            $subscription_item = $invoice->get_recurring( true );
+        if (!empty($invoice) && $subscription_item = $invoice->get_recurring(true)) {
+            $subscription_item = $invoice->get_recurring(true);
             
             $interval   = $subscription_item->get_recurring_interval();
             $period     = $subscription_item->get_recurring_period();
             
-            if ( $period == 'D' && ( $interval < 7 || $interval > 365 ) ) {
-                wpinv_set_error( 'authorizenet_subscription_error', __( 'Interval Length must be a value from 7 through 365 for day based subscriptions.', 'invoicing' ) );
+            if ($period == 'D' && ($interval < 7 || $interval > 365)) {
+                wpinv_set_error('authorizenet_subscription_error', __('Interval Length must be a value from 7 through 365 for day based subscriptions.', 'invoicing'));
             }
         }
     }
 }
-add_action( 'wpinv_checkout_error_checks', 'wpinv_authorizenet_validate_checkout', 11, 2 );
+add_action('wpinv_checkout_error_checks', 'wpinv_authorizenet_validate_checkout', 11, 2);
 
-function wpinv_authorizenet_get_time_period( $subscription_interval, $subscription_period ) {
-    $subscription_interval = absint( $subscription_interval );
+function wpinv_authorizenet_get_time_period($subscription_interval, $subscription_period) {
+    $subscription_interval = absint($subscription_interval);
 
-    switch( $subscription_period ) {
+    switch ($subscription_period) {
         case 'W':
         case 'week':
         case 'weeks':
@@ -502,14 +502,14 @@ 
         case 'M':
         case 'month':
         case 'months':
-            if ( $subscription_interval > 12 ) {
+            if ($subscription_interval > 12) {
                 $subscription_interval = 12;
             }
             
             $interval = $subscription_interval;
             $period   = 'months';
             
-            if ( !( $subscription_interval === 1 || $subscription_interval === 2 || $subscription_interval === 3 || $subscription_interval === 6 || $subscription_interval === 12 ) ) {
+            if (!($subscription_interval === 1 || $subscription_interval === 2 || $subscription_interval === 3 || $subscription_interval === 6 || $subscription_interval === 12)) {
                 $interval = $subscription_interval * 30;
                 $period   = 'days';
             }
@@ -526,40 +526,40 @@ 
             break;
     }
 
-    return compact( 'interval', 'period' );
+    return compact('interval', 'period');
 }
 
 function wpinv_authorizenet_process_ipn() {
-    if ( !( !empty( $_REQUEST['wpi-gateway'] ) && $_REQUEST['wpi-gateway'] == 'authorizenet' ) ) {
+    if (!(!empty($_REQUEST['wpi-gateway']) && $_REQUEST['wpi-gateway'] == 'authorizenet')) {
         return;
     }
     
-    $subscription_id = intval( $_POST['x_subscription_id'] );
+    $subscription_id = intval($_POST['x_subscription_id']);
     
-    if ( $subscription_id ) {
-        $transaction_id = sanitize_text_field( $_POST['x_trans_id'] );
-        $renewal_amount = sanitize_text_field( $_POST['x_amount'] );
-        $response_code  = intval( $_POST['x_response_code'] );
-        $reason_code    = intval( $_POST['x_response_reason_code'] );
+    if ($subscription_id) {
+        $transaction_id = sanitize_text_field($_POST['x_trans_id']);
+        $renewal_amount = sanitize_text_field($_POST['x_amount']);
+        $response_code  = intval($_POST['x_response_code']);
+        $reason_code    = intval($_POST['x_response_reason_code']);
 
-        if ( 1 == $response_code ) {
+        if (1 == $response_code) {
             // Approved
-            do_action( 'wpinv_authorizenet_renewal_payment', $transaction_id );
-        } else if ( 2 == $response_code ) {
+            do_action('wpinv_authorizenet_renewal_payment', $transaction_id);
+        } else if (2 == $response_code) {
             // Declined
-            do_action( 'wpinv_authorizenet_renewal_payment_failed', $transaction_id );
-            do_action( 'wpinv_authorizenet_renewal_error', $transaction_id );
-        } else if ( 3 == $response_code || 8 == $reason_code ) {
+            do_action('wpinv_authorizenet_renewal_payment_failed', $transaction_id);
+            do_action('wpinv_authorizenet_renewal_error', $transaction_id);
+        } else if (3 == $response_code || 8 == $reason_code) {
             // An expired card
-            do_action( 'wpinv_authorizenet_renewal_payment_failed', $transaction_id );
-            do_action( 'wpinv_authorizenet_renewal_payment_error', $transaction_id );
+            do_action('wpinv_authorizenet_renewal_payment_failed', $transaction_id);
+            do_action('wpinv_authorizenet_renewal_payment_error', $transaction_id);
 
         } else {
             // Other Error
-            do_action( 'wpinv_authorizenet_renewal_payment_error', $subscription );
+            do_action('wpinv_authorizenet_renewal_payment_error', $subscription);
         }
         
         exit;
     }
 }
-add_action( 'wpinv_verify_authorizenet_ipn', 'wpinv_authorizenet_process_ipn' );
\ No newline at end of file
+add_action('wpinv_verify_authorizenet_ipn', 'wpinv_authorizenet_process_ipn');
\ No newline at end of file

includes/class-wpinv-api.php

Spacing +67 added lines, -67 removed lines

@@ -7,51 +7,51 @@ 
  */
  
 // 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__));
 }
 
 class WPInv_API {
     protected $post_type = 'wpi_invoice';
     
-    public function __construct( $params = array() ) {
+    public function __construct($params = array()) {
     }
-    public function insert_invoice( $data ) {
+    public function insert_invoice($data) {
         global $wpdb;
         //wpinv_transaction_query( 'start' );
 
         try {
-            if ( empty( $data['invoice'] ) ) {
-                throw new WPInv_API_Exception( 'wpinv_api_missing_invoice_data', sprintf( __( 'No %1$s data specified to create %1$s', 'invoicing' ), 'invoice' ), 400 );
+            if (empty($data['invoice'])) {
+                throw new WPInv_API_Exception('wpinv_api_missing_invoice_data', sprintf(__('No %1$s data specified to create %1$s', 'invoicing'), 'invoice'), 400);
             }
 
-            $data = apply_filters( 'wpinv_api_create_invoice_data', $data['invoice'], $this );
+            $data = apply_filters('wpinv_api_create_invoice_data', $data['invoice'], $this);
 
-            $invoice = wpinv_insert_invoice( $data, true );
-            if ( empty( $invoice->ID ) || is_wp_error( $invoice ) ) {
-                throw new WPInv_API_Exception( 'wpinv_api_cannot_create_invoice', sprintf( __( 'Cannot create invoice: %s', 'invoicing' ), implode( ', ', $invoice->get_error_messages() ) ), 400 );
+            $invoice = wpinv_insert_invoice($data, true);
+            if (empty($invoice->ID) || is_wp_error($invoice)) {
+                throw new WPInv_API_Exception('wpinv_api_cannot_create_invoice', sprintf(__('Cannot create invoice: %s', 'invoicing'), implode(', ', $invoice->get_error_messages())), 400);
             }
 
             // HTTP 201 Created
-            $this->send_status( 201 );
+            $this->send_status(201);
 
-            do_action( 'wpinv_api_create_invoice', $invoice->ID, $data, $this );
+            do_action('wpinv_api_create_invoice', $invoice->ID, $data, $this);
 
             //wpinv_transaction_query( 'commit' );
 
-            return wpinv_get_invoice( $invoice->ID );
-        } catch ( WPInv_API_Exception $e ) {
+            return wpinv_get_invoice($invoice->ID);
+        } catch (WPInv_API_Exception $e) {
             //wpinv_transaction_query( 'rollback' );
 
-            return new WP_Error( $e->getErrorCode(), $e->getMessage(), array( 'status' => $e->getCode() ) );
+            return new WP_Error($e->getErrorCode(), $e->getMessage(), array('status' => $e->getCode()));
         }
     }
     
-    public function send_status( $code ) {
-        status_header( $code );
+    public function send_status($code) {
+        status_header($code);
     }
     
-    protected function set_billing_details( $invoice, $data ) {
+    protected function set_billing_details($invoice, $data) {
         $address_fields = array(
             'user_id',
             'first_name',
@@ -70,66 +70,66 @@ 
         $billing_details = array();
         $user_id = $invoice->get_user_id();
         
-        foreach ( $address_fields as $field ) {
-            if ( isset( $data['billing_details'][ $field ] ) ) {
-                $value = sanitize_text_field( $data['billing_details'][ $field ] );
+        foreach ($address_fields as $field) {
+            if (isset($data['billing_details'][$field])) {
+                $value = sanitize_text_field($data['billing_details'][$field]);
                 
-                if ( $field == 'country' && empty( $value ) ) {
-                    if ( !empty( $invoice->country ) ) {
+                if ($field == 'country' && empty($value)) {
+                    if (!empty($invoice->country)) {
                         $value = $invoice->country;
                     } else {
-                        $value = wpinv_default_billing_country( '', $user_id );
+                        $value = wpinv_default_billing_country('', $user_id);
                     }
                 }
                 
-                if ( $field == 'state' && empty( $value ) ) {
-                    if ( !empty( $invoice->state ) ) {
+                if ($field == 'state' && empty($value)) {
+                    if (!empty($invoice->state)) {
                         $value = $invoice->state;
                     } else {
                         $value = wpinv_get_default_state();
                     }
                 }
                 
-                $invoice->set( $field, $value );
+                $invoice->set($field, $value);
                 
-                update_post_meta( $invoice->ID, '_wpinv_' . $field, $value );
+                update_post_meta($invoice->ID, '_wpinv_' . $field, $value);
             }
         }
         
         return $invoice;
     }
     
-    protected function set_discount( $invoice, $data ) {
-        if ( isset( $data['discount'] ) ) {
-            $invoice->set( 'discount', wpinv_round_amount( $data['discount'] ) );
+    protected function set_discount($invoice, $data) {
+        if (isset($data['discount'])) {
+            $invoice->set('discount', wpinv_round_amount($data['discount']));
             
-            update_post_meta( $invoice->ID, '_wpinv_discount', wpinv_round_amount( $data['discount'] ) );
+            update_post_meta($invoice->ID, '_wpinv_discount', wpinv_round_amount($data['discount']));
             
-            if ( isset( $data['discount_code'] ) ) {
-                $invoice->set( 'discount_code', $data['discount_code'] );
+            if (isset($data['discount_code'])) {
+                $invoice->set('discount_code', $data['discount_code']);
                 
-                update_post_meta( $invoice->ID, '_wpinv_discount_code', $data['discount_code'] );
+                update_post_meta($invoice->ID, '_wpinv_discount_code', $data['discount_code']);
             }
         }
         
         return $invoice;
     }
     
-    protected function set_items( $invoice, $data ) {
-        if ( !empty( $data['items'] ) && is_array( $data['items'] ) ) {
+    protected function set_items($invoice, $data) {
+        if (!empty($data['items']) && is_array($data['items'])) {
             $items_array = array();
            
-            if ( !empty( $invoice->country ) ) {
+            if (!empty($invoice->country)) {
                 $country = $invoice->country;
-            } else if ( !empty( $data['billing_details']['country'] ) ) {
+            } else if (!empty($data['billing_details']['country'])) {
                 $country = $data['billing_details']['country'];
             } else {
-                $country = wpinv_default_billing_country( '', $invoice->get_user_id() );
+                $country = wpinv_default_billing_country('', $invoice->get_user_id());
             }
             
-            if ( !empty( $invoice->state ) ) {
+            if (!empty($invoice->state)) {
                 $state = $invoice->state;
-            } else if ( !empty( $data['billing_details']['state'] ) ) {
+            } else if (!empty($data['billing_details']['state'])) {
                 $state = $data['billing_details']['state'];
             } else {
                 $state = wpinv_get_default_state();
@@ -138,54 +138,54 @@ 
             $_POST['country']   = $country;
             $_POST['state']     = $state;
             
-            $rate = wpinv_get_tax_rate( $country, $state, 'global' );
+            $rate = wpinv_get_tax_rate($country, $state, 'global');
             
             $total_tax = 0;
-            foreach ( $data['items'] as $item ) {
-                $id                 = isset( $item['id'] ) ? sanitize_text_field( $item['id'] ) : '';
-                $title              = isset( $item['title'] ) ? sanitize_text_field( $item['title'] ) : '';
-                $desc               = isset( $item['description'] ) ? sanitize_text_field( $item['description'] ) : '';
-                $amount             = isset( $item['amount'] ) ? wpinv_round_amount( $item['amount'] ) : 0;
+            foreach ($data['items'] as $item) {
+                $id                 = isset($item['id']) ? sanitize_text_field($item['id']) : '';
+                $title              = isset($item['title']) ? sanitize_text_field($item['title']) : '';
+                $desc               = isset($item['description']) ? sanitize_text_field($item['description']) : '';
+                $amount             = isset($item['amount']) ? wpinv_round_amount($item['amount']) : 0;
                 
-                if ( !empty( $item['vat_rates_class'] ) ) {
+                if (!empty($item['vat_rates_class'])) {
                     $vat_rates_class = $item['vat_rates_class'];
                 } else {
                     $vat_rates_class = '_standard';
                 }
-                $vat_rate = wpinv_get_tax_rate( $country, $state, $id );
+                $vat_rate = wpinv_get_tax_rate($country, $state, $id);
                 
-                $tax = $amount > 0 ? ( $amount * 0.01 * (float)$vat_rate ) : 0;
+                $tax = $amount > 0 ? ($amount * 0.01 * (float)$vat_rate) : 0;
                 $total_tax += $tax;
                 
                 $items_array[] = array(
                     'id'                => $id,
-                    'title'             => esc_html( $title ),
-                    'description'       => esc_html( $desc ),
-                    'amount'            => $amount > 0 ? wpinv_round_amount( $amount ) : 0,
-                    'subtotal'          => $amount > 0 ? wpinv_round_amount( $amount ) : 0,
+                    'title'             => esc_html($title),
+                    'description'       => esc_html($desc),
+                    'amount'            => $amount > 0 ? wpinv_round_amount($amount) : 0,
+                    'subtotal'          => $amount > 0 ? wpinv_round_amount($amount) : 0,
                     'vat_rates_class'   => $vat_rates_class,
                     'vat_rate'          => $vat_rate,
-                    'tax'               => $tax > 0 ? wpinv_round_amount( $tax ) : 0,
+                    'tax'               => $tax > 0 ? wpinv_round_amount($tax) : 0,
                 );
             }
 
-            update_post_meta( $invoice->ID, '_wpinv_tax', wpinv_round_amount( $total_tax ) );
-            $invoice->set( 'tax', wpinv_round_amount( $total_tax ) );
+            update_post_meta($invoice->ID, '_wpinv_tax', wpinv_round_amount($total_tax));
+            $invoice->set('tax', wpinv_round_amount($total_tax));
             
-            $items_array = apply_filters( 'wpinv_save_invoice_items', $items_array, $data['items'], $invoice );
+            $items_array = apply_filters('wpinv_save_invoice_items', $items_array, $data['items'], $invoice);
             
-            $invoice->set( 'items', $items_array );
-            update_post_meta( $invoice->ID, '_wpinv_items', $items_array );
+            $invoice->set('items', $items_array);
+            update_post_meta($invoice->ID, '_wpinv_items', $items_array);
         }
         
         return $invoice;
     }
     
-    protected function set_invoice_meta( $invoice_id, $invoice_meta ) {
-        foreach ( $invoice_meta as $meta_key => $meta_value ) {
+    protected function set_invoice_meta($invoice_id, $invoice_meta) {
+        foreach ($invoice_meta as $meta_key => $meta_value) {
 
-            if ( is_string( $meta_key) && ! is_protected_meta( $meta_key ) && is_scalar( $meta_value ) ) {
-                update_post_meta( $invoice_id, $meta_key, $meta_value );
+            if (is_string($meta_key) && !is_protected_meta($meta_key) && is_scalar($meta_value)) {
+                update_post_meta($invoice_id, $meta_key, $meta_value);
             }
         }
     }
@@ -195,9 +195,9 @@ 
 class WPInv_API_Exception extends Exception {
     protected $error_code;
 
-    public function __construct( $error_code, $error_message, $http_status_code ) {
+    public function __construct($error_code, $error_message, $http_status_code) {
         $this->error_code = $error_code;
-        parent::__construct( $error_message, $http_status_code );
+        parent::__construct($error_message, $http_status_code);
     }
 
     public function getErrorCode() {

templates/emails/wpinv-email-invoice-items.php

Spacing +70 added lines, -70 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
 global $wpinv_euvat, $ajax_cart_details;
@@ -11,158 +11,158 @@ 
 $quantities_enabled = wpinv_item_quantities_enabled();
 $use_taxes          = wpinv_use_taxes();
 $zero_tax           = !(float)$invoice->get_tax() > 0 ? true : false;
-$tax_label          = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __( 'Tax', 'invoicing' );
-$tax_title          = !$zero_tax && $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+$tax_label          = $use_taxes && $invoice->has_vat() ? $wpinv_euvat->get_vat_name() : __('Tax', 'invoicing');
+$tax_title          = !$zero_tax && $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
 
-do_action( 'wpinv_before_email_items', $invoice ); ?>
+do_action('wpinv_before_email_items', $invoice); ?>
 <div id="wpinv-email-items">
-    <h3 class="wpinv-items-t"><?php echo apply_filters( 'wpinv_email_items_title', __( 'Items', 'invoicing' ) ); ?></h3>
+    <h3 class="wpinv-items-t"><?php echo apply_filters('wpinv_email_items_title', __('Items', 'invoicing')); ?></h3>
     <table id="wpinv_checkout_cart" class="table table-bordered table-hover">
         <thead>
             <tr class="wpinv_cart_header_row">
-                <?php do_action( 'wpinv_email_items_table_header_first' ); ?>
-                <th class="wpinv_cart_item_name text-left"><?php _e( 'Item Name', 'invoicing' ); ?></th>
-                <th class="wpinv_cart_item_price text-right"><?php _e( 'Item Price', 'invoicing' ); ?></th>
-                <?php if ( $quantities_enabled ) { ?>
-                <th class="wpinv_cart_item_qty text-right"><?php _e( 'Qty', 'invoicing' ); ?></th>
+                <?php do_action('wpinv_email_items_table_header_first'); ?>
+                <th class="wpinv_cart_item_name text-left"><?php _e('Item Name', 'invoicing'); ?></th>
+                <th class="wpinv_cart_item_price text-right"><?php _e('Item Price', 'invoicing'); ?></th>
+                <?php if ($quantities_enabled) { ?>
+                <th class="wpinv_cart_item_qty text-right"><?php _e('Qty', 'invoicing'); ?></th>
                 <?php } ?>
-                <?php if ( !$zero_tax && $use_taxes ) { ?>
+                <?php if (!$zero_tax && $use_taxes) { ?>
                 <th class="wpinv_cart_item_tax text-right"><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></th>
                 <?php } ?>
-                <th class="wpinv_cart_item_subtotal text-right"><?php echo __( 'Item Total', 'invoicing' ) . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
-                <?php do_action( 'wpinv_email_items_table_header_last' ); ?>
+                <th class="wpinv_cart_item_subtotal text-right"><?php echo __('Item Total', 'invoicing') . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
+                <?php do_action('wpinv_email_items_table_header_last'); ?>
             </tr>
         </thead>
         <tbody>
             <?php
-                do_action( 'wpinv_email_items_before' );
-                if ( $cart_items ) {
-                    foreach ( $cart_items as $key => $item ) {
-                        $wpi_item = $item['id'] ? new WPInv_Item( $item['id'] ) : NULL;
+                do_action('wpinv_email_items_before');
+                if ($cart_items) {
+                    foreach ($cart_items as $key => $item) {
+                        $wpi_item = $item['id'] ? new WPInv_Item($item['id']) : NULL;
                     ?>
-                    <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr( $key ) . '_' . esc_attr( $item['id'] ); ?>" data-item-id="<?php echo esc_attr( $item['id'] ); ?>">
-                        <?php do_action( 'wpinv_email_items_table_body_first', $item ); ?>
+                    <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr($key) . '_' . esc_attr($item['id']); ?>" data-item-id="<?php echo esc_attr($item['id']); ?>">
+                        <?php do_action('wpinv_email_items_table_body_first', $item); ?>
                         <td class="wpinv_cart_item_name text-left">
                             <?php
-                                if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $item['id'] ) ) {
+                                if (current_theme_supports('post-thumbnails') && has_post_thumbnail($item['id'])) {
                                     echo '<div class="wpinv_cart_item_image">';
-                                        echo get_the_post_thumbnail( $item['id'], apply_filters( 'wpinv_checkout_image_size', array( 25,25 ) ) );
+                                        echo get_the_post_thumbnail($item['id'], apply_filters('wpinv_checkout_image_size', array(25, 25)));
                                     echo '</div>';
                                 }
-                                $item_title = esc_html( wpinv_get_cart_item_name( $item ) ) . wpinv_get_item_suffix( $wpi_item );
+                                $item_title = esc_html(wpinv_get_cart_item_name($item)) . wpinv_get_item_suffix($wpi_item);
                                 echo '<span class="wpinv_email_cart_item_title">' . $item_title . '</span>';
                                 
                                 $summary = '';
-                                if ( !empty( $wpi_item ) && $wpi_item->is_package() && !empty( $item['meta']['post_id'] ) ) {
-                                    $post_link = '<a href="' . get_permalink( $item['meta']['post_id'] ) .'" target="_blank">' . (!empty($item['meta']['invoice_title']) ? $item['meta']['invoice_title'] : get_the_title( $item['meta']['post_id']) ) . '</a>';
-                                    $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $wpi_item->get_custom_singular_name(), $post_link );
+                                if (!empty($wpi_item) && $wpi_item->is_package() && !empty($item['meta']['post_id'])) {
+                                    $post_link = '<a href="' . get_permalink($item['meta']['post_id']) . '" target="_blank">' . (!empty($item['meta']['invoice_title']) ? $item['meta']['invoice_title'] : get_the_title($item['meta']['post_id'])) . '</a>';
+                                    $summary = wp_sprintf(__('%s: %s', 'invoicing'), $wpi_item->get_custom_singular_name(), $post_link);
                                 }
                                 
-                                $summary = apply_filters( 'wpinv_email_invoice_line_item_summary', $summary, $item, $wpi_item, $invoice );
-                                if ( !empty( $summary ) ) {
+                                $summary = apply_filters('wpinv_email_invoice_line_item_summary', $summary, $item, $wpi_item, $invoice);
+                                if (!empty($summary)) {
                                     echo '<p class="small">' . $summary . '</p>';
                                 }
     
-                                do_action( 'wpinv_email_cart_item_title_after', $item, $key );
+                                do_action('wpinv_email_cart_item_title_after', $item, $key);
                             ?>
                         </td>
                         <td class="wpinv_cart_item_price text-right">
                             <?php 
-                            echo wpinv_cart_item_price( $item );
-                            do_action( 'wpinv_email_cart_item_price_after', $item, $key );
+                            echo wpinv_cart_item_price($item);
+                            do_action('wpinv_email_cart_item_price_after', $item, $key);
                             ?>
                         </td>
-                        <?php if ( $quantities_enabled ) { ?>
+                        <?php if ($quantities_enabled) { ?>
                         <td class="wpinv_cart_item_qty text-right">
                             <?php
-                            echo wpinv_get_cart_item_quantity( $item );
-                            do_action( 'wpinv_email_item_quantitiy', $item, $key );
+                            echo wpinv_get_cart_item_quantity($item);
+                            do_action('wpinv_email_item_quantitiy', $item, $key);
                             ?>
                         </td>
                         <?php } ?>
-                        <?php if ( !$zero_tax && $use_taxes ) { ?>
+                        <?php if (!$zero_tax && $use_taxes) { ?>
                         <td class="wpinv_cart_item_tax text-right">
                             <?php
-                            echo wpinv_cart_item_tax( $item );
-                            do_action( 'wpinv_email_item_tax', $item, $key );
+                            echo wpinv_cart_item_tax($item);
+                            do_action('wpinv_email_item_tax', $item, $key);
                             ?>
                         </td>
                         <?php } ?>
                         <td class="wpinv_cart_item_subtotal text-right">
                             <?php
-                            echo wpinv_cart_item_subtotal( $item );
-                            do_action( 'wpinv_email_item_subtotal', $item, $key );
+                            echo wpinv_cart_item_subtotal($item);
+                            do_action('wpinv_email_item_subtotal', $item, $key);
                             ?>
                         </td>
-                        <?php do_action( 'wpinv_email_items_table_body_last', $item, $key ); ?>
+                        <?php do_action('wpinv_email_items_table_body_last', $item, $key); ?>
                     </tr>
                 <?php } ?>
             <?php } ?>
-            <?php do_action( 'wpinv_email_items_middle' ); ?>
-            <?php do_action( 'wpinv_email_items_after' ); ?>
+            <?php do_action('wpinv_email_items_middle'); ?>
+            <?php do_action('wpinv_email_items_after'); ?>
         </tbody>
         <tfoot>
-            <?php $cart_columns = wpinv_checkout_cart_columns(); if ( $zero_tax && $use_taxes ) { $cart_columns--; } ?>
-            <?php if ( has_action( 'wpinv_email_footer_buttons' ) ) { ?>
+            <?php $cart_columns = wpinv_checkout_cart_columns(); if ($zero_tax && $use_taxes) { $cart_columns--; } ?>
+            <?php if (has_action('wpinv_email_footer_buttons')) { ?>
                 <tr class="wpinv_cart_footer_row">
-                    <?php do_action( 'wpinv_email_items_table_buttons_first', $cart_items ); ?>
-                    <td colspan="<?php echo ( $cart_columns ); ?>">
-                        <?php do_action( 'wpinv_email_footer_buttons' ); ?>
+                    <?php do_action('wpinv_email_items_table_buttons_first', $cart_items); ?>
+                    <td colspan="<?php echo ($cart_columns); ?>">
+                        <?php do_action('wpinv_email_footer_buttons'); ?>
                     </td>
-                    <?php do_action( 'wpinv_email_items_table_buttons_first', $cart_items ); ?>
+                    <?php do_action('wpinv_email_items_table_buttons_first', $cart_items); ?>
                 </tr>
             <?php } ?>
 
-            <?php if ( !$zero_tax && $use_taxes && !wpinv_prices_include_tax() && wpinv_is_cart_taxed() ) { ?>
+            <?php if (!$zero_tax && $use_taxes && !wpinv_prices_include_tax() && wpinv_is_cart_taxed()) { ?>
                 <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row">
-                    <?php do_action( 'wpinv_email_items_table_subtotal_first', $cart_items ); ?>
-                    <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_subtotal_label text-right">
-                        <strong><?php _e( 'Sub-Total', 'invoicing' ); ?>:</strong>
+                    <?php do_action('wpinv_email_items_table_subtotal_first', $cart_items); ?>
+                    <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_subtotal_label text-right">
+                        <strong><?php _e('Sub-Total', 'invoicing'); ?>:</strong>
                     </td>
                     <td class="wpinv_cart_subtotal text-right">
-                        <span class="wpinv_cart_subtotal_amount bold"><?php echo $invoice->get_subtotal( true ); ?></span>
+                        <span class="wpinv_cart_subtotal_amount bold"><?php echo $invoice->get_subtotal(true); ?></span>
                     </td>
-                    <?php do_action( 'wpinv_email_items_table_subtotal_last', $cart_items, $invoice ); ?>
+                    <?php do_action('wpinv_email_items_table_subtotal_last', $cart_items, $invoice); ?>
                 </tr>
             <?php } ?>
             
-            <?php if ( wpinv_discount( $invoice_id, false ) > 0 ) { ?>
+            <?php if (wpinv_discount($invoice_id, false) > 0) { ?>
                 <tr class="wpinv_cart_footer_row wpinv_cart_discount_row">
-                    <?php do_action( 'wpinv_receipt_items_table_discount_first', $cart_items, $invoice ); ?>
-                    <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_discount_label text-right">
-                        <strong><?php wpinv_get_discount_label( wpinv_discount_code( $invoice_id ) ); ?>:</strong>
+                    <?php do_action('wpinv_receipt_items_table_discount_first', $cart_items, $invoice); ?>
+                    <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_discount_label text-right">
+                        <strong><?php wpinv_get_discount_label(wpinv_discount_code($invoice_id)); ?>:</strong>
                     </td>
                     <td class="wpinv_cart_discount text-right">
-                        <span class="wpinv_cart_discount_amount"><?php echo wpinv_discount( $invoice_id, true, true ); ?></span>
+                        <span class="wpinv_cart_discount_amount"><?php echo wpinv_discount($invoice_id, true, true); ?></span>
                     </td>
-                    <?php do_action( 'wpinv_receipt_items_table_discount_last', $cart_items, $invoice ); ?>
+                    <?php do_action('wpinv_receipt_items_table_discount_last', $cart_items, $invoice); ?>
                 </tr>
             <?php } ?>
 
-            <?php if ( !$zero_tax && $use_taxes && wpinv_is_cart_taxed() ) { ?>
+            <?php if (!$zero_tax && $use_taxes && wpinv_is_cart_taxed()) { ?>
                 <tr class="wpinv_cart_footer_row wpinv_cart_tax_row">
-                    <?php do_action( 'wpinv_email_items_table_tax_first', $cart_items, $invoice ); ?>
-                    <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_tax_label text-right">
+                    <?php do_action('wpinv_email_items_table_tax_first', $cart_items, $invoice); ?>
+                    <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_tax_label text-right">
                         <strong><?php echo $tax_label; ?>:</strong>
                     </td>
                     <td class="wpinv_cart_tax text-right">
-                        <span class="wpinv_cart_tax_amount"><?php echo $invoice->get_tax( true ); ?></span>
+                        <span class="wpinv_cart_tax_amount"><?php echo $invoice->get_tax(true); ?></span>
                     </td>
-                    <?php do_action( 'wpinv_email_items_table_tax_last', $cart_items, $invoice ); ?>
+                    <?php do_action('wpinv_email_items_table_tax_last', $cart_items, $invoice); ?>
                 </tr>
             <?php } ?>
 
             <tr class="wpinv_cart_footer_row">
-                <?php do_action( 'wpinv_email_items_table_footer_first', $cart_items, $invoice ); ?>
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_total_label text-right">
-                    <?php echo apply_filters( 'wpinv_email_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?>
+                <?php do_action('wpinv_email_items_table_footer_first', $cart_items, $invoice); ?>
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_total_label text-right">
+                    <?php echo apply_filters('wpinv_email_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?>
                 </td>
                 <td class="wpinv_cart_total text-right">
-                    <span class="wpinv_cart_amount bold"><?php echo $invoice->get_total( true ); ?></span>
+                    <span class="wpinv_cart_amount bold"><?php echo $invoice->get_total(true); ?></span>
                 </td>
-                <?php do_action( 'wpinv_email_items_table_footer_last', $cart_items, $invoice ); ?>
+                <?php do_action('wpinv_email_items_table_footer_last', $cart_items, $invoice); ?>
             </tr>
         </tfoot>
     </table>
 </div>
-<?php do_action( 'wpinv_after_email_items', $invoice ); ?>
\ No newline at end of file
+<?php do_action('wpinv_after_email_items', $invoice); ?>
\ No newline at end of file

templates/wpinv-checkout-cart.php

Spacing +61 added lines, -61 removed lines

@@ -5,140 +5,140 @@
 
 global $wpinv_euvat, $post, $ajax_cart_details, $wpi_cart_columns, $wpi_session;
 $invoice            = wpinv_get_invoice_cart();
-$cart_items         = !empty( $ajax_cart_details ) ? $ajax_cart_details : wpinv_get_cart_content_details();
+$cart_items         = !empty($ajax_cart_details) ? $ajax_cart_details : wpinv_get_cart_content_details();
 $quantities_enabled = wpinv_item_quantities_enabled();
 $use_taxes          = wpinv_use_taxes();
 $tax_label          = $wpinv_euvat->tax_label();
-$tax_title          = $use_taxes ? ( wpinv_prices_include_tax() ? wp_sprintf( __( '(%s Incl.)', 'invoicing' ), $tax_label ) : wp_sprintf( __( '(%s Excl.)', 'invoicing' ), $tax_label ) ) : '';
+$tax_title          = $use_taxes ? (wpinv_prices_include_tax() ? wp_sprintf(__('(%s Incl.)', 'invoicing'), $tax_label) : wp_sprintf(__('(%s Excl.)', 'invoicing'), $tax_label)) : '';
 ?>
 <table id="wpinv_checkout_cart" class="table table-bordered table-hover">
     <thead>
         <tr class="wpinv_cart_header_row">
-            <?php do_action( 'wpinv_checkout_table_header_first' ); ?>
-            <th class="wpinv_cart_item_name text-left"><?php _e( 'Item Name', 'invoicing' ); ?></th>
-            <th class="wpinv_cart_item_price text-right"><?php _e( 'Item Price', 'invoicing' ); ?></th>
-            <?php if ( $quantities_enabled ) { ?>
-            <th class="wpinv_cart_item_qty text-right"><?php _e( 'Qty', 'invoicing' ); ?></th>
+            <?php do_action('wpinv_checkout_table_header_first'); ?>
+            <th class="wpinv_cart_item_name text-left"><?php _e('Item Name', 'invoicing'); ?></th>
+            <th class="wpinv_cart_item_price text-right"><?php _e('Item Price', 'invoicing'); ?></th>
+            <?php if ($quantities_enabled) { ?>
+            <th class="wpinv_cart_item_qty text-right"><?php _e('Qty', 'invoicing'); ?></th>
             <?php } ?>
-            <?php if ( $use_taxes ) { ?>
+            <?php if ($use_taxes) { ?>
             <th class="wpinv_cart_item_tax text-right"><?php echo $tax_label . ' <span class="normal small">(%)</span>'; ?></th>
             <?php } ?>
-            <th class="wpinv_cart_item_subtotal text-right"><?php echo __( 'Item Total', 'invoicing' ) . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
-            <?php do_action( 'wpinv_checkout_table_header_last' ); ?>
+            <th class="wpinv_cart_item_subtotal text-right"><?php echo __('Item Total', 'invoicing') . ' <span class="normal small">' . $tax_title . '<span>'; ?></th>
+            <?php do_action('wpinv_checkout_table_header_last'); ?>
         </tr>
     </thead>
     <tbody>
         <?php
-            do_action( 'wpinv_cart_items_before' );
+            do_action('wpinv_cart_items_before');
             
-            if ( $cart_items ) {
-                foreach ( $cart_items as $key => $item ) {
-                    $wpi_item = !empty( $item['id'] ) ? new WPInv_Item( $item['id'] ) : NULL;
+            if ($cart_items) {
+                foreach ($cart_items as $key => $item) {
+                    $wpi_item = !empty($item['id']) ? new WPInv_Item($item['id']) : NULL;
                 ?>
-                <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr( $key ) . '_' . esc_attr( $item['id'] ); ?>" data-item-id="<?php echo esc_attr( $item['id'] ); ?>">
-                    <?php do_action( 'wpinv_checkout_table_body_first', $item ); ?>
+                <tr class="wpinv_cart_item" id="wpinv_cart_item_<?php echo esc_attr($key) . '_' . esc_attr($item['id']); ?>" data-item-id="<?php echo esc_attr($item['id']); ?>">
+                    <?php do_action('wpinv_checkout_table_body_first', $item); ?>
                     <td class="wpinv_cart_item_name text-left">
                         <?php
-                            if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $item['id'] ) ) {
+                            if (current_theme_supports('post-thumbnails') && has_post_thumbnail($item['id'])) {
                                 echo '<div class="wpinv_cart_item_image">';
-                                    echo get_the_post_thumbnail( $item['id'], apply_filters( 'wpinv_checkout_image_size', array( 25,25 ) ) );
+                                    echo get_the_post_thumbnail($item['id'], apply_filters('wpinv_checkout_image_size', array(25, 25)));
                                 echo '</div>';
                             }
-                            $item_title = esc_html( wpinv_get_cart_item_name( $item ) ) . wpinv_get_item_suffix( $wpi_item );
+                            $item_title = esc_html(wpinv_get_cart_item_name($item)) . wpinv_get_item_suffix($wpi_item);
                             echo '<span class="wpinv_checkout_cart_item_title">' . $item_title . '</span>';
-                            if ( !empty( $wpi_item ) && $wpi_item->is_package() && !empty( $item['meta']['post_id'] ) ) {
-                                $post_link = !empty( $item['meta']['invoice_title'] ) ? $item['meta']['invoice_title'] : get_the_title( $item['meta']['post_id'] );
-                                $summary = wp_sprintf( __( '%s: %s', 'invoicing' ), $wpi_item->get_custom_singular_name(), $post_link );
-                                echo '<small class="meta">' . wpautop( wp_kses_post( $summary ) ) . '</small>';
+                            if (!empty($wpi_item) && $wpi_item->is_package() && !empty($item['meta']['post_id'])) {
+                                $post_link = !empty($item['meta']['invoice_title']) ? $item['meta']['invoice_title'] : get_the_title($item['meta']['post_id']);
+                                $summary = wp_sprintf(__('%s: %s', 'invoicing'), $wpi_item->get_custom_singular_name(), $post_link);
+                                echo '<small class="meta">' . wpautop(wp_kses_post($summary)) . '</small>';
                             }
-                            do_action( 'wpinv_checkout_cart_item_title_after', $item, $key );
+                            do_action('wpinv_checkout_cart_item_title_after', $item, $key);
                         ?>
                     </td>
                     <td class="wpinv_cart_item_price text-right">
                         <?php 
-                        echo wpinv_cart_item_price( $item );
-                        do_action( 'wpinv_checkout_cart_item_price_after', $item, $key );
+                        echo wpinv_cart_item_price($item);
+                        do_action('wpinv_checkout_cart_item_price_after', $item, $key);
                         ?>
                     </td>
-                    <?php if ( $quantities_enabled ) { ?>
+                    <?php if ($quantities_enabled) { ?>
                     <td class="wpinv_cart_item_qty text-right">
                         <?php
-                        echo wpinv_get_cart_item_quantity( $item );
-                        do_action( 'wpinv_cart_item_quantitiy', $item, $key );
+                        echo wpinv_get_cart_item_quantity($item);
+                        do_action('wpinv_cart_item_quantitiy', $item, $key);
                         ?>
                     </td>
                     <?php } ?>
-                    <?php if ( $use_taxes ) { ?>
+                    <?php if ($use_taxes) { ?>
                     <td class="wpinv_cart_item_tax text-right">
                         <?php
-                        echo wpinv_cart_item_tax( $item );
+                        echo wpinv_cart_item_tax($item);
                         //echo wpinv_get_cart_item_tax( $wpi_item->ID, $subtotal = '', $options = array() );
-                        do_action( 'wpinv_cart_item_tax', $item, $key );
+                        do_action('wpinv_cart_item_tax', $item, $key);
                         ?>
                     </td>
                     <?php } ?>
                     <td class="wpinv_cart_item_subtotal text-right">
                         <?php
-                        echo wpinv_cart_item_subtotal( $item );
-                        do_action( 'wpinv_cart_item_subtotal', $item, $key );
+                        echo wpinv_cart_item_subtotal($item);
+                        do_action('wpinv_cart_item_subtotal', $item, $key);
                         ?>
                     </td>
-                    <?php do_action( 'wpinv_checkout_table_body_last', $item, $key ); ?>
+                    <?php do_action('wpinv_checkout_table_body_last', $item, $key); ?>
                 </tr>
             <?php } ?>
         <?php } ?>
-        <?php do_action( 'wpinv_cart_items_middle' ); ?>
-        <?php do_action( 'wpinv_cart_items_after' ); ?>
+        <?php do_action('wpinv_cart_items_middle'); ?>
+        <?php do_action('wpinv_cart_items_after'); ?>
     </tbody>
     <tfoot>
         <?php $cart_columns = wpinv_checkout_cart_columns(); ?>
-        <?php if ( has_action( 'wpinv_cart_footer_buttons' ) ) { ?>
+        <?php if (has_action('wpinv_cart_footer_buttons')) { ?>
             <tr class="wpinv_cart_footer_row">
-                <?php do_action( 'wpinv_checkout_table_buttons_first', $cart_items ); ?>
-                <td colspan="<?php echo ( $cart_columns ); ?>">
-                    <?php do_action( 'wpinv_cart_footer_buttons' ); ?>
+                <?php do_action('wpinv_checkout_table_buttons_first', $cart_items); ?>
+                <td colspan="<?php echo ($cart_columns); ?>">
+                    <?php do_action('wpinv_cart_footer_buttons'); ?>
                 </td>
-                <?php do_action( 'wpinv_checkout_table_buttons_first', $cart_items ); ?>
+                <?php do_action('wpinv_checkout_table_buttons_first', $cart_items); ?>
             </tr>
         <?php } ?>
 
-        <?php if ( $use_taxes && !wpinv_prices_include_tax() ) { ?>
-            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if ( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
-                <?php do_action( 'wpinv_checkout_table_subtotal_first', $cart_items ); ?>
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_subtotal_label text-right">
-                    <strong><?php _e( 'Sub-Total', 'invoicing' ); ?>:</strong>
+        <?php if ($use_taxes && !wpinv_prices_include_tax()) { ?>
+            <tr class="wpinv_cart_footer_row wpinv_cart_subtotal_row"<?php if (!wpinv_is_cart_taxed()) echo ' style="display:none;"'; ?>>
+                <?php do_action('wpinv_checkout_table_subtotal_first', $cart_items); ?>
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_subtotal_label text-right">
+                    <strong><?php _e('Sub-Total', 'invoicing'); ?>:</strong>
                 </td>
                 <td class="wpinv_cart_subtotal text-right">
-                    <span class="wpinv_cart_subtotal_amount bold"><?php echo wpinv_cart_subtotal( $cart_items ); ?></span>
+                    <span class="wpinv_cart_subtotal_amount bold"><?php echo wpinv_cart_subtotal($cart_items); ?></span>
                 </td>
-                <?php do_action( 'wpinv_checkout_table_subtotal_last', $cart_items ); ?>
+                <?php do_action('wpinv_checkout_table_subtotal_last', $cart_items); ?>
             </tr>
         <?php } ?>
         
-        <?php $wpi_cart_columns = $cart_columns - 1; wpinv_cart_discounts_html( $cart_items ); ?>
+        <?php $wpi_cart_columns = $cart_columns - 1; wpinv_cart_discounts_html($cart_items); ?>
 
-        <?php if ( $use_taxes ) { ?>
-            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if( !wpinv_is_cart_taxed() ) echo ' style="display:none;"'; ?>>
-                <?php do_action( 'wpinv_checkout_table_tax_first' ); ?>
-                <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_tax_label text-right">
+        <?php if ($use_taxes) { ?>
+            <tr class="wpinv_cart_footer_row wpinv_cart_tax_row"<?php if (!wpinv_is_cart_taxed()) echo ' style="display:none;"'; ?>>
+                <?php do_action('wpinv_checkout_table_tax_first'); ?>
+                <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_tax_label text-right">
                     <strong><?php echo $tax_label; ?>:</strong>
                 </td>
                 <td class="wpinv_cart_tax text-right">
-                    <span class="wpinv_cart_tax_amount" data-tax="<?php echo wpinv_get_cart_tax( $cart_items ); ?>"><?php echo esc_html( wpinv_cart_tax( $cart_items ) ); ?></span>
+                    <span class="wpinv_cart_tax_amount" data-tax="<?php echo wpinv_get_cart_tax($cart_items); ?>"><?php echo esc_html(wpinv_cart_tax($cart_items)); ?></span>
                 </td>
-                <?php do_action( 'wpinv_checkout_table_tax_last' ); ?>
+                <?php do_action('wpinv_checkout_table_tax_last'); ?>
             </tr>
         <?php } ?>
 
         <tr class="wpinv_cart_footer_row wpinv_cart_total_row">
-            <?php do_action( 'wpinv_checkout_table_footer_first' ); ?>
-            <td colspan="<?php echo ( $cart_columns - 1 ); ?>" class="wpinv_cart_total_label text-right">
-                <?php echo apply_filters( 'wpinv_cart_total_label', '<strong>' . __( 'Total', 'invoicing' ) . ':</strong>', $invoice ); ?>
+            <?php do_action('wpinv_checkout_table_footer_first'); ?>
+            <td colspan="<?php echo ($cart_columns - 1); ?>" class="wpinv_cart_total_label text-right">
+                <?php echo apply_filters('wpinv_cart_total_label', '<strong>' . __('Total', 'invoicing') . ':</strong>', $invoice); ?>
             </td>
             <td class="wpinv_cart_total text-right">
-                <span class="wpinv_cart_amount bold" data-subtotal="<?php echo wpinv_get_cart_total( $cart_items ); ?>" data-total="<?php echo wpinv_get_cart_total( NULL, NULL, $invoice ); ?>"><?php wpinv_cart_total( $cart_items, true, $invoice ); ?></span>
+                <span class="wpinv_cart_amount bold" data-subtotal="<?php echo wpinv_get_cart_total($cart_items); ?>" data-total="<?php echo wpinv_get_cart_total(NULL, NULL, $invoice); ?>"><?php wpinv_cart_total($cart_items, true, $invoice); ?></span>
             </td>
-            <?php do_action( 'wpinv_checkout_table_footer_last' ); ?>
+            <?php do_action('wpinv_checkout_table_footer_last'); ?>
         </tr>
     </tfoot>
 </table>

includes/admin/meta-boxes/class-mb-invoice-address.php

Spacing +48 added lines, -48 removed lines

@@ -1,34 +1,34 @@ 
 <?php
 // 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__));
 }
 
 class WPInv_Meta_Box_Billing_Details {
-    public static function output( $post ) {
+    public static function output($post) {
         global $user_ID;
-        $post_id    = !empty( $post->ID ) ? $post->ID : 0;
-        $invoice    = new WPInv_Invoice( $post_id );
+        $post_id    = !empty($post->ID) ? $post->ID : 0;
+        $invoice    = new WPInv_Invoice($post_id);
 ?>
 <div class="gdmbx2-wrap form-table">
     <div id="gdmbx2-metabox-wpinv_address" class="gdmbx2-metabox gdmbx-field-list wpinv-address gdmbx-row">
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-user-id table-layout">
             <div class="gdmbx-th">
-                <label for="post_author_override"><?php _e( 'Customer', 'invoicing' );?></label>
+                <label for="post_author_override"><?php _e('Customer', 'invoicing'); ?></label>
             </div>
             <div class="gdmbx-td gdmbx-customer-div">
-            <?php wpinv_dropdown_users( array(
+            <?php wpinv_dropdown_users(array(
                             'name' => 'post_author_override',
                             'selected' => empty($post->ID) ? $user_ID : $post->post_author,
                             'include_selected' => true,
                             'show' => 'user_email',
                             'orderby' => 'user_email',
                             'class' => 'gdmbx2-text-large'
-                        ) ); ?>
+                        )); ?>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-email table-layout" style="display:none">
-            <div class="gdmbx-th"><label for="wpinv_email"><?php _e( 'Email', 'invoicing' );?> <span class="required">*</span></label>
+            <div class="gdmbx-th"><label for="wpinv_email"><?php _e('Email', 'invoicing'); ?> <span class="required">*</span></label>
             </div>
             <div class="gdmbx-td">
                 <input type="hidden" id="wpinv_new_user" name="wpinv_new_user" value="" />
@@ -36,56 +36,56 @@ 
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-btns table-layout">
-            <div class="gdmbx-th"><label><?php _e( 'Actions', 'invoicing' );?></label>
+            <div class="gdmbx-th"><label><?php _e('Actions', 'invoicing'); ?></label>
             </div>
             <div class="gdmbx-td">
-                <a id="wpinv-fill-user-details" class="button button-small button-secondary" title="<?php esc_attr_e( 'Fill User Details', 'invoicing' );?>" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-refresh"></i><?php _e( 'Fill User Details', 'invoicing' );?></a>
-                <a class="wpinv-new-user button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-plus"></i><?php _e( 'Add New User', 'invoicing' );?></a>
-                <a style="display:none" class="wpinv-new-cancel button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-close"></i><?php _e( 'Cancel', 'invoicing' );?> </a>
+                <a id="wpinv-fill-user-details" class="button button-small button-secondary" title="<?php esc_attr_e('Fill User Details', 'invoicing'); ?>" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-refresh"></i><?php _e('Fill User Details', 'invoicing'); ?></a>
+                <a class="wpinv-new-user button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-plus"></i><?php _e('Add New User', 'invoicing'); ?></a>
+                <a style="display:none" class="wpinv-new-cancel button button-small button-secondary" href="javascript:void(0)"><i aria-hidden="true" class="fa fa-close"></i><?php _e('Cancel', 'invoicing'); ?> </a>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-first-name table-layout">
-            <div class="gdmbx-th"><label for="wpinv_first_name"><?php _e( 'First Name', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_first_name"><?php _e('First Name', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_first_name" id="wpinv_first_name" value="<?php echo esc_attr( $invoice->first_name );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_first_name" id="wpinv_first_name" value="<?php echo esc_attr($invoice->first_name); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-last-name table-layout">
-            <div class="gdmbx-th"><label for="wpinv_last_name"><?php _e( 'Last Name', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_last_name"><?php _e('Last Name', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_last_name" id="wpinv_last_name" value="<?php echo esc_attr( $invoice->last_name );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_last_name" id="wpinv_last_name" value="<?php echo esc_attr($invoice->last_name); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-company table-layout">
-            <div class="gdmbx-th"><label for="wpinv_company"><?php _e( 'Company', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_company"><?php _e('Company', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_company" id="wpinv_company" value="<?php echo esc_attr( $invoice->company );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_company" id="wpinv_company" value="<?php echo esc_attr($invoice->company); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-vat-number table-layout">
-            <div class="gdmbx-th"><label for="wpinv_vat_number"><?php _e( 'Vat Number', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_vat_number"><?php _e('Vat Number', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_vat_number" id="wpinv_vat_number" value="<?php echo esc_attr( $invoice->vat_number );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_vat_number" id="wpinv_vat_number" value="<?php echo esc_attr($invoice->vat_number); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-address table-layout">
-            <div class="gdmbx-th"><label for="wpinv_address"><?php _e( 'Address', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_address"><?php _e('Address', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_address" id="wpinv_address" value="<?php echo esc_attr( $invoice->address );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_address" id="wpinv_address" value="<?php echo esc_attr($invoice->address); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-city table-layout">
-            <div class="gdmbx-th"><label for="wpinv_city"><?php _e( 'City', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_city"><?php _e('City', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_city" id="wpinv_city" value="<?php echo esc_attr( $invoice->city );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_city" id="wpinv_city" value="<?php echo esc_attr($invoice->city); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-select gdmbx-wpinv-country table-layout">
-            <div class="gdmbx-th"><label for="wpinv_country"><?php _e( 'Country', 'invoicing' );?> <span class="wpi-loader"><i class="fa fa-refresh fa-spin"></i></span></label></div>
+            <div class="gdmbx-th"><label for="wpinv_country"><?php _e('Country', 'invoicing'); ?> <span class="wpi-loader"><i class="fa fa-refresh fa-spin"></i></span></label></div>
             <div class="gdmbx-td">
                 <?php
-                echo wpinv_html_select( array(
-                    'options'          => array_merge( array( '' => __( 'Choose a country', 'invoicing' ) ), wpinv_get_country_list() ),
+                echo wpinv_html_select(array(
+                    'options'          => array_merge(array('' => __('Choose a country', 'invoicing')), wpinv_get_country_list()),
                     'name'             => 'wpinv_country',
                     'id'               => 'wpinv_country',
                     'selected'         => $invoice->country,
@@ -93,20 +93,20 @@ 
                     'show_option_none' => false,
                     'class'            => 'gdmbx2-text-large',
                     'chosen'           => false,
-                    'placeholder'      => __( 'Choose a country', 'invoicing' ),
+                    'placeholder'      => __('Choose a country', 'invoicing'),
                     'required'         => false,
-                ) );
+                ));
                 ?>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-state table-layout">
-            <div class="gdmbx-th"><label for="wpinv_state"><?php _e( 'State', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_state"><?php _e('State', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
                 <?php
-                $states = wpinv_get_country_states( $invoice->country );
-                if( !empty( $states ) ) {
-                    echo wpinv_html_select( array(
-                        'options'          => array_merge( array( '' => __( 'Choose a state', 'invoicing' ) ), $states ),
+                $states = wpinv_get_country_states($invoice->country);
+                if (!empty($states)) {
+                    echo wpinv_html_select(array(
+                        'options'          => array_merge(array('' => __('Choose a state', 'invoicing')), $states),
                         'name'             => 'wpinv_state',
                         'id'               => 'wpinv_state',
                         'selected'         => $invoice->state,
@@ -114,44 +114,44 @@ 
                         'show_option_none' => false,
                         'class'            => 'gdmbx2-text-large',
                         'chosen'           => false,
-                        'placeholder'      => __( 'Choose a state', 'invoicing' ),
+                        'placeholder'      => __('Choose a state', 'invoicing'),
                         'required'         => false,
-                    ) );
+                    ));
                 } else {
-                    echo wpinv_html_text( array(
+                    echo wpinv_html_text(array(
                         'name'  => 'wpinv_state',
-                        'value' => ! empty( $invoice->state ) ? $invoice->state : '',
+                        'value' => !empty($invoice->state) ? $invoice->state : '',
                         'id'    => 'wpinv_state',
                         'class' => 'gdmbx2-text-large',
                         'required' => false,
-                    ) );
+                    ));
                 }
                 ?>
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-zip table-layout">
-            <div class="gdmbx-th"><label for="wpinv_zip"><?php _e( 'Zipcode', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_zip"><?php _e('Zipcode', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_zip" id="wpinv_zip" value="<?php echo esc_attr( $invoice->zip );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_zip" id="wpinv_zip" value="<?php echo esc_attr($invoice->zip); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-phone table-layout">
-            <div class="gdmbx-th"><label for="wpinv_phone"><?php _e( 'Phone', 'invoicing' );?></label></div>
+            <div class="gdmbx-th"><label for="wpinv_phone"><?php _e('Phone', 'invoicing'); ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" name="wpinv_phone" id="wpinv_phone" value="<?php echo esc_attr( $invoice->phone );?>" />
+                <input type="text" class="gdmbx2-text-large" name="wpinv_phone" id="wpinv_phone" value="<?php echo esc_attr($invoice->phone); ?>" />
             </div>
         </div>
         <div class="gdmbx-row gdmbx-type-text gdmbx-wpinv-ip table-layout">
-            <div class="gdmbx-th"><label for="wpinv_ip"><?php _e( 'IP Address', 'invoicing' );?><?php if ($invoice->ip) { ?>
-                &nbsp;&nbsp;<a href="<?php echo admin_url( 'admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $invoice->ip ); ?>" title="<?php esc_attr_e( 'View IP information', 'invoicing' );?>" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i></a>
+            <div class="gdmbx-th"><label for="wpinv_ip"><?php _e('IP Address', 'invoicing'); ?><?php if ($invoice->ip) { ?>
+                &nbsp;&nbsp;<a href="<?php echo admin_url('admin-ajax.php?action=wpinv_ip_geolocation&ip=' . $invoice->ip); ?>" title="<?php esc_attr_e('View IP information', 'invoicing'); ?>" target="_blank"><i class="fa fa-external-link" aria-hidden="true"></i></a>
                 <?php } ?></label></div>
             <div class="gdmbx-td">
-                <input type="text" class="gdmbx2-text-large" value="<?php echo esc_attr( $invoice->ip );?>" readonly />
+                <input type="text" class="gdmbx2-text-large" value="<?php echo esc_attr($invoice->ip); ?>" readonly />
             </div>
         </div>
     </div>
 </div>
-<?php wp_nonce_field( 'wpinv_save_invoice', 'wpinv_save_invoice' ) ;?>
+<?php wp_nonce_field('wpinv_save_invoice', 'wpinv_save_invoice'); ?>
 <?php
     }
 }

includes/class-wpinv-reports.php

Spacing +169 added lines, -169 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit; // Exit if accessed directly
 }
 
@@ -21,68 +21,68 @@ 
     public function init() {
         global $wp_filesystem;
 
-        if ( empty( $wp_filesystem ) ) {
-            require_once( ABSPATH . '/wp-admin/includes/file.php' );
+        if (empty($wp_filesystem)) {
+            require_once(ABSPATH . '/wp-admin/includes/file.php');
             WP_Filesystem();
             global $wp_filesystem;
         }
         $this->wp_filesystem    = $wp_filesystem;
         
         $this->export_dir       = $this->export_location();
-        $this->export_url       = $this->export_location( true );
+        $this->export_url       = $this->export_location(true);
         $this->export           = 'invoicing';
         $this->filetype         = 'csv';
         $this->per_page         = 20;
         
-        do_action( 'wpinv_class_reports_init', $this );
+        do_action('wpinv_class_reports_init', $this);
     }
     
     public function includes() {
-        do_action( 'wpinv_class_reports_includes', $this );
+        do_action('wpinv_class_reports_includes', $this);
     }
     
     public function actions() {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'add_submenu' ), 10 );
-            add_action( 'wpinv_reports_tab_export', array( $this, 'export' ) );
-            add_action( 'wp_ajax_wpinv_ajax_export', array( $this, 'ajax_export' ) );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'add_submenu'), 10);
+            add_action('wpinv_reports_tab_export', array($this, 'export'));
+            add_action('wp_ajax_wpinv_ajax_export', array($this, 'ajax_export'));
             
             // Export Invoices.
-            add_action( 'wpinv_export_set_params_invoices', array( $this, 'set_invoices_export' ) );
-            add_filter( 'wpinv_export_get_columns_invoices', array( $this, 'get_invoices_columns' ) );
-            add_filter( 'wpinv_export_get_data_invoices', array( $this, 'get_invoices_data' ) );
-            add_filter( 'wpinv_get_export_status_invoices', array( $this, 'invoices_export_status' ) );
+            add_action('wpinv_export_set_params_invoices', array($this, 'set_invoices_export'));
+            add_filter('wpinv_export_get_columns_invoices', array($this, 'get_invoices_columns'));
+            add_filter('wpinv_export_get_data_invoices', array($this, 'get_invoices_data'));
+            add_filter('wpinv_get_export_status_invoices', array($this, 'invoices_export_status'));
         }
-        do_action( 'wpinv_class_reports_actions', $this );
+        do_action('wpinv_class_reports_actions', $this);
     }
     
     public function add_submenu() {
         global $wpi_reports_page;
-        $wpi_reports_page = add_submenu_page( 'wpinv', __( 'Reports', 'invoicing' ), __( 'Reports', 'invoicing' ), 'manage_options', 'wpinv-reports', array( $this, 'reports_page' ) );
+        $wpi_reports_page = add_submenu_page('wpinv', __('Reports', 'invoicing'), __('Reports', 'invoicing'), 'manage_options', 'wpinv-reports', array($this, 'reports_page'));
     }
     
     public function reports_page() {
-        if ( !wp_script_is( 'postbox', 'enqueued' ) ) {
-            wp_enqueue_script( 'postbox' );
+        if (!wp_script_is('postbox', 'enqueued')) {
+            wp_enqueue_script('postbox');
         }
-        if ( !wp_script_is( 'jquery-ui-datepicker', 'enqueued' ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if (!wp_script_is('jquery-ui-datepicker', 'enqueued')) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
         
-        $current_page = admin_url( 'admin.php?page=wpinv-reports' );
-        $active_tab = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'export';
+        $current_page = admin_url('admin.php?page=wpinv-reports');
+        $active_tab = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'export';
         ?>
         <div class="wrap wpi-reports-wrap">
-            <h1><?php echo esc_html( __( 'Reports', 'invoicing' ) ); ?></h1>
+            <h1><?php echo esc_html(__('Reports', 'invoicing')); ?></h1>
             <h2 class="nav-tab-wrapper wp-clearfix">
-                <a href="<?php echo add_query_arg( array( 'tab' => 'export', 'settings-updated' => false ), $current_page ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'invoicing' ); ?></a>
-                <?php do_action( 'wpinv_reports_page_tabs' ); ;?>
+                <a href="<?php echo add_query_arg(array('tab' => 'export', 'settings-updated' => false), $current_page); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'invoicing'); ?></a>
+                <?php do_action('wpinv_reports_page_tabs'); ;?>
             </h2>
             <div class="wpi-reports-content wpi-reports-<?php echo $active_tab; ?>">
             <?php
-                do_action( 'wpinv_reports_page_top' );
-                do_action( 'wpinv_reports_tab_' . $active_tab );
-                do_action( 'wpinv_reports_page_bottom' );
+                do_action('wpinv_reports_page_top');
+                do_action('wpinv_reports_tab_' . $active_tab);
+                do_action('wpinv_reports_page_bottom');
             ?>
         </div>
         <?php
@@ -90,97 +90,97 @@ 
     
     public function export() {
         $statuses = wpinv_get_invoice_statuses();
-        $statuses = array_merge( array( 'any' => __( 'All Statuses', 'invoicing' ) ), $statuses );
+        $statuses = array_merge(array('any' => __('All Statuses', 'invoicing')), $statuses);
         ?>
         <div class="metabox-holder">
             <div id="post-body">
                 <div id="post-body-content">
-                    <?php do_action( 'wpinv_reports_tab_export_content_top' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_top'); ?>
                     
                     <div class="postbox wpi-export-invoices">
-                        <h2 class="hndle ui-sortabled-handle"><span><?php _e( 'Invoices','invoicing' ); ?></span></h2>
+                        <h2 class="hndle ui-sortabled-handle"><span><?php _e('Invoices', 'invoicing'); ?></span></h2>
                         <div class="inside">
-                            <p><?php _e( 'Download a CSV of all payment invoices.', 'invoicing' ); ?></p>
+                            <p><?php _e('Download a CSV of all payment invoices.', 'invoicing'); ?></p>
                             <form id="wpi-export-invoices" class="wpi-export-form" method="post">
-                                <?php echo wpinv_html_date_field( array( 
+                                <?php echo wpinv_html_date_field(array( 
                                     'id' => 'wpi_export_from_date', 
                                     'name' => 'from_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'From date', 'invoicing' ) )
+                                    'placeholder' => __('From date', 'invoicing') )
                                 ); ?>
-                                <?php echo wpinv_html_date_field( array( 
+                                <?php echo wpinv_html_date_field(array( 
                                     'id' => 'wpi_export_to_date',
                                     'name' => 'to_date',
                                     'data' => array(
                                         'dateFormat' => 'yy-mm-dd'
                                     ),
-                                    'placeholder' => __( 'To date', 'invoicing' ) )
+                                    'placeholder' => __('To date', 'invoicing') )
                                 ); ?>
                                 <span id="wpinv-status-wrap">
-                                <?php echo wpinv_html_select( array(
+                                <?php echo wpinv_html_select(array(
                                     'options'          => $statuses,
                                     'name'             => 'status',
                                     'id'               => 'wpi_export_status',
                                     'show_option_all'  => false,
                                     'show_option_none' => false,
                                     'class'            => '',
-                                ) ); ?>
-                                <?php wp_nonce_field( 'wpi_ajax_export', 'wpi_ajax_export' ); ?>
+                                )); ?>
+                                <?php wp_nonce_field('wpi_ajax_export', 'wpi_ajax_export'); ?>
                                 </span>
                                 <span id="wpinv-submit-wrap">
                                     <input type="hidden" value="invoices" name="export" />
-                                    <input type="submit" value="<?php _e( 'Generate CSV', 'invoicing' ); ?>" class="button-primary" />
+                                    <input type="submit" value="<?php _e('Generate CSV', 'invoicing'); ?>" class="button-primary" />
                                 </span>
                             </form>
                         </div>
                     </div>
                     
-                    <?php do_action( 'wpinv_reports_tab_export_content_bottom' ); ?>
+                    <?php do_action('wpinv_reports_tab_export_content_bottom'); ?>
                 </div>
             </div>
         </div>
         <?php
     }
     
-    public function export_location( $relative = false ) {
+    public function export_location($relative = false) {
         $upload_dir         = wp_upload_dir();
-        $export_location    = $relative ? trailingslashit( $upload_dir['baseurl'] ) . 'cache' : trailingslashit( $upload_dir['basedir'] ) . 'cache';
-        $export_location    = apply_filters( 'wpinv_export_location', $export_location, $relative );
+        $export_location    = $relative ? trailingslashit($upload_dir['baseurl']) . 'cache' : trailingslashit($upload_dir['basedir']) . 'cache';
+        $export_location    = apply_filters('wpinv_export_location', $export_location, $relative);
         
-        return trailingslashit( $export_location );
+        return trailingslashit($export_location);
     }
     
     public function check_export_location() {
         try {
-            if ( empty( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: Could not access filesystem.', 'invoicing' );
+            if (empty($this->wp_filesystem)) {
+                return __('Filesystem ERROR: Could not access filesystem.', 'invoicing');
             }
 
-            if ( is_wp_error( $this->wp_filesystem ) ) {
-                return __( 'Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing' );
+            if (is_wp_error($this->wp_filesystem)) {
+                return __('Filesystem ERROR: ' . $this->wp_filesystem->get_error_message(), 'invoicing');
             }
         
-            $is_dir         = $this->wp_filesystem->is_dir( $this->export_dir );
-            $is_writeable   = $is_dir && is_writeable( $this->export_dir );
+            $is_dir         = $this->wp_filesystem->is_dir($this->export_dir);
+            $is_writeable   = $is_dir && is_writeable($this->export_dir);
             
-            if ( $is_dir && $is_writeable ) {
+            if ($is_dir && $is_writeable) {
                return true;
-            } else if ( $is_dir && !$is_writeable ) {
-               if ( !$this->wp_filesystem->chmod( $this->export_dir, FS_CHMOD_DIR ) ) {
-                   return wp_sprintf( __( 'Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing' ), $this->export_dir );
+            } else if ($is_dir && !$is_writeable) {
+               if (!$this->wp_filesystem->chmod($this->export_dir, FS_CHMOD_DIR)) {
+                   return wp_sprintf(__('Filesystem ERROR: Export location %s is not writable, check your file permissions.', 'invoicing'), $this->export_dir);
                }
                
                return true;
             } else {
-                if ( !$this->wp_filesystem->mkdir( $this->export_dir, FS_CHMOD_DIR ) ) {
-                    return wp_sprintf( __( 'Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing' ), $this->export_dir );
+                if (!$this->wp_filesystem->mkdir($this->export_dir, FS_CHMOD_DIR)) {
+                    return wp_sprintf(__('Filesystem ERROR: Could not create directory %s. This is usually due to inconsistent file permissions.', 'invoicing'), $this->export_dir);
                 }
                 
                 return true;
             }
-        } catch ( Exception $e ) {
+        } catch (Exception $e) {
             return $e->getMessage();
         }
     }
@@ -188,130 +188,130 @@ 
     public function ajax_export() {
         $response               = array();
         $response['success']    = false;
-        $response['msg']        = __( 'Invalid export request found.', 'invoicing' );
+        $response['msg']        = __('Invalid export request found.', 'invoicing');
         
-        if ( empty( $_POST['data'] ) || !current_user_can( 'manage_options' ) ) {
-            wp_send_json( $response );
+        if (empty($_POST['data']) || !current_user_can('manage_options')) {
+            wp_send_json($response);
         }
 
-        parse_str( $_POST['data'], $data );
+        parse_str($_POST['data'], $data);
         
-        $data['step']   = !empty( $_POST['step'] ) ? absint( $_POST['step'] ) : 1;
+        $data['step'] = !empty($_POST['step']) ? absint($_POST['step']) : 1;
 
         $_REQUEST = (array)$data;
-        if ( !( !empty( $_REQUEST['wpi_ajax_export'] ) && wp_verify_nonce( $_REQUEST['wpi_ajax_export'], 'wpi_ajax_export' ) ) ) {
-            $response['msg']    = __( 'Security check failed.', 'invoicing' );
-            wp_send_json( $response );
+        if (!(!empty($_REQUEST['wpi_ajax_export']) && wp_verify_nonce($_REQUEST['wpi_ajax_export'], 'wpi_ajax_export'))) {
+            $response['msg'] = __('Security check failed.', 'invoicing');
+            wp_send_json($response);
         }
         
-        if ( ( $error = $this->check_export_location( true ) ) !== true ) {
-            $response['msg'] = __( 'Filesystem ERROR: ' . $error, 'invoicing' );
-            wp_send_json( $response );
+        if (($error = $this->check_export_location(true)) !== true) {
+            $response['msg'] = __('Filesystem ERROR: ' . $error, 'invoicing');
+            wp_send_json($response);
         }
                         
-        $this->set_export_params( $_REQUEST );
+        $this->set_export_params($_REQUEST);
         
         $return = $this->process_export_step();
         $done   = $this->get_export_status();
         
-        if ( $return ) {
+        if ($return) {
             $this->step += 1;
             
             $response['success']    = true;
             $response['msg']        = '';
             
-            if ( $done >= 100 ) {
+            if ($done >= 100) {
                 $this->step     = 'done';
-                $new_filename   = 'wpi-' . $this->export . '-' . date( 'y-m-d-H-i' ) . '.' . $this->filetype;
+                $new_filename   = 'wpi-' . $this->export . '-' . date('y-m-d-H-i') . '.' . $this->filetype;
                 $new_file       = $this->export_dir . $new_filename;
                 
-                if ( file_exists( $this->file ) ) {
-                    $this->wp_filesystem->move( $this->file, $new_file, true );
+                if (file_exists($this->file)) {
+                    $this->wp_filesystem->move($this->file, $new_file, true);
                 }
                 
-                if ( file_exists( $new_file ) ) {
-                    $response['data']['file'] = array( 'u' => $this->export_url . $new_filename, 's' => size_format( filesize( $new_file ), 2 ) );
+                if (file_exists($new_file)) {
+                    $response['data']['file'] = array('u' => $this->export_url . $new_filename, 's' => size_format(filesize($new_file), 2));
                 }
             }
             
             $response['data']['step']   = $this->step;
             $response['data']['done']   = $done;
         } else {
-            $response['msg']    = __( 'No data found for export.', 'invoicing' );
+            $response['msg'] = __('No data found for export.', 'invoicing');
         }
 
-        wp_send_json( $response );
+        wp_send_json($response);
     }
     
-    public function set_export_params( $request ) {
+    public function set_export_params($request) {
         $this->empty    = false;
-        $this->step     = !empty( $request['step'] ) ? absint( $request['step'] ) : 1;
-        $this->export   = !empty( $request['export'] ) ? $request['export'] : $this->export;
+        $this->step     = !empty($request['step']) ? absint($request['step']) : 1;
+        $this->export   = !empty($request['export']) ? $request['export'] : $this->export;
         $this->filename = 'wpi-' . $this->export . '-' . $request['wpi_ajax_export'] . '.' . $this->filetype;
         $this->file     = $this->export_dir . $this->filename;
         
-        do_action( 'wpinv_export_set_params_' . $this->export, $request );
+        do_action('wpinv_export_set_params_' . $this->export, $request);
     }
     
     public function get_columns() {
         $columns = array(
-            'id'   => __( 'ID',   'invoicing' ),
-            'date' => __( 'Date', 'invoicing' )
+            'id'   => __('ID', 'invoicing'),
+            'date' => __('Date', 'invoicing')
         );
         
-        return apply_filters( 'wpinv_export_get_columns_' . $this->export, $columns );
+        return apply_filters('wpinv_export_get_columns_' . $this->export, $columns);
     }
     
     protected function get_export_file() {
         $file = '';
 
-        if ( $this->wp_filesystem->exists( $this->file ) ) {
-            $file = $this->wp_filesystem->get_contents( $this->file );
+        if ($this->wp_filesystem->exists($this->file)) {
+            $file = $this->wp_filesystem->get_contents($this->file);
         } else {
-            $this->wp_filesystem->put_contents( $this->file, '' );
+            $this->wp_filesystem->put_contents($this->file, '');
         }
 
         return $file;
     }
     
-    protected function attach_export_data( $data = '' ) {
-        $filedata   = $this->get_export_file();
-        $filedata   .= $data;
+    protected function attach_export_data($data = '') {
+        $filedata = $this->get_export_file();
+        $filedata .= $data;
         
-        $this->wp_filesystem->put_contents( $this->file, $filedata );
+        $this->wp_filesystem->put_contents($this->file, $filedata);
 
-        $rows       = file( $this->file, FILE_SKIP_EMPTY_LINES );
+        $rows       = file($this->file, FILE_SKIP_EMPTY_LINES);
         $columns    = $this->get_columns();
-        $columns    = empty( $columns ) ? 0 : 1;
+        $columns    = empty($columns) ? 0 : 1;
 
-        $this->empty = count( $rows ) == $columns ? true : false;
+        $this->empty = count($rows) == $columns ? true : false;
     }
     
     public function print_columns() {
         $column_data    = '';
         $columns        = $this->get_columns();
         $i              = 1;
-        foreach( $columns as $key => $column ) {
-            $column_data .= '"' . addslashes( $column ) . '"';
-            $column_data .= $i == count( $columns ) ? '' : ',';
+        foreach ($columns as $key => $column) {
+            $column_data .= '"' . addslashes($column) . '"';
+            $column_data .= $i == count($columns) ? '' : ',';
             $i++;
         }
         $column_data .= "\r\n";
 
-        $this->attach_export_data( $column_data );
+        $this->attach_export_data($column_data);
 
         return $column_data;
     }
     
     public function process_export_step() {
-        if ( $this->step < 2 ) {
-            @unlink( $this->file );
+        if ($this->step < 2) {
+            @unlink($this->file);
             $this->print_columns();
         }
         
         $return = $this->print_rows();
         
-        if ( $return ) {
+        if ($return) {
             return true;
         } else {
             return false;
@@ -320,23 +320,23 @@ 
     
     public function get_export_status() {
         $status = 100;
-        return apply_filters( 'wpinv_get_export_status_' . $this->export, $status );
+        return apply_filters('wpinv_get_export_status_' . $this->export, $status);
     }
     
     public function get_export_data() {
         $data = array(
             0 => array(
                 'id'   => '',
-                'data' => date( 'F j, Y' )
+                'data' => date('F j, Y')
             ),
             1 => array(
                 'id'   => '',
-                'data' => date( 'F j, Y' )
+                'data' => date('F j, Y')
             )
         );
 
-        $data = apply_filters( 'wpinv_export_get_data', $data );
-        $data = apply_filters( 'wpinv_export_get_data_' . $this->export, $data );
+        $data = apply_filters('wpinv_export_get_data', $data);
+        $data = apply_filters('wpinv_export_get_data_' . $this->export, $data);
 
         return $data;
     }
@@ -346,20 +346,20 @@ 
         $data       = $this->get_export_data();
         $columns    = $this->get_columns();
 
-        if ( $data ) {
-            foreach ( $data as $row ) {
+        if ($data) {
+            foreach ($data as $row) {
                 $i = 1;
-                foreach ( $row as $key => $column ) {
-                    if ( array_key_exists( $key, $columns ) ) {
-                        $row_data .= '"' . addslashes( preg_replace( "/\"/","'", $column ) ) . '"';
-                        $row_data .= $i == count( $columns ) ? '' : ',';
+                foreach ($row as $key => $column) {
+                    if (array_key_exists($key, $columns)) {
+                        $row_data .= '"' . addslashes(preg_replace("/\"/", "'", $column)) . '"';
+                        $row_data .= $i == count($columns) ? '' : ',';
                         $i++;
                     }
                 }
                 $row_data .= "\r\n";
             }
 
-            $this->attach_export_data( $row_data );
+            $this->attach_export_data($row_data);
 
             return $row_data;
         }
@@ -368,46 +368,46 @@ 
     }
     
     // Export Invoices.
-    public function set_invoices_export( $request ) {
-        $this->from_date    = isset( $request['from_date'] ) ? sanitize_text_field( $request['from_date'] ) : '';
-        $this->to_date      = isset( $request['to_date'] ) ? sanitize_text_field( $request['to_date'] ) : '';
-        $this->status       = isset( $request['status'] ) ? sanitize_text_field( $request['status'] ) : 'publish';
+    public function set_invoices_export($request) {
+        $this->from_date    = isset($request['from_date']) ? sanitize_text_field($request['from_date']) : '';
+        $this->to_date      = isset($request['to_date']) ? sanitize_text_field($request['to_date']) : '';
+        $this->status       = isset($request['status']) ? sanitize_text_field($request['status']) : 'publish';
     }
     
-    public function get_invoices_columns( $columns = array() ) {
+    public function get_invoices_columns($columns = array()) {
         $columns = array(
-            'id'            => __( 'ID',   'invoicing' ),
-            'number'        => __( 'Number',   'invoicing' ),
-            'date'          => __( 'Date', 'invoicing' ),
-            'amount'        => __( 'Amount', 'invoicing' ),
-            'status_nicename'  => __( 'Status Nicename', 'invoicing' ),
-            'status'        => __( 'Status', 'invoicing' ),
-            'tax'           => __( 'Tax', 'invoicing' ),
-            'discount'      => __( 'Discount', 'invoicing' ),
-            'user_id'       => __( 'User ID', 'invoicing' ),
-            'email'         => __( 'Email', 'invoicing' ),
-            'first_name'    => __( 'First Name', 'invoicing' ),
-            'last_name'     => __( 'Last Name', 'invoicing' ),
-            'address'       => __( 'Address', 'invoicing' ),
-            'city'          => __( 'City', 'invoicing' ),
-            'state'         => __( 'State', 'invoicing' ),
-            'country'       => __( 'Country', 'invoicing' ),
-            'zip'           => __( 'Zipcode', 'invoicing' ),
-            'phone'         => __( 'Phone', 'invoicing' ),
-            'company'       => __( 'Company', 'invoicing' ),
-            'vat_number'    => __( 'Vat Number', 'invoicing' ),
-            'ip'            => __( 'IP', 'invoicing' ),
-            'gateway'       => __( 'Gateway', 'invoicing' ),
-            'gateway_nicename'       => __( 'Gateway Nicename', 'invoicing' ),
-            'transaction_id'=> __( 'Transaction ID', 'invoicing' ),
-            'currency'      => __( 'Currency', 'invoicing' ),
-            'due_date'      => __( 'Due Date', 'invoicing' ),
+            'id'            => __('ID', 'invoicing'),
+            'number'        => __('Number', 'invoicing'),
+            'date'          => __('Date', 'invoicing'),
+            'amount'        => __('Amount', 'invoicing'),
+            'status_nicename'  => __('Status Nicename', 'invoicing'),
+            'status'        => __('Status', 'invoicing'),
+            'tax'           => __('Tax', 'invoicing'),
+            'discount'      => __('Discount', 'invoicing'),
+            'user_id'       => __('User ID', 'invoicing'),
+            'email'         => __('Email', 'invoicing'),
+            'first_name'    => __('First Name', 'invoicing'),
+            'last_name'     => __('Last Name', 'invoicing'),
+            'address'       => __('Address', 'invoicing'),
+            'city'          => __('City', 'invoicing'),
+            'state'         => __('State', 'invoicing'),
+            'country'       => __('Country', 'invoicing'),
+            'zip'           => __('Zipcode', 'invoicing'),
+            'phone'         => __('Phone', 'invoicing'),
+            'company'       => __('Company', 'invoicing'),
+            'vat_number'    => __('Vat Number', 'invoicing'),
+            'ip'            => __('IP', 'invoicing'),
+            'gateway'       => __('Gateway', 'invoicing'),
+            'gateway_nicename'       => __('Gateway Nicename', 'invoicing'),
+            'transaction_id'=> __('Transaction ID', 'invoicing'),
+            'currency'      => __('Currency', 'invoicing'),
+            'due_date'      => __('Due Date', 'invoicing'),
         );
 
         return $columns;
     }
         
-    public function get_invoices_data( $response = array() ) {
+    public function get_invoices_data($response = array()) {
         $args = array(
             'limit'    => $this->per_page,
             'page'     => $this->step,
@@ -415,35 +415,35 @@ 
             'orderby'  => 'date',
         );
         
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices = wpinv_get_invoices( $args );
+        $invoices = wpinv_get_invoices($args);
         
         $data = array();
         
-        if ( !empty( $invoices ) ) {
-            foreach ( $invoices as $invoice ) {
+        if (!empty($invoices)) {
+            foreach ($invoices as $invoice) {
                 $row = array(
                     'id'            => $invoice->ID,
                     'number'        => $invoice->get_number(),
-                    'date'          => $invoice->get_invoice_date( false ),
-                    'amount'        => wpinv_round_amount( $invoice->get_total() ),
-                    'status_nicename' => $invoice->get_status( true ),
+                    'date'          => $invoice->get_invoice_date(false),
+                    'amount'        => wpinv_round_amount($invoice->get_total()),
+                    'status_nicename' => $invoice->get_status(true),
                     'status'        => $invoice->get_status(),
-                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount( $invoice->get_tax() ) : '',
-                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount( $invoice->get_discount() ) : '',
+                    'tax'           => $invoice->get_tax() > 0 ? wpinv_round_amount($invoice->get_tax()) : '',
+                    'discount'      => $invoice->get_discount() > 0 ? wpinv_round_amount($invoice->get_discount()) : '',
                     'user_id'       => $invoice->get_user_id(),
                     'email'         => $invoice->get_email(),
                     'first_name'    => $invoice->get_first_name(),
@@ -464,7 +464,7 @@ 
                     'due_date'      => $invoice->needs_payment() ? $invoice->get_due_date() : '',
                 );
                 
-                $data[] = apply_filters( 'wpinv_export_invoice_row', $row, $invoice );
+                $data[] = apply_filters('wpinv_export_invoice_row', $row, $invoice);
             }
 
             return $data;
@@ -480,29 +480,29 @@ 
             'return'   => 'ids',
         );
         
-        if ( $this->status != 'any' ) {
+        if ($this->status != 'any') {
             $args['status'] = $this->status;
         }
 
-        if ( !empty( $this->from_date ) || !empty( $this->to_date ) ) {
+        if (!empty($this->from_date) || !empty($this->to_date)) {
             $args['date_query'] = array(
                 array(
-                    'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->from_date ) ),
-                    'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->to_date ) ),
+                    'after'     => date('Y-n-d 00:00:00', strtotime($this->from_date)),
+                    'before'    => date('Y-n-d 23:59:59', strtotime($this->to_date)),
                     'inclusive' => true
                 )
             );
         }
 
-        $invoices   = wpinv_get_invoices( $args );
-        $total      = !empty( $invoices ) ? count( $invoices ) : 0;
+        $invoices   = wpinv_get_invoices($args);
+        $total      = !empty($invoices) ? count($invoices) : 0;
         $status     = 100;
 
-        if ( $total > 0 ) {
-            $status = ( ( $this->per_page * $this->step ) / $total ) * 100;
+        if ($total > 0) {
+            $status = (($this->per_page * $this->step) / $total) * 100;
         }
 
-        if ( $status > 100 ) {
+        if ($status > 100) {
             $status = 100;
         }
 

includes/wpinv-helper-functions.php

Spacing +235 added lines, -235 removed lines

@@ -7,89 +7,89 @@ 
  */
  
 // 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_item_quantities_enabled() {
-    $ret = wpinv_get_option( 'item_quantities', true );
+    $ret = wpinv_get_option('item_quantities', true);
     
-    return (bool) apply_filters( 'wpinv_item_quantities_enabled', $ret );
+    return (bool)apply_filters('wpinv_item_quantities_enabled', $ret);
 }
 
 function wpinv_get_ip() {
     $ip = '127.0.0.1';
 
-    if ( !empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_CLIENT_IP'] );
-    } elseif ( !empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['HTTP_X_FORWARDED_FOR'] );
-    } elseif( !empty( $_SERVER['REMOTE_ADDR'] ) ) {
-        $ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
+    if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_CLIENT_IP']);
+    } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+        $ip = sanitize_text_field($_SERVER['HTTP_X_FORWARDED_FOR']);
+    } elseif (!empty($_SERVER['REMOTE_ADDR'])) {
+        $ip = sanitize_text_field($_SERVER['REMOTE_ADDR']);
     }
     
-    return apply_filters( 'wpinv_get_ip', $ip );
+    return apply_filters('wpinv_get_ip', $ip);
 }
 
 function wpinv_get_user_agent() {
-    if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
-        $user_agent = sanitize_text_field( $_SERVER['HTTP_USER_AGENT'] );
+    if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+        $user_agent = sanitize_text_field($_SERVER['HTTP_USER_AGENT']);
     } else {
         $user_agent = '';
     }
     
-    return apply_filters( 'wpinv_get_user_agent', $user_agent );
+    return apply_filters('wpinv_get_user_agent', $user_agent);
 }
 
-function wpinv_sanitize_amount( $amount, $decimals = NULL ) {
+function wpinv_sanitize_amount($amount, $decimals = NULL) {
     $is_negative   = false;
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
     // Sanitize the amount
-    if ( $decimal_sep == ',' && false !== ( $found = strpos( $amount, $decimal_sep ) ) ) {
-        if ( ( $thousands_sep == '.' || $thousands_sep == ' ' ) && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-            $amount = str_replace( $thousands_sep, '', $amount );
-        } elseif( empty( $thousands_sep ) && false !== ( $found = strpos( $amount, '.' ) ) ) {
-            $amount = str_replace( '.', '', $amount );
+    if ($decimal_sep == ',' && false !== ($found = strpos($amount, $decimal_sep))) {
+        if (($thousands_sep == '.' || $thousands_sep == ' ') && false !== ($found = strpos($amount, $thousands_sep))) {
+            $amount = str_replace($thousands_sep, '', $amount);
+        } elseif (empty($thousands_sep) && false !== ($found = strpos($amount, '.'))) {
+            $amount = str_replace('.', '', $amount);
         }
 
-        $amount = str_replace( $decimal_sep, '.', $amount );
-    } elseif( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( $thousands_sep, '', $amount );
+        $amount = str_replace($decimal_sep, '.', $amount);
+    } elseif ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace($thousands_sep, '', $amount);
     }
 
-    if( $amount < 0 ) {
+    if ($amount < 0) {
         $is_negative = true;
     }
 
-    $amount   = preg_replace( '/[^0-9\.]/', '', $amount );
+    $amount   = preg_replace('/[^0-9\.]/', '', $amount);
 
-    $decimals = apply_filters( 'wpinv_sanitize_amount_decimals', absint( $decimals ), $amount );
-    $amount   = number_format( (double) $amount, absint( $decimals ), '.', '' );
+    $decimals = apply_filters('wpinv_sanitize_amount_decimals', absint($decimals), $amount);
+    $amount   = number_format((double)$amount, absint($decimals), '.', '');
 
-    if( $is_negative ) {
+    if ($is_negative) {
         $amount *= -1;
     }
 
-    return apply_filters( 'wpinv_sanitize_amount', $amount, $decimals );
+    return apply_filters('wpinv_sanitize_amount', $amount, $decimals);
 }
-add_filter( 'wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_sanitize_amount_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_round_amount( $amount, $decimals = NULL ) {
-    if ( $decimals === NULL ) {
+function wpinv_round_amount($amount, $decimals = NULL) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
     
-    $amount = round( (double)$amount, wpinv_currency_decimal_filter( absint( $decimals ) ) );
+    $amount = round((double)$amount, wpinv_currency_decimal_filter(absint($decimals)));
 
-    return apply_filters( 'wpinv_round_amount', $amount, $decimals );
+    return apply_filters('wpinv_round_amount', $amount, $decimals);
 }
 
-function wpinv_get_invoice_statuses( $trashed = false ) {
+function wpinv_get_invoice_statuses($trashed = false) {
     global $post;
     $invoice_statuses = array();
     $invoice_statuses = array(
@@ -103,32 +103,32 @@ 
         'wpi-renewal' => __('Renewal Payment', 'invoicing')
     );
     
-    if ( $trashed ) {
-        $invoice_statuses['trash'] = __( 'Trash', 'invoicing' );
+    if ($trashed) {
+        $invoice_statuses['trash'] = __('Trash', 'invoicing');
     }
 
-    return apply_filters( 'wpinv_statuses', $invoice_statuses );
+    return apply_filters('wpinv_statuses', $invoice_statuses);
 }
 
-function wpinv_status_nicename( $status ) {
+function wpinv_status_nicename($status) {
     $statuses = wpinv_get_invoice_statuses();
-    $status   = isset( $statuses[$status] ) ? $statuses[$status] : __( $status, 'invoicing' );
+    $status   = isset($statuses[$status]) ? $statuses[$status] : __($status, 'invoicing');
 
     return $status;
 }
 
 function wpinv_get_currency() {
-    $currency = wpinv_get_option( 'currency', 'USD' );
+    $currency = wpinv_get_option('currency', 'USD');
     
-    return apply_filters( 'wpinv_currency', $currency );
+    return apply_filters('wpinv_currency', $currency);
 }
 
-function wpinv_currency_symbol( $currency = '' ) {
-    if ( empty( $currency ) ) {
+function wpinv_currency_symbol($currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
     
-    $symbols = apply_filters( 'wpinv_currency_symbols', array(
+    $symbols = apply_filters('wpinv_currency_symbols', array(
         'AED' => 'د.إ',
         'ARS' => '&#36;',
         'AUD' => '&#36;',
@@ -180,78 +180,78 @@ 
         'USD' => '&#36;',
         'VND' => '&#8363;',
         'ZAR' => '&#82;',
-    ) );
+    ));
 
-    $currency_symbol = isset( $symbols[$currency] ) ? $symbols[$currency] : '&#36;';
+    $currency_symbol = isset($symbols[$currency]) ? $symbols[$currency] : '&#36;';
 
-    return apply_filters( 'wpinv_currency_symbol', $currency_symbol, $currency );
+    return apply_filters('wpinv_currency_symbol', $currency_symbol, $currency);
 }
 
 function wpinv_currency_position() {
-    $position = wpinv_get_option( 'currency_position', 'left' );
+    $position = wpinv_get_option('currency_position', 'left');
     
-    return apply_filters( 'wpinv_currency_position', $position );
+    return apply_filters('wpinv_currency_position', $position);
 }
 
 function wpinv_thousands_separator() {
-    $thousand_sep = wpinv_get_option( 'thousands_separator', ',' );
+    $thousand_sep = wpinv_get_option('thousands_separator', ',');
     
-    return apply_filters( 'wpinv_thousands_separator', $thousand_sep );
+    return apply_filters('wpinv_thousands_separator', $thousand_sep);
 }
 
 function wpinv_decimal_separator() {
-    $decimal_sep = wpinv_get_option( 'decimal_separator', '.' );
+    $decimal_sep = wpinv_get_option('decimal_separator', '.');
     
-    return apply_filters( 'wpinv_decimal_separator', $decimal_sep );
+    return apply_filters('wpinv_decimal_separator', $decimal_sep);
 }
 
 function wpinv_decimals() {
-    $decimals = apply_filters( 'wpinv_decimals', wpinv_get_option( 'decimals', 2 ) );
+    $decimals = apply_filters('wpinv_decimals', wpinv_get_option('decimals', 2));
     
-    return absint( $decimals );
+    return absint($decimals);
 }
 
 function wpinv_get_currencies() {
     $currencies = array(
-        'USD'  => __( 'US Dollars (&#36;)', 'invoicing' ),
-        'EUR'  => __( 'Euros (&euro;)', 'invoicing' ),
-        'GBP'  => __( 'Pounds Sterling (&pound;)', 'invoicing' ),
-        'AUD'  => __( 'Australian Dollars (&#36;)', 'invoicing' ),
-        'BRL'  => __( 'Brazilian Real (R&#36;)', 'invoicing' ),
-        'CAD'  => __( 'Canadian Dollars (&#36;)', 'invoicing' ),
-        'CLP'  => __( 'Chilean Peso (&#36;)', 'invoicing' ),
-        'CNY'  => __( 'Chinese Yuan (&yen;)', 'invoicing' ),
-        'CZK'  => __( 'Czech Koruna (&#75;&#269;)', 'invoicing' ),
-        'DKK'  => __( 'Danish Krone (DKK)', 'invoicing' ),
-        'HKD'  => __( 'Hong Kong Dollar (&#36;)', 'invoicing' ),
-        'HUF'  => __( 'Hungarian Forint (&#70;&#116;)', 'invoicing' ),
-        'INR'  => __( 'Indian Rupee (&#8377;)', 'invoicing' ),
-        'ILS'  => __( 'Israeli Shekel (&#8362;)', 'invoicing' ),
-        'JPY'  => __( 'Japanese Yen (&yen;)', 'invoicing' ),
-        'MYR'  => __( 'Malaysian Ringgit (&#82;&#77;)', 'invoicing' ),
-        'MXN'  => __( 'Mexican Peso (&#36;)', 'invoicing' ),
-        'NZD'  => __( 'New Zealand Dollar (&#36;)', 'invoicing' ),
-        'NOK'  => __( 'Norwegian Krone (&#107;&#114;)', 'invoicing' ),
-        'PHP'  => __( 'Philippine Peso (&#8369;)', 'invoicing' ),
-        'PLN'  => __( 'Polish Zloty (&#122;&#322;)', 'invoicing' ),
-        'SGD'  => __( 'Singapore Dollar (&#36;)', 'invoicing' ),
-        'SEK'  => __( 'Swedish Krona (&#107;&#114;)', 'invoicing' ),
-        'CHF'  => __( 'Swiss Franc (&#67;&#72;&#70;)', 'invoicing' ),
-        'TWD'  => __( 'Taiwan New Dollar (&#78;&#84;&#36;)', 'invoicing' ),
-        'THB'  => __( 'Thai Baht (&#3647;)', 'invoicing' ),
-        'TRY'  => __( 'Turkish Lira (&#8378;)', 'invoicing' ),
-        'RIAL' => __( 'Iranian Rial (&#65020;)', 'invoicing' ),
-        'RUB'  => __( 'Russian Ruble (&#8381;)', 'invoicing' ),
-        'ZAR'  => __( 'South African Rand (&#82;)', 'invoicing' )
+        'USD'  => __('US Dollars (&#36;)', 'invoicing'),
+        'EUR'  => __('Euros (&euro;)', 'invoicing'),
+        'GBP'  => __('Pounds Sterling (&pound;)', 'invoicing'),
+        'AUD'  => __('Australian Dollars (&#36;)', 'invoicing'),
+        'BRL'  => __('Brazilian Real (R&#36;)', 'invoicing'),
+        'CAD'  => __('Canadian Dollars (&#36;)', 'invoicing'),
+        'CLP'  => __('Chilean Peso (&#36;)', 'invoicing'),
+        'CNY'  => __('Chinese Yuan (&yen;)', 'invoicing'),
+        'CZK'  => __('Czech Koruna (&#75;&#269;)', 'invoicing'),
+        'DKK'  => __('Danish Krone (DKK)', 'invoicing'),
+        'HKD'  => __('Hong Kong Dollar (&#36;)', 'invoicing'),
+        'HUF'  => __('Hungarian Forint (&#70;&#116;)', 'invoicing'),
+        'INR'  => __('Indian Rupee (&#8377;)', 'invoicing'),
+        'ILS'  => __('Israeli Shekel (&#8362;)', 'invoicing'),
+        'JPY'  => __('Japanese Yen (&yen;)', 'invoicing'),
+        'MYR'  => __('Malaysian Ringgit (&#82;&#77;)', 'invoicing'),
+        'MXN'  => __('Mexican Peso (&#36;)', 'invoicing'),
+        'NZD'  => __('New Zealand Dollar (&#36;)', 'invoicing'),
+        'NOK'  => __('Norwegian Krone (&#107;&#114;)', 'invoicing'),
+        'PHP'  => __('Philippine Peso (&#8369;)', 'invoicing'),
+        'PLN'  => __('Polish Zloty (&#122;&#322;)', 'invoicing'),
+        'SGD'  => __('Singapore Dollar (&#36;)', 'invoicing'),
+        'SEK'  => __('Swedish Krona (&#107;&#114;)', 'invoicing'),
+        'CHF'  => __('Swiss Franc (&#67;&#72;&#70;)', 'invoicing'),
+        'TWD'  => __('Taiwan New Dollar (&#78;&#84;&#36;)', 'invoicing'),
+        'THB'  => __('Thai Baht (&#3647;)', 'invoicing'),
+        'TRY'  => __('Turkish Lira (&#8378;)', 'invoicing'),
+        'RIAL' => __('Iranian Rial (&#65020;)', 'invoicing'),
+        'RUB'  => __('Russian Ruble (&#8381;)', 'invoicing'),
+        'ZAR'  => __('South African Rand (&#82;)', 'invoicing')
     );
     
-    asort( $currencies );
+    asort($currencies);
 
-    return apply_filters( 'wpinv_currencies', $currencies );
+    return apply_filters('wpinv_currencies', $currencies);
 }
 
-function wpinv_price( $amount = '', $currency = '' ) {
-    if( empty( $currency ) ) {
+function wpinv_price($amount = '', $currency = '') {
+    if (empty($currency)) {
         $currency = wpinv_get_currency();
     }
 
@@ -259,14 +259,14 @@ 
 
     $negative = $amount < 0;
 
-    if ( $negative ) {
-        $amount = substr( $amount, 1 );
+    if ($negative) {
+        $amount = substr($amount, 1);
     }
 
-    $symbol = wpinv_currency_symbol( $currency );
+    $symbol = wpinv_currency_symbol($currency);
 
-    if ( $position == 'left' || $position == 'left_space' ) {
-        switch ( $currency ) {
+    if ($position == 'left' || $position == 'left_space') {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -278,15 +278,15 @@ 
             case "NZD" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
             default :
                 //$price = $currency . ' ' . $amount;
-                $price = $position == 'left_space' ? $symbol . ' ' .  $amount : $symbol . $amount;
+                $price = $position == 'left_space' ? $symbol . ' ' . $amount : $symbol . $amount;
                 break;
         }
     } else {
-        switch ( $currency ) {
+        switch ($currency) {
             case "GBP" :
             case "BRL" :
             case "EUR" :
@@ -297,83 +297,83 @@ 
             case "MXN" :
             case "SGD" :
             case "JPY" :
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
             default :
                 //$price = $amount . ' ' . $currency;
-                $price = $position == 'right_space' ? $amount . ' ' .  $symbol : $amount . $symbol;
+                $price = $position == 'right_space' ? $amount . ' ' . $symbol : $amount . $symbol;
                 break;
         }
     }
     
-    if ( $negative ) {
+    if ($negative) {
         $price = '-' . $price;
     }
     
-    $price = apply_filters( 'wpinv_' . strtolower( $currency ) . '_currency_filter_' . $position, $price, $currency, $amount );
+    $price = apply_filters('wpinv_' . strtolower($currency) . '_currency_filter_' . $position, $price, $currency, $amount);
 
     return $price;
 }
 
-function wpinv_format_amount( $amount, $decimals = NULL, $calculate = false ) {
+function wpinv_format_amount($amount, $decimals = NULL, $calculate = false) {
     $thousands_sep = wpinv_thousands_separator();
     $decimal_sep   = wpinv_decimal_separator();
 
-    if ( $decimals === NULL ) {
+    if ($decimals === NULL) {
         $decimals = wpinv_decimals();
     }
 
-    if ( $decimal_sep == ',' && false !== ( $sep_found = strpos( $amount, $decimal_sep ) ) ) {
-        $whole = substr( $amount, 0, $sep_found );
-        $part = substr( $amount, $sep_found + 1, ( strlen( $amount ) - 1 ) );
+    if ($decimal_sep == ',' && false !== ($sep_found = strpos($amount, $decimal_sep))) {
+        $whole = substr($amount, 0, $sep_found);
+        $part = substr($amount, $sep_found + 1, (strlen($amount) - 1));
         $amount = $whole . '.' . $part;
     }
 
-    if ( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ',', '', $amount );
+    if ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(',', '', $amount);
     }
 
-    if ( $thousands_sep == ' ' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-        $amount = str_replace( ' ', '', $amount );
+    if ($thousands_sep == ' ' && false !== ($found = strpos($amount, $thousands_sep))) {
+        $amount = str_replace(' ', '', $amount);
     }
 
-    if ( empty( $amount ) ) {
+    if (empty($amount)) {
         $amount = 0;
     }
     
-    $decimals  = apply_filters( 'wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate );
-    $formatted = number_format( (float)$amount, $decimals, $decimal_sep, $thousands_sep );
+    $decimals  = apply_filters('wpinv_amount_format_decimals', $decimals ? $decimals : 0, $amount, $calculate);
+    $formatted = number_format((float)$amount, $decimals, $decimal_sep, $thousands_sep);
     
-    if ( $calculate ) {
-        if ( $thousands_sep === "," ) {
-            $formatted = str_replace( ",", "", $formatted );
+    if ($calculate) {
+        if ($thousands_sep === ",") {
+            $formatted = str_replace(",", "", $formatted);
         }
         
-        if ( $decimal_sep === "," ) {
-            $formatted = str_replace( ",", ".", $formatted );
+        if ($decimal_sep === ",") {
+            $formatted = str_replace(",", ".", $formatted);
         }
     }
 
-    return apply_filters( 'wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate );
+    return apply_filters('wpinv_amount_format', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep, $calculate);
 }
-add_filter( 'wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1 );
+add_filter('wpinv_amount_format_decimals', 'wpinv_currency_decimal_filter', 10, 1);
 
-function wpinv_sanitize_key( $key ) {
+function wpinv_sanitize_key($key) {
     $raw_key = $key;
-    $key = preg_replace( '/[^a-zA-Z0-9_\-\.\:\/]/', '', $key );
+    $key = preg_replace('/[^a-zA-Z0-9_\-\.\:\/]/', '', $key);
 
-    return apply_filters( 'wpinv_sanitize_key', $key, $raw_key );
+    return apply_filters('wpinv_sanitize_key', $key, $raw_key);
 }
 
-function wpinv_get_file_extension( $str ) {
-    $parts = explode( '.', $str );
-    return end( $parts );
+function wpinv_get_file_extension($str) {
+    $parts = explode('.', $str);
+    return end($parts);
 }
 
-function wpinv_string_is_image_url( $str ) {
-    $ext = wpinv_get_file_extension( $str );
+function wpinv_string_is_image_url($str) {
+    $ext = wpinv_get_file_extension($str);
 
-    switch ( strtolower( $ext ) ) {
+    switch (strtolower($ext)) {
         case 'jpeg';
         case 'jpg';
             $return = true;
@@ -389,32 +389,32 @@ 
             break;
     }
 
-    return (bool)apply_filters( 'wpinv_string_is_image', $return, $str );
+    return (bool)apply_filters('wpinv_string_is_image', $return, $str);
 }
 
-function wpinv_error_log( $log, $title = '', $file = '', $line = '', $exit = false ) {
-    $should_log = apply_filters( 'wpinv_log_errors', WP_DEBUG );
+function wpinv_error_log($log, $title = '', $file = '', $line = '', $exit = false) {
+    $should_log = apply_filters('wpinv_log_errors', WP_DEBUG);
     
-    if ( true === $should_log ) {
+    if (true === $should_log) {
         $label = '';
-        if ( $file && $file !== '' ) {
-            $label .= basename( $file ) . ( $line ? '(' . $line . ')' : '' );
+        if ($file && $file !== '') {
+            $label .= basename($file) . ($line ? '(' . $line . ')' : '');
         }
         
-        if ( $title && $title !== '' ) {
+        if ($title && $title !== '') {
             $label = $label !== '' ? $label . ' ' : '';
             $label .= $title . ' ';
         }
         
-        $label = $label !== '' ? trim( $label ) . ' : ' : '';
+        $label = $label !== '' ? trim($label) . ' : ' : '';
         
-        if ( is_array( $log ) || is_object( $log ) ) {
-            error_log( $label . print_r( $log, true ) );
+        if (is_array($log) || is_object($log)) {
+            error_log($label . print_r($log, true));
         } else {
-            error_log( $label . $log );
+            error_log($label . $log);
         }
         
-        if ( $exit ) {
+        if ($exit) {
             exit;
         }
     }
@@ -422,65 +422,65 @@ 
 
 function wpinv_is_ajax_disabled() {
     $retval = false;
-    return apply_filters( 'wpinv_is_ajax_disabled', $retval );
+    return apply_filters('wpinv_is_ajax_disabled', $retval);
 }
 
-function wpinv_get_current_page_url( $nocache = false ) {
+function wpinv_get_current_page_url($nocache = false) {
     global $wp;
 
-    if ( get_option( 'permalink_structure' ) ) {
-        $base = trailingslashit( home_url( $wp->request ) );
+    if (get_option('permalink_structure')) {
+        $base = trailingslashit(home_url($wp->request));
     } else {
-        $base = add_query_arg( $wp->query_string, '', trailingslashit( home_url( $wp->request ) ) );
-        $base = remove_query_arg( array( 'post_type', 'name' ), $base );
+        $base = add_query_arg($wp->query_string, '', trailingslashit(home_url($wp->request)));
+        $base = remove_query_arg(array('post_type', 'name'), $base);
     }
 
     $scheme = is_ssl() ? 'https' : 'http';
-    $uri    = set_url_scheme( $base, $scheme );
+    $uri    = set_url_scheme($base, $scheme);
 
-    if ( is_front_page() ) {
-        $uri = home_url( '/' );
-    } elseif ( wpinv_is_checkout( array(), false ) ) {
+    if (is_front_page()) {
+        $uri = home_url('/');
+    } elseif (wpinv_is_checkout(array(), false)) {
         $uri = wpinv_get_checkout_uri();
     }
 
-    $uri = apply_filters( 'wpinv_get_current_page_url', $uri );
+    $uri = apply_filters('wpinv_get_current_page_url', $uri);
 
-    if ( $nocache ) {
-        $uri = wpinv_add_cache_busting( $uri );
+    if ($nocache) {
+        $uri = wpinv_add_cache_busting($uri);
     }
 
     return $uri;
 }
 
 function wpinv_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
-function wpinv_rgb_from_hex( $color ) {
-    $color = str_replace( '#', '', $color );
+function wpinv_rgb_from_hex($color) {
+    $color = str_replace('#', '', $color);
     // Convert shorthand colors to full format, e.g. "FFF" -> "FFFFFF"
-    $color = preg_replace( '~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color );
+    $color = preg_replace('~^(.)(.)(.)$~', '$1$1$2$2$3$3', $color);
 
     $rgb      = array();
-    $rgb['R'] = hexdec( $color{0}.$color{1} );
-    $rgb['G'] = hexdec( $color{2}.$color{3} );
-    $rgb['B'] = hexdec( $color{4}.$color{5} );
+    $rgb['R'] = hexdec($color{0} . $color{1} );
+    $rgb['G'] = hexdec($color{2} . $color{3} );
+    $rgb['B'] = hexdec($color{4} . $color{5} );
 
     return $rgb;
 }
 
-function wpinv_hex_darker( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_darker($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = $v / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v - $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -489,18 +489,18 @@ 
     return $color;
 }
 
-function wpinv_hex_lighter( $color, $factor = 30 ) {
-    $base  = wpinv_rgb_from_hex( $color );
+function wpinv_hex_lighter($color, $factor = 30) {
+    $base  = wpinv_rgb_from_hex($color);
     $color = '#';
 
-    foreach ( $base as $k => $v ) {
+    foreach ($base as $k => $v) {
         $amount      = 255 - $v;
         $amount      = $amount / 100;
-        $amount      = round( $amount * $factor );
+        $amount      = round($amount * $factor);
         $new_decimal = $v + $amount;
 
-        $new_hex_component = dechex( $new_decimal );
-        if ( strlen( $new_hex_component ) < 2 ) {
+        $new_hex_component = dechex($new_decimal);
+        if (strlen($new_hex_component) < 2) {
             $new_hex_component = "0" . $new_hex_component;
         }
         $color .= $new_hex_component;
@@ -509,22 +509,22 @@ 
     return $color;
 }
 
-function wpinv_light_or_dark( $color, $dark = '#000000', $light = '#FFFFFF' ) {
-    $hex = str_replace( '#', '', $color );
+function wpinv_light_or_dark($color, $dark = '#000000', $light = '#FFFFFF') {
+    $hex = str_replace('#', '', $color);
 
-    $c_r = hexdec( substr( $hex, 0, 2 ) );
-    $c_g = hexdec( substr( $hex, 2, 2 ) );
-    $c_b = hexdec( substr( $hex, 4, 2 ) );
+    $c_r = hexdec(substr($hex, 0, 2));
+    $c_g = hexdec(substr($hex, 2, 2));
+    $c_b = hexdec(substr($hex, 4, 2));
 
-    $brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000;
+    $brightness = (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 
     return $brightness > 155 ? $dark : $light;
 }
 
-function wpinv_format_hex( $hex ) {
-    $hex = trim( str_replace( '#', '', $hex ) );
+function wpinv_format_hex($hex) {
+    $hex = trim(str_replace('#', '', $hex));
 
-    if ( strlen( $hex ) == 3 ) {
+    if (strlen($hex) == 3) {
         $hex = $hex[0] . $hex[0] . $hex[1] . $hex[1] . $hex[2] . $hex[2];
     }
 
@@ -544,12 +544,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strimwidth' ) ) {
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
+function wpinv_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
+    if (function_exists('mb_strimwidth')) {
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
     }
     
-    return wpinv_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
+    return wpinv_utf8_substr($str, $start, $width, $encoding) . $trimmaker;
 }
 
 /**
@@ -561,28 +561,28 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the number of characters in string.
  */
-function wpinv_utf8_strlen( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        return mb_strlen( $str, $encoding );
+function wpinv_utf8_strlen($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        return mb_strlen($str, $encoding);
     }
         
-    return strlen( $str );
+    return strlen($str);
 }
 
-function wpinv_utf8_strtolower( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtolower' ) ) {
-        return mb_strtolower( $str, $encoding );
+function wpinv_utf8_strtolower($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtolower')) {
+        return mb_strtolower($str, $encoding);
     }
     
-    return strtolower( $str );
+    return strtolower($str);
 }
 
-function wpinv_utf8_strtoupper( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strtoupper' ) ) {
-        return mb_strtoupper( $str, $encoding );
+function wpinv_utf8_strtoupper($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strtoupper')) {
+        return mb_strtoupper($str, $encoding);
     }
     
-    return strtoupper( $str );
+    return strtoupper($str);
 }
 
 /**
@@ -596,12 +596,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the first occurrence of search in the string.
  */
-function wpinv_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strpos' ) ) {
-        return mb_strpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strpos')) {
+        return mb_strpos($str, $find, $offset, $encoding);
     }
         
-    return strpos( $str, $find, $offset );
+    return strpos($str, $find, $offset);
 }
 
 /**
@@ -615,12 +615,12 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return int Returns the position of the last occurrence of search.
  */
-function wpinv_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strrpos' ) ) {
-        return mb_strrpos( $str, $find, $offset, $encoding );
+function wpinv_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
+    if (function_exists('mb_strrpos')) {
+        return mb_strrpos($str, $find, $offset, $encoding);
     }
         
-    return strrpos( $str, $find, $offset );
+    return strrpos($str, $find, $offset);
 }
 
 /**
@@ -635,16 +635,16 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string
  */
-function wpinv_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_substr' ) ) {
-        if ( $length === null ) {
-            return mb_substr( $str, $start, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+function wpinv_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
+    if (function_exists('mb_substr')) {
+        if ($length === null) {
+            return mb_substr($str, $start, wpinv_utf8_strlen($str, $encoding), $encoding);
         } else {
-            return mb_substr( $str, $start, $length, $encoding );
+            return mb_substr($str, $start, $length, $encoding);
         }
     }
         
-    return substr( $str, $start, $length );
+    return substr($str, $start, $length);
 }
 
 /**
@@ -656,48 +656,48 @@ 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
  * @return string The width of string.
  */
-function wpinv_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strwidth' ) ) {
-        return mb_strwidth( $str, $encoding );
+function wpinv_utf8_strwidth($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_strwidth')) {
+        return mb_strwidth($str, $encoding);
     }
     
-    return wpinv_utf8_strlen( $str, $encoding );
+    return wpinv_utf8_strlen($str, $encoding);
 }
 
-function wpinv_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_strlen' ) ) {
-        $first_letter = wpinv_utf8_strtoupper( wpinv_utf8_substr( $str, 0, 1, $encoding ), $encoding );
+function wpinv_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
+    if (function_exists('mb_strlen')) {
+        $first_letter = wpinv_utf8_strtoupper(wpinv_utf8_substr($str, 0, 1, $encoding), $encoding);
         $str_end = "";
         
-        if ( $lower_str_end ) {
-            $str_end = wpinv_utf8_strtolower( wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
+        if ($lower_str_end) {
+            $str_end = wpinv_utf8_strtolower(wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding), $encoding);
         } else {
-            $str_end = wpinv_utf8_substr( $str, 1, wpinv_utf8_strlen( $str, $encoding ), $encoding );
+            $str_end = wpinv_utf8_substr($str, 1, wpinv_utf8_strlen($str, $encoding), $encoding);
         }
 
         return $first_letter . $str_end;
     }
     
-    return ucfirst( $str );
+    return ucfirst($str);
 }
 
-function wpinv_utf8_ucwords( $str, $encoding = 'UTF-8' ) {
-    if ( function_exists( 'mb_convert_case' ) ) {
-        return mb_convert_case( $str, MB_CASE_TITLE, $encoding );
+function wpinv_utf8_ucwords($str, $encoding = 'UTF-8') {
+    if (function_exists('mb_convert_case')) {
+        return mb_convert_case($str, MB_CASE_TITLE, $encoding);
     }
     
-    return ucwords( $str );
+    return ucwords($str);
 }
 
-function wpinv_period_in_days( $period, $unit ) {
-    $period = absint( $period );
+function wpinv_period_in_days($period, $unit) {
+    $period = absint($period);
     
-    if ( $period > 0 ) {
-        if ( in_array( strtolower( $unit ), array( 'w', 'week', 'weeks' ) ) ) {
+    if ($period > 0) {
+        if (in_array(strtolower($unit), array('w', 'week', 'weeks'))) {
             $period = $period * 7;
-        } else if ( in_array( strtolower( $unit ), array( 'm', 'month', 'months' ) ) ) {
+        } else if (in_array(strtolower($unit), array('m', 'month', 'months'))) {
             $period = $period * 30;
-        } else if ( in_array( strtolower( $unit ), array( 'y', 'year', 'years' ) ) ) {
+        } else if (in_array(strtolower($unit), array('y', 'year', 'years'))) {
             $period = $period * 365;
         }
     }