AyeCode / invoicing

templates/emails/wpinv-email-footer.php

Spacing +3 added lines, -3 removed lines

@@ -1,10 +1,10 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-$email_footer = apply_filters( 'wpinv_email_footer_text', wpinv_get_option( 'email_footer_text', get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ) ) );
-$email_footer = $email_footer ? wpautop( wp_kses_post( wptexturize( $email_footer ) ) ) : '';
+$email_footer = apply_filters('wpinv_email_footer_text', wpinv_get_option('email_footer_text', get_bloginfo('name', 'display') . ' - ' . __('Powered by GetPaid', 'invoicing')));
+$email_footer = $email_footer ? wpautop(wp_kses_post(wptexturize($email_footer))) : '';
 ?>
                                                             </div>
                                                         </td>

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
     die('-1');
+}
 
 $email_footer = apply_filters( 'wpinv_email_footer_text', wpinv_get_option( 'email_footer_text', get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ) ) );
 $email_footer = $email_footer ? wpautop( wp_kses_post( wptexturize( $email_footer ) ) ) : '';

templates/payment-forms/elements/billing_email.php

Spacing +13 added lines, -13 removed lines

@@ -7,35 +7,35 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $value = '';
 $class = '';
 
-if ( ! empty( $form->invoice ) ) {
-    $value   = sanitize_email( $form->invoice->get_email() );
-} else if ( is_user_logged_in() ) {
+if (!empty($form->invoice)) {
+    $value = sanitize_email($form->invoice->get_email());
+} else if (is_user_logged_in()) {
     $user  = wp_get_current_user();
-    $value = sanitize_email( $user->user_email );
+    $value = sanitize_email($user->user_email);
 }
 
-if ( ! empty( $value ) && ! empty( $hide_billing_email ) ) {
+if (!empty($value) && !empty($hide_billing_email)) {
     $class = 'd-none';
 }
 
-do_action( 'getpaid_before_payment_form_billing_email', $form );
+do_action('getpaid_before_payment_form_billing_email', $form);
 
 echo "<span class='$class'>";
 
 echo aui()->input(
     array(
         'name'       => 'billing_email',
-        'id'         => esc_attr( $id ) . uniqid( '_' ),
-        'placeholder'=> empty( $placeholder ) ? '' : esc_attr( $placeholder ),
-        'required'   => ! empty( $required ),
-        'label'      => empty( $label ) ? '' : wp_kses_post( $label ) . '<span class="text-danger"> *</span>',
+        'id'         => esc_attr($id) . uniqid('_'),
+        'placeholder'=> empty($placeholder) ? '' : esc_attr($placeholder),
+        'required'   => !empty($required),
+        'label'      => empty($label) ? '' : wp_kses_post($label) . '<span class="text-danger"> *</span>',
         'label_type' => 'vertical',
-        'help_text'  => empty( $description ) ? '' : wp_kses_post( $description ),
+        'help_text'  => empty($description) ? '' : wp_kses_post($description),
         'type'       => 'email',
         'value'      => $value,
         'class'      => 'wpinv_billing_email',
@@ -47,4 +47,4 @@ 
 
 echo '</span>';
 
-do_action( 'getpaid_after_payment_form_billing_email', $form );
+do_action('getpaid_after_payment_form_billing_email', $form);

includes/admin/class-getpaid-metaboxes.php

Indentation +231 added lines, -231 removed lines

@@ -12,267 +12,267 @@
  */
 class GetPaid_Metaboxes {
 
-	/**
-	 * Only save metaboxes once.
-	 *
-	 * @var boolean
-	 */
-	private static $saved_meta_boxes = false;
-
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
-
-		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
-
-		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
-
-		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
-
-		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
-	}
+     * Only save metaboxes once.
+     *
+     * @var boolean
+     */
+    private static $saved_meta_boxes = false;
 
-	/**
-	 * Register core metaboxes.
-	 */
-	public static function add_meta_boxes( $post_type, $post ) {
-
-		// For invoices...
-		self::add_invoice_meta_boxes( $post_type, $post );
+    /**
+     * Hook in methods.
+     */
+    public static function init() {
 
-		// For payment forms.
-		self::add_payment_form_meta_boxes( $post_type );
+        // Register metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
 
-		// For invoice items.
-		self::add_item_meta_boxes( $post_type );
+        // Remove metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
 
-		// For invoice discounts.
-		if ( $post_type == 'wpi_discount' ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
-		}
+        // Rename metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
 
-	}
+        // Save metaboxes.
+        add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+    }
 
-	/**
-	 * Register core metaboxes.
-	 */
-	protected static function add_payment_form_meta_boxes( $post_type ) {
+    /**
+     * Register core metaboxes.
+     */
+    public static function add_meta_boxes( $post_type, $post ) {
 
-		// For payment forms.
-		if ( $post_type == 'wpi_payment_form' ) {
+        // For invoices...
+        self::add_invoice_meta_boxes( $post_type, $post );
 
-			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+        // For payment forms.
+        self::add_payment_form_meta_boxes( $post_type );
 
-			// Payment form information.
-			add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+        // For invoice items.
+        self::add_item_meta_boxes( $post_type );
 
-		}
+        // For invoice discounts.
+        if ( $post_type == 'wpi_discount' ) {
+            add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+        }
 
-	}
+    }
 
-	/**
-	 * Register core metaboxes.
-	 */
-	protected static function add_item_meta_boxes( $post_type ) {
+    /**
+     * Register core metaboxes.
+     */
+    protected static function add_payment_form_meta_boxes( $post_type ) {
 
-		if ( $post_type == 'wpi_item' ) {
+        // For payment forms.
+        if ( $post_type == 'wpi_payment_form' ) {
 
-			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+            // Design payment form.
+            add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
 
-			// If taxes are enabled, register the tax metabox.
-			if ( wpinv_use_taxes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
-			}
+            // Payment form information.
+            add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
 
-			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+        }
 
-		}
+    }
 
-	}
+    /**
+     * Register core metaboxes.
+     */
+    protected static function add_item_meta_boxes( $post_type ) {
 
-	/**
-	 * Register invoice metaboxes.
-	 */
-	protected static function add_invoice_meta_boxes( $post_type, $post ) {
+        if ( $post_type == 'wpi_item' ) {
 
-		// For invoices...
-		if ( getpaid_is_invoice_post_type( $post_type ) ) {
-			$invoice = new WPInv_Invoice( $post );
+            // Item details.
+            add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
 
-			// Resend invoice.
-			if ( ! $invoice->is_draft() ) {
+            // If taxes are enabled, register the tax metabox.
+            if ( wpinv_use_taxes() ) {
+                add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+            }
 
-				add_meta_box(
-					'wpinv-mb-resend-invoice',
-					sprintf(
-						__( 'Resend %s', 'invoicing' ),
-						ucfirst( $invoice->get_invoice_quote_type() )
-					),
-					'GetPaid_Meta_Box_Resend_Invoice::output',
-					$post_type,
-					'side',
-					'low'
-				);
+            // Item info.
+            add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
 
-			}
+        }
 
-			// Subscriptions.
-			$subscription = getpaid_get_invoice_subscription( $invoice );
-			if ( ! empty( $subscription ) ) {
-				add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
-				add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
-			}
-
-			// Invoice details.
-			add_meta_box(
-				'wpinv-details',
-				sprintf(
-					__( '%s Details', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'GetPaid_Meta_Box_Invoice_Details::output',
-				$post_type,
-				'side'
-			);
-
-			// Payment details.
-			if ( ! $invoice->is_draft() ) {
-				add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
-			}
+    }
 
-			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
+    /**
+     * Register invoice metaboxes.
+     */
+    protected static function add_invoice_meta_boxes( $post_type, $post ) {
+
+        // For invoices...
+        if ( getpaid_is_invoice_post_type( $post_type ) ) {
+            $invoice = new WPInv_Invoice( $post );
+
+            // Resend invoice.
+            if ( ! $invoice->is_draft() ) {
+
+                add_meta_box(
+                    'wpinv-mb-resend-invoice',
+                    sprintf(
+                        __( 'Resend %s', 'invoicing' ),
+                        ucfirst( $invoice->get_invoice_quote_type() )
+                    ),
+                    'GetPaid_Meta_Box_Resend_Invoice::output',
+                    $post_type,
+                    'side',
+                    'low'
+                );
+
+            }
+
+            // Subscriptions.
+            $subscription = getpaid_get_invoice_subscription( $invoice );
+            if ( ! empty( $subscription ) ) {
+                add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
+                add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
+            }
+
+            // Invoice details.
+            add_meta_box(
+                'wpinv-details',
+                sprintf(
+                    __( '%s Details', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'GetPaid_Meta_Box_Invoice_Details::output',
+                $post_type,
+                'side'
+            );
+
+            // Payment details.
+            if ( ! $invoice->is_draft() ) {
+                add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
+            }
+
+            // Billing details.
+            add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
 			
-			// Invoice items.
-			add_meta_box(
-				'wpinv-items',
-				sprintf(
-					__( '%s Items', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'GetPaid_Meta_Box_Invoice_Items::output',
-				$post_type,
-				'normal',
-				'high'
-			);
+            // Invoice items.
+            add_meta_box(
+                'wpinv-items',
+                sprintf(
+                    __( '%s Items', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'GetPaid_Meta_Box_Invoice_Items::output',
+                $post_type,
+                'normal',
+                'high'
+            );
 			
-			// Invoice notes.
-			add_meta_box(
-				'wpinv-notes',
-				sprintf(
-					__( '%s Notes', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'WPInv_Meta_Box_Notes::output',
-				$post_type,
-				'side',
-				'low'
-			);
-
-			// Shipping Address.
-			if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
-				add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
-			}
-
-			// Payment form information.
-			if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
-			}
-
-		}
-
-	}
-
-	/**
-	 * Remove some metaboxes.
-	 */
-	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
-	}
-
-	/**
-	 * Rename other metaboxes.
-	 */
-	public static function rename_meta_boxes() {
+            // Invoice notes.
+            add_meta_box(
+                'wpinv-notes',
+                sprintf(
+                    __( '%s Notes', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'WPInv_Meta_Box_Notes::output',
+                $post_type,
+                'side',
+                'low'
+            );
+
+            // Shipping Address.
+            if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
+                add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
+            }
+
+            // Payment form information.
+            if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
+                add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
+            }
+
+        }
+
+    }
+
+    /**
+     * Remove some metaboxes.
+     */
+    public static function remove_meta_boxes() {
+        remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+    }
+
+    /**
+     * Rename other metaboxes.
+     */
+    public static function rename_meta_boxes() {
 		
-	}
-
-	/**
-	 * Check if we're saving, then trigger an action based on the post type.
-	 *
-	 * @param  int    $post_id Post ID.
-	 * @param  object $post Post object.
-	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_unslash( $_POST );
-
-		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
-			return;
-		}
-
-		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
-			return;
-		}
-
-		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
-			return;
-		}
-
-		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
-			return;
-		}
-
-		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
-			return;
-		}
-
-		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			return;
-		}
-
-		if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
-
-			// We need this save event to run once to avoid potential endless loops.
-			self::$saved_meta_boxes = true;
-
-			return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
-
-		}
-
-		// Ensure this is our post type.
-		$post_types_map = array(
-			'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
-			'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
-			'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
-		);
-
-		// Is this our post type?
-		if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
-			return;
-		}
-
-		// We need this save event to run once to avoid potential endless loops.
-		self::$saved_meta_boxes = true;
+    }
+
+    /**
+     * Check if we're saving, then trigger an action based on the post type.
+     *
+     * @param  int    $post_id Post ID.
+     * @param  object $post Post object.
+     */
+    public static function save_meta_boxes( $post_id, $post ) {
+        $post_id = absint( $post_id );
+        $data    = wp_unslash( $_POST );
+
+        // Do not save for ajax requests.
+        if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+            return;
+        }
+
+        // $post_id and $post are required
+        if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+            return;
+        }
+
+        // Dont' save meta boxes for revisions or autosaves.
+        if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+            return;
+        }
+
+        // Check the nonce.
+        if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+            return;
+        }
+
+        // Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
+        if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+            return;
+        }
+
+        // Check user has permission to edit.
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+            return;
+        }
+
+        if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+
+            // We need this save event to run once to avoid potential endless loops.
+            self::$saved_meta_boxes = true;
+
+            return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
+
+        }
+
+        // Ensure this is our post type.
+        $post_types_map = array(
+            'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
+            'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
+            'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
+        );
+
+        // Is this our post type?
+        if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
+            return;
+        }
+
+        // We need this save event to run once to avoid potential endless loops.
+        self::$saved_meta_boxes = true;
 		
-		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, $_POST, $post );
+        // Save the post.
+        $class = $post_types_map[ $post->post_type ];
+        $class::save( $post_id, $_POST, $post );
 
-	}
+    }
 
 }

Spacing +59 added lines, -59 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Metaboxes Admin Class
@@ -25,35 +25,35 @@ 
 	public static function init() {
 
 		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2);
 
 		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30);
 
 		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45);
 
 		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+		add_action('save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2);
 	}
 
 	/**
 	 * Register core metaboxes.
 	 */
-	public static function add_meta_boxes( $post_type, $post ) {
+	public static function add_meta_boxes($post_type, $post) {
 
 		// For invoices...
-		self::add_invoice_meta_boxes( $post_type, $post );
+		self::add_invoice_meta_boxes($post_type, $post);
 
 		// For payment forms.
-		self::add_payment_form_meta_boxes( $post_type );
+		self::add_payment_form_meta_boxes($post_type);
 
 		// For invoice items.
-		self::add_item_meta_boxes( $post_type );
+		self::add_item_meta_boxes($post_type);
 
 		// For invoice discounts.
-		if ( $post_type == 'wpi_discount' ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+		if ($post_type == 'wpi_discount') {
+			add_meta_box('wpinv_discount_details', __('Discount Details', 'invoicing'), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high');
 		}
 
 	}
@@ -61,16 +61,16 @@ 
 	/**
 	 * Register core metaboxes.
 	 */
-	protected static function add_payment_form_meta_boxes( $post_type ) {
+	protected static function add_payment_form_meta_boxes($post_type) {
 
 		// For payment forms.
-		if ( $post_type == 'wpi_payment_form' ) {
+		if ($post_type == 'wpi_payment_form') {
 
 			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+			add_meta_box('wpinv-payment-form-design', __('Payment Form', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal');
 
 			// Payment form information.
-			add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+			add_meta_box('wpinv-payment-form-info', __('Details', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side');
 
 		}
 
@@ -79,20 +79,20 @@ 
 	/**
 	 * Register core metaboxes.
 	 */
-	protected static function add_item_meta_boxes( $post_type ) {
+	protected static function add_item_meta_boxes($post_type) {
 
-		if ( $post_type == 'wpi_item' ) {
+		if ($post_type == 'wpi_item') {
 
 			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+			add_meta_box('wpinv_item_details', __('Item Details', 'invoicing'), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high');
 
 			// If taxes are enabled, register the tax metabox.
-			if ( wpinv_use_taxes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+			if (wpinv_use_taxes()) {
+				add_meta_box('wpinv_item_vat', __('Tax', 'invoicing'), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high');
 			}
 
 			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+			add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core');
 
 		}
 
@@ -101,20 +101,20 @@ 
 	/**
 	 * Register invoice metaboxes.
 	 */
-	protected static function add_invoice_meta_boxes( $post_type, $post ) {
+	protected static function add_invoice_meta_boxes($post_type, $post) {
 
 		// For invoices...
-		if ( getpaid_is_invoice_post_type( $post_type ) ) {
-			$invoice = new WPInv_Invoice( $post );
+		if (getpaid_is_invoice_post_type($post_type)) {
+			$invoice = new WPInv_Invoice($post);
 
 			// Resend invoice.
-			if ( ! $invoice->is_draft() ) {
+			if (!$invoice->is_draft()) {
 
 				add_meta_box(
 					'wpinv-mb-resend-invoice',
 					sprintf(
-						__( 'Resend %s', 'invoicing' ),
-						ucfirst( $invoice->get_invoice_quote_type() )
+						__('Resend %s', 'invoicing'),
+						ucfirst($invoice->get_invoice_quote_type())
 					),
 					'GetPaid_Meta_Box_Resend_Invoice::output',
 					$post_type,
@@ -125,18 +125,18 @@ 
 			}
 
 			// Subscriptions.
-			$subscription = getpaid_get_invoice_subscription( $invoice );
-			if ( ! empty( $subscription ) ) {
-				add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
-				add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
+			$subscription = getpaid_get_invoice_subscription($invoice);
+			if (!empty($subscription)) {
+				add_meta_box('wpinv-mb-subscriptions', __('Subscription Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced');
+				add_meta_box('wpinv-mb-subscription-invoices', __('Related Payments', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced');
 			}
 
 			// Invoice details.
 			add_meta_box(
 				'wpinv-details',
 				sprintf(
-					__( '%s Details', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Details', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'GetPaid_Meta_Box_Invoice_Details::output',
 				$post_type,
@@ -144,19 +144,19 @@ 
 			);
 
 			// Payment details.
-			if ( ! $invoice->is_draft() ) {
-				add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
+			if (!$invoice->is_draft()) {
+				add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default');
 			}
 
 			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
+			add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high');
 			
 			// Invoice items.
 			add_meta_box(
 				'wpinv-items',
 				sprintf(
-					__( '%s Items', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Items', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'GetPaid_Meta_Box_Invoice_Items::output',
 				$post_type,
@@ -168,8 +168,8 @@ 
 			add_meta_box(
 				'wpinv-notes',
 				sprintf(
-					__( '%s Notes', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Notes', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'WPInv_Meta_Box_Notes::output',
 				$post_type,
@@ -178,13 +178,13 @@ 
 			);
 
 			// Shipping Address.
-			if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
-				add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
+			if (get_post_meta($invoice->get_id(), 'shipping_address', true)) {
+				add_meta_box('wpinv-invoice-shipping-details', __('Shipping Address', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high');
 			}
 
 			// Payment form information.
-			if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
+			if (get_post_meta($invoice->get_id(), 'payment_form_data', true)) {
+				add_meta_box('wpinv-invoice-payment-form-details', __('Payment Form Details', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high');
 			}
 
 		}
@@ -195,7 +195,7 @@ 
 	 * Remove some metaboxes.
 	 */
 	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+		remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
 	}
 
 	/**
@@ -211,46 +211,46 @@ 
 	 * @param  int    $post_id Post ID.
 	 * @param  object $post Post object.
 	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_unslash( $_POST );
+	public static function save_meta_boxes($post_id, $post) {
+		$post_id = absint($post_id);
+		$data    = wp_unslash($_POST);
 
 		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+		if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
 			return;
 		}
 
 		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+		if (empty($post_id) || empty($post) || self::$saved_meta_boxes) {
 			return;
 		}
 
 		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+		if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
 			return;
 		}
 
 		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+		if (empty($data['getpaid_meta_nonce']) || !wp_verify_nonce($data['getpaid_meta_nonce'], 'getpaid_meta_nonce')) {
 			return;
 		}
 
 		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+		if (empty($data['post_ID']) || absint($data['post_ID']) !== $post_id) {
 			return;
 		}
 
 		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if (!current_user_can('edit_post', $post_id)) {
 			return;
 		}
 
-		if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+		if (getpaid_is_invoice_post_type($post->post_type)) {
 
 			// We need this save event to run once to avoid potential endless loops.
 			self::$saved_meta_boxes = true;
 
-			return GetPaid_Meta_Box_Invoice_Address::save( $post_id );
+			return GetPaid_Meta_Box_Invoice_Address::save($post_id);
 
 		}
 
@@ -262,7 +262,7 @@ 
 		);
 
 		// Is this our post type?
-		if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
+		if (!isset($post_types_map[$post->post_type])) {
 			return;
 		}
 
@@ -270,8 +270,8 @@ 
 		self::$saved_meta_boxes = true;
 		
 		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, $_POST, $post );
+		$class = $post_types_map[$post->post_type];
+		$class::save($post_id, $_POST, $post);
 
 	}
 

includes/gateways/class-getpaid-manual-gateway.php

Indentation +38 added lines, -38 removed lines

@@ -13,30 +13,30 @@ 
 class GetPaid_Manual_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'manual';
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array( 'subscription', 'addons' );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 11;
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 11;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title        = __( 'Test Gateway', 'invoicing' );
@@ -46,15 +46,15 @@ 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Mark it as paid.
         $invoice->mark_paid();
@@ -68,13 +68,13 @@ 
     }
 
     /**
-	 * (Maybe) renews a manual subscription profile.
-	 *
-	 *
-	 * @param bool $should_expire
+     * (Maybe) renews a manual subscription profile.
+     *
+     *
+     * @param bool $should_expire
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $should_expire, $subscription ) {
+     */
+    public function maybe_renew_subscription( $should_expire, $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( 'manual' != $subscription->get_gateway() || ! $subscription->has_status( 'active trialling' ) ) {
@@ -102,13 +102,13 @@ 
     }
 
     /**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );

Spacing +14 added lines, -14 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Manual Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'addons' );
+    protected $supports = array('subscription', 'addons');
 
     /**
 	 * Payment method order.
@@ -39,10 +39,10 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title        = __( 'Test Gateway', 'invoicing' );
-        $this->method_title = __( 'Test Gateway', 'invoicing' );
+        $this->title        = __('Test Gateway', 'invoicing');
+        $this->method_title = __('Test Gateway', 'invoicing');
 
-        add_filter( 'getpaid_daily_maintenance_should_expire_subscription', array( $this, 'maybe_renew_subscription' ), 10, 2 );
+        add_filter('getpaid_daily_maintenance_should_expire_subscription', array($this, 'maybe_renew_subscription'), 10, 2);
     }
 
     /**
@@ -54,16 +54,16 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Mark it as paid.
         $invoice->mark_paid();
 
         // (Maybe) activate subscription.
-        getpaid_activate_invoice_subscription( $invoice );
+        getpaid_activate_invoice_subscription($invoice);
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -74,15 +74,15 @@ 
 	 * @param bool $should_expire
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $should_expire, $subscription ) {
+	public function maybe_renew_subscription($should_expire, $subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( 'manual' != $subscription->get_gateway() || ! $subscription->has_status( 'active trialling' ) ) {
+        if ('manual' != $subscription->get_gateway() || !$subscription->has_status('active trialling')) {
             return $should_expire;
         }
 
         // If this is the last renewal, complete the subscription.
-        if ( $subscription->is_last_renewal() ) {
+        if ($subscription->is_last_renewal()) {
             $subscription->complete();
             return false;
         }
@@ -108,10 +108,10 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();

includes/data/default-payment-form.php

Spacing +17 added lines, -17 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
@@ -16,7 +16,7 @@ 
 
         'placeholder' => 'jon@snow.com',
         'value'       => '',
-        'label'       => __( 'Billing Email', 'invoicing' ),
+        'label'       => __('Billing Email', 'invoicing'),
         'description' => '',
         'required'    => true,
         'id'          => 'mmdwqzpox',
@@ -34,7 +34,7 @@ 
             array(
                 'placeholder'  => 'Jon',
                 'value'        => '',
-                'label'        => __( 'First Name', 'invoicing' ),
+                'label'        => __('First Name', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -44,7 +44,7 @@ 
             array(
                 'placeholder'  => 'Snow',
                 'value'        => '',
-                'label'        => __( 'Last Name', 'invoicing' ),
+                'label'        => __('Last Name', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -54,7 +54,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'Address', 'invoicing' ),
+                'label'        => __('Address', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -64,7 +64,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'City', 'invoicing' ),
+                'label'        => __('City', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -72,9 +72,9 @@ 
             ),
 
             array(
-                'placeholder'  => __( 'Select your country' ),
+                'placeholder'  => __('Select your country'),
                 'value'        => '',
-                'label'        => __( 'Country', 'invoicing' ),
+                'label'        => __('Country', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -82,9 +82,9 @@ 
             ),
 
             array(
-                'placeholder'  => __( 'Choose a state', 'invoicing' ),
+                'placeholder'  => __('Choose a state', 'invoicing'),
                 'value'        => '',
-                'label'        => __( 'State / Province', 'invoicing' ),
+                'label'        => __('State / Province', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -94,7 +94,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'ZIP / Postcode', 'invoicing' ),
+                'label'        => __('ZIP / Postcode', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -104,7 +104,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'Phone', 'invoicing' ),
+                'label'        => __('Phone', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -114,7 +114,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'Company', 'invoicing' ),
+                'label'        => __('Company', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -124,7 +124,7 @@ 
             array(
                 'placeholder'  => '',
                 'value'        => '',
-                'label'        => __( 'VAT Number', 'invoicing' ),
+                'label'        => __('VAT Number', 'invoicing'),
                 'description'  => '',
                 'required'     => false,
                 'visible'      => true,
@@ -146,7 +146,7 @@ 
     ),
 
     array(
-        'text'    => __( 'Select Payment Method', 'invoicing' ),
+        'text'    => __('Select Payment Method', 'invoicing'),
         'id'          => 'gtscicd',
         'name'        => 'gtscicd',
         'type'        => 'gateway_select',
@@ -158,8 +158,8 @@ 
 
         'value'       =>'',
         'class'       => 'btn-primary',
-        'label'       => __( 'Pay Now »', 'invoicing' ),
-        'description' => __( 'By continuing with your payment, you are agreeing to our privacy policy and terms of service.', 'invoicing' ),
+        'label'       => __('Pay Now »', 'invoicing'),
+        'description' => __('By continuing with your payment, you are agreeing to our privacy policy and terms of service.', 'invoicing'),
         'id'          => 'rtqljyy',
         'name'        => 'rtqljyy',
         'type'        => 'pay_button',

templates/payment-forms/elements/address.php

Indentation +24 added lines, -24 removed lines

@@ -10,7 +10,7 @@ 
 defined( 'ABSPATH' ) || exit;
 
 if ( empty( $fields ) ) {
-	return;
+    return;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
@@ -18,12 +18,12 @@ 
 
 // Prepare the user's country.
 if ( ! empty( $form->invoice ) ) {
-	$country = $form->invoice->get_country();
+    $country = $form->invoice->get_country();
 }
 
 if ( empty( $country ) ) {
-	$country = empty( $country ) ? getpaid_get_ip_country() : $country;
-	$country = empty( $country ) ? wpinv_get_default_country() : $country;
+    $country = empty( $country ) ? getpaid_get_ip_country() : $country;
+    $country = empty( $country ) ? wpinv_get_default_country() : $country;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
@@ -55,10 +55,10 @@ 
 	<!-- Start Billing Address -->
 	<div class="getpaid-billing-address-wrapper">
 		<?php
-			$field_type = 'billing';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_billing_fields', $form );
-		?>
+            $field_type = 'billing';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+            do_action( 'getpaid_after_payment_form_billing_fields', $form );
+        ?>
 	</div>
 	<!-- End Billing Address -->
 
@@ -70,19 +70,19 @@ 
 
 	<?php
 
-		echo aui()->input(
-		    array(
-			    'type'       => 'checkbox',
-			    'name'       => 'same-shipping-address',
-			    'id'         => "shipping-toggle$uniqid",
-			    'required'   => false,
-			    'label'      => wp_kses_post( $shipping_address_toggle ),
-			    'value'      => 1,
-			    'checked'    => true,
-		    )
-		);
+        echo aui()->input(
+            array(
+                'type'       => 'checkbox',
+                'name'       => 'same-shipping-address',
+                'id'         => "shipping-toggle$uniqid",
+                'required'   => false,
+                'label'      => wp_kses_post( $shipping_address_toggle ),
+                'value'      => 1,
+                'checked'    => true,
+            )
+        );
 
-	?>
+    ?>
 
 
 	<!-- Start Shipping Address Title -->
@@ -101,10 +101,10 @@ 
 	<!-- Start Shipping Address -->
 	<div class="getpaid-shipping-address-wrapper">
 		<?php
-			$field_type = 'shipping';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_shipping_fields', $form );
-		?>
+            $field_type = 'shipping';
+            include plugin_dir_path( __FILE__ ) . 'address-fields.php';
+            do_action( 'getpaid_after_payment_form_shipping_fields', $form );
+        ?>
 	</div>
 	<!-- End Shipping Address -->
 

Spacing +21 added lines, -21 removed lines

@@ -7,57 +7,57 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( empty( $fields ) ) {
+if (empty($fields)) {
 	return;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
-$uniqid = uniqid( '_' );
+$uniqid = uniqid('_');
 
 // Prepare the user's country.
-if ( ! empty( $form->invoice ) ) {
+if (!empty($form->invoice)) {
 	$country = $form->invoice->get_country();
 }
 
-if ( empty( $country ) ) {
-	$country = empty( $country ) ? getpaid_get_ip_country() : $country;
-	$country = empty( $country ) ? wpinv_get_default_country() : $country;
+if (empty($country)) {
+	$country = empty($country) ? getpaid_get_ip_country() : $country;
+	$country = empty($country) ? wpinv_get_default_country() : $country;
 }
 
 // A prefix for all ids (so that a form can be included in the same page multiple times).
-$uniqid = uniqid( '_' );
+$uniqid = uniqid('_');
 
-$address_type = empty( $address_type ) ? 'billing' : $address_type;
+$address_type = empty($address_type) ? 'billing' : $address_type;
 
 ?>
 
-<?php if ( 'both' === $address_type ) : ?>
+<?php if ('both' === $address_type) : ?>
 
 	<!-- Start Billing/Shipping Address Title -->
 	<h4 class="mb-3 getpaid-shipping-billing-address-title">
-		<?php _e( 'Billing / Shipping Address', 'invoicing' ); ?>
+		<?php _e('Billing / Shipping Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Billing Address Title -->
 
 	<!-- Start Billing Address Title -->
 	<h4 class="mb-3 getpaid-billing-address-title">
-		<?php _e( 'Billing Address', 'invoicing' ); ?>
+		<?php _e('Billing Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Billing Address Title -->
 
 <?php endif; ?>
 
 
-<?php if ( 'both' === $address_type || 'billing' === $address_type ) : ?>
+<?php if ('both' === $address_type || 'billing' === $address_type) : ?>
 
 	<!-- Start Billing Address -->
 	<div class="getpaid-billing-address-wrapper">
 		<?php
 			$field_type = 'billing';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_billing_fields', $form );
+			include plugin_dir_path(__FILE__) . 'address-fields.php';
+			do_action('getpaid_after_payment_form_billing_fields', $form);
 		?>
 	</div>
 	<!-- End Billing Address -->
@@ -65,7 +65,7 @@ 
 <?php endif; ?>
 
 
-<?php if ( 'both' === $address_type ) : ?>
+<?php if ('both' === $address_type) : ?>
 
 
 	<?php
@@ -76,7 +76,7 @@ 
 			    'name'       => 'same-shipping-address',
 			    'id'         => "shipping-toggle$uniqid",
 			    'required'   => false,
-			    'label'      => wp_kses_post( $shipping_address_toggle ),
+			    'label'      => wp_kses_post($shipping_address_toggle),
 			    'value'      => 1,
 			    'checked'    => true,
 		    )
@@ -87,7 +87,7 @@ 
 
 	<!-- Start Shipping Address Title -->
 	<h4 class="mb-3 getpaid-shipping-address-title">
-		<?php _e( 'Shipping Address', 'invoicing' ); ?>
+		<?php _e('Shipping Address', 'invoicing'); ?>
 	</h4>
 	<!-- End Shipping Address Title -->
 
@@ -96,14 +96,14 @@ 
 
 
 	
-<?php if ( 'both' === $address_type || 'shipping' === $address_type ) : ?>
+<?php if ('both' === $address_type || 'shipping' === $address_type) : ?>
 
 	<!-- Start Shipping Address -->
 	<div class="getpaid-shipping-address-wrapper">
 		<?php
 			$field_type = 'shipping';
-			include plugin_dir_path( __FILE__ ) . 'address-fields.php';
-			do_action( 'getpaid_after_payment_form_shipping_fields', $form );
+			include plugin_dir_path(__FILE__) . 'address-fields.php';
+			do_action('getpaid_after_payment_form_shipping_fields', $form);
 		?>
 	</div>
 	<!-- End Shipping Address -->

templates/payment-forms/elements/address-fields.php

Spacing +42 added lines, -42 removed lines

@@ -11,58 +11,58 @@ 
  * @var string $country The current user's country
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 
-$field_type = sanitize_key( $field_type );
+$field_type = sanitize_key($field_type);
 
 echo "<div class='row $field_type'>";
 
-foreach ( $fields as $address_field ) {
+foreach ($fields as $address_field) {
 
     // Skip if it is hidden.
-    if ( empty( $address_field['visible'] ) ) {
+    if (empty($address_field['visible'])) {
         continue;
     }
 
-    do_action( 'getpaid_payment_form_address_field_before_' . $address_field['name'], $field_type, $address_field );
+    do_action('getpaid_payment_form_address_field_before_' . $address_field['name'], $field_type, $address_field);
 
     // Prepare variables.
-    if ( ! empty( $form->invoice ) ) {
+    if (!empty($form->invoice)) {
         $user_id = $form->invoice->get_user_id();
     }
 
-    if ( empty( $user_id ) && is_user_logged_in() ) {
+    if (empty($user_id) && is_user_logged_in()) {
         $user_id = get_current_user_id();
     }
 
     $field_name  = $address_field['name'];
     $field_name  = "{$field_type}[$field_name]";
-    $wrap_class  = getpaid_get_form_element_grid_class( $address_field );
-    $wrap_class  = esc_attr( "$wrap_class getpaid-address-field-wrapper" );
-    $placeholder = empty( $address_field['placeholder'] ) ? '' : esc_attr( $address_field['placeholder'] );
-    $description = empty( $address_field['description'] ) ? '' : wp_kses_post( $address_field['description'] );
-    $value       = ! empty( $user_id ) ? get_user_meta( $user_id, '_' . $address_field['name'], true ) : '';
-    $label       = empty( $address_field['label'] ) ? '' : wp_kses_post( $address_field['label'] );
-
-    if ( ! empty( $address_field['required'] ) ) {
+    $wrap_class  = getpaid_get_form_element_grid_class($address_field);
+    $wrap_class  = esc_attr("$wrap_class getpaid-address-field-wrapper");
+    $placeholder = empty($address_field['placeholder']) ? '' : esc_attr($address_field['placeholder']);
+    $description = empty($address_field['description']) ? '' : wp_kses_post($address_field['description']);
+    $value       = !empty($user_id) ? get_user_meta($user_id, '_' . $address_field['name'], true) : '';
+    $label       = empty($address_field['label']) ? '' : wp_kses_post($address_field['label']);
+
+    if (!empty($address_field['required'])) {
         $label .= "<span class='text-danger'> *</span>";
     }
 
     // Display the country.
-    if ( 'wpinv_country' == $address_field['name'] ) {
+    if ('wpinv_country' == $address_field['name']) {
 
         echo "<div class='form-group $wrap_class getpaid-address-field-wrapper__country'";
 
         echo aui()->select(
             array(
                 'options'     => wpinv_get_country_list(),
-                'name'        => esc_attr( $field_name ),
-                'id'          => sanitize_html_class( $field_name ) . $uniqid,
-                'value'       => sanitize_text_field( $country ),
+                'name'        => esc_attr($field_name),
+                'id'          => sanitize_html_class($field_name) . $uniqid,
+                'value'       => sanitize_text_field($country),
                 'placeholder' => $placeholder,
-                'required'    => ! empty( $address_field['required'] ),
-                'label'       => wp_kses_post( $label ),
+                'required'    => !empty($address_field['required']),
+                'label'       => wp_kses_post($label),
                 'label_type'  => 'vertical',
                 'help_text'   => $description,
                 'class'       => 'getpaid-address-field wpinv_country',
@@ -75,7 +75,7 @@ 
             )
         );
 
-        if ( wpinv_should_validate_vat_number() ) {
+        if (wpinv_should_validate_vat_number()) {
 
             echo aui()->input(
                 array(
@@ -84,7 +84,7 @@ 
                     'id'         => "shipping-toggle$uniqid",
                     'wrap_class' => "getpaid-address-field-wrapper__address-confirm mt-1 d-none",
                     'required'   => false,
-                    'label'      => __( 'I certify that I live in the country selected above', 'invoicing' ) . "<span class='text-danger'> *</span>",
+                    'label'      => __('I certify that I live in the country selected above', 'invoicing') . "<span class='text-danger'> *</span>",
                     'value'      => 1,
                     'checked'    => true,
                 )
@@ -97,27 +97,27 @@ 
     }
 
     // Display the state.
-    else if ( 'wpinv_state' == $address_field['name'] ) {
+    else if ('wpinv_state' == $address_field['name']) {
 
-        if ( empty( $value ) ) {
+        if (empty($value)) {
             $value = wpinv_get_default_state();
         }
 
-        echo getpaid_get_states_select_markup (
+        echo getpaid_get_states_select_markup(
             $country,
             $value,
             $placeholder,
             $label,
             $description,
-            ! empty( $address_field['required'] ),
+            !empty($address_field['required']),
             $wrap_class,
             $field_name
         );
 
     } else {
 
-        $key      = str_replace( 'wpinv_', '', $address_field['name'] );
-        $key      = esc_attr( str_replace( '_', '-', $key ) );
+        $key      = str_replace('wpinv_', '', $address_field['name']);
+        $key      = esc_attr(str_replace('_', '-', $key));
         $autocomplete = '';
         $replacements = array(
             'zip'        => 'postal-code',
@@ -130,33 +130,33 @@ 
         );
 
 
-        if ( isset( $replacements[ $key ] ) ) {
+        if (isset($replacements[$key])) {
             $autocomplete = array(
-                'autocomplete' => "$field_type {$replacements[ $key ]}",
+                'autocomplete' => "$field_type {$replacements[$key]}",
             );
         }
 
         $append = '';
 
-        if ( 'billing' === $field_type && wpinv_should_validate_vat_number() && 'vat-number' === $key ) {
-            $valid    = esc_attr__( 'Valid', 'invoicing' );
-            $invalid  = esc_attr__( 'Invalid', 'invoicing' );
-            $validate = esc_attr__( 'Validate', 'invoicing' );
+        if ('billing' === $field_type && wpinv_should_validate_vat_number() && 'vat-number' === $key) {
+            $valid    = esc_attr__('Valid', 'invoicing');
+            $invalid  = esc_attr__('Invalid', 'invoicing');
+            $validate = esc_attr__('Validate', 'invoicing');
             $append   = "<span class='btn btn-secondary getpaid-vat-number-validate' data-valid='$valid' data-invalid='$invalid' data-validate='$validate'>$validate</span>";
         }
 
         echo aui()->input(
             array(
-                'name'        => esc_attr( $field_name ),
-                'id'          => sanitize_html_class( $field_name ) . $uniqid,
-                'required'    => ! empty( $address_field['required'] ),
+                'name'        => esc_attr($field_name),
+                'id'          => sanitize_html_class($field_name) . $uniqid,
+                'required'    => !empty($address_field['required']),
                 'placeholder' => $placeholder,
-                'label'       => wp_kses_post( $label ),
+                'label'       => wp_kses_post($label),
                 'label_type'  => 'vertical',
                 'help_text'   => $description,
                 'type'        => 'text',
-                'value'       => sanitize_text_field( $value ),
-                'class'       => 'getpaid-address-field ' . esc_attr( $address_field['name'] ),
+                'value'       => sanitize_text_field($value),
+                'class'       => 'getpaid-address-field ' . esc_attr($address_field['name']),
                 'wrap_class'  => "$wrap_class getpaid-address-field-wrapper__$key",
                 'label_class' => 'getpaid-address-field-label getpaid-address-field-label__' . $key,
                 'extra_attributes'  => $autocomplete,
@@ -166,7 +166,7 @@ 
 
     }
 
-    do_action( 'getpaid_payment_form_address_field_after_' . $address_field['name'], $field_type, $address_field );
+    do_action('getpaid_payment_form_address_field_after_' . $address_field['name'], $field_type, $address_field);
 }
 
 echo "</div>";

includes/data/vat-number-regexes.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @package Invoicing/data
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 

includes/geolocation/class-getpaid-geolocation.php

Indentation +259 added lines, -259 removed lines

@@ -13,264 +13,264 @@
  */
 class GetPaid_Geolocation {
 
-	/**
-	 * Holds the current user's IP Address.
-	 *
-	 * @var string
-	 */
-	public static $current_user_ip;
-
-	/**
-	 * API endpoints for looking up a user IP address.
-	 *
-	 * For example, in case a user is on localhost.
-	 *
-	 * @var array
-	 */
-	protected static $ip_lookup_apis = array(
-		'ipify'             => 'http://api.ipify.org/',
-		'ipecho'            => 'http://ipecho.net/plain',
-		'ident'             => 'http://ident.me',
-		'whatismyipaddress' => 'http://bot.whatismyipaddress.com',
-	);
-
-	/**
-	 * API endpoints for geolocating an IP address
-	 *
-	 * @var array
-	 */
-	protected static $geoip_apis = array(
-		'ip-api.com' => 'http://ip-api.com/json/%s',
-		'ipinfo.io'  => 'https://ipinfo.io/%s/json',
-	);
-
-	/**
-	 * Get current user IP Address.
-	 *
-	 * @return string
-	 */
-	public static function get_ip_address() {
-		return wpinv_get_ip();
-	}
-
-	/**
-	 * Get user IP Address using an external service.
-	 * This can be used as a fallback for users on localhost where
-	 * get_ip_address() will be a local IP and non-geolocatable.
-	 *
-	 * @return string
-	 */
-	public static function get_external_ip_address() {
-
-		$transient_name = 'external_ip_address_0.0.0.0';
-
-		if ( '' !== self::get_ip_address() ) {
-			$transient_name      = 'external_ip_address_' . self::get_ip_address();
-		}
-
-		// Try retrieving from cache.
-		$external_ip_address = get_transient( $transient_name );
-
-		if ( false === $external_ip_address ) {
-			$external_ip_address     = '0.0.0.0';
-			$ip_lookup_services      = apply_filters( 'getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis );
-			$ip_lookup_services_keys = array_keys( $ip_lookup_services );
-			shuffle( $ip_lookup_services_keys );
-
-			foreach ( $ip_lookup_services_keys as $service_name ) {
-				$service_endpoint = $ip_lookup_services[ $service_name ];
-				$response         = wp_safe_remote_get( $service_endpoint, array( 'timeout' => 2 ) );
-
-				if ( ! is_wp_error( $response ) && rest_is_ip_address( $response['body'] ) ) {
-					$external_ip_address = apply_filters( 'getpaid_geolocation_ip_lookup_api_response', wpinv_clean( $response['body'] ), $service_name );
-					break;
-				}
-
-			}
-
-			set_transient( $transient_name, $external_ip_address, WEEK_IN_SECONDS );
-		}
-
-		return $external_ip_address;
-	}
-
-	/**
-	 * Geolocate an IP address.
-	 *
-	 * @param  string $ip_address   IP Address.
-	 * @param  bool   $fallback     If true, fallbacks to alternative IP detection (can be slower).
-	 * @param  bool   $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
-	 * @return array
-	 */
-	public static function geolocate_ip( $ip_address = '', $fallback = false, $api_fallback = true ) {
-
-		if ( empty( $ip_address ) ) {
-			$ip_address = self::get_ip_address();
-		}
-
-		// Update the current user's IP Address.
-		self::$current_user_ip = $ip_address;
-
-		// Filter to allow custom geolocation of the IP address.
-		$country_code = apply_filters( 'getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
-
-		if ( false !== $country_code ) {
-
-			return array(
-				'country'  => $country_code,
-				'state'    => '',
-				'city'     => '',
-				'postcode' => '',
-			);
-
-		}
-
-		$country_code = self::get_country_code_from_headers();
-
-		/**
-		 * Get geolocation filter.
-		 *
-		 * @since 1.0.19
-		 * @param array  $geolocation Geolocation data, including country, state, city, and postcode.
-		 * @param string $ip_address  IP Address.
-		 */
-		$geolocation  = apply_filters(
-			'getpaid_get_geolocation',
-			array(
-				'country'  => $country_code,
-				'state'    => '',
-				'city'     => '',
-				'postcode' => '',
-			),
-			$ip_address
-		);
-
-		// If we still haven't found a country code, let's consider doing an API lookup.
-		if ( '' === $geolocation['country'] && $api_fallback ) {
-			$geolocation['country'] = self::geolocate_via_api( $ip_address );
-		}
-
-		// It's possible that we're in a local environment, in which case the geolocation needs to be done from the
-		// external address.
-		if ( '' === $geolocation['country'] && $fallback ) {
-			$external_ip_address = self::get_external_ip_address();
-
-			// Only bother with this if the external IP differs.
-			if ( '0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address ) {
-				return self::geolocate_ip( $external_ip_address, false, $api_fallback );
-			}
-
-		}
-
-		return array(
-			'country'  => $geolocation['country'],
-			'state'    => $geolocation['state'],
-			'city'     => $geolocation['city'],
-			'postcode' => $geolocation['postcode'],
-		);
-
-	}
-
-	/**
-	 * Fetches the country code from the request headers, if one is available.
-	 *
-	 * @since 1.0.19
-	 * @return string The country code pulled from the headers, or empty string if one was not found.
-	 */
-	protected static function get_country_code_from_headers() {
-		$country_code = '';
-
-		$headers = array(
-			'MM_COUNTRY_CODE',
-			'GEOIP_COUNTRY_CODE',
-			'HTTP_CF_IPCOUNTRY',
-			'HTTP_X_COUNTRY_CODE',
-		);
-
-		foreach ( $headers as $header ) {
-			if ( empty( $_SERVER[ $header ] ) ) {
-				continue;
-			}
-
-			$country_code = strtoupper( sanitize_text_field( wp_unslash( $_SERVER[ $header ] ) ) );
-			break;
-		}
-
-		return $country_code;
-	}
-
-	/**
-	 * Use APIs to Geolocate the user.
-	 *
-	 * Geolocation APIs can be added through the use of the getpaid_geolocation_geoip_apis filter.
-	 * Provide a name=>value pair for service-slug=>endpoint.
-	 *
-	 * If APIs are defined, one will be chosen at random to fulfil the request. After completing, the result
-	 * will be cached in a transient.
-	 *
-	 * @param  string $ip_address IP address.
-	 * @return string
-	 */
-	protected static function geolocate_via_api( $ip_address ) {
-
-		// Retrieve from cache...
-		$country_code = get_transient( 'geoip_' . $ip_address );
-
-		// If missing, retrieve from the API.
-		if ( false === $country_code ) {
-			$geoip_services = apply_filters( 'getpaid_geolocation_geoip_apis', self::$geoip_apis );
-
-			if ( empty( $geoip_services ) ) {
-				return '';
-			}
-
-			$geoip_services_keys = array_keys( $geoip_services );
-
-			shuffle( $geoip_services_keys );
-
-			foreach ( $geoip_services_keys as $service_name ) {
-
-				$service_endpoint = $geoip_services[ $service_name ];
-				$response         = wp_safe_remote_get( sprintf( $service_endpoint, $ip_address ), array( 'timeout' => 2 ) );
-				$country_code     = sanitize_text_field( strtoupper( self::handle_geolocation_response( $response, $service_name ) ) );
-
-				if ( ! empty( $country_code ) ) {
-					break;
-				}
-
-			}
-
-			set_transient( 'geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS );
-		}
-
-		return $country_code;
-	}
-
-	/**
-	 * Handles geolocation response
-	 *
-	 * @param  WP_Error|String $geolocation_response
-	 * @param  String $geolocation_service
-	 * @return string Country code
-	 */
-	protected static function handle_geolocation_response( $geolocation_response, $geolocation_service ) {
-
-		if ( is_wp_error( $geolocation_response ) || empty( $geolocation_response['body'] ) ) {
-			return '';
-		}
-
-		if ( $geolocation_service === 'ipinfo.io' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) || empty( $data->country ) ? '' : $data->country;
-		}
-
-		if ( $geolocation_service === 'ip-api.com' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) || empty( $data->countryCode ) ? '' : $data->countryCode;
-		}
-
-		return apply_filters( 'getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body'] );
-
-	}
+    /**
+     * Holds the current user's IP Address.
+     *
+     * @var string
+     */
+    public static $current_user_ip;
+
+    /**
+     * API endpoints for looking up a user IP address.
+     *
+     * For example, in case a user is on localhost.
+     *
+     * @var array
+     */
+    protected static $ip_lookup_apis = array(
+        'ipify'             => 'http://api.ipify.org/',
+        'ipecho'            => 'http://ipecho.net/plain',
+        'ident'             => 'http://ident.me',
+        'whatismyipaddress' => 'http://bot.whatismyipaddress.com',
+    );
+
+    /**
+     * API endpoints for geolocating an IP address
+     *
+     * @var array
+     */
+    protected static $geoip_apis = array(
+        'ip-api.com' => 'http://ip-api.com/json/%s',
+        'ipinfo.io'  => 'https://ipinfo.io/%s/json',
+    );
+
+    /**
+     * Get current user IP Address.
+     *
+     * @return string
+     */
+    public static function get_ip_address() {
+        return wpinv_get_ip();
+    }
+
+    /**
+     * Get user IP Address using an external service.
+     * This can be used as a fallback for users on localhost where
+     * get_ip_address() will be a local IP and non-geolocatable.
+     *
+     * @return string
+     */
+    public static function get_external_ip_address() {
+
+        $transient_name = 'external_ip_address_0.0.0.0';
+
+        if ( '' !== self::get_ip_address() ) {
+            $transient_name      = 'external_ip_address_' . self::get_ip_address();
+        }
+
+        // Try retrieving from cache.
+        $external_ip_address = get_transient( $transient_name );
+
+        if ( false === $external_ip_address ) {
+            $external_ip_address     = '0.0.0.0';
+            $ip_lookup_services      = apply_filters( 'getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis );
+            $ip_lookup_services_keys = array_keys( $ip_lookup_services );
+            shuffle( $ip_lookup_services_keys );
+
+            foreach ( $ip_lookup_services_keys as $service_name ) {
+                $service_endpoint = $ip_lookup_services[ $service_name ];
+                $response         = wp_safe_remote_get( $service_endpoint, array( 'timeout' => 2 ) );
+
+                if ( ! is_wp_error( $response ) && rest_is_ip_address( $response['body'] ) ) {
+                    $external_ip_address = apply_filters( 'getpaid_geolocation_ip_lookup_api_response', wpinv_clean( $response['body'] ), $service_name );
+                    break;
+                }
+
+            }
+
+            set_transient( $transient_name, $external_ip_address, WEEK_IN_SECONDS );
+        }
+
+        return $external_ip_address;
+    }
+
+    /**
+     * Geolocate an IP address.
+     *
+     * @param  string $ip_address   IP Address.
+     * @param  bool   $fallback     If true, fallbacks to alternative IP detection (can be slower).
+     * @param  bool   $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
+     * @return array
+     */
+    public static function geolocate_ip( $ip_address = '', $fallback = false, $api_fallback = true ) {
+
+        if ( empty( $ip_address ) ) {
+            $ip_address = self::get_ip_address();
+        }
+
+        // Update the current user's IP Address.
+        self::$current_user_ip = $ip_address;
+
+        // Filter to allow custom geolocation of the IP address.
+        $country_code = apply_filters( 'getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
+
+        if ( false !== $country_code ) {
+
+            return array(
+                'country'  => $country_code,
+                'state'    => '',
+                'city'     => '',
+                'postcode' => '',
+            );
+
+        }
+
+        $country_code = self::get_country_code_from_headers();
+
+        /**
+         * Get geolocation filter.
+         *
+         * @since 1.0.19
+         * @param array  $geolocation Geolocation data, including country, state, city, and postcode.
+         * @param string $ip_address  IP Address.
+         */
+        $geolocation  = apply_filters(
+            'getpaid_get_geolocation',
+            array(
+                'country'  => $country_code,
+                'state'    => '',
+                'city'     => '',
+                'postcode' => '',
+            ),
+            $ip_address
+        );
+
+        // If we still haven't found a country code, let's consider doing an API lookup.
+        if ( '' === $geolocation['country'] && $api_fallback ) {
+            $geolocation['country'] = self::geolocate_via_api( $ip_address );
+        }
+
+        // It's possible that we're in a local environment, in which case the geolocation needs to be done from the
+        // external address.
+        if ( '' === $geolocation['country'] && $fallback ) {
+            $external_ip_address = self::get_external_ip_address();
+
+            // Only bother with this if the external IP differs.
+            if ( '0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address ) {
+                return self::geolocate_ip( $external_ip_address, false, $api_fallback );
+            }
+
+        }
+
+        return array(
+            'country'  => $geolocation['country'],
+            'state'    => $geolocation['state'],
+            'city'     => $geolocation['city'],
+            'postcode' => $geolocation['postcode'],
+        );
+
+    }
+
+    /**
+     * Fetches the country code from the request headers, if one is available.
+     *
+     * @since 1.0.19
+     * @return string The country code pulled from the headers, or empty string if one was not found.
+     */
+    protected static function get_country_code_from_headers() {
+        $country_code = '';
+
+        $headers = array(
+            'MM_COUNTRY_CODE',
+            'GEOIP_COUNTRY_CODE',
+            'HTTP_CF_IPCOUNTRY',
+            'HTTP_X_COUNTRY_CODE',
+        );
+
+        foreach ( $headers as $header ) {
+            if ( empty( $_SERVER[ $header ] ) ) {
+                continue;
+            }
+
+            $country_code = strtoupper( sanitize_text_field( wp_unslash( $_SERVER[ $header ] ) ) );
+            break;
+        }
+
+        return $country_code;
+    }
+
+    /**
+     * Use APIs to Geolocate the user.
+     *
+     * Geolocation APIs can be added through the use of the getpaid_geolocation_geoip_apis filter.
+     * Provide a name=>value pair for service-slug=>endpoint.
+     *
+     * If APIs are defined, one will be chosen at random to fulfil the request. After completing, the result
+     * will be cached in a transient.
+     *
+     * @param  string $ip_address IP address.
+     * @return string
+     */
+    protected static function geolocate_via_api( $ip_address ) {
+
+        // Retrieve from cache...
+        $country_code = get_transient( 'geoip_' . $ip_address );
+
+        // If missing, retrieve from the API.
+        if ( false === $country_code ) {
+            $geoip_services = apply_filters( 'getpaid_geolocation_geoip_apis', self::$geoip_apis );
+
+            if ( empty( $geoip_services ) ) {
+                return '';
+            }
+
+            $geoip_services_keys = array_keys( $geoip_services );
+
+            shuffle( $geoip_services_keys );
+
+            foreach ( $geoip_services_keys as $service_name ) {
+
+                $service_endpoint = $geoip_services[ $service_name ];
+                $response         = wp_safe_remote_get( sprintf( $service_endpoint, $ip_address ), array( 'timeout' => 2 ) );
+                $country_code     = sanitize_text_field( strtoupper( self::handle_geolocation_response( $response, $service_name ) ) );
+
+                if ( ! empty( $country_code ) ) {
+                    break;
+                }
+
+            }
+
+            set_transient( 'geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS );
+        }
+
+        return $country_code;
+    }
+
+    /**
+     * Handles geolocation response
+     *
+     * @param  WP_Error|String $geolocation_response
+     * @param  String $geolocation_service
+     * @return string Country code
+     */
+    protected static function handle_geolocation_response( $geolocation_response, $geolocation_service ) {
+
+        if ( is_wp_error( $geolocation_response ) || empty( $geolocation_response['body'] ) ) {
+            return '';
+        }
+
+        if ( $geolocation_service === 'ipinfo.io' ) {
+            $data = json_decode( $geolocation_response['body'] );
+            return empty( $data ) || empty( $data->country ) ? '' : $data->country;
+        }
+
+        if ( $geolocation_service === 'ip-api.com' ) {
+            $data = json_decode( $geolocation_response['body'] );
+            return empty( $data ) || empty( $data->countryCode ) ? '' : $data->countryCode;
+        }
+
+        return apply_filters( 'getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body'] );
+
+    }
 
 }

Spacing +49 added lines, -49 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Geolocation Class.
@@ -64,31 +64,31 @@ 
 
 		$transient_name = 'external_ip_address_0.0.0.0';
 
-		if ( '' !== self::get_ip_address() ) {
-			$transient_name      = 'external_ip_address_' . self::get_ip_address();
+		if ('' !== self::get_ip_address()) {
+			$transient_name = 'external_ip_address_' . self::get_ip_address();
 		}
 
 		// Try retrieving from cache.
-		$external_ip_address = get_transient( $transient_name );
+		$external_ip_address = get_transient($transient_name);
 
-		if ( false === $external_ip_address ) {
+		if (false === $external_ip_address) {
 			$external_ip_address     = '0.0.0.0';
-			$ip_lookup_services      = apply_filters( 'getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis );
-			$ip_lookup_services_keys = array_keys( $ip_lookup_services );
-			shuffle( $ip_lookup_services_keys );
+			$ip_lookup_services      = apply_filters('getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis);
+			$ip_lookup_services_keys = array_keys($ip_lookup_services);
+			shuffle($ip_lookup_services_keys);
 
-			foreach ( $ip_lookup_services_keys as $service_name ) {
-				$service_endpoint = $ip_lookup_services[ $service_name ];
-				$response         = wp_safe_remote_get( $service_endpoint, array( 'timeout' => 2 ) );
+			foreach ($ip_lookup_services_keys as $service_name) {
+				$service_endpoint = $ip_lookup_services[$service_name];
+				$response         = wp_safe_remote_get($service_endpoint, array('timeout' => 2));
 
-				if ( ! is_wp_error( $response ) && rest_is_ip_address( $response['body'] ) ) {
-					$external_ip_address = apply_filters( 'getpaid_geolocation_ip_lookup_api_response', wpinv_clean( $response['body'] ), $service_name );
+				if (!is_wp_error($response) && rest_is_ip_address($response['body'])) {
+					$external_ip_address = apply_filters('getpaid_geolocation_ip_lookup_api_response', wpinv_clean($response['body']), $service_name);
 					break;
 				}
 
 			}
 
-			set_transient( $transient_name, $external_ip_address, WEEK_IN_SECONDS );
+			set_transient($transient_name, $external_ip_address, WEEK_IN_SECONDS);
 		}
 
 		return $external_ip_address;
@@ -102,9 +102,9 @@ 
 	 * @param  bool   $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
 	 * @return array
 	 */
-	public static function geolocate_ip( $ip_address = '', $fallback = false, $api_fallback = true ) {
+	public static function geolocate_ip($ip_address = '', $fallback = false, $api_fallback = true) {
 
-		if ( empty( $ip_address ) ) {
+		if (empty($ip_address)) {
 			$ip_address = self::get_ip_address();
 		}
 
@@ -112,9 +112,9 @@ 
 		self::$current_user_ip = $ip_address;
 
 		// Filter to allow custom geolocation of the IP address.
-		$country_code = apply_filters( 'getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
+		$country_code = apply_filters('getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback);
 
-		if ( false !== $country_code ) {
+		if (false !== $country_code) {
 
 			return array(
 				'country'  => $country_code,
@@ -134,7 +134,7 @@ 
 		 * @param array  $geolocation Geolocation data, including country, state, city, and postcode.
 		 * @param string $ip_address  IP Address.
 		 */
-		$geolocation  = apply_filters(
+		$geolocation = apply_filters(
 			'getpaid_get_geolocation',
 			array(
 				'country'  => $country_code,
@@ -146,18 +146,18 @@ 
 		);
 
 		// If we still haven't found a country code, let's consider doing an API lookup.
-		if ( '' === $geolocation['country'] && $api_fallback ) {
-			$geolocation['country'] = self::geolocate_via_api( $ip_address );
+		if ('' === $geolocation['country'] && $api_fallback) {
+			$geolocation['country'] = self::geolocate_via_api($ip_address);
 		}
 
 		// It's possible that we're in a local environment, in which case the geolocation needs to be done from the
 		// external address.
-		if ( '' === $geolocation['country'] && $fallback ) {
+		if ('' === $geolocation['country'] && $fallback) {
 			$external_ip_address = self::get_external_ip_address();
 
 			// Only bother with this if the external IP differs.
-			if ( '0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address ) {
-				return self::geolocate_ip( $external_ip_address, false, $api_fallback );
+			if ('0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address) {
+				return self::geolocate_ip($external_ip_address, false, $api_fallback);
 			}
 
 		}
@@ -187,12 +187,12 @@ 
 			'HTTP_X_COUNTRY_CODE',
 		);
 
-		foreach ( $headers as $header ) {
-			if ( empty( $_SERVER[ $header ] ) ) {
+		foreach ($headers as $header) {
+			if (empty($_SERVER[$header])) {
 				continue;
 			}
 
-			$country_code = strtoupper( sanitize_text_field( wp_unslash( $_SERVER[ $header ] ) ) );
+			$country_code = strtoupper(sanitize_text_field(wp_unslash($_SERVER[$header])));
 			break;
 		}
 
@@ -211,36 +211,36 @@ 
 	 * @param  string $ip_address IP address.
 	 * @return string
 	 */
-	protected static function geolocate_via_api( $ip_address ) {
+	protected static function geolocate_via_api($ip_address) {
 
 		// Retrieve from cache...
-		$country_code = get_transient( 'geoip_' . $ip_address );
+		$country_code = get_transient('geoip_' . $ip_address);
 
 		// If missing, retrieve from the API.
-		if ( false === $country_code ) {
-			$geoip_services = apply_filters( 'getpaid_geolocation_geoip_apis', self::$geoip_apis );
+		if (false === $country_code) {
+			$geoip_services = apply_filters('getpaid_geolocation_geoip_apis', self::$geoip_apis);
 
-			if ( empty( $geoip_services ) ) {
+			if (empty($geoip_services)) {
 				return '';
 			}
 
-			$geoip_services_keys = array_keys( $geoip_services );
+			$geoip_services_keys = array_keys($geoip_services);
 
-			shuffle( $geoip_services_keys );
+			shuffle($geoip_services_keys);
 
-			foreach ( $geoip_services_keys as $service_name ) {
+			foreach ($geoip_services_keys as $service_name) {
 
-				$service_endpoint = $geoip_services[ $service_name ];
-				$response         = wp_safe_remote_get( sprintf( $service_endpoint, $ip_address ), array( 'timeout' => 2 ) );
-				$country_code     = sanitize_text_field( strtoupper( self::handle_geolocation_response( $response, $service_name ) ) );
+				$service_endpoint = $geoip_services[$service_name];
+				$response         = wp_safe_remote_get(sprintf($service_endpoint, $ip_address), array('timeout' => 2));
+				$country_code     = sanitize_text_field(strtoupper(self::handle_geolocation_response($response, $service_name)));
 
-				if ( ! empty( $country_code ) ) {
+				if (!empty($country_code)) {
 					break;
 				}
 
 			}
 
-			set_transient( 'geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS );
+			set_transient('geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS);
 		}
 
 		return $country_code;
@@ -253,23 +253,23 @@ 
 	 * @param  String $geolocation_service
 	 * @return string Country code
 	 */
-	protected static function handle_geolocation_response( $geolocation_response, $geolocation_service ) {
+	protected static function handle_geolocation_response($geolocation_response, $geolocation_service) {
 
-		if ( is_wp_error( $geolocation_response ) || empty( $geolocation_response['body'] ) ) {
+		if (is_wp_error($geolocation_response) || empty($geolocation_response['body'])) {
 			return '';
 		}
 
-		if ( $geolocation_service === 'ipinfo.io' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) || empty( $data->country ) ? '' : $data->country;
+		if ($geolocation_service === 'ipinfo.io') {
+			$data = json_decode($geolocation_response['body']);
+			return empty($data) || empty($data->country) ? '' : $data->country;
 		}
 
-		if ( $geolocation_service === 'ip-api.com' ) {
-			$data = json_decode( $geolocation_response['body'] );
-			return empty( $data ) || empty( $data->countryCode ) ? '' : $data->countryCode;
+		if ($geolocation_service === 'ip-api.com') {
+			$data = json_decode($geolocation_response['body']);
+			return empty($data) || empty($data->countryCode) ? '' : $data->countryCode;
 		}
 
-		return apply_filters( 'getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body'] );
+		return apply_filters('getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body']);
 
 	}