AyeCode / invoicing

vendor/composer/platform_check.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 $issues = array();
 
 if (!(PHP_VERSION_ID >= 50600)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 5.6.0". You are running ' . PHP_VERSION  .  '.';
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 5.6.0". You are running ' . PHP_VERSION . '.';
 }
 
 if ($issues) {

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-shipping-address.php

Indentation +34 added lines, -34 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -15,22 +15,22 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Shipping_Address {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
 
-		// Retrieve shipping address.
-		$shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
+        // Retrieve shipping address.
+        $shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
 
-		// Abort if it is invalid.
-		if ( ! is_array( $shipping_address ) ) {
-			return;
-		}
+        // Abort if it is invalid.
+        if ( ! is_array( $shipping_address ) ) {
+            return;
+        }
 
-		?>
+        ?>
 
 		<div class="bsui">
 
@@ -55,31 +55,31 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Prepares a value.
-	 *
-	 * @param array $address
-	 * @param string $key
-	 * @return string
-	 */
-	public static function prepare_for_display( $address, $key ) {
+    /**
+     * Prepares a value.
+     *
+     * @param array $address
+     * @param string $key
+     * @return string
+     */
+    public static function prepare_for_display( $address, $key ) {
 
-		// Prepare the value.
-		$value = $address[ $key ];
+        // Prepare the value.
+        $value = $address[ $key ];
 
-		if ( $key == 'country' ) {
-			$value = wpinv_country_name( $value );
-		}
+        if ( $key == 'country' ) {
+            $value = wpinv_country_name( $value );
+        }
 
-		if ( $key == 'state' ) {
-			$country = isset( $address[ 'country' ] ) ? $address[ 'country' ] : wpinv_get_default_country();
-			$value = wpinv_state_name( $value, $country );
-		}
+        if ( $key == 'state' ) {
+            $country = isset( $address[ 'country' ] ) ? $address[ 'country' ] : wpinv_get_default_country();
+            $value = wpinv_state_name( $value, $country );
+        }
 
-		return sanitize_text_field( $value );
+        return sanitize_text_field( $value );
 
-	}
+    }
 
 }

Spacing +16 added lines, -16 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -20,13 +20,13 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 
 		// Retrieve shipping address.
-		$shipping_address = get_post_meta( $post->ID, 'shipping_address', true );
+		$shipping_address = get_post_meta($post->ID, 'shipping_address', true);
 
 		// Abort if it is invalid.
-		if ( ! is_array( $shipping_address ) ) {
+		if (!is_array($shipping_address)) {
 			return;
 		}
 
@@ -34,16 +34,16 @@ 
 
 		<div class="bsui">
 
-			<?php foreach ( getpaid_user_address_fields() as $key => $label ) : ?>
+			<?php foreach (getpaid_user_address_fields() as $key => $label) : ?>
 
-					<?php if ( ! empty( $shipping_address[ $key ] ) ) : ?>
+					<?php if (!empty($shipping_address[$key])) : ?>
 
 						<div class="form-group form-row">
 							<div class="col">
-								<span style="font-weight: 600"><?php echo sanitize_text_field( $label ); ?>:</span>
+								<span style="font-weight: 600"><?php echo sanitize_text_field($label); ?>:</span>
 							</div>
 							<div class="col">
-								<?php echo self::prepare_for_display( $shipping_address, $key ); ?>
+								<?php echo self::prepare_for_display($shipping_address, $key); ?>
 							</div>
 						</div>
 
@@ -64,21 +64,21 @@ 
 	 * @param string $key
 	 * @return string
 	 */
-	public static function prepare_for_display( $address, $key ) {
+	public static function prepare_for_display($address, $key) {
 
 		// Prepare the value.
-		$value = $address[ $key ];
+		$value = $address[$key];
 
-		if ( $key == 'country' ) {
-			$value = wpinv_country_name( $value );
+		if ($key == 'country') {
+			$value = wpinv_country_name($value);
 		}
 
-		if ( $key == 'state' ) {
-			$country = isset( $address[ 'country' ] ) ? $address[ 'country' ] : wpinv_get_default_country();
-			$value = wpinv_state_name( $value, $country );
+		if ($key == 'state') {
+			$country = isset($address['country']) ? $address['country'] : wpinv_get_default_country();
+			$value = wpinv_state_name($value, $country);
 		}
 
-		return sanitize_text_field( $value );
+		return sanitize_text_field($value);
 
 	}
 

includes/data/payment-form-elements.php

Spacing +74 added lines, -74 removed lines

@@ -9,41 +9,41 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
     array(
         'type'     => 'heading',
-        'name'     => __( 'Heading', 'invoicing' ),
+        'name'     => __('Heading', 'invoicing'),
         'defaults' => array(
             'level' => 'h2',
-            'text'  => __( 'Heading', 'invoicing' ),
+            'text'  => __('Heading', 'invoicing'),
         )
     ),
 
     array(
         'type' => 'paragraph',
-        'name' => __( 'Paragraph', 'invoicing' ),
+        'name' => __('Paragraph', 'invoicing'),
         'defaults'  => array(
-            'text'  => __( 'Paragraph text', 'invoicing' ),
+            'text'  => __('Paragraph text', 'invoicing'),
         )
     ),
 
     array( 
         'type' => 'alert',
-        'name' => __( 'Alert', 'invoicing' ),
+        'name' => __('Alert', 'invoicing'),
         'defaults'  => array(
             'value'        => '',
             'class'        => 'alert-warning',
-            'text'         => __( 'Alert', 'invoicing' ),
+            'text'         => __('Alert', 'invoicing'),
             'dismissible'  => false,
         )
     ),
 
     array( 
         'type' => 'separator',
-        'name' => __( 'Separator', 'invoicing' ),
+        'name' => __('Separator', 'invoicing'),
         'defaults'  => array(
             'value'        => '',
         ),
@@ -51,11 +51,11 @@ 
 
     array(
         'type' => 'text',
-        'name' => __( 'Text Input', 'invoicing' ),
+        'name' => __('Text Input', 'invoicing'),
         'defaults'  => array(
-            'placeholder'  => __( 'Enter some text', 'invoicing' ),
+            'placeholder'  => __('Enter some text', 'invoicing'),
             'value'        => '',
-            'label'        => __( 'Field Label', 'invoicing' ),
+            'label'        => __('Field Label', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -63,11 +63,11 @@ 
 
     array(
         'type' => 'textarea',
-        'name' => __( 'Textarea', 'invoicing' ),
+        'name' => __('Textarea', 'invoicing'),
         'defaults'         => array(
-            'placeholder'  => __( 'Enter your text hear', 'invoicing' ),
+            'placeholder'  => __('Enter your text hear', 'invoicing'),
             'value'        => '',
-            'label'        => __( 'Textarea Label', 'invoicing' ),
+            'label'        => __('Textarea Label', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -75,27 +75,27 @@ 
 
     array(
         'type' => 'select',
-        'name' => __( 'Dropdown', 'invoicing' ),
+        'name' => __('Dropdown', 'invoicing'),
         'defaults'         => array(
-            'placeholder'  => __( 'Select a value', 'invoicing' ),
+            'placeholder'  => __('Select a value', 'invoicing'),
             'value'        => '',
-            'label'        => __( 'Dropdown Label', 'invoicing' ),
+            'label'        => __('Dropdown Label', 'invoicing'),
             'description'  => '',
             'required'     => false,
             'options'      => array(
-                esc_attr__( 'Option One', 'invoicing' ),
-                esc_attr__( 'Option Two', 'invoicing' ),
-                esc_attr__( 'Option Three', 'invoicing' )
+                esc_attr__('Option One', 'invoicing'),
+                esc_attr__('Option Two', 'invoicing'),
+                esc_attr__('Option Three', 'invoicing')
             ),
         )
     ),
 
     array(
         'type' => 'checkbox',
-        'name' => __( 'Checkbox', 'invoicing' ),
+        'name' => __('Checkbox', 'invoicing'),
         'defaults'         => array(
             'value'        => '',
-            'label'        => __( 'Checkbox Label', 'invoicing' ),
+            'label'        => __('Checkbox Label', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -103,23 +103,23 @@ 
 
     array( 
         'type' => 'radio',
-        'name' => __( 'Radio', 'invoicing' ),
+        'name' => __('Radio', 'invoicing'),
         'defaults'     => array(
-            'label'    => __( 'Select one choice', 'invoicing' ),
+            'label'    => __('Select one choice', 'invoicing'),
             'options'  => array(
-                esc_attr__( 'Choice One', 'invoicing' ),
-                esc_attr__( 'Choice Two', 'invoicing' ),
-                esc_attr__( 'Choice Three', 'invoicing' )
+                esc_attr__('Choice One', 'invoicing'),
+                esc_attr__('Choice Two', 'invoicing'),
+                esc_attr__('Choice Three', 'invoicing')
             ),
         )
     ),
 
     array( 
         'type' => 'date',
-        'name' => __( 'Date', 'invoicing' ),
+        'name' => __('Date', 'invoicing'),
         'defaults' => array(
             'value'        => '',
-            'label'        => __( 'Date', 'invoicing' ),
+            'label'        => __('Date', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -127,10 +127,10 @@ 
 
     array( 
         'type' => 'time',
-        'name' => __( 'Time', 'invoicing' ),
+        'name' => __('Time', 'invoicing'),
         'defaults' => array(
             'value'        => '',
-            'label'        => __( 'Time', 'invoicing' ),
+            'label'        => __('Time', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -138,11 +138,11 @@ 
 
     array( 
         'type' => 'number',
-        'name' => __( 'Number', 'invoicing' ),
+        'name' => __('Number', 'invoicing'),
         'defaults' => array(
             'placeholder'  => '',
             'value'        => '',
-            'label'        => __( 'Number', 'invoicing' ),
+            'label'        => __('Number', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -150,11 +150,11 @@ 
 
     array( 
         'type' => 'website',
-        'name' => __( 'Website', 'invoicing' ),
+        'name' => __('Website', 'invoicing'),
         'defaults' => array(
             'placeholder'  => 'http://example.com',
             'value'        => '',
-            'label'        => __( 'Website', 'invoicing' ),
+            'label'        => __('Website', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -162,11 +162,11 @@ 
 
     array( 
         'type' => 'email',
-        'name' => __( 'Email', 'invoicing' ),
+        'name' => __('Email', 'invoicing'),
         'defaults'  => array(
             'placeholder'  => 'jon@snow.com',
             'value'        => '',
-            'label'        => __( 'Email Address', 'invoicing' ),
+            'label'        => __('Email Address', 'invoicing'),
             'description'  => '',
             'required'     => false,
         )
@@ -174,18 +174,18 @@ 
 
     array( 
         'type' => 'address',
-        'name' => __( 'Address', 'invoicing' ),
+        'name' => __('Address', 'invoicing'),
         'defaults'  => array(
 
             'address_type'            => 'billing',
-            'billing_address_title'   => __( 'Billing Address', 'invoicing' ),
-            'shipping_address_title'  => __( 'Shipping Address', 'invoicing' ),
-            'shipping_address_toggle' => __( 'Same billing & shipping address.', 'invoicing' ),
+            'billing_address_title'   => __('Billing Address', 'invoicing'),
+            'shipping_address_title'  => __('Shipping Address', 'invoicing'),
+            'shipping_address_toggle' => __('Same billing & shipping address.', 'invoicing'),
             'fields'                  => array(
                 array(
                     'placeholder'  => 'Jon',
                     'value'        => '',
-                    'label'        => __( 'First Name', 'invoicing' ),
+                    'label'        => __('First Name', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -196,7 +196,7 @@ 
                 array(
                     'placeholder'  => 'Snow',
                     'value'        => '',
-                    'label'        => __( 'Last Name', 'invoicing' ),
+                    'label'        => __('Last Name', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -207,7 +207,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Address', 'invoicing' ),
+                    'label'        => __('Address', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -218,7 +218,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'City', 'invoicing' ),
+                    'label'        => __('City', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -227,9 +227,9 @@ 
                 ),
 
                 array(
-                    'placeholder'  => __( 'Select your country' ),
+                    'placeholder'  => __('Select your country'),
                     'value'        => '',
-                    'label'        => __( 'Country', 'invoicing' ),
+                    'label'        => __('Country', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -238,9 +238,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,
@@ -251,7 +251,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'ZIP / Postcode', 'invoicing' ),
+                    'label'        => __('ZIP / Postcode', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -262,7 +262,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Phone', 'invoicing' ),
+                    'label'        => __('Phone', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => true,
@@ -273,7 +273,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'Company', 'invoicing' ),
+                    'label'        => __('Company', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => false,
@@ -284,7 +284,7 @@ 
                 array(
                     'placeholder'  => '',
                     'value'        => '',
-                    'label'        => __( 'VAT Number', 'invoicing' ),
+                    'label'        => __('VAT Number', 'invoicing'),
                     'description'  => '',
                     'required'     => false,
                     'visible'      => false,
@@ -297,11 +297,11 @@ 
 
     array( 
         'type' => 'billing_email',
-        'name' => __( 'Billing Email', 'invoicing' ),
+        'name' => __('Billing Email', 'invoicing'),
         'defaults'  => array(
             'placeholder'  => 'jon@snow.com',
             'value'        => '',
-            'label'        => __( 'Billing Email', 'invoicing' ),
+            'label'        => __('Billing Email', 'invoicing'),
             'description'  => '',
             'premade'      => true,
         )
@@ -309,18 +309,18 @@ 
 
     array( 
         'type' => 'discount',
-        'name' => __( 'Discount Input', 'invoicing' ),
+        'name' => __('Discount Input', 'invoicing'),
         'defaults'  => array(
             'value'        => '',
-            'input_label'  => __( 'Coupon Code', 'invoicing' ),
-            'button_label' => __( 'Apply Coupon', 'invoicing' ),
-            'description'  => __( 'Have a discount code? Enter it above.', 'invoicing' ),
+            'input_label'  => __('Coupon Code', 'invoicing'),
+            'button_label' => __('Apply Coupon', 'invoicing'),
+            'description'  => __('Have a discount code? Enter it above.', 'invoicing'),
         )
     ),
 
     array( 
         'type' => 'items',
-        'name' => __( 'Items', 'invoicing' ),
+        'name' => __('Items', 'invoicing'),
         'defaults'  => array(
             'value'        => '',
             'items_type'   => 'total',
@@ -332,22 +332,22 @@ 
 
     array( 
         'type' => 'price_input',
-        'name' => __( 'Price Input', 'invoicing' ),
+        'name' => __('Price Input', 'invoicing'),
         'defaults'  => array(
             'placeholder'  => wpinv_format_amount(0),
             'value'        => wpinv_format_amount(0),
             'minimum'      => wpinv_format_amount(0),
-            'label'        => __( 'Enter Amount', 'invoicing' ),
+            'label'        => __('Enter Amount', 'invoicing'),
             'description'  => '',
         )
     ),
 
     array( 
         'type' => 'price_select',
-        'name' => __( 'Price Select', 'invoicing' ),
+        'name' => __('Price Select', 'invoicing'),
         'defaults'  => array(
             'description'  => '',
-            'label'        => __( 'Select Amount', 'invoicing' ),
+            'label'        => __('Select Amount', 'invoicing'),
             'options'      => 'Option 1|10, Option 2|20',
             'placeholder'  => '',
             'select_type'  => 'select',
@@ -356,39 +356,39 @@ 
 
     array( 
         'type'       => 'pay_button',
-        'name'       => __( 'Payment Button', 'invoicing' ),
+        'name'       => __('Payment Button', 'invoicing'),
         'defaults'   => array(
             'value'          => '',
             'class'          => 'btn-primary',
-            'label'          => __( 'Pay %price% »', 'invoicing' ),
-            'free'           => __( 'Continue »', 'invoicing' ),
-            'description'    => __( 'By continuing with our payment, you are agreeing to our privacy policy and terms of service.', 'invoicing' ),
+            'label'          => __('Pay %price% »', 'invoicing'),
+            'free'           => __('Continue »', 'invoicing'),
+            'description'    => __('By continuing with our payment, you are agreeing to our privacy policy and terms of service.', 'invoicing'),
             'premade'        => true,
         )
     ),
 
     array(
         'type'       => 'gateway_select',
-        'name'       => __( 'Gateway Select', 'invoicing' ),
+        'name'       => __('Gateway Select', 'invoicing'),
         'defaults'   => array(
-            'text'    => __( 'Select Payment Method', 'invoicing' ),
+            'text'    => __('Select Payment Method', 'invoicing'),
             'premade' => true,
         )
     ),
 
     array( 
         'type'       => 'total_payable',
-        'name'       => __( 'Total Payable', 'invoicing' ),
+        'name'       => __('Total Payable', 'invoicing'),
         'defaults'   => array(
-            'text' => __( 'Total to pay:', 'invoicing' ),
+            'text' => __('Total to pay:', 'invoicing'),
         )
     ),
 
     array( 
         'type'       => 'ip_address',
-        'name'       => __( 'IP Address', 'invoicing' ),
+        'name'       => __('IP Address', 'invoicing'),
         'defaults'   => array(
-            'text' => __( 'Your IP address is:', 'invoicing' ),
+            'text' => __('Your IP address is:', 'invoicing'),
         )
     )
 );

templates/payment-forms-admin/previews/address.php

Spacing +2 added lines, -2 removed lines

@@ -7,13 +7,13 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='wpinv-address-wrapper row'>
 
-    <h4 v-if="form_element.address_type == 'both'" class="col-12 mb-3"><?php _e( 'Billing / Shipping Address', 'invoicing' ); ?></h4>
+    <h4 v-if="form_element.address_type == 'both'" class="col-12 mb-3"><?php _e('Billing / Shipping Address', 'invoicing'); ?></h4>
 
     <div class='form-group address-field-preview wpinv-payment-form-field-preview' v-for='(field, index) in visible_fields( form_element.fields )' :class='grid_class( field )' :key='field.name'>
         <label class="d-block w-100">

includes/reports/class-getpaid-reports-abstract-report.php

Indentation +179 added lines, -179 removed lines

@@ -12,72 +12,72 @@ 
  */
 abstract class GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var array
-	 */
-	public $stats;
-
-	/**
-	 * Class constructor.
-	 *
-	 */
-	public function __construct() {
-		$this->prepare_stats();
-	}
-
-	/**
-	 * Retrieves the current range.
-	 *
-	 */
-	public function get_range() {
-		$valid_ranges = $this->get_periods();
-
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
-		}
-
-		return '7_days';
-	}
-
-	/**
-	 * Returns an array of date ranges.
-	 *
-	 * @return array
-	 */
-	public function get_periods() {
-
-		$periods = array(
+    /**
+     * @var array
+     */
+    public $stats;
+
+    /**
+     * Class constructor.
+     *
+     */
+    public function __construct() {
+        $this->prepare_stats();
+    }
+
+    /**
+     * Retrieves the current range.
+     *
+     */
+    public function get_range() {
+        $valid_ranges = $this->get_periods();
+
+        if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
+            return sanitize_key( $_GET['date_range'] );
+        }
+
+        return '7_days';
+    }
+
+    /**
+     * Returns an array of date ranges.
+     *
+     * @return array
+     */
+    public function get_periods() {
+
+        $periods = array(
             'today'     => __( 'Today', 'invoicing' ),
             'yesterday' => __( 'Yesterday', 'invoicing' ),
             '7_days'    => __( 'Last 7 days', 'invoicing' ),
-			'30_days'   => __( 'Last 30 days', 'invoicing' ),
-			'60_days'   => __( 'Last 60 days', 'invoicing' ),
-			'90_days'   => __( 'Last 90 days', 'invoicing' ),
-			'180_days'  => __( 'Last 180 days', 'invoicing' ),
-			'360_days'  => __( 'Last 360 days', 'invoicing' ),
-		);
-
-		return apply_filters( 'getpaid_earning_periods', $periods );
-	}
-
-	/**
-	 * Retrieves the current range's sql.
-	 *
-	 */
-	public function get_range_sql( $range ) {
-
-		$date     = 'CAST(meta.completed_date AS DATE)';
+            '30_days'   => __( 'Last 30 days', 'invoicing' ),
+            '60_days'   => __( 'Last 60 days', 'invoicing' ),
+            '90_days'   => __( 'Last 90 days', 'invoicing' ),
+            '180_days'  => __( 'Last 180 days', 'invoicing' ),
+            '360_days'  => __( 'Last 360 days', 'invoicing' ),
+        );
+
+        return apply_filters( 'getpaid_earning_periods', $periods );
+    }
+
+    /**
+     * Retrieves the current range's sql.
+     *
+     */
+    public function get_range_sql( $range ) {
+
+        $date     = 'CAST(meta.completed_date AS DATE)';
         $datetime = 'meta.completed_date';
 
         // Prepare durations.
         $today                = current_time( 'Y-m-d' );
-		$yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
-		$seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
-		$thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
-		$ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
-		$sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
-		$one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
-		$three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
+        $yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
+        $seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
+        $thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
+        $ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
+        $sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
+        $one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
+        $three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
 
         $ranges = array(
 
@@ -94,130 +94,130 @@ 
             '7_days'       => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$seven_days_ago' AND '$today'"
-			),
+            ),
 
-			'30_days'       => array(
+            '30_days'       => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$thirty_days_ago' AND '$today'"
-			),
+            ),
 
-			'60_days'       => array(
+            '60_days'       => array(
                 "DATE($datetime)",
                 "$date BETWEEN '$sixty_days_ago' AND '$today'"
-			),
+            ),
 
-			'90_days'       => array(
+            '90_days'       => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$ninety_days_ago' AND '$today'"
-			),
+            ),
 
-			'180_days'       => array(
+            '180_days'       => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$one_eighty_days_ago' AND '$today'"
-			),
+            ),
 
-			'360_days'       => array(
+            '360_days'       => array(
                 "WEEK($datetime)",
                 "$date BETWEEN '$three_sixty_days_ago' AND '$today'"
             ),
 
         );
 
-		$sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges[ '7_days' ];
-		return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
-
-	}
-
-	/**
-	 * Retrieves the hours in a day
-	 *
-	 */
-	public function get_hours_in_a_day() {
-
-		return array(
-			'12AM' => __( '12 AM', 'invoicing'),
-			'1AM'  => __( '1 AM', 'invoicing'),
-			'2AM'  => __( '2 AM', 'invoicing'),
-			'3AM'  => __( '3 AM', 'invoicing'),
-			'4AM'  => __( '4 AM', 'invoicing'),
-			'5AM'  => __( '5 AM', 'invoicing'),
-			'6AM'  => __( '6 AM', 'invoicing'),
-			'7AM'  => __( '7 AM', 'invoicing'),
-			'8AM'  => __( '8 AM', 'invoicing'),
-			'9AM'  => __( '9 AM', 'invoicing'),
-			'10AM' => __( '10 AM', 'invoicing'),
-			'11AM' => __( '11 AM', 'invoicing'),
-			'12pm' => __( '12 PM', 'invoicing'),
-			'1PM'  => __( '1 PM', 'invoicing'),
-			'2PM'  => __( '2 PM', 'invoicing'),
-			'3PM'  => __( '3 PM', 'invoicing'),
-			'4PM'  => __( '4 PM', 'invoicing'),
-			'5PM'  => __( '5 PM', 'invoicing'),
-			'6PM'  => __( '6 PM', 'invoicing'),
-			'7PM'  => __( '7 PM', 'invoicing'),
-			'8PM'  => __( '8 PM', 'invoicing'),
-			'9PM'  => __( '9 PM', 'invoicing'),
-			'10PM' => __( '10 PM', 'invoicing'),
-			'11PM' => __( '11 PM', 'invoicing'),
-		);
-
-	}
-
-	/**
-	 * Retrieves the days in a period
-	 *
-	 */
-	public function get_days_in_period( $days ) {
-
-		$return = array();
-		$format = 'Y-m-d';
-
-		if ( $days < 8 ) {
-			$format = 'D';
-		}
-
-		if ( $days < 32 ) {
-			$format = 'M j';
-		}
-
-		while ( $days > 0 ) {
-
-			$key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
-			$days--;
-
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Retrieves the weeks in a period
-	 *
-	 */
-	public function get_weeks_in_period( $days ) {
-
-		$return = array();
-
-		while ( $days > 0 ) {
-
-			$key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
-			$days--;
-
-		}
-
-		return $return;
-	}
-
-	/**
-	 * Displays the report card.
-	 *
-	 */
-	public function display() {
-		?>
+        $sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges[ '7_days' ];
+        return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
+
+    }
+
+    /**
+     * Retrieves the hours in a day
+     *
+     */
+    public function get_hours_in_a_day() {
+
+        return array(
+            '12AM' => __( '12 AM', 'invoicing'),
+            '1AM'  => __( '1 AM', 'invoicing'),
+            '2AM'  => __( '2 AM', 'invoicing'),
+            '3AM'  => __( '3 AM', 'invoicing'),
+            '4AM'  => __( '4 AM', 'invoicing'),
+            '5AM'  => __( '5 AM', 'invoicing'),
+            '6AM'  => __( '6 AM', 'invoicing'),
+            '7AM'  => __( '7 AM', 'invoicing'),
+            '8AM'  => __( '8 AM', 'invoicing'),
+            '9AM'  => __( '9 AM', 'invoicing'),
+            '10AM' => __( '10 AM', 'invoicing'),
+            '11AM' => __( '11 AM', 'invoicing'),
+            '12pm' => __( '12 PM', 'invoicing'),
+            '1PM'  => __( '1 PM', 'invoicing'),
+            '2PM'  => __( '2 PM', 'invoicing'),
+            '3PM'  => __( '3 PM', 'invoicing'),
+            '4PM'  => __( '4 PM', 'invoicing'),
+            '5PM'  => __( '5 PM', 'invoicing'),
+            '6PM'  => __( '6 PM', 'invoicing'),
+            '7PM'  => __( '7 PM', 'invoicing'),
+            '8PM'  => __( '8 PM', 'invoicing'),
+            '9PM'  => __( '9 PM', 'invoicing'),
+            '10PM' => __( '10 PM', 'invoicing'),
+            '11PM' => __( '11 PM', 'invoicing'),
+        );
+
+    }
+
+    /**
+     * Retrieves the days in a period
+     *
+     */
+    public function get_days_in_period( $days ) {
+
+        $return = array();
+        $format = 'Y-m-d';
+
+        if ( $days < 8 ) {
+            $format = 'D';
+        }
+
+        if ( $days < 32 ) {
+            $format = 'M j';
+        }
+
+        while ( $days > 0 ) {
+
+            $key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $return[ $key ] = $label;
+            $days--;
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * Retrieves the weeks in a period
+     *
+     */
+    public function get_weeks_in_period( $days ) {
+
+        $return = array();
+
+        while ( $days > 0 ) {
+
+            $key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
+            $return[ $key ] = $label;
+            $days--;
+
+        }
+
+        return $return;
+    }
+
+    /**
+     * Displays the report card.
+     *
+     */
+    public function display() {
+        ?>
 
 			<div class="row">
 				<div class="col-12">
@@ -231,20 +231,20 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Prepares the report stats.
-	 *
-	 * Extend this in child classes.
-	 */
-	abstract public function prepare_stats();
-
-	/**
-	 * Displays the actual report.
-	 *
-	 * Extend this in child classes.
-	 */
-	abstract public function display_stats();
+    }
+
+    /**
+     * Prepares the report stats.
+     *
+     * Extend this in child classes.
+     */
+    abstract public function prepare_stats();
+
+    /**
+     * Displays the actual report.
+     *
+     * Extend this in child classes.
+     */
+    abstract public function display_stats();
 
 }

Spacing +60 added lines, -60 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Abstract_Report Class.
@@ -32,8 +32,8 @@ 
 	public function get_range() {
 		$valid_ranges = $this->get_periods();
 
-		if ( isset( $_GET['date_range'] ) && array_key_exists( $_GET['date_range'], $valid_ranges ) ) {
-			return sanitize_key( $_GET['date_range'] );
+		if (isset($_GET['date_range']) && array_key_exists($_GET['date_range'], $valid_ranges)) {
+			return sanitize_key($_GET['date_range']);
 		}
 
 		return '7_days';
@@ -47,37 +47,37 @@ 
 	public function get_periods() {
 
 		$periods = array(
-            'today'     => __( 'Today', 'invoicing' ),
-            'yesterday' => __( 'Yesterday', 'invoicing' ),
-            '7_days'    => __( 'Last 7 days', 'invoicing' ),
-			'30_days'   => __( 'Last 30 days', 'invoicing' ),
-			'60_days'   => __( 'Last 60 days', 'invoicing' ),
-			'90_days'   => __( 'Last 90 days', 'invoicing' ),
-			'180_days'  => __( 'Last 180 days', 'invoicing' ),
-			'360_days'  => __( 'Last 360 days', 'invoicing' ),
+            'today'     => __('Today', 'invoicing'),
+            'yesterday' => __('Yesterday', 'invoicing'),
+            '7_days'    => __('Last 7 days', 'invoicing'),
+			'30_days'   => __('Last 30 days', 'invoicing'),
+			'60_days'   => __('Last 60 days', 'invoicing'),
+			'90_days'   => __('Last 90 days', 'invoicing'),
+			'180_days'  => __('Last 180 days', 'invoicing'),
+			'360_days'  => __('Last 360 days', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_earning_periods', $periods );
+		return apply_filters('getpaid_earning_periods', $periods);
 	}
 
 	/**
 	 * Retrieves the current range's sql.
 	 *
 	 */
-	public function get_range_sql( $range ) {
+	public function get_range_sql($range) {
 
-		$date     = 'CAST(meta.completed_date AS DATE)';
+		$date = 'CAST(meta.completed_date AS DATE)';
         $datetime = 'meta.completed_date';
 
         // Prepare durations.
-        $today                = current_time( 'Y-m-d' );
-		$yesterday            = date( 'Y-m-d', strtotime( '-1 day', current_time( 'timestamp' ) ) );
-		$seven_days_ago       = date( 'Y-m-d', strtotime( '-7 days', current_time( 'timestamp' ) ) );
-		$thirty_days_ago      = date( 'Y-m-d', strtotime( '-30 days', current_time( 'timestamp' ) ) );
-		$ninety_days_ago      = date( 'Y-m-d', strtotime( '-90 days', current_time( 'timestamp' ) ) );
-		$sixty_days_ago       = date( 'Y-m-d', strtotime( '-60 days', current_time( 'timestamp' ) ) );
-		$one_eighty_days_ago  = date( 'Y-m-d', strtotime( '-180 days', current_time( 'timestamp' ) ) );
-		$three_sixty_days_ago = date( 'Y-m-d', strtotime( '-360 days', current_time( 'timestamp' ) ) );
+        $today = current_time('Y-m-d');
+		$yesterday            = date('Y-m-d', strtotime('-1 day', current_time('timestamp')));
+		$seven_days_ago       = date('Y-m-d', strtotime('-7 days', current_time('timestamp')));
+		$thirty_days_ago      = date('Y-m-d', strtotime('-30 days', current_time('timestamp')));
+		$ninety_days_ago      = date('Y-m-d', strtotime('-90 days', current_time('timestamp')));
+		$sixty_days_ago       = date('Y-m-d', strtotime('-60 days', current_time('timestamp')));
+		$one_eighty_days_ago  = date('Y-m-d', strtotime('-180 days', current_time('timestamp')));
+		$three_sixty_days_ago = date('Y-m-d', strtotime('-360 days', current_time('timestamp')));
 
         $ranges = array(
 
@@ -123,8 +123,8 @@ 
 
         );
 
-		$sql = isset( $ranges[ $range ] ) ? $ranges[ $range ] : $ranges[ '7_days' ];
-		return apply_filters( 'getpaid_earning_graphs_get_range_sql', $sql, $range );
+		$sql = isset($ranges[$range]) ? $ranges[$range] : $ranges['7_days'];
+		return apply_filters('getpaid_earning_graphs_get_range_sql', $sql, $range);
 
 	}
 
@@ -135,30 +135,30 @@ 
 	public function get_hours_in_a_day() {
 
 		return array(
-			'12AM' => __( '12 AM', 'invoicing'),
-			'1AM'  => __( '1 AM', 'invoicing'),
-			'2AM'  => __( '2 AM', 'invoicing'),
-			'3AM'  => __( '3 AM', 'invoicing'),
-			'4AM'  => __( '4 AM', 'invoicing'),
-			'5AM'  => __( '5 AM', 'invoicing'),
-			'6AM'  => __( '6 AM', 'invoicing'),
-			'7AM'  => __( '7 AM', 'invoicing'),
-			'8AM'  => __( '8 AM', 'invoicing'),
-			'9AM'  => __( '9 AM', 'invoicing'),
-			'10AM' => __( '10 AM', 'invoicing'),
-			'11AM' => __( '11 AM', 'invoicing'),
-			'12pm' => __( '12 PM', 'invoicing'),
-			'1PM'  => __( '1 PM', 'invoicing'),
-			'2PM'  => __( '2 PM', 'invoicing'),
-			'3PM'  => __( '3 PM', 'invoicing'),
-			'4PM'  => __( '4 PM', 'invoicing'),
-			'5PM'  => __( '5 PM', 'invoicing'),
-			'6PM'  => __( '6 PM', 'invoicing'),
-			'7PM'  => __( '7 PM', 'invoicing'),
-			'8PM'  => __( '8 PM', 'invoicing'),
-			'9PM'  => __( '9 PM', 'invoicing'),
-			'10PM' => __( '10 PM', 'invoicing'),
-			'11PM' => __( '11 PM', 'invoicing'),
+			'12AM' => __('12 AM', 'invoicing'),
+			'1AM'  => __('1 AM', 'invoicing'),
+			'2AM'  => __('2 AM', 'invoicing'),
+			'3AM'  => __('3 AM', 'invoicing'),
+			'4AM'  => __('4 AM', 'invoicing'),
+			'5AM'  => __('5 AM', 'invoicing'),
+			'6AM'  => __('6 AM', 'invoicing'),
+			'7AM'  => __('7 AM', 'invoicing'),
+			'8AM'  => __('8 AM', 'invoicing'),
+			'9AM'  => __('9 AM', 'invoicing'),
+			'10AM' => __('10 AM', 'invoicing'),
+			'11AM' => __('11 AM', 'invoicing'),
+			'12pm' => __('12 PM', 'invoicing'),
+			'1PM'  => __('1 PM', 'invoicing'),
+			'2PM'  => __('2 PM', 'invoicing'),
+			'3PM'  => __('3 PM', 'invoicing'),
+			'4PM'  => __('4 PM', 'invoicing'),
+			'5PM'  => __('5 PM', 'invoicing'),
+			'6PM'  => __('6 PM', 'invoicing'),
+			'7PM'  => __('7 PM', 'invoicing'),
+			'8PM'  => __('8 PM', 'invoicing'),
+			'9PM'  => __('9 PM', 'invoicing'),
+			'10PM' => __('10 PM', 'invoicing'),
+			'11PM' => __('11 PM', 'invoicing'),
 		);
 
 	}
@@ -167,24 +167,24 @@ 
 	 * Retrieves the days in a period
 	 *
 	 */
-	public function get_days_in_period( $days ) {
+	public function get_days_in_period($days) {
 
 		$return = array();
 		$format = 'Y-m-d';
 
-		if ( $days < 8 ) {
+		if ($days < 8) {
 			$format = 'D';
 		}
 
-		if ( $days < 32 ) {
+		if ($days < 32) {
 			$format = 'M j';
 		}
 
-		while ( $days > 0 ) {
+		while ($days > 0) {
 
-			$key            = date( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( $format, strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
+			$key            = date('Y-m-d', strtotime("-$days days", current_time('timestamp')));
+			$label          = date_i18n($format, strtotime("-$days days", current_time('timestamp')));
+			$return[$key] = $label;
 			$days--;
 
 		}
@@ -196,15 +196,15 @@ 
 	 * Retrieves the weeks in a period
 	 *
 	 */
-	public function get_weeks_in_period( $days ) {
+	public function get_weeks_in_period($days) {
 
 		$return = array();
 
-		while ( $days > 0 ) {
+		while ($days > 0) {
 
-			$key            = date( 'W', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$label          = date_i18n( 'Y-m-d', strtotime( "-$days days", current_time( 'timestamp' ) ) );
-			$return[ $key ] = $label;
+			$key            = date('W', strtotime("-$days days", current_time('timestamp')));
+			$label          = date_i18n('Y-m-d', strtotime("-$days days", current_time('timestamp')));
+			$return[$key] = $label;
 			$days--;
 
 		}

includes/geolocation/class-getpaid-maxmind-database-service.php

Indentation +149 added lines, -149 removed lines

@@ -13,154 +13,154 @@
  */
 class GetPaid_MaxMind_Database_Service {
 
-	/**
-	 * The name of the MaxMind database to utilize.
-	 */
-	const DATABASE = 'GeoLite2-Country';
-
-	/**
-	 * The extension for the MaxMind database.
-	 */
-	const DATABASE_EXTENSION = '.mmdb';
-
-	/**
-	 * A prefix for the MaxMind database filename.
-	 *
-	 * @var string
-	 */
-	private $database_prefix;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param string|null $database_prefix A prefix for the MaxMind database filename.
-	 */
-	public function __construct( $database_prefix ) {
-		$this->database_prefix = $database_prefix;
-	}
-
-	/**
-	 * Fetches the path that the database should be stored.
-	 *
-	 * @return string The local database path.
-	 */
-	public function get_database_path() {
-		$uploads_dir = wp_upload_dir();
-
-		$database_path = trailingslashit( $uploads_dir['basedir'] ) . 'invoicing/';
-		if ( ! empty( $this->database_prefix ) ) {
-			$database_path .= $this->database_prefix . '-';
-		}
-		$database_path .= self::DATABASE . self::DATABASE_EXTENSION;
-
-		// Filter the geolocation database storage path.
-		return apply_filters( 'getpaid_maxmind_geolocation_database_path', $database_path );
-	}
-
-	/**
-	 * Fetches the database from the MaxMind service.
-	 *
-	 * @param string $license_key The license key to be used when downloading the database.
-	 * @return string|WP_Error The path to the database file or an error if invalid.
-	 */
-	public function download_database( $license_key ) {
-
-		$download_uri = add_query_arg(
-			array(
-				'edition_id'  => self::DATABASE,
-				'license_key' => urlencode( wpinv_clean( $license_key ) ),
-				'suffix'      => 'tar.gz',
-			),
-			'https://download.maxmind.com/app/geoip_download'
-		);
-
-		// Needed for the download_url call right below.
-		require_once ABSPATH . 'wp-admin/includes/file.php';
-
-		$tmp_archive_path = download_url( esc_url_raw( $download_uri ) );
-
-		if ( is_wp_error( $tmp_archive_path ) ) {
-			// Transform the error into something more informative.
-			$error_data = $tmp_archive_path->get_error_data();
-			if ( isset( $error_data['code'] ) && $error_data['code'] == 401 ) {
-				return new WP_Error(
-					'getpaid_maxmind_geolocation_database_license_key',
-					__( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
-				);
-			}
-
-			return new WP_Error( 'getpaid_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
-		}
-
-		// Extract the database from the archive.
-		return $this->extract_downloaded_database( $tmp_archive_path );
-
-	}
-
-	/**
-	 * Extracts the downloaded database.
-	 *
-	 * @param string $tmp_archive_path The database archive path.
-	 * @return string|WP_Error The path to the database file or an error if invalid.
-	 */
-	protected function extract_downloaded_database( $tmp_archive_path ) {
-
-		// Extract the database from the archive.
-		$tmp_database_path = '';
-
-		try {
-
-			$file              = new PharData( $tmp_archive_path );
-			$tmp_database_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION;
-
-			$file->extractTo(
-				dirname( $tmp_archive_path ),
-				trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION,
-				true
-			);
-
-		} catch ( Exception $exception ) {
-			return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
-		} finally {
-			// Remove the archive since we only care about a single file in it.
-			unlink( $tmp_archive_path );
-		}
-
-		return $tmp_database_path;
-	}
-
-	/**
-	 * Fetches the ISO country code associated with an IP address.
-	 *
-	 * @param string $ip_address The IP address to find the country code for.
-	 * @return string The country code for the IP address, or empty if not found.
-	 */
-	public function get_iso_country_code_for_ip( $ip_address ) {
-		$country_code = '';
-
-		if ( ! class_exists( 'MaxMind\Db\Reader' ) ) {
-			return $country_code;
-		}
-
-		$database_path = $this->get_database_path();
-		if ( ! file_exists( $database_path ) ) {
-			return $country_code;
-		}
-
-		try {
-			$reader = new MaxMind\Db\Reader( $database_path );
-			$data   = $reader->get( $ip_address );
-
-			if ( isset( $data['country']['iso_code'] ) ) {
-				$country_code = $data['country']['iso_code'];
-			}
-
-			$reader->close();
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), 'SOURCE: MaxMind GeoLocation' );
-		}
-
-		return $country_code;
-	}
+    /**
+     * The name of the MaxMind database to utilize.
+     */
+    const DATABASE = 'GeoLite2-Country';
+
+    /**
+     * The extension for the MaxMind database.
+     */
+    const DATABASE_EXTENSION = '.mmdb';
+
+    /**
+     * A prefix for the MaxMind database filename.
+     *
+     * @var string
+     */
+    private $database_prefix;
+
+    /**
+     * Class constructor.
+     *
+     * @param string|null $database_prefix A prefix for the MaxMind database filename.
+     */
+    public function __construct( $database_prefix ) {
+        $this->database_prefix = $database_prefix;
+    }
+
+    /**
+     * Fetches the path that the database should be stored.
+     *
+     * @return string The local database path.
+     */
+    public function get_database_path() {
+        $uploads_dir = wp_upload_dir();
+
+        $database_path = trailingslashit( $uploads_dir['basedir'] ) . 'invoicing/';
+        if ( ! empty( $this->database_prefix ) ) {
+            $database_path .= $this->database_prefix . '-';
+        }
+        $database_path .= self::DATABASE . self::DATABASE_EXTENSION;
+
+        // Filter the geolocation database storage path.
+        return apply_filters( 'getpaid_maxmind_geolocation_database_path', $database_path );
+    }
+
+    /**
+     * Fetches the database from the MaxMind service.
+     *
+     * @param string $license_key The license key to be used when downloading the database.
+     * @return string|WP_Error The path to the database file or an error if invalid.
+     */
+    public function download_database( $license_key ) {
+
+        $download_uri = add_query_arg(
+            array(
+                'edition_id'  => self::DATABASE,
+                'license_key' => urlencode( wpinv_clean( $license_key ) ),
+                'suffix'      => 'tar.gz',
+            ),
+            'https://download.maxmind.com/app/geoip_download'
+        );
+
+        // Needed for the download_url call right below.
+        require_once ABSPATH . 'wp-admin/includes/file.php';
+
+        $tmp_archive_path = download_url( esc_url_raw( $download_uri ) );
+
+        if ( is_wp_error( $tmp_archive_path ) ) {
+            // Transform the error into something more informative.
+            $error_data = $tmp_archive_path->get_error_data();
+            if ( isset( $error_data['code'] ) && $error_data['code'] == 401 ) {
+                return new WP_Error(
+                    'getpaid_maxmind_geolocation_database_license_key',
+                    __( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
+                );
+            }
+
+            return new WP_Error( 'getpaid_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
+        }
+
+        // Extract the database from the archive.
+        return $this->extract_downloaded_database( $tmp_archive_path );
+
+    }
+
+    /**
+     * Extracts the downloaded database.
+     *
+     * @param string $tmp_archive_path The database archive path.
+     * @return string|WP_Error The path to the database file or an error if invalid.
+     */
+    protected function extract_downloaded_database( $tmp_archive_path ) {
+
+        // Extract the database from the archive.
+        $tmp_database_path = '';
+
+        try {
+
+            $file              = new PharData( $tmp_archive_path );
+            $tmp_database_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION;
+
+            $file->extractTo(
+                dirname( $tmp_archive_path ),
+                trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION,
+                true
+            );
+
+        } catch ( Exception $exception ) {
+            return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
+        } finally {
+            // Remove the archive since we only care about a single file in it.
+            unlink( $tmp_archive_path );
+        }
+
+        return $tmp_database_path;
+    }
+
+    /**
+     * Fetches the ISO country code associated with an IP address.
+     *
+     * @param string $ip_address The IP address to find the country code for.
+     * @return string The country code for the IP address, or empty if not found.
+     */
+    public function get_iso_country_code_for_ip( $ip_address ) {
+        $country_code = '';
+
+        if ( ! class_exists( 'MaxMind\Db\Reader' ) ) {
+            return $country_code;
+        }
+
+        $database_path = $this->get_database_path();
+        if ( ! file_exists( $database_path ) ) {
+            return $country_code;
+        }
+
+        try {
+            $reader = new MaxMind\Db\Reader( $database_path );
+            $data   = $reader->get( $ip_address );
+
+            if ( isset( $data['country']['iso_code'] ) ) {
+                $country_code = $data['country']['iso_code'];
+            }
+
+            $reader->close();
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), 'SOURCE: MaxMind GeoLocation' );
+        }
+
+        return $country_code;
+    }
 
 }

Spacing +29 added lines, -29 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The service class responsible for interacting with MaxMind databases.
@@ -35,7 +35,7 @@ 
 	 *
 	 * @param string|null $database_prefix A prefix for the MaxMind database filename.
 	 */
-	public function __construct( $database_prefix ) {
+	public function __construct($database_prefix) {
 		$this->database_prefix = $database_prefix;
 	}
 
@@ -47,14 +47,14 @@ 
 	public function get_database_path() {
 		$uploads_dir = wp_upload_dir();
 
-		$database_path = trailingslashit( $uploads_dir['basedir'] ) . 'invoicing/';
-		if ( ! empty( $this->database_prefix ) ) {
+		$database_path = trailingslashit($uploads_dir['basedir']) . 'invoicing/';
+		if (!empty($this->database_prefix)) {
 			$database_path .= $this->database_prefix . '-';
 		}
 		$database_path .= self::DATABASE . self::DATABASE_EXTENSION;
 
 		// Filter the geolocation database storage path.
-		return apply_filters( 'getpaid_maxmind_geolocation_database_path', $database_path );
+		return apply_filters('getpaid_maxmind_geolocation_database_path', $database_path);
 	}
 
 	/**
@@ -63,12 +63,12 @@ 
 	 * @param string $license_key The license key to be used when downloading the database.
 	 * @return string|WP_Error The path to the database file or an error if invalid.
 	 */
-	public function download_database( $license_key ) {
+	public function download_database($license_key) {
 
 		$download_uri = add_query_arg(
 			array(
 				'edition_id'  => self::DATABASE,
-				'license_key' => urlencode( wpinv_clean( $license_key ) ),
+				'license_key' => urlencode(wpinv_clean($license_key)),
 				'suffix'      => 'tar.gz',
 			),
 			'https://download.maxmind.com/app/geoip_download'
@@ -77,23 +77,23 @@ 
 		// Needed for the download_url call right below.
 		require_once ABSPATH . 'wp-admin/includes/file.php';
 
-		$tmp_archive_path = download_url( esc_url_raw( $download_uri ) );
+		$tmp_archive_path = download_url(esc_url_raw($download_uri));
 
-		if ( is_wp_error( $tmp_archive_path ) ) {
+		if (is_wp_error($tmp_archive_path)) {
 			// Transform the error into something more informative.
 			$error_data = $tmp_archive_path->get_error_data();
-			if ( isset( $error_data['code'] ) && $error_data['code'] == 401 ) {
+			if (isset($error_data['code']) && $error_data['code'] == 401) {
 				return new WP_Error(
 					'getpaid_maxmind_geolocation_database_license_key',
-					__( 'The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing' )
+					__('The MaxMind license key is invalid. If you have recently created this key, you may need to wait for it to become active.', 'invoicing')
 				);
 			}
 
-			return new WP_Error( 'getpaid_maxmind_geolocation_database_download', __( 'Failed to download the MaxMind database.', 'invoicing' ) );
+			return new WP_Error('getpaid_maxmind_geolocation_database_download', __('Failed to download the MaxMind database.', 'invoicing'));
 		}
 
 		// Extract the database from the archive.
-		return $this->extract_downloaded_database( $tmp_archive_path );
+		return $this->extract_downloaded_database($tmp_archive_path);
 
 	}
 
@@ -103,27 +103,27 @@ 
 	 * @param string $tmp_archive_path The database archive path.
 	 * @return string|WP_Error The path to the database file or an error if invalid.
 	 */
-	protected function extract_downloaded_database( $tmp_archive_path ) {
+	protected function extract_downloaded_database($tmp_archive_path) {
 
 		// Extract the database from the archive.
 		$tmp_database_path = '';
 
 		try {
 
-			$file              = new PharData( $tmp_archive_path );
-			$tmp_database_path = trailingslashit( dirname( $tmp_archive_path ) ) . trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION;
+			$file              = new PharData($tmp_archive_path);
+			$tmp_database_path = trailingslashit(dirname($tmp_archive_path)) . trailingslashit($file->current()->getFilename()) . self::DATABASE . self::DATABASE_EXTENSION;
 
 			$file->extractTo(
-				dirname( $tmp_archive_path ),
-				trailingslashit( $file->current()->getFilename() ) . self::DATABASE . self::DATABASE_EXTENSION,
+				dirname($tmp_archive_path),
+				trailingslashit($file->current()->getFilename()) . self::DATABASE . self::DATABASE_EXTENSION,
 				true
 			);
 
-		} catch ( Exception $exception ) {
-			return new WP_Error( 'invoicing_maxmind_geolocation_database_archive', $exception->getMessage() );
+		} catch (Exception $exception) {
+			return new WP_Error('invoicing_maxmind_geolocation_database_archive', $exception->getMessage());
 		} finally {
 			// Remove the archive since we only care about a single file in it.
-			unlink( $tmp_archive_path );
+			unlink($tmp_archive_path);
 		}
 
 		return $tmp_database_path;
@@ -135,29 +135,29 @@ 
 	 * @param string $ip_address The IP address to find the country code for.
 	 * @return string The country code for the IP address, or empty if not found.
 	 */
-	public function get_iso_country_code_for_ip( $ip_address ) {
+	public function get_iso_country_code_for_ip($ip_address) {
 		$country_code = '';
 
-		if ( ! class_exists( 'MaxMind\Db\Reader' ) ) {
+		if (!class_exists('MaxMind\Db\Reader')) {
 			return $country_code;
 		}
 
 		$database_path = $this->get_database_path();
-		if ( ! file_exists( $database_path ) ) {
+		if (!file_exists($database_path)) {
 			return $country_code;
 		}
 
 		try {
-			$reader = new MaxMind\Db\Reader( $database_path );
-			$data   = $reader->get( $ip_address );
+			$reader = new MaxMind\Db\Reader($database_path);
+			$data   = $reader->get($ip_address);
 
-			if ( isset( $data['country']['iso_code'] ) ) {
+			if (isset($data['country']['iso_code'])) {
 				$country_code = $data['country']['iso_code'];
 			}
 
 			$reader->close();
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), 'SOURCE: MaxMind GeoLocation' );
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), 'SOURCE: MaxMind GeoLocation');
 		}
 
 		return $country_code;

includes/geolocation/class-getpaid-maxmind-geolocation.php

Indentation +159 added lines, -159 removed lines

@@ -16,164 +16,164 @@
  */
 class GetPaid_MaxMind_Geolocation {
 
-	/**
-	 * The service responsible for interacting with the MaxMind database.
-	 *
-	 * @var GetPaid_MaxMind_Database_Service
-	 */
-	private $database_service;
-
-	/**
-	 * Initialize the integration.
-	 */
-	public function __construct() {
-
-		/**
-		 * Supports overriding the database service to be used.
-		 *
-		 * @since 1.0.19
-		 * @return mixed|null The geolocation database service.
-		 */
-		$this->database_service = apply_filters( 'getpaid_maxmind_geolocation_database_service', null );
-		if ( null === $this->database_service ) {
-			$this->database_service = new GetPaid_MaxMind_Database_Service( $this->get_database_prefix() );
-		}
-
-		// Bind to the scheduled updater action.
-		add_action( 'getpaid_update_geoip_databases', array( $this, 'update_database' ) );
-
-		// Bind to the geolocation filter for MaxMind database lookups.
-		add_filter( 'getpaid_get_geolocation', array( $this, 'get_geolocation' ), 10, 2 );
-
-		// Handle maxmind key updates.
-		add_filter( 'wpinv_settings_sanitize_maxmind_license_key', array( $this, 'handle_key_updates' ) );
-
-	}
-
-	/**
-	 * Get database service.
-	 *
-	 * @return GetPaid_MaxMind_Database_Service|null
-	 */
-	public function get_database_service() {
-		return $this->database_service;
-	}
-
-	/**
-	 * Checks to make sure that the license key is valid.
-	 *
-	 * @param string $license_key The new license key.
-	 * @return string
-	 */
-	public function handle_key_updates( $license_key ) {
-
-		// Trim whitespaces and strip slashes.
-		$license_key = trim( $license_key );
-
-		// Abort if the license key is empty or unchanged.
-		if ( empty( $license_key ) ) {
-			return $license_key;
-		}
-
-		// Abort if a database exists and the license key is unchaged.
-		if ( file_exists( $this->database_service->get_database_path() && $license_key == wpinv_get_option( 'maxmind_license_key' ) ) ) {
-			return $license_key;
-		}
-
-		// Check the license key by attempting to download the Geolocation database.
-		$tmp_database_path = $this->database_service->download_database( $license_key );
-		if ( is_wp_error( $tmp_database_path ) ) {
-			getpaid_admin()->show_error( $tmp_database_path->get_error_message() );
-			return $license_key;
-		}
-
-		$this->update_database( /** @scrutinizer ignore-type */ $tmp_database_path );
-
-	}
-
-	/**
-	 * Updates the database used for geolocation queries.
-	 *
-	 * @param string $tmp_database_path Temporary database path.
-	 */
-	public function update_database( $tmp_database_path = null ) {
-
-		// Allow us to easily interact with the filesystem.
-		require_once ABSPATH . 'wp-admin/includes/file.php';
-		WP_Filesystem();
-		global $wp_filesystem;
-
-		// Remove any existing archives to comply with the MaxMind TOS.
-		$target_database_path = $this->database_service->get_database_path();
-
-		// If there's no database path, we can't store the database.
-		if ( empty( $target_database_path ) ) {
-			return;
-		}
-
-		if ( $wp_filesystem->exists( $target_database_path ) ) {
-			$wp_filesystem->delete( $target_database_path );
-		}
-
-		// We can't download a database if there's no license key configured.
-		$license_key = wpinv_get_option( 'maxmind_license_key' );
-		if ( empty( $license_key ) ) {
-			return;
-		}
-
-		if ( empty( $tmp_database_path ) ) {
-			$tmp_database_path = $this->database_service->download_database( $license_key );
-		}
-
-		if ( is_wp_error( $tmp_database_path ) ) {
-			wpinv_error_log( $tmp_database_path->get_error_message() );
-			return;
-		}
-
-		// Move the new database into position.
-		$wp_filesystem->move( $tmp_database_path, $target_database_path, true );
-		$wp_filesystem->delete( dirname( $tmp_database_path ) );
-	}
-
-	/**
-	 * Performs a geolocation lookup against the MaxMind database for the given IP address.
-	 *
-	 * @param array  $data       Geolocation data.
-	 * @param string $ip_address The IP address to geolocate.
-	 * @return array Geolocation including country code, state, city and postcode based on an IP address.
-	 */
-	public function get_geolocation( $data, $ip_address ) {
-
-		if ( ! empty( $data['country'] ) || empty( $ip_address ) ) {
-			return $data;
-		}
-
-		$country_code = $this->database_service->get_iso_country_code_for_ip( $ip_address );
-
-		return array(
-			'country'  => $country_code,
-			'state'    => '',
-			'city'     => '',
-			'postcode' => '',
-		);
-
-	}
-
-	/**
-	 * Fetches the prefix for the MaxMind database file.
-	 *
-	 * @return string
-	 */
-	private function get_database_prefix() {
-
-		$prefix = get_option( 'wpinv_maxmind_database_prefix' );
-
-		if ( empty( $prefix ) ) {
-			$prefix = md5( uniqid( 'wpinv' ) );
-			update_option( 'wpinv_maxmind_database_prefix', $prefix );
-		}
-
-		return $prefix;
-	}
+    /**
+     * The service responsible for interacting with the MaxMind database.
+     *
+     * @var GetPaid_MaxMind_Database_Service
+     */
+    private $database_service;
+
+    /**
+     * Initialize the integration.
+     */
+    public function __construct() {
+
+        /**
+         * Supports overriding the database service to be used.
+         *
+         * @since 1.0.19
+         * @return mixed|null The geolocation database service.
+         */
+        $this->database_service = apply_filters( 'getpaid_maxmind_geolocation_database_service', null );
+        if ( null === $this->database_service ) {
+            $this->database_service = new GetPaid_MaxMind_Database_Service( $this->get_database_prefix() );
+        }
+
+        // Bind to the scheduled updater action.
+        add_action( 'getpaid_update_geoip_databases', array( $this, 'update_database' ) );
+
+        // Bind to the geolocation filter for MaxMind database lookups.
+        add_filter( 'getpaid_get_geolocation', array( $this, 'get_geolocation' ), 10, 2 );
+
+        // Handle maxmind key updates.
+        add_filter( 'wpinv_settings_sanitize_maxmind_license_key', array( $this, 'handle_key_updates' ) );
+
+    }
+
+    /**
+     * Get database service.
+     *
+     * @return GetPaid_MaxMind_Database_Service|null
+     */
+    public function get_database_service() {
+        return $this->database_service;
+    }
+
+    /**
+     * Checks to make sure that the license key is valid.
+     *
+     * @param string $license_key The new license key.
+     * @return string
+     */
+    public function handle_key_updates( $license_key ) {
+
+        // Trim whitespaces and strip slashes.
+        $license_key = trim( $license_key );
+
+        // Abort if the license key is empty or unchanged.
+        if ( empty( $license_key ) ) {
+            return $license_key;
+        }
+
+        // Abort if a database exists and the license key is unchaged.
+        if ( file_exists( $this->database_service->get_database_path() && $license_key == wpinv_get_option( 'maxmind_license_key' ) ) ) {
+            return $license_key;
+        }
+
+        // Check the license key by attempting to download the Geolocation database.
+        $tmp_database_path = $this->database_service->download_database( $license_key );
+        if ( is_wp_error( $tmp_database_path ) ) {
+            getpaid_admin()->show_error( $tmp_database_path->get_error_message() );
+            return $license_key;
+        }
+
+        $this->update_database( /** @scrutinizer ignore-type */ $tmp_database_path );
+
+    }
+
+    /**
+     * Updates the database used for geolocation queries.
+     *
+     * @param string $tmp_database_path Temporary database path.
+     */
+    public function update_database( $tmp_database_path = null ) {
+
+        // Allow us to easily interact with the filesystem.
+        require_once ABSPATH . 'wp-admin/includes/file.php';
+        WP_Filesystem();
+        global $wp_filesystem;
+
+        // Remove any existing archives to comply with the MaxMind TOS.
+        $target_database_path = $this->database_service->get_database_path();
+
+        // If there's no database path, we can't store the database.
+        if ( empty( $target_database_path ) ) {
+            return;
+        }
+
+        if ( $wp_filesystem->exists( $target_database_path ) ) {
+            $wp_filesystem->delete( $target_database_path );
+        }
+
+        // We can't download a database if there's no license key configured.
+        $license_key = wpinv_get_option( 'maxmind_license_key' );
+        if ( empty( $license_key ) ) {
+            return;
+        }
+
+        if ( empty( $tmp_database_path ) ) {
+            $tmp_database_path = $this->database_service->download_database( $license_key );
+        }
+
+        if ( is_wp_error( $tmp_database_path ) ) {
+            wpinv_error_log( $tmp_database_path->get_error_message() );
+            return;
+        }
+
+        // Move the new database into position.
+        $wp_filesystem->move( $tmp_database_path, $target_database_path, true );
+        $wp_filesystem->delete( dirname( $tmp_database_path ) );
+    }
+
+    /**
+     * Performs a geolocation lookup against the MaxMind database for the given IP address.
+     *
+     * @param array  $data       Geolocation data.
+     * @param string $ip_address The IP address to geolocate.
+     * @return array Geolocation including country code, state, city and postcode based on an IP address.
+     */
+    public function get_geolocation( $data, $ip_address ) {
+
+        if ( ! empty( $data['country'] ) || empty( $ip_address ) ) {
+            return $data;
+        }
+
+        $country_code = $this->database_service->get_iso_country_code_for_ip( $ip_address );
+
+        return array(
+            'country'  => $country_code,
+            'state'    => '',
+            'city'     => '',
+            'postcode' => '',
+        );
+
+    }
+
+    /**
+     * Fetches the prefix for the MaxMind database file.
+     *
+     * @return string
+     */
+    private function get_database_prefix() {
+
+        $prefix = get_option( 'wpinv_maxmind_database_prefix' );
+
+        if ( empty( $prefix ) ) {
+            $prefix = md5( uniqid( 'wpinv' ) );
+            update_option( 'wpinv_maxmind_database_prefix', $prefix );
+        }
+
+        return $prefix;
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Uses MaxMind for Geolocation
@@ -34,19 +34,19 @@ 
 		 * @since 1.0.19
 		 * @return mixed|null The geolocation database service.
 		 */
-		$this->database_service = apply_filters( 'getpaid_maxmind_geolocation_database_service', null );
-		if ( null === $this->database_service ) {
-			$this->database_service = new GetPaid_MaxMind_Database_Service( $this->get_database_prefix() );
+		$this->database_service = apply_filters('getpaid_maxmind_geolocation_database_service', null);
+		if (null === $this->database_service) {
+			$this->database_service = new GetPaid_MaxMind_Database_Service($this->get_database_prefix());
 		}
 
 		// Bind to the scheduled updater action.
-		add_action( 'getpaid_update_geoip_databases', array( $this, 'update_database' ) );
+		add_action('getpaid_update_geoip_databases', array($this, 'update_database'));
 
 		// Bind to the geolocation filter for MaxMind database lookups.
-		add_filter( 'getpaid_get_geolocation', array( $this, 'get_geolocation' ), 10, 2 );
+		add_filter('getpaid_get_geolocation', array($this, 'get_geolocation'), 10, 2);
 
 		// Handle maxmind key updates.
-		add_filter( 'wpinv_settings_sanitize_maxmind_license_key', array( $this, 'handle_key_updates' ) );
+		add_filter('wpinv_settings_sanitize_maxmind_license_key', array($this, 'handle_key_updates'));
 
 	}
 
@@ -65,29 +65,29 @@ 
 	 * @param string $license_key The new license key.
 	 * @return string
 	 */
-	public function handle_key_updates( $license_key ) {
+	public function handle_key_updates($license_key) {
 
 		// Trim whitespaces and strip slashes.
-		$license_key = trim( $license_key );
+		$license_key = trim($license_key);
 
 		// Abort if the license key is empty or unchanged.
-		if ( empty( $license_key ) ) {
+		if (empty($license_key)) {
 			return $license_key;
 		}
 
 		// Abort if a database exists and the license key is unchaged.
-		if ( file_exists( $this->database_service->get_database_path() && $license_key == wpinv_get_option( 'maxmind_license_key' ) ) ) {
+		if (file_exists($this->database_service->get_database_path() && $license_key == wpinv_get_option('maxmind_license_key'))) {
 			return $license_key;
 		}
 
 		// Check the license key by attempting to download the Geolocation database.
-		$tmp_database_path = $this->database_service->download_database( $license_key );
-		if ( is_wp_error( $tmp_database_path ) ) {
-			getpaid_admin()->show_error( $tmp_database_path->get_error_message() );
+		$tmp_database_path = $this->database_service->download_database($license_key);
+		if (is_wp_error($tmp_database_path)) {
+			getpaid_admin()->show_error($tmp_database_path->get_error_message());
 			return $license_key;
 		}
 
-		$this->update_database( /** @scrutinizer ignore-type */ $tmp_database_path );
+		$this->update_database(/** @scrutinizer ignore-type */ $tmp_database_path);
 
 	}
 
@@ -96,7 +96,7 @@ 
 	 *
 	 * @param string $tmp_database_path Temporary database path.
 	 */
-	public function update_database( $tmp_database_path = null ) {
+	public function update_database($tmp_database_path = null) {
 
 		// Allow us to easily interact with the filesystem.
 		require_once ABSPATH . 'wp-admin/includes/file.php';
@@ -107,32 +107,32 @@ 
 		$target_database_path = $this->database_service->get_database_path();
 
 		// If there's no database path, we can't store the database.
-		if ( empty( $target_database_path ) ) {
+		if (empty($target_database_path)) {
 			return;
 		}
 
-		if ( $wp_filesystem->exists( $target_database_path ) ) {
-			$wp_filesystem->delete( $target_database_path );
+		if ($wp_filesystem->exists($target_database_path)) {
+			$wp_filesystem->delete($target_database_path);
 		}
 
 		// We can't download a database if there's no license key configured.
-		$license_key = wpinv_get_option( 'maxmind_license_key' );
-		if ( empty( $license_key ) ) {
+		$license_key = wpinv_get_option('maxmind_license_key');
+		if (empty($license_key)) {
 			return;
 		}
 
-		if ( empty( $tmp_database_path ) ) {
-			$tmp_database_path = $this->database_service->download_database( $license_key );
+		if (empty($tmp_database_path)) {
+			$tmp_database_path = $this->database_service->download_database($license_key);
 		}
 
-		if ( is_wp_error( $tmp_database_path ) ) {
-			wpinv_error_log( $tmp_database_path->get_error_message() );
+		if (is_wp_error($tmp_database_path)) {
+			wpinv_error_log($tmp_database_path->get_error_message());
 			return;
 		}
 
 		// Move the new database into position.
-		$wp_filesystem->move( $tmp_database_path, $target_database_path, true );
-		$wp_filesystem->delete( dirname( $tmp_database_path ) );
+		$wp_filesystem->move($tmp_database_path, $target_database_path, true);
+		$wp_filesystem->delete(dirname($tmp_database_path));
 	}
 
 	/**
@@ -142,13 +142,13 @@ 
 	 * @param string $ip_address The IP address to geolocate.
 	 * @return array Geolocation including country code, state, city and postcode based on an IP address.
 	 */
-	public function get_geolocation( $data, $ip_address ) {
+	public function get_geolocation($data, $ip_address) {
 
-		if ( ! empty( $data['country'] ) || empty( $ip_address ) ) {
+		if (!empty($data['country']) || empty($ip_address)) {
 			return $data;
 		}
 
-		$country_code = $this->database_service->get_iso_country_code_for_ip( $ip_address );
+		$country_code = $this->database_service->get_iso_country_code_for_ip($ip_address);
 
 		return array(
 			'country'  => $country_code,
@@ -166,11 +166,11 @@ 
 	 */
 	private function get_database_prefix() {
 
-		$prefix = get_option( 'wpinv_maxmind_database_prefix' );
+		$prefix = get_option('wpinv_maxmind_database_prefix');
 
-		if ( empty( $prefix ) ) {
-			$prefix = md5( uniqid( 'wpinv' ) );
-			update_option( 'wpinv_maxmind_database_prefix', $prefix );
+		if (empty($prefix)) {
+			$prefix = md5(uniqid('wpinv'));
+			update_option('wpinv_maxmind_database_prefix', $prefix);
 		}
 
 		return $prefix;

includes/reports/class-getpaid-reports-report-gateways.php

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Items Class.
@@ -16,11 +16,11 @@ 
 	 * Retrieves the earning sql.
 	 *
 	 */
-	public function get_sql( $range ) {
+	public function get_sql($range) {
 		global $wpdb;
 
 		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
+		$clauses    = $this->get_range_sql($range);
 
 		$sql        = "SELECT
 				meta.gateway AS gateway,
@@ -35,7 +35,7 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_gateways_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_gateways_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -45,30 +45,30 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
+		$this->stats = $this->normalize_stats($this->stats);
 	}
 
 	/**
 	 * Normalizes the report stats.
 	 *
 	 */
-	public function normalize_stats( $stats ) {
+	public function normalize_stats($stats) {
 		$normalized = array();
 		$others     = 0;
 		$did        = 0;
 
-		foreach ( $stats as $stat ) {
+		foreach ($stats as $stat) {
 
-			if ( $did > 4 ) {
+			if ($did > 4) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+				$others += wpinv_round_amount(wpinv_sanitize_amount($stat->total));
 
 			} else {
 
 				$normalized[] = array(
-					'total'     => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'gateway'   => strip_tags( wpinv_get_gateway_admin_label( $stat->gateway ) ),
+					'total'     => wpinv_round_amount(wpinv_sanitize_amount($stat->total)),
+					'gateway'   => strip_tags(wpinv_get_gateway_admin_label($stat->gateway)),
 				);
 
 			}
@@ -76,11 +76,11 @@ 
 			$did++;
 		}
 
-		if ( $others > 0 ) {
+		if ($others > 0) {
 
 			$normalized[] = array(
-				'total'     => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'gateway'   => esc_html__( 'Others', 'invoicing' ),
+				'total'     => wpinv_round_amount(wpinv_sanitize_amount($others)),
+				'gateway'   => esc_html__('Others', 'invoicing'),
 			);
 
 		}
@@ -94,10 +94,10 @@ 
 	 */
 	public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688','#4caf50','#8bc34a','#00bcd4','#03a9f4','#2196f3' );
+		$data     = wp_list_pluck($this->stats, 'total');
+		$colors   = array('#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3');
 
-		shuffle( $colors );
+		shuffle($colors);
 
 		return array(
 			'data'            => $data,
@@ -111,7 +111,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'gateway' );
+		return wp_list_pluck($this->stats, 'gateway');
 	}
 
 	/**
@@ -132,8 +132,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( $this->get_labels() ); ?>,
-								'datasets': [ <?php echo wp_json_encode( $this->get_data() ); ?> ]
+								'labels': <?php echo wp_json_encode($this->get_labels()); ?>,
+								'datasets': [ <?php echo wp_json_encode($this->get_data()); ?> ]
 							},
 							options: {
 								legend: {

Indentation +81 added lines, -81 removed lines

@@ -12,22 +12,22 @@ 
  */
 class GetPaid_Reports_Report_Gateways extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var string
-	 */
-	public $field = 'gateway';
-
-	/**
-	 * Retrieves the earning sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
-
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-
-		$sql        = "SELECT
+    /**
+     * @var string
+     */
+    public $field = 'gateway';
+
+    /**
+     * Retrieves the earning sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
+
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $clauses    = $this->get_range_sql( $range );
+
+        $sql        = "SELECT
 				meta.gateway AS gateway,
 				SUM(total) as total
             FROM $wpdb->posts
@@ -40,91 +40,91 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_gateways_graphs_get_sql', $sql, $range );
+        return apply_filters( 'getpaid_gateways_graphs_get_sql', $sql, $range );
 
-	}
+    }
 
-	/**
-	 * Prepares the report stats.
-	 *
-	 */
-	public function prepare_stats() {
-		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
-	}
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+        $this->stats = $this->normalize_stats( $this->stats );
+    }
 
-	/**
-	 * Normalizes the report stats.
-	 *
-	 */
-	public function normalize_stats( $stats ) {
-		$normalized = array();
-		$others     = 0;
-		$did        = 0;
+    /**
+     * Normalizes the report stats.
+     *
+     */
+    public function normalize_stats( $stats ) {
+        $normalized = array();
+        $others     = 0;
+        $did        = 0;
 
-		foreach ( $stats as $stat ) {
+        foreach ( $stats as $stat ) {
 
-			if ( $did > 4 ) {
+            if ( $did > 4 ) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+                $others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
 
-			} else {
+            } else {
 
-				$normalized[] = array(
-					'total'     => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'gateway'   => strip_tags( wpinv_get_gateway_admin_label( $stat->gateway ) ),
-				);
+                $normalized[] = array(
+                    'total'     => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
+                    'gateway'   => strip_tags( wpinv_get_gateway_admin_label( $stat->gateway ) ),
+                );
 
-			}
+            }
 
-			$did++;
-		}
+            $did++;
+        }
 
-		if ( $others > 0 ) {
+        if ( $others > 0 ) {
 
-			$normalized[] = array(
-				'total'     => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'gateway'   => esc_html__( 'Others', 'invoicing' ),
-			);
+            $normalized[] = array(
+                'total'     => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
+                'gateway'   => esc_html__( 'Others', 'invoicing' ),
+            );
 
-		}
+        }
 
-		return $normalized;
-	}
+        return $normalized;
+    }
 
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data() {
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688','#4caf50','#8bc34a','#00bcd4','#03a9f4','#2196f3' );
+        $data     = wp_list_pluck( $this->stats, 'total' );
+        $colors   = array( '#009688','#4caf50','#8bc34a','#00bcd4','#03a9f4','#2196f3' );
 
-		shuffle( $colors );
+        shuffle( $colors );
 
-		return array(
-			'data'            => $data,
-			'backgroundColor' => $colors,
-		);
+        return array(
+            'data'            => $data,
+            'backgroundColor' => $colors,
+        );
 
-	}
+    }
 
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'gateway' );
-	}
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels() {
+        return wp_list_pluck( $this->stats, 'gateway' );
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {
-		?>
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {
+        ?>
 
 			<canvas id="getpaid-chartjs-earnings-gateways"></canvas>
 
@@ -153,6 +153,6 @@ 
 			</script>
 
 		<?php
-	}
+    }
 
 }

includes/reports/class-getpaid-reports-report-discounts.php

Spacing +21 added lines, -21 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Report_Discounts Class.
@@ -16,11 +16,11 @@ 
 	 * Retrieves the discounts sql.
 	 *
 	 */
-	public function get_sql( $range ) {
+	public function get_sql($range) {
 		global $wpdb;
 
 		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
+		$clauses    = $this->get_range_sql($range);
 
 		$sql        = "SELECT
 				meta.discount_code AS discount_code,
@@ -36,7 +36,7 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_discounts_graphs_get_sql', $sql, $range );
+		return apply_filters('getpaid_discounts_graphs_get_sql', $sql, $range);
 
 	}
 
@@ -46,30 +46,30 @@ 
 	 */
 	public function prepare_stats() {
 		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
+		$this->stats = $wpdb->get_results($this->get_sql($this->get_range()));
+		$this->stats = $this->normalize_stats($this->stats);
 	}
 
 	/**
 	 * Normalizes the report stats.
 	 *
 	 */
-	public function normalize_stats( $stats ) {
+	public function normalize_stats($stats) {
 		$normalized = array();
 		$others     = 0;
 		$did        = 0;
 
-		foreach ( $stats as $stat ) {
+		foreach ($stats as $stat) {
 
-			if ( $did > 4 ) {
+			if ($did > 4) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+				$others += wpinv_round_amount(wpinv_sanitize_amount($stat->total));
 
 			} else {
 
 				$normalized[] = array(
-					'total'         => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'discount_code' => strip_tags( $stat->discount_code ),
+					'total'         => wpinv_round_amount(wpinv_sanitize_amount($stat->total)),
+					'discount_code' => strip_tags($stat->discount_code),
 				);
 
 			}
@@ -77,11 +77,11 @@ 
 			$did++;
 		}
 
-		if ( $others > 0 ) {
+		if ($others > 0) {
 
 			$normalized[] = array(
-				'total'         => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'discount_code' => esc_html__( 'Others', 'invoicing' ),
+				'total'         => wpinv_round_amount(wpinv_sanitize_amount($others)),
+				'discount_code' => esc_html__('Others', 'invoicing'),
 			);
 
 		}
@@ -95,10 +95,10 @@ 
 	 */
 	public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688','#4caf50','#8bc34a','#00bcd4','#03a9f4','#2196f3' );
+		$data     = wp_list_pluck($this->stats, 'total');
+		$colors   = array('#009688', '#4caf50', '#8bc34a', '#00bcd4', '#03a9f4', '#2196f3');
 
-		shuffle( $colors );
+		shuffle($colors);
 
 		return array(
 			'data'            => $data,
@@ -112,7 +112,7 @@ 
 	 *
 	 */
 	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'discount_code' );
+		return wp_list_pluck($this->stats, 'discount_code');
 	}
 
 	/**
@@ -133,8 +133,8 @@ 
 						{
 							type: 'doughnut',
 							data: {
-								'labels': <?php echo wp_json_encode( $this->get_labels() ); ?>,
-								'datasets': [ <?php echo wp_json_encode( $this->get_data() ); ?> ]
+								'labels': <?php echo wp_json_encode($this->get_labels()); ?>,
+								'datasets': [ <?php echo wp_json_encode($this->get_data()); ?> ]
 							},
 							options: {
 								legend: {

Indentation +81 added lines, -81 removed lines

@@ -12,22 +12,22 @@ 
  */
 class GetPaid_Reports_Report_Discounts extends GetPaid_Reports_Abstract_Report {
 
-	/**
-	 * @var string
-	 */
-	public $field = 'discount_code';
-
-	/**
-	 * Retrieves the discounts sql.
-	 *
-	 */
-	public function get_sql( $range ) {
-		global $wpdb;
-
-		$table      = $wpdb->prefix . 'getpaid_invoices';
-		$clauses    = $this->get_range_sql( $range );
-
-		$sql        = "SELECT
+    /**
+     * @var string
+     */
+    public $field = 'discount_code';
+
+    /**
+     * Retrieves the discounts sql.
+     *
+     */
+    public function get_sql( $range ) {
+        global $wpdb;
+
+        $table      = $wpdb->prefix . 'getpaid_invoices';
+        $clauses    = $this->get_range_sql( $range );
+
+        $sql        = "SELECT
 				meta.discount_code AS discount_code,
 				SUM(total) as total
             FROM $wpdb->posts
@@ -41,91 +41,91 @@ 
 			ORDER BY total DESC
         ";
 
-		return apply_filters( 'getpaid_discounts_graphs_get_sql', $sql, $range );
+        return apply_filters( 'getpaid_discounts_graphs_get_sql', $sql, $range );
 
-	}
+    }
 
-	/**
-	 * Prepares the report stats.
-	 *
-	 */
-	public function prepare_stats() {
-		global $wpdb;
-		$this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
-		$this->stats = $this->normalize_stats( $this->stats );
-	}
+    /**
+     * Prepares the report stats.
+     *
+     */
+    public function prepare_stats() {
+        global $wpdb;
+        $this->stats = $wpdb->get_results( $this->get_sql( $this->get_range() ) );
+        $this->stats = $this->normalize_stats( $this->stats );
+    }
 
-	/**
-	 * Normalizes the report stats.
-	 *
-	 */
-	public function normalize_stats( $stats ) {
-		$normalized = array();
-		$others     = 0;
-		$did        = 0;
+    /**
+     * Normalizes the report stats.
+     *
+     */
+    public function normalize_stats( $stats ) {
+        $normalized = array();
+        $others     = 0;
+        $did        = 0;
 
-		foreach ( $stats as $stat ) {
+        foreach ( $stats as $stat ) {
 
-			if ( $did > 4 ) {
+            if ( $did > 4 ) {
 
-				$others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
+                $others += wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) );
 
-			} else {
+            } else {
 
-				$normalized[] = array(
-					'total'         => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
-					'discount_code' => strip_tags( $stat->discount_code ),
-				);
+                $normalized[] = array(
+                    'total'         => wpinv_round_amount( wpinv_sanitize_amount( $stat->total ) ),
+                    'discount_code' => strip_tags( $stat->discount_code ),
+                );
 
-			}
+            }
 
-			$did++;
-		}
+            $did++;
+        }
 
-		if ( $others > 0 ) {
+        if ( $others > 0 ) {
 
-			$normalized[] = array(
-				'total'         => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
-				'discount_code' => esc_html__( 'Others', 'invoicing' ),
-			);
+            $normalized[] = array(
+                'total'         => wpinv_round_amount( wpinv_sanitize_amount( $others ) ),
+                'discount_code' => esc_html__( 'Others', 'invoicing' ),
+            );
 
-		}
+        }
 
-		return $normalized;
-	}
+        return $normalized;
+    }
 
-	/**
-	 * Retrieves report data.
-	 *
-	 */
-	public function get_data() {
+    /**
+     * Retrieves report data.
+     *
+     */
+    public function get_data() {
 
-		$data     = wp_list_pluck( $this->stats, 'total' );
-		$colors   = array( '#009688','#4caf50','#8bc34a','#00bcd4','#03a9f4','#2196f3' );
+        $data     = wp_list_pluck( $this->stats, 'total' );
+        $colors   = array( '#009688','#4caf50','#8bc34a','#00bcd4','#03a9f4','#2196f3' );
 
-		shuffle( $colors );
+        shuffle( $colors );
 
-		return array(
-			'data'            => $data,
-			'backgroundColor' => $colors,
-		);
+        return array(
+            'data'            => $data,
+            'backgroundColor' => $colors,
+        );
 
-	}
+    }
 
-	/**
-	 * Retrieves report labels.
-	 *
-	 */
-	public function get_labels() {
-		return wp_list_pluck( $this->stats, 'discount_code' );
-	}
+    /**
+     * Retrieves report labels.
+     *
+     */
+    public function get_labels() {
+        return wp_list_pluck( $this->stats, 'discount_code' );
+    }
 
-	/**
-	 * Displays the actual report.
-	 *
-	 */
-	public function display_stats() {
-		?>
+    /**
+     * Displays the actual report.
+     *
+     */
+    public function display_stats() {
+        ?>
 
 			<canvas id="getpaid-chartjs-earnings-discount_code"></canvas>
 
@@ -154,6 +154,6 @@ 
 			</script>
 
 		<?php
-	}
+    }
 
 }