Inspection of "fixes #666" - AyeCode/invoicing - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( d0e164...00f338 )

by Brian

created 2022-03-11 10:49 UTC

Status

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,10 +1,10 @@
 block discarded – undo
 <?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>

Please login to merge, or discard this patch.

templates/emails/wpinv-email-header.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,16 +1,16 @@  discard block
 block discarded – undo
 <?php
 // don't load directly
-if ( !defined('ABSPATH') )
+if (!defined('ABSPATH'))
     die('-1');
 
-if ( !isset( $email_heading ) ) {
+if (!isset($email_heading)) {
     global $email_heading;
 }
 ?>
 <!DOCTYPE html>
 <html dir="<?php echo is_rtl() ? 'rtl' : 'ltr'?>">
     <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo( 'charset' ); ?>" />
+        <meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="robots" content="noindex,nofollow">
         <title><?php echo wpinv_get_blogname(); ?></title>
@@ -22,13 +22,13 @@  discard block
 block discarded – undo
                     <td align="center" valign="top">
                         <div id="template_header_image">
                         <?php
-                            if ( $img = wpinv_get_option( 'email_header_image', '' ) ) {
-                                echo '<p style="margin-top:0;"><img style="max-width:100%" src="' . esc_url( $img ) . '" alt="' . esc_attr( wpinv_get_blogname() ) . '" /></p>';
+                            if ($img = wpinv_get_option('email_header_image', '')) {
+                                echo '<p style="margin-top:0;"><img style="max-width:100%" src="' . esc_url($img) . '" alt="' . esc_attr(wpinv_get_blogname()) . '" /></p>';
                             }
                         ?>
                         </div>
                         <table border="0" cellpadding="0" cellspacing="0" width="100%" id="template_container">
-                            <?php if ( !empty( $email_heading ) ) { ?>
+                            <?php if (!empty($email_heading)) { ?>
                             <tr>
                                 <td align="center" valign="top">
                                     <!-- Header -->

Please login to merge, or discard this patch.

templates/payment-forms/elements/billing_email.php 1 patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -7,35 +7,35 @@  discard block
 block discarded – undo
  * @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 @@  discard block
 block discarded – undo
 
 echo '</span>';
 
-do_action( 'getpaid_after_payment_form_billing_email', $form );
+do_action('getpaid_after_payment_form_billing_email', $form);

Please login to merge, or discard this patch.

includes/data/vat-number-regexes.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

includes/geolocation/class-getpaid-geolocation.php 1 patch

Spacing +49 added lines, -49 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Geolocation Class.
@@ -64,31 +64,31 @@  discard block
 block discarded – undo
 
 		$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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 		 * @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 @@  discard block
 block discarded – undo
 		);
 
 		// 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 @@  discard block
 block discarded – undo
 			'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 @@  discard block
 block discarded – undo
 	 * @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 @@  discard block
 block discarded – undo
 	 * @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']);
 
 	}
 

Please login to merge, or discard this patch.

includes/class-wpinv-session-handler.php 1 patch

Spacing +55 added lines, -55 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Session handler class.
@@ -52,11 +52,11 @@  discard block
 block discarded – undo
 	 */
 	public function __construct() {
 
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
-        add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+	    $this->_cookie = apply_filters('wpinv_cookie', 'wpinv_session_' . COOKIEHASH);
+        add_action('init', array($this, 'init'), -1);
+		add_action('wp_logout', array($this, 'destroy_session'));
+		add_action('wp', array($this, 'set_customer_session_cookie'), 10);
+		add_action('shutdown', array($this, 'save_data'), 20);
 
 	}
 
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
 	public function init() {
 		$this->init_session_cookie();
 
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
+		if (!is_user_logged_in()) {
+			add_filter('nonce_user_logged_out', array($this, 'nonce_user_logged_out'), 10, 2);
 		}
 	}
 
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
 	public function init_session_cookie() {
 		$cookie = $this->get_session_cookie();
 
-		if ( $cookie ) {
+		if ($cookie) {
 			$this->_customer_id        = $cookie[0];
 			$this->_session_expiration = $cookie[1];
 			$this->_session_expiring   = $cookie[2];
@@ -89,17 +89,17 @@  discard block
 block discarded – undo
 			$this->_data               = $this->get_session_data();
 
 			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+			if (is_user_logged_in() && get_current_user_id() != $this->_customer_id) {
 				$this->_customer_id = get_current_user_id();
 				$this->_dirty       = true;
 				$this->save_data();
-				$this->set_customer_session_cookie( true );
+				$this->set_customer_session_cookie(true);
 			}
 
 			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
+			if (time() > $this->_session_expiring) {
 				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+				$this->update_session_timestamp($this->_customer_id, $this->_session_expiration);
 			}
 		} else {
 			$this->set_session_expiration();
@@ -117,25 +117,25 @@  discard block
 block discarded – undo
 	 *
 	 * @param bool $set Should the session cookie be set.
 	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
+	public function set_customer_session_cookie($set) {
+		if ($set) {
 			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+			$cookie_hash       = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
 			$this->_has_cookie = true;
 
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+			if (!isset($_COOKIE[$this->_cookie]) || $_COOKIE[$this->_cookie] !== $cookie_value) {
+				$this->setcookie($this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true);
 			}
 		}
 	}
 
-	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
-        if ( ! headers_sent() ) {
-            setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
-        } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-            headers_sent( $file, $line );
-            trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE ); // @codingStandardsIgnoreLine
+	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false) {
+        if (!headers_sent()) {
+            setcookie($name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters('wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure));
+        } elseif (defined('WP_DEBUG') && WP_DEBUG) {
+            headers_sent($file, $line);
+            trigger_error("{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE); // @codingStandardsIgnoreLine
         }
     }
 
@@ -146,8 +146,8 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	protected function use_secure_cookie() {
-        $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+        $is_https = false !== strstr(get_option('home'), 'https:');
+		return apply_filters('wpinv_session_use_secure_cookie', $is_https && is_ssl());
 	}
 
 	/**
@@ -156,15 +156,15 @@  discard block
 block discarded – undo
 	 * @return bool
 	 */
 	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+		return isset($_COOKIE[$this->_cookie]) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
 	}
 
 	/**
 	 * Set session expiration.
 	 */
 	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+		$this->_session_expiring   = time() + intval(apply_filters('wpinv_session_expiring', 60 * 60 * 47)); // 47 Hours.
+		$this->_session_expiration = time() + intval(apply_filters('wpinv_session_expiration', 60 * 60 * 48)); // 48 Hours.
 	}
 
 	/**
@@ -174,8 +174,8 @@  discard block
 block discarded – undo
 	 */
 	public function generate_customer_id() {
 		require_once ABSPATH . 'wp-includes/class-phpass.php';
-		$hasher      = new PasswordHash( 8, false );
-		return md5( $hasher->get_random_bytes( 32 ) );
+		$hasher = new PasswordHash(8, false);
+		return md5($hasher->get_random_bytes(32));
 	}
 
 	/**
@@ -186,27 +186,27 @@  discard block
 block discarded – undo
 	 * @return bool|array
 	 */
 	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+		$cookie_value = isset($_COOKIE[$this->_cookie]) ? wp_unslash($_COOKIE[$this->_cookie]) : false; // @codingStandardsIgnoreLine.
 
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+		if (empty($cookie_value) || !is_string($cookie_value)) {
 			return false;
 		}
 
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+		list($customer_id, $session_expiration, $session_expiring, $cookie_hash) = explode('||', $cookie_value);
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
 			return false;
 		}
 
 		// Validate hash.
 		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+		$hash    = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+		if (empty($cookie_hash) || !hash_equals($hash, $cookie_hash)) {
 			return false;
 		}
 
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+		return array($customer_id, $session_expiration, $session_expiring, $cookie_hash);
 	}
 
 	/**
@@ -215,15 +215,15 @@  discard block
 block discarded – undo
 	 * @return array
 	 */
 	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+		return $this->has_session() ? (array) $this->get_session($this->_customer_id) : array();
 	}
 
-	public function generate_key($customer_id){
-        if(!$customer_id){
+	public function generate_key($customer_id) {
+        if (!$customer_id) {
             return;
         }
 
-        return 'wpi_trans_'.$customer_id;
+        return 'wpi_trans_' . $customer_id;
     }
 
 	/**
@@ -231,9 +231,9 @@  discard block
 block discarded – undo
 	 */
 	public function save_data() {
 		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+		if ($this->_dirty && $this->has_session()) {
 
-            set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
+            set_transient($this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
 			$this->_dirty = false;
 		}
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
 	 * Destroy all session data.
 	 */
 	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
+		$this->delete_session($this->_customer_id);
 		$this->forget_session();
 	}
 
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
 	 * Forget all session data without destroying it.
 	 */
 	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+		$this->setcookie($this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true);
 
 		wpinv_empty_cart();
 
@@ -266,10 +266,10 @@  discard block
 block discarded – undo
 	 * @param int $uid User ID.
 	 * @return string
 	 */
-	public function nonce_user_logged_out( $uid ) {
+	public function nonce_user_logged_out($uid) {
 
 		// Check if one of our nonces.
-		if ( substr( $uid, 0, 5 ) === 'wpinv' || substr( $uid, 0, 7 ) === 'getpaid' ) {
+		if (substr($uid, 0, 5) === 'wpinv' || substr($uid, 0, 7) === 'getpaid') {
 			return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
 		}
 
@@ -283,20 +283,20 @@  discard block
 block discarded – undo
 	 * @param mixed  $default Default session value.
 	 * @return string|array
 	 */
-	public function get_session( $customer_id, $default = false ) {
+	public function get_session($customer_id, $default = false) {
 
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return array();
 		}
 
         $key = $this->generate_key($customer_id);
         $value = get_transient($key);
 
-        if ( !$value ) {
+        if (!$value) {
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
+		return maybe_unserialize($value);
 	}
 
 	/**
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
 	 *
 	 * @param int $customer_id Customer ID.
 	 */
-	public function delete_session( $customer_id ) {
+	public function delete_session($customer_id) {
 
         $key = $this->generate_key($customer_id);
 
@@ -317,9 +317,9 @@  discard block
 block discarded – undo
 	 * @param string $customer_id Customer ID.
 	 * @param int    $timestamp Timestamp to expire the cookie.
 	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+	public function update_session_timestamp($customer_id, $timestamp) {
 
-        set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
+        set_transient($this->generate_key($customer_id), maybe_serialize($this->_data), $timestamp);
 
 	}
 }

Please login to merge, or discard this patch.

includes/class-wpinv-privacy.php 1 patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
  * Privacy/GDPR related functionality which ties into WordPress functionality.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WPInv_Privacy Class.
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
         $this->init();
 
         // This hook registers Invoicing data exporters.
-        $this->add_exporter( 'wpinv-customer-invoices', __( 'Customer Invoices', 'invoicing' ), array( 'WPInv_Privacy_Exporters', 'customer_invoice_data_exporter' ) );
+        $this->add_exporter('wpinv-customer-invoices', __('Customer Invoices', 'invoicing'), array('WPInv_Privacy_Exporters', 'customer_invoice_data_exporter'));
     }
 
     /**
@@ -37,27 +37,27 @@  discard block
 block discarded – undo
     public function get_privacy_message() {
 
         $content = '<div class="wp-suggested-text">' .
-                   '<h2>' . __( 'Invoices and checkout', 'invoicing' ) . '</h2>' .
-                   '<p class="privacy-policy-tutorial">' . __( 'Example privacy texts.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Handling this data also allows us to:', 'invoicing' ) . '</p>' .
+                   '<h2>' . __('Invoices and checkout', 'invoicing') . '</h2>' .
+                   '<p class="privacy-policy-tutorial">' . __('Example privacy texts.', 'invoicing') . '</p>' .
+                   '<p>' . __('We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing') . '</p>' .
+                   '<p>' . __('Handling this data also allows us to:', 'invoicing') . '</p>' .
                    '<ul>' .
-                   '<li>' . __( '- Send you important account/invoice/service information.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Estimate taxes based on your location.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Respond to your queries or complaints.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing' ) . '</li>' .
-                   '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
+                   '<li>' . __('- Send you important account/invoice/service information.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Estimate taxes based on your location.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Respond to your queries or complaints.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing') . '</li>' .
+                   '<li>' . __('- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing') . '</li>' .
                    '</ul>' .
-                   '<p>' . __( 'In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing' ) . '</p>' .
-                   '<h2>' . __( 'What we share with others', 'invoicing' ) . '</h2>' .
-                   '<p>' . __( 'We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing' ) . '</p>' .
-                   '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing' ) . '</p>' .
-                   '<p>' . __( 'Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing' ) . '</p>' .
+                   '<p>' . __('In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing') . '</p>' .
+                   '<h2>' . __('What we share with others', 'invoicing') . '</h2>' .
+                   '<p>' . __('We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing') . '</p>' .
+                   '<p class="privacy-policy-tutorial">' . __('In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing') . '</p>' .
+                   '<p>' . __('We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing') . '</p>' .
+                   '<p>' . __('Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing') . '</p>' .
                    '</div>';
 
-        return apply_filters( 'wpinv_privacy_policy_content', $content );
+        return apply_filters('wpinv_privacy_policy_content', $content);
     }
 
 }

Please login to merge, or discard this patch.

includes/class-wpinv-privacy-exporters.php 1 patch

Spacing +59 added lines, -59 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
  * Personal data exporters.
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WPInv_Privacy_Exporters Class.
@@ -17,39 +17,39 @@  discard block
 block discarded – undo
      * @param int    $page  Page.
      * @return array An array of invoice data in name value pairs
      */
-    public static function customer_invoice_data_exporter( $email_address, $page ) {
+    public static function customer_invoice_data_exporter($email_address, $page) {
         $done           = false;
         $page           = (int) $page;
         $data_to_export = array();
 
-        $user           = get_user_by( 'email', $email_address );
-        if ( ! $user instanceof WP_User ) {
+        $user           = get_user_by('email', $email_address);
+        if (!$user instanceof WP_User) {
             return array(
                 'data' => $data_to_export,
                 'done' => true,
             );
         }
 
-        $args    = array(
-            'limit'    => get_option( 'posts_per_page' ),
+        $args = array(
+            'limit'    => get_option('posts_per_page'),
             'page'     => $page,
             'user'     => $user->ID,
             'paginate' => false,
         );
 
-        $invoices = wpinv_get_invoices( $args );
+        $invoices = wpinv_get_invoices($args);
 
-        if ( 0 < count( $invoices ) ) {
-            foreach ( $invoices as $invoice ) {
+        if (0 < count($invoices)) {
+            foreach ($invoices as $invoice) {
                 $data_to_export[] = array(
                     'group_id'          => 'customer_invoices',
-                    'group_label'       => __( 'GetPaid: Invoices', 'invoicing' ),
-                    'group_description' => __( 'Customer invoices.', 'invoicing' ),
+                    'group_label'       => __('GetPaid: Invoices', 'invoicing'),
+                    'group_description' => __('Customer invoices.', 'invoicing'),
                     'item_id'           => "wpinv-{$invoice->get_id()}",
-                    'data'              => self::get_customer_invoice_data( $invoice ),
+                    'data'              => self::get_customer_invoice_data($invoice),
                 );
             }
-            $done = get_option( 'posts_per_page' ) > count( $invoices );
+            $done = get_option('posts_per_page') > count($invoices);
         } else {
             $done = true;
         }
@@ -67,116 +67,116 @@  discard block
 block discarded – undo
      * @param WPInv_Invoice $invoice invoice object.
      * @return array
      */
-    public static function get_customer_invoice_data( $invoice ) {
+    public static function get_customer_invoice_data($invoice) {
 
         // Prepare basic properties.
         $props_to_export = array(
             'number'               => array(
-                'name' => __( 'Invoice Number', 'invoicing' ),
+                'name' => __('Invoice Number', 'invoicing'),
                 'value' => $invoice->get_number(),
             ),
             'created_date'         => array(
-                'name' => __( 'Created Date', 'invoicing' ),
+                'name' => __('Created Date', 'invoicing'),
                 'value' => $invoice->get_date_created(),
             ),
             'due_date'         => array(
-                'name' => __( 'Due Date', 'invoicing' ),
+                'name' => __('Due Date', 'invoicing'),
                 'value' => $invoice->get_due_date(),
             ),
             'items'                => array(
-                'name' => __( 'Invoice Items', 'invoicing' ),
-                'value' => self::process_invoice_items( $invoice ),
+                'name' => __('Invoice Items', 'invoicing'),
+                'value' => self::process_invoice_items($invoice),
             ),
             'discount'                => array(
-                'name' => __( 'Invoice Discount', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() ),
+                'name' => __('Invoice Discount', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total_discount(), $invoice->get_currency()),
             ),
             'total'                => array(
-                'name' => __( 'Invoice Total', 'invoicing' ),
-                'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
+                'name' => __('Invoice Total', 'invoicing'),
+                'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
             ),
             'status'               => array(
-                'name' => __( 'Invoice Status', 'invoicing' ),
+                'name' => __('Invoice Status', 'invoicing'),
                 'value' => $invoice->get_status_nicename(),
             ),
             'first_name'           => array(
-                'name' => __( 'First Name', 'invoicing' ),
+                'name' => __('First Name', 'invoicing'),
                 'value' => $invoice->get_first_name(),
             ),
             'last_name'           => array(
-                'name' => __( 'Last Name', 'invoicing' ),
+                'name' => __('Last Name', 'invoicing'),
                 'value' => $invoice->get_last_name(),
             ),
             'email'           => array(
-                'name' => __( 'Email Address', 'invoicing' ),
+                'name' => __('Email Address', 'invoicing'),
                 'value' => $invoice->get_email(),
             ),
             'company'           => array(
-                'name' => __( 'Company', 'invoicing' ),
+                'name' => __('Company', 'invoicing'),
                 'value' => $invoice->get_company(),
             ),
             'phone'           => array(
-                'name' => __( 'Phone Number', 'invoicing' ),
+                'name' => __('Phone Number', 'invoicing'),
                 'value' => $invoice->get_phone(),
             ),
             'address'           => array(
-                'name' => __( 'Address', 'invoicing' ),
+                'name' => __('Address', 'invoicing'),
                 'value' => $invoice->get_address(),
             ),
             'city'           => array(
-                'name' => __( 'City', 'invoicing' ),
+                'name' => __('City', 'invoicing'),
                 'value' => $invoice->get_city(),
             ),
             'state'           => array(
-                'name' => __( 'State', 'invoicing' ),
+                'name' => __('State', 'invoicing'),
                 'value' => $invoice->get_state(),
             ),
             'zip'           => array(
-                'name' => __( 'Zip', 'invoicing' ),
+                'name' => __('Zip', 'invoicing'),
                 'value' => $invoice->get_zip(),
             ),
             'vat_number'    => array(
-                'name' => __( 'VAT Number', 'invoicing' ),
+                'name' => __('VAT Number', 'invoicing'),
                 'value' => $invoice->get_vat_number(),
             ),
             'description'   => array(
-                'name' => __( 'Description', 'invoicing' ),
+                'name' => __('Description', 'invoicing'),
                 'value' => $invoice->get_description(),
             ), 
         );
 
         // In case the invoice is paid, add the payment date and gateway.
-        if ( $invoice->is_paid() ) {
+        if ($invoice->is_paid()) {
 
             $props_to_export['completed_date'] = array(
-                'name' => __( 'Completed Date', 'invoicing' ),
+                'name' => __('Completed Date', 'invoicing'),
                 'value' => $invoice->get_completed_date(),
             );
 
             $props_to_export['gateway'] = array(
-                'name' => __( 'Paid Via', 'invoicing' ),
+                'name' => __('Paid Via', 'invoicing'),
                 'value' => $invoice->get_gateway(),
             );
 
         }
 
         // Maybe add subscription details.
-        $props_to_export = self::process_subscription( $invoice, $props_to_export );
+        $props_to_export = self::process_subscription($invoice, $props_to_export);
 
         // Add the ip address.
         $props_to_export['ip'] = array(
-            'name' => __( 'IP Address', 'invoicing' ),
+            'name' => __('IP Address', 'invoicing'),
             'value' => $invoice->get_ip(),
         );
 
         // Add the invoice url.
         $props_to_export['view_url'] = array(
-            'name' => __( 'Invoice URL', 'invoicing' ),
+            'name' => __('Invoice URL', 'invoicing'),
             'value' => $invoice->get_view_url(),
         );
 
         // Return the values.
-        return apply_filters( 'getpaid_privacy_export_invoice_personal_data', array_values( $props_to_export ), $invoice );
+        return apply_filters('getpaid_privacy_export_invoice_personal_data', array_values($props_to_export), $invoice);
 
     }
 
@@ -188,40 +188,40 @@  discard block
 block discarded – undo
      * @param array $props invoice props.
      * @return array
      */
-    public static function process_subscription( $invoice, $props ) {
+    public static function process_subscription($invoice, $props) {
 
-        $subscription = wpinv_get_subscription( $invoice );
-        if ( ! empty( $subscription ) ) {
+        $subscription = wpinv_get_subscription($invoice);
+        if (!empty($subscription)) {
 
-            $frequency    = getpaid_get_subscription_period_label( $subscription->get_period(),$subscription->get_frequency() );
-            $period       = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() ) . ' / ' . $frequency;
-            $initial_amt  = wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
-            $bill_times   = $subscription->get_times_billed() . ' / ' . ( ( $subscription->get_bill_times() == 0 ) ? __( 'Until Cancelled', 'invoicing' ) : $subscription->get_bill_times() );
-            $renewal_date = getpaid_format_date_value( $subscription->get_expiration() );
+            $frequency    = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency());
+            $period       = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency()) . ' / ' . $frequency;
+            $initial_amt  = wpinv_price($subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency());
+            $bill_times   = $subscription->get_times_billed() . ' / ' . (($subscription->get_bill_times() == 0) ? __('Until Cancelled', 'invoicing') : $subscription->get_bill_times());
+            $renewal_date = getpaid_format_date_value($subscription->get_expiration());
 
             // Billing cycle.
             $props['period'] = array(
-                'name' => __( 'Billing Cycle', 'invoicing' ),
+                'name' => __('Billing Cycle', 'invoicing'),
                 'value' => $period,
             );
 
             // Initial amount.
             $props['initial_amount'] = array(
-                'name' => __( 'Initial Amount', 'invoicing' ),
+                'name' => __('Initial Amount', 'invoicing'),
                 'value' => $initial_amt,
             );
 
             // Bill times.
             $props['bill_times'] = array(
-                'name' => __( 'Times Billed', 'invoicing' ),
+                'name' => __('Times Billed', 'invoicing'),
                 'value' => $bill_times,
             );
 
             // Add expiry date.
-            if ( $subscription->is_active() ) {
+            if ($subscription->is_active()) {
 
                 $props['renewal_date'] = array(
-                    'name' => __( 'Expires', 'invoicing' ),
+                    'name' => __('Expires', 'invoicing'),
                     'value' => $renewal_date,
                 );
 
@@ -240,19 +240,19 @@  discard block
 block discarded – undo
      * @param WPInv_Invoice $invoice invoice object.
      * @return array
      */
-    public static function process_invoice_items( $invoice ) {
+    public static function process_invoice_items($invoice) {
 
         $item_names = array();
-        foreach ( $invoice->get_items() as $cart_item ) {
+        foreach ($invoice->get_items() as $cart_item) {
             $item_names[] = sprintf(
                 '%s x %s - %s',
                 $cart_item->get_name(),
                 $cart_item->get_quantity(),
-                wpinv_price( $invoice->is_renewal() ? $cart_item->get_recurring_sub_total() : $cart_item->get_sub_total(), $invoice->get_currency() )
+                wpinv_price($invoice->is_renewal() ? $cart_item->get_recurring_sub_total() : $cart_item->get_sub_total(), $invoice->get_currency())
             );
         }
 
-        return implode( ', ', $item_names );
+        return implode(', ', $item_names);
 
     }
 

Please login to merge, or discard this patch.

templates/wpinv-invalid-access.php 1 patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -7,11 +7,11 @@  discard block
 block discarded – undo
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Fetch the invoice.
-if ( empty( $invoice ) ) {
-    $invoice = new WPInv_Invoice( $GLOBALS['post'] );
+if (empty($invoice)) {
+    $invoice = new WPInv_Invoice($GLOBALS['post']);
 }
 
 ?><!DOCTYPE html>
@@ -21,16 +21,16 @@  discard block
 block discarded – undo
 
     <head>
 
-		<meta charset="<?php bloginfo( 'charset' ); ?>">
+		<meta charset="<?php bloginfo('charset'); ?>">
         <meta name="viewport" content="width=device-width, initial-scale=1.0" >
 
         <meta name="robots" content="noindex,nofollow">
 
 		<link rel="profile" href="https://gmpg.org/xfn/11">
 
-        <title><?php _e( 'Invalid Access', 'invoicing' ); ?></title>
+        <title><?php _e('Invalid Access', 'invoicing'); ?></title>
 
-        <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_head', $invoice); ?>
 
     </head>
 
@@ -39,20 +39,20 @@  discard block
 block discarded – undo
 
         <?php
 
-            if ( ! $invoice->exists() || $invoice->is_draft() ) {
-                $error = __( 'This invoice was deleted or is not visible.', 'invoicing' );
+            if (!$invoice->exists() || $invoice->is_draft()) {
+                $error = __('This invoice was deleted or is not visible.', 'invoicing');
             } else {
 
                 $user_id = get_current_user_id();
-                if ( wpinv_require_login_to_checkout() && empty( $user_id ) ) {
-                    $error  = __( 'You must be logged in to view this invoice.', 'invoicing' );
+                if (wpinv_require_login_to_checkout() && empty($user_id)) {
+                    $error  = __('You must be logged in to view this invoice.', 'invoicing');
                     $error .= sprintf(
                         ' <a href="%s">%s</a>',
-                        wp_login_url( $invoice->get_view_url() ),
-                        __( 'Login.', 'invoicing' )
+                        wp_login_url($invoice->get_view_url()),
+                        __('Login.', 'invoicing')
                     );
                 } else {
-                    $error = __( 'This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing' );
+                    $error = __('This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing');
                 }
 
             }
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
 
         <div class="container">
             <div class="alert alert-danger m-5" role="alert">
-                <h4 class="alert-heading"><?php _e( 'Access Denied', 'invoicing' ); ?></h4>
+                <h4 class="alert-heading"><?php _e('Access Denied', 'invoicing'); ?></h4>
                 <p><?php echo $error; ?></p>
             </div>
         </div>

Please login to merge, or discard this patch.

		@@ -1,10 +1,10 @@
		block discarded – undo
1	1	<?php
2	2	// don't load directly
3		-if ( !defined('ABSPATH') )
	3	+if (!defined('ABSPATH'))
4	4	die('-1');
5	5
6		-$email_footer = apply_filters( 'wpinv_email_footer_text', wpinv_get_option( 'email_footer_text', get_bloginfo( 'name', 'display' ) . ' - ' . __( 'Powered by GetPaid', 'invoicing' ) ) );
7		-$email_footer = $email_footer ? wpautop( wp_kses_post( wptexturize( $email_footer ) ) ) : '';
	6	+$email_footer = apply_filters('wpinv_email_footer_text', wpinv_get_option('email_footer_text', get_bloginfo('name', 'display') . ' - ' . __('Powered by GetPaid', 'invoicing')));
	7	+$email_footer = $email_footer ? wpautop(wp_kses_post(wptexturize($email_footer))) : '';
8	8	?>
9	9	</div>
10	10	</td>

		@@ -1,16 +1,16 @@ discard block
		block discarded – undo
1	1	<?php
2	2	// don't load directly
3		-if ( !defined('ABSPATH') )
	3	+if (!defined('ABSPATH'))
4	4	die('-1');
5	5
6		-if ( !isset( $email_heading ) ) {
	6	+if (!isset($email_heading)) {
7	7	global $email_heading;
8	8	}
9	9	?>
10	10	<!DOCTYPE html>
11	11	<html dir="<?php echo is_rtl() ? 'rtl' : 'ltr'?>">
12	12	<head>
13		- <meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo( 'charset' ); ?>" />
	13	+ <meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
14	14	<meta name="viewport" content="width=device-width, initial-scale=1">
15	15	<meta name="robots" content="noindex,nofollow">
16	16	<title><?php echo wpinv_get_blogname(); ?></title>
		@@ -22,13 +22,13 @@ discard block
		block discarded – undo
22	22	<td align="center" valign="top">
23	23	<div id="template_header_image">
24	24	<?php
25		- if ( $img = wpinv_get_option( 'email_header_image', '' ) ) {
26		- echo '<p style="margin-top:0;"><img style="max-width:100%" src="' . esc_url( $img ) . '" alt="' . esc_attr( wpinv_get_blogname() ) . '" /></p>';
	25	+ if ($img = wpinv_get_option('email_header_image', '')) {
	26	+ echo '<p style="margin-top:0;"><img style="max-width:100%" src="' . esc_url($img) . '" alt="' . esc_attr(wpinv_get_blogname()) . '" /></p>';
27	27	}
28	28	?>
29	29	</div>
30	30	<table border="0" cellpadding="0" cellspacing="0" width="100%" id="template_container">
31		- <?php if ( !empty( $email_heading ) ) { ?>
	31	+ <?php if (!empty($email_heading)) { ?>
32	32	<tr>
33	33	<td align="center" valign="top">
34	34	<!-- Header -->

		@@ -7,35 +7,35 @@ discard block
		block discarded – undo
7	7	* @version 1.0.19
8	8	*/
9	9
10		-defined( 'ABSPATH' ) \|\| exit;
	10	+defined('ABSPATH') \|\| exit;
11	11
12	12	$value = '';
13	13	$class = '';
14	14
15		-if ( ! empty( $form->invoice ) ) {
16		- $value = sanitize_email( $form->invoice->get_email() );
17		-} else if ( is_user_logged_in() ) {
	15	+if (!empty($form->invoice)) {
	16	+ $value = sanitize_email($form->invoice->get_email());
	17	+} else if (is_user_logged_in()) {
18	18	$user = wp_get_current_user();
19		- $value = sanitize_email( $user->user_email );
	19	+ $value = sanitize_email($user->user_email);
20	20	}
21	21
22		-if ( ! empty( $value ) && ! empty( $hide_billing_email ) ) {
	22	+if (!empty($value) && !empty($hide_billing_email)) {
23	23	$class = 'd-none';
24	24	}
25	25
26		-do_action( 'getpaid_before_payment_form_billing_email', $form );
	26	+do_action('getpaid_before_payment_form_billing_email', $form);
27	27
28	28	echo "<span class='$class'>";
29	29
30	30	echo aui()->input(
31	31	array(
32	32	'name' => 'billing_email',
33		- 'id' => esc_attr( $id ) . uniqid( '_' ),
34		- 'placeholder'=> empty( $placeholder ) ? '' : esc_attr( $placeholder ),
35		- 'required' => ! empty( $required ),
36		- 'label' => empty( $label ) ? '' : wp_kses_post( $label ) . '<span class="text-danger"> *</span>',
	33	+ 'id' => esc_attr($id) . uniqid('_'),
	34	+ 'placeholder'=> empty($placeholder) ? '' : esc_attr($placeholder),
	35	+ 'required' => !empty($required),
	36	+ 'label' => empty($label) ? '' : wp_kses_post($label) . '<span class="text-danger"> *</span>',
37	37	'label_type' => 'vertical',
38		- 'help_text' => empty( $description ) ? '' : wp_kses_post( $description ),
	38	+ 'help_text' => empty($description) ? '' : wp_kses_post($description),
39	39	'type' => 'email',
40	40	'value' => $value,
41	41	'class' => 'wpinv_billing_email',
		@@ -47,4 +47,4 @@ discard block
		block discarded – undo
47	47
48	48	echo '</span>';
49	49
50		-do_action( 'getpaid_after_payment_form_billing_email', $form );
	50	+do_action('getpaid_after_payment_form_billing_email', $form);

		@@ -6,7 +6,7 @@
		block discarded – undo
6	6	* @package Invoicing/data
7	7	*/
8	8
9		-defined( 'ABSPATH' ) \|\| exit;
	9	+defined('ABSPATH') \|\| exit;
10	10
11	11	return array(
12	12

		@@ -6,7 +6,7 @@ discard block
		block discarded – undo
6	6	*
7	7	*/
8	8
9		-defined( 'ABSPATH' ) \|\| exit;
	9	+defined('ABSPATH') \|\| exit;
10	10
11	11	/**
12	12	* GetPaid_Geolocation Class.
		@@ -64,31 +64,31 @@ discard block
		block discarded – undo
64	64
65	65	$transient_name = 'external_ip_address_0.0.0.0';
66	66
67		- if ( '' !== self::get_ip_address() ) {
68		- $transient_name = 'external_ip_address_' . self::get_ip_address();
	67	+ if ('' !== self::get_ip_address()) {
	68	+ $transient_name = 'external_ip_address_' . self::get_ip_address();
69	69	}
70	70
71	71	// Try retrieving from cache.
72		- $external_ip_address = get_transient( $transient_name );
	72	+ $external_ip_address = get_transient($transient_name);
73	73
74		- if ( false === $external_ip_address ) {
	74	+ if (false === $external_ip_address) {
75	75	$external_ip_address = '0.0.0.0';
76		- $ip_lookup_services = apply_filters( 'getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis );
77		- $ip_lookup_services_keys = array_keys( $ip_lookup_services );
78		- shuffle( $ip_lookup_services_keys );
	76	+ $ip_lookup_services = apply_filters('getpaid_geolocation_ip_lookup_apis', self::$ip_lookup_apis);
	77	+ $ip_lookup_services_keys = array_keys($ip_lookup_services);
	78	+ shuffle($ip_lookup_services_keys);
79	79
80		- foreach ( $ip_lookup_services_keys as $service_name ) {
81		- $service_endpoint = $ip_lookup_services[ $service_name ];
82		- $response = wp_safe_remote_get( $service_endpoint, array( 'timeout' => 2 ) );
	80	+ foreach ($ip_lookup_services_keys as $service_name) {
	81	+ $service_endpoint = $ip_lookup_services[$service_name];
	82	+ $response = wp_safe_remote_get($service_endpoint, array('timeout' => 2));
83	83
84		- if ( ! is_wp_error( $response ) && rest_is_ip_address( $response['body'] ) ) {
85		- $external_ip_address = apply_filters( 'getpaid_geolocation_ip_lookup_api_response', wpinv_clean( $response['body'] ), $service_name );
	84	+ if (!is_wp_error($response) && rest_is_ip_address($response['body'])) {
	85	+ $external_ip_address = apply_filters('getpaid_geolocation_ip_lookup_api_response', wpinv_clean($response['body']), $service_name);
86	86	break;
87	87	}
88	88
89	89	}
90	90
91		- set_transient( $transient_name, $external_ip_address, WEEK_IN_SECONDS );
	91	+ set_transient($transient_name, $external_ip_address, WEEK_IN_SECONDS);
92	92	}
93	93
94	94	return $external_ip_address;
		@@ -102,9 +102,9 @@ discard block
		block discarded – undo
102	102	* @param bool $api_fallback If true, uses geolocation APIs if the database file doesn't exist (can be slower).
103	103	* @return array
104	104	*/
105		- public static function geolocate_ip( $ip_address = '', $fallback = false, $api_fallback = true ) {
	105	+ public static function geolocate_ip($ip_address = '', $fallback = false, $api_fallback = true) {
106	106
107		- if ( empty( $ip_address ) ) {
	107	+ if (empty($ip_address)) {
108	108	$ip_address = self::get_ip_address();
109	109	}
110	110
		@@ -112,9 +112,9 @@ discard block
		block discarded – undo
112	112	self::$current_user_ip = $ip_address;
113	113
114	114	// Filter to allow custom geolocation of the IP address.
115		- $country_code = apply_filters( 'getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback );
	115	+ $country_code = apply_filters('getpaid_geolocate_ip', false, $ip_address, $fallback, $api_fallback);
116	116
117		- if ( false !== $country_code ) {
	117	+ if (false !== $country_code) {
118	118
119	119	return array(
120	120	'country' => $country_code,
		@@ -134,7 +134,7 @@ discard block
		block discarded – undo
134	134	* @param array $geolocation Geolocation data, including country, state, city, and postcode.
135	135	* @param string $ip_address IP Address.
136	136	*/
137		- $geolocation = apply_filters(
	137	+ $geolocation = apply_filters(
138	138	'getpaid_get_geolocation',
139	139	array(
140	140	'country' => $country_code,
		@@ -146,18 +146,18 @@ discard block
		block discarded – undo
146	146	);
147	147
148	148	// If we still haven't found a country code, let's consider doing an API lookup.
149		- if ( '' === $geolocation['country'] && $api_fallback ) {
150		- $geolocation['country'] = self::geolocate_via_api( $ip_address );
	149	+ if ('' === $geolocation['country'] && $api_fallback) {
	150	+ $geolocation['country'] = self::geolocate_via_api($ip_address);
151	151	}
152	152
153	153	// It's possible that we're in a local environment, in which case the geolocation needs to be done from the
154	154	// external address.
155		- if ( '' === $geolocation['country'] && $fallback ) {
	155	+ if ('' === $geolocation['country'] && $fallback) {
156	156	$external_ip_address = self::get_external_ip_address();
157	157
158	158	// Only bother with this if the external IP differs.
159		- if ( '0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address ) {
160		- return self::geolocate_ip( $external_ip_address, false, $api_fallback );
	159	+ if ('0.0.0.0' !== $external_ip_address && $external_ip_address !== $ip_address) {
	160	+ return self::geolocate_ip($external_ip_address, false, $api_fallback);
161	161	}
162	162
163	163	}
		@@ -187,12 +187,12 @@ discard block
		block discarded – undo
187	187	'HTTP_X_COUNTRY_CODE',
188	188	);
189	189
190		- foreach ( $headers as $header ) {
191		- if ( empty( $_SERVER[ $header ] ) ) {
	190	+ foreach ($headers as $header) {
	191	+ if (empty($_SERVER[$header])) {
192	192	continue;
193	193	}
194	194
195		- $country_code = strtoupper( sanitize_text_field( wp_unslash( $_SERVER[ $header ] ) ) );
	195	+ $country_code = strtoupper(sanitize_text_field(wp_unslash($_SERVER[$header])));
196	196	break;
197	197	}
198	198
		@@ -211,36 +211,36 @@ discard block
		block discarded – undo
211	211	* @param string $ip_address IP address.
212	212	* @return string
213	213	*/
214		- protected static function geolocate_via_api( $ip_address ) {
	214	+ protected static function geolocate_via_api($ip_address) {
215	215
216	216	// Retrieve from cache...
217		- $country_code = get_transient( 'geoip_' . $ip_address );
	217	+ $country_code = get_transient('geoip_' . $ip_address);
218	218
219	219	// If missing, retrieve from the API.
220		- if ( false === $country_code ) {
221		- $geoip_services = apply_filters( 'getpaid_geolocation_geoip_apis', self::$geoip_apis );
	220	+ if (false === $country_code) {
	221	+ $geoip_services = apply_filters('getpaid_geolocation_geoip_apis', self::$geoip_apis);
222	222
223		- if ( empty( $geoip_services ) ) {
	223	+ if (empty($geoip_services)) {
224	224	return '';
225	225	}
226	226
227		- $geoip_services_keys = array_keys( $geoip_services );
	227	+ $geoip_services_keys = array_keys($geoip_services);
228	228
229		- shuffle( $geoip_services_keys );
	229	+ shuffle($geoip_services_keys);
230	230
231		- foreach ( $geoip_services_keys as $service_name ) {
	231	+ foreach ($geoip_services_keys as $service_name) {
232	232
233		- $service_endpoint = $geoip_services[ $service_name ];
234		- $response = wp_safe_remote_get( sprintf( $service_endpoint, $ip_address ), array( 'timeout' => 2 ) );
235		- $country_code = sanitize_text_field( strtoupper( self::handle_geolocation_response( $response, $service_name ) ) );
	233	+ $service_endpoint = $geoip_services[$service_name];
	234	+ $response = wp_safe_remote_get(sprintf($service_endpoint, $ip_address), array('timeout' => 2));
	235	+ $country_code = sanitize_text_field(strtoupper(self::handle_geolocation_response($response, $service_name)));
236	236
237		- if ( ! empty( $country_code ) ) {
	237	+ if (!empty($country_code)) {
238	238	break;
239	239	}
240	240
241	241	}
242	242
243		- set_transient( 'geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS );
	243	+ set_transient('geoip_' . $ip_address, $country_code, WEEK_IN_SECONDS);
244	244	}
245	245
246	246	return $country_code;
		@@ -253,23 +253,23 @@ discard block
		block discarded – undo
253	253	* @param String $geolocation_service
254	254	* @return string Country code
255	255	*/
256		- protected static function handle_geolocation_response( $geolocation_response, $geolocation_service ) {
	256	+ protected static function handle_geolocation_response($geolocation_response, $geolocation_service) {
257	257
258		- if ( is_wp_error( $geolocation_response ) \|\| empty( $geolocation_response['body'] ) ) {
	258	+ if (is_wp_error($geolocation_response) \|\| empty($geolocation_response['body'])) {
259	259	return '';
260	260	}
261	261
262		- if ( $geolocation_service === 'ipinfo.io' ) {
263		- $data = json_decode( $geolocation_response['body'] );
264		- return empty( $data ) \|\| empty( $data->country ) ? '' : $data->country;
	262	+ if ($geolocation_service === 'ipinfo.io') {
	263	+ $data = json_decode($geolocation_response['body']);
	264	+ return empty($data) \|\| empty($data->country) ? '' : $data->country;
265	265	}
266	266
267		- if ( $geolocation_service === 'ip-api.com' ) {
268		- $data = json_decode( $geolocation_response['body'] );
269		- return empty( $data ) \|\| empty( $data->countryCode ) ? '' : $data->countryCode;
	267	+ if ($geolocation_service === 'ip-api.com') {
	268	+ $data = json_decode($geolocation_response['body']);
	269	+ return empty($data) \|\| empty($data->countryCode) ? '' : $data->countryCode;
270	270	}
271	271
272		- return apply_filters( 'getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body'] );
	272	+ return apply_filters('getpaid_geolocation_geoip_response_' . $geolocation_service, '', $geolocation_response['body']);
273	273
274	274	}
275	275

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5	*
6	6	*/
7	7
8		-defined( 'ABSPATH' ) \|\| exit;
	8	+defined('ABSPATH') \|\| exit;
9	9
10	10	/**
11	11	* Session handler class.
		@@ -52,11 +52,11 @@ discard block
		block discarded – undo
52	52	*/
53	53	public function __construct() {
54	54
55		- $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
56		- add_action( 'init', array( $this, 'init' ), -1 );
57		- add_action( 'wp_logout', array( $this, 'destroy_session' ) );
58		- add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
59		- add_action( 'shutdown', array( $this, 'save_data' ), 20 );
	55	+ $this->_cookie = apply_filters('wpinv_cookie', 'wpinv_session_' . COOKIEHASH);
	56	+ add_action('init', array($this, 'init'), -1);
	57	+ add_action('wp_logout', array($this, 'destroy_session'));
	58	+ add_action('wp', array($this, 'set_customer_session_cookie'), 10);
	59	+ add_action('shutdown', array($this, 'save_data'), 20);
60	60
61	61	}
62	62
		@@ -68,8 +68,8 @@ discard block
		block discarded – undo
68	68	public function init() {
69	69	$this->init_session_cookie();
70	70
71		- if ( ! is_user_logged_in() ) {
72		- add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
	71	+ if (!is_user_logged_in()) {
	72	+ add_filter('nonce_user_logged_out', array($this, 'nonce_user_logged_out'), 10, 2);
73	73	}
74	74	}
75	75
		@@ -81,7 +81,7 @@ discard block
		block discarded – undo
81	81	public function init_session_cookie() {
82	82	$cookie = $this->get_session_cookie();
83	83
84		- if ( $cookie ) {
	84	+ if ($cookie) {
85	85	$this->_customer_id = $cookie[0];
86	86	$this->_session_expiration = $cookie[1];
87	87	$this->_session_expiring = $cookie[2];
		@@ -89,17 +89,17 @@ discard block
		block discarded – undo
89	89	$this->_data = $this->get_session_data();
90	90
91	91	// If the user logs in, update session.
92		- if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
	92	+ if (is_user_logged_in() && get_current_user_id() != $this->_customer_id) {
93	93	$this->_customer_id = get_current_user_id();
94	94	$this->_dirty = true;
95	95	$this->save_data();
96		- $this->set_customer_session_cookie( true );
	96	+ $this->set_customer_session_cookie(true);
97	97	}
98	98
99	99	// Update session if its close to expiring.
100		- if ( time() > $this->_session_expiring ) {
	100	+ if (time() > $this->_session_expiring) {
101	101	$this->set_session_expiration();
102		- $this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
	102	+ $this->update_session_timestamp($this->_customer_id, $this->_session_expiration);
103	103	}
104	104	} else {
105	105	$this->set_session_expiration();
		@@ -117,25 +117,25 @@ discard block
		block discarded – undo
117	117	*
118	118	* @param bool $set Should the session cookie be set.
119	119	*/
120		- public function set_customer_session_cookie( $set ) {
121		- if ( $set ) {
	120	+ public function set_customer_session_cookie($set) {
	121	+ if ($set) {
122	122	$to_hash = $this->_customer_id . '\|' . $this->_session_expiration;
123		- $cookie_hash = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
	123	+ $cookie_hash = hash_hmac('md5', $to_hash, wp_hash($to_hash));
124	124	$cookie_value = $this->_customer_id . '\|\|' . $this->_session_expiration . '\|\|' . $this->_session_expiring . '\|\|' . $cookie_hash;
125	125	$this->_has_cookie = true;
126	126
127		- if ( ! isset( $_COOKIE[ $this->_cookie ] ) \|\| $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
128		- $this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
	127	+ if (!isset($_COOKIE[$this->_cookie]) \|\| $_COOKIE[$this->_cookie] !== $cookie_value) {
	128	+ $this->setcookie($this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true);
129	129	}
130	130	}
131	131	}
132	132
133		- public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false){
134		- if ( ! headers_sent() ) {
135		- setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
136		- } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
137		- headers_sent( $file, $line );
138		- trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE ); // @codingStandardsIgnoreLine
	133	+ public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false) {
	134	+ if (!headers_sent()) {
	135	+ setcookie($name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters('wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure));
	136	+ } elseif (defined('WP_DEBUG') && WP_DEBUG) {
	137	+ headers_sent($file, $line);
	138	+ trigger_error("{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE); // @codingStandardsIgnoreLine
139	139	}
140	140	}
141	141
		@@ -146,8 +146,8 @@ discard block
		block discarded – undo
146	146	* @return bool
147	147	*/
148	148	protected function use_secure_cookie() {
149		- $is_https = false !== strstr( get_option( 'home' ), 'https:' );
150		- return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
	149	+ $is_https = false !== strstr(get_option('home'), 'https:');
	150	+ return apply_filters('wpinv_session_use_secure_cookie', $is_https && is_ssl());
151	151	}
152	152
153	153	/**
		@@ -156,15 +156,15 @@ discard block
		block discarded – undo
156	156	* @return bool
157	157	*/
158	158	public function has_session() {
159		- return isset( $_COOKIE[ $this->_cookie ] ) \|\| $this->_has_cookie \|\| is_user_logged_in(); // @codingStandardsIgnoreLine.
	159	+ return isset($_COOKIE[$this->_cookie]) \|\| $this->_has_cookie \|\| is_user_logged_in(); // @codingStandardsIgnoreLine.
160	160	}
161	161
162	162	/**
163	163	* Set session expiration.
164	164	*/
165	165	public function set_session_expiration() {
166		- $this->_session_expiring = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
167		- $this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
	166	+ $this->_session_expiring = time() + intval(apply_filters('wpinv_session_expiring', 60 * 60 * 47)); // 47 Hours.
	167	+ $this->_session_expiration = time() + intval(apply_filters('wpinv_session_expiration', 60 * 60 * 48)); // 48 Hours.
168	168	}
169	169
170	170	/**
		@@ -174,8 +174,8 @@ discard block
		block discarded – undo
174	174	*/
175	175	public function generate_customer_id() {
176	176	require_once ABSPATH . 'wp-includes/class-phpass.php';
177		- $hasher = new PasswordHash( 8, false );
178		- return md5( $hasher->get_random_bytes( 32 ) );
	177	+ $hasher = new PasswordHash(8, false);
	178	+ return md5($hasher->get_random_bytes(32));
179	179	}
180	180
181	181	/**
		@@ -186,27 +186,27 @@ discard block
		block discarded – undo
186	186	* @return bool\|array
187	187	*/
188	188	public function get_session_cookie() {
189		- $cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
	189	+ $cookie_value = isset($_COOKIE[$this->_cookie]) ? wp_unslash($_COOKIE[$this->_cookie]) : false; // @codingStandardsIgnoreLine.
190	190
191		- if ( empty( $cookie_value ) \|\| ! is_string( $cookie_value ) ) {
	191	+ if (empty($cookie_value) \|\| !is_string($cookie_value)) {
192	192	return false;
193	193	}
194	194
195		- list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '\|\|', $cookie_value );
	195	+ list($customer_id, $session_expiration, $session_expiring, $cookie_hash) = explode('\|\|', $cookie_value);
196	196
197		- if ( empty( $customer_id ) ) {
	197	+ if (empty($customer_id)) {
198	198	return false;
199	199	}
200	200
201	201	// Validate hash.
202	202	$to_hash = $customer_id . '\|' . $session_expiration;
203		- $hash = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
	203	+ $hash = hash_hmac('md5', $to_hash, wp_hash($to_hash));
204	204
205		- if ( empty( $cookie_hash ) \|\| ! hash_equals( $hash, $cookie_hash ) ) {
	205	+ if (empty($cookie_hash) \|\| !hash_equals($hash, $cookie_hash)) {
206	206	return false;
207	207	}
208	208
209		- return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
	209	+ return array($customer_id, $session_expiration, $session_expiring, $cookie_hash);
210	210	}
211	211
212	212	/**
		@@ -215,15 +215,15 @@ discard block
		block discarded – undo
215	215	* @return array
216	216	*/
217	217	public function get_session_data() {
218		- return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
	218	+ return $this->has_session() ? (array) $this->get_session($this->_customer_id) : array();
219	219	}
220	220
221		- public function generate_key($customer_id){
222		- if(!$customer_id){
	221	+ public function generate_key($customer_id) {
	222	+ if (!$customer_id) {
223	223	return;
224	224	}
225	225
226		- return 'wpi_trans_'.$customer_id;
	226	+ return 'wpi_trans_' . $customer_id;
227	227	}
228	228
229	229	/**
		@@ -231,9 +231,9 @@ discard block
		block discarded – undo
231	231	*/
232	232	public function save_data() {
233	233	// Dirty if something changed - prevents saving nothing new.
234		- if ( $this->_dirty && $this->has_session() ) {
	234	+ if ($this->_dirty && $this->has_session()) {
235	235
236		- set_transient( $this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
	236	+ set_transient($this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
237	237
238	238	$this->_dirty = false;
239	239	}
		@@ -243,7 +243,7 @@ discard block
		block discarded – undo
243	243	* Destroy all session data.
244	244	*/
245	245	public function destroy_session() {
246		- $this->delete_session( $this->_customer_id );
	246	+ $this->delete_session($this->_customer_id);
247	247	$this->forget_session();
248	248	}
249	249
		@@ -251,7 +251,7 @@ discard block
		block discarded – undo
251	251	* Forget all session data without destroying it.
252	252	*/
253	253	public function forget_session() {
254		- $this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
	254	+ $this->setcookie($this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true);
255	255
256	256	wpinv_empty_cart();
257	257
		@@ -266,10 +266,10 @@ discard block
		block discarded – undo
266	266	* @param int $uid User ID.
267	267	* @return string
268	268	*/
269		- public function nonce_user_logged_out( $uid ) {
	269	+ public function nonce_user_logged_out($uid) {
270	270
271	271	// Check if one of our nonces.
272		- if ( substr( $uid, 0, 5 ) === 'wpinv' \|\| substr( $uid, 0, 7 ) === 'getpaid' ) {
	272	+ if (substr($uid, 0, 5) === 'wpinv' \|\| substr($uid, 0, 7) === 'getpaid') {
273	273	return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
274	274	}
275	275
		@@ -283,20 +283,20 @@ discard block
		block discarded – undo
283	283	* @param mixed $default Default session value.
284	284	* @return string\|array
285	285	*/
286		- public function get_session( $customer_id, $default = false ) {
	286	+ public function get_session($customer_id, $default = false) {
287	287
288		- if ( defined( 'WP_SETUP_CONFIG' ) ) {
	288	+ if (defined('WP_SETUP_CONFIG')) {
289	289	return array();
290	290	}
291	291
292	292	$key = $this->generate_key($customer_id);
293	293	$value = get_transient($key);
294	294
295		- if ( !$value ) {
	295	+ if (!$value) {
296	296	$value = $default;
297	297	}
298	298
299		- return maybe_unserialize( $value );
	299	+ return maybe_unserialize($value);
300	300	}
301	301
302	302	/**
		@@ -304,7 +304,7 @@ discard block
		block discarded – undo
304	304	*
305	305	* @param int $customer_id Customer ID.
306	306	*/
307		- public function delete_session( $customer_id ) {
	307	+ public function delete_session($customer_id) {
308	308
309	309	$key = $this->generate_key($customer_id);
310	310
		@@ -317,9 +317,9 @@ discard block
		block discarded – undo
317	317	* @param string $customer_id Customer ID.
318	318	* @param int $timestamp Timestamp to expire the cookie.
319	319	*/
320		- public function update_session_timestamp( $customer_id, $timestamp ) {
	320	+ public function update_session_timestamp($customer_id, $timestamp) {
321	321
322		- set_transient( $this->generate_key($customer_id), maybe_serialize( $this->_data ), $timestamp);
	322	+ set_transient($this->generate_key($customer_id), maybe_serialize($this->_data), $timestamp);
323	323
324	324	}
325	325	}

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	* Privacy/GDPR related functionality which ties into WordPress functionality.
4	4	*/
5	5
6		-defined( 'ABSPATH' ) \|\| exit;
	6	+defined('ABSPATH') \|\| exit;
7	7
8	8	/**
9	9	* WPInv_Privacy Class.
		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	$this->init();
27	27
28	28	// This hook registers Invoicing data exporters.
29		- $this->add_exporter( 'wpinv-customer-invoices', __( 'Customer Invoices', 'invoicing' ), array( 'WPInv_Privacy_Exporters', 'customer_invoice_data_exporter' ) );
	29	+ $this->add_exporter('wpinv-customer-invoices', __('Customer Invoices', 'invoicing'), array('WPInv_Privacy_Exporters', 'customer_invoice_data_exporter'));
30	30	}
31	31
32	32	/**
		@@ -37,27 +37,27 @@ discard block
		block discarded – undo
37	37	public function get_privacy_message() {
38	38
39	39	$content = '<div class="wp-suggested-text">' .
40		- '<h2>' . __( 'Invoices and checkout', 'invoicing' ) . '</h2>' .
41		- '<p class="privacy-policy-tutorial">' . __( 'Example privacy texts.', 'invoicing' ) . '</p>' .
42		- '<p>' . __( 'We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing' ) . '</p>' .
43		- '<p>' . __( 'Handling this data also allows us to:', 'invoicing' ) . '</p>' .
	40	+ '<h2>' . __('Invoices and checkout', 'invoicing') . '</h2>' .
	41	+ '<p class="privacy-policy-tutorial">' . __('Example privacy texts.', 'invoicing') . '</p>' .
	42	+ '<p>' . __('We collect information about you during the checkout process on our site. This information may include, but is not limited to, your name, email address, phone number, address, IP and any other details that might be requested from you for the purpose of processing your payment and retaining your invoice details for legal reasons.', 'invoicing') . '</p>' .
	43	+ '<p>' . __('Handling this data also allows us to:', 'invoicing') . '</p>' .
44	44	'<ul>' .
45		- '<li>' . __( '- Send you important account/invoice/service information.', 'invoicing' ) . '</li>' .
46		- '<li>' . __( '- Estimate taxes based on your location.', 'invoicing' ) . '</li>' .
47		- '<li>' . __( '- Respond to your queries or complaints.', 'invoicing' ) . '</li>' .
48		- '<li>' . __( '- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
49		- '<li>' . __( '- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing' ) . '</li>' .
50		- '<li>' . __( '- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing' ) . '</li>' .
	45	+ '<li>' . __('- Send you important account/invoice/service information.', 'invoicing') . '</li>' .
	46	+ '<li>' . __('- Estimate taxes based on your location.', 'invoicing') . '</li>' .
	47	+ '<li>' . __('- Respond to your queries or complaints.', 'invoicing') . '</li>' .
	48	+ '<li>' . __('- Process payments and to prevent fraudulent transactions. We do this on the basis of our legitimate business interests.', 'invoicing') . '</li>' .
	49	+ '<li>' . __('- Retain historical payment and invoice history. We do this on the basis of legal obligations.', 'invoicing') . '</li>' .
	50	+ '<li>' . __('- Set up and administer your account, provide technical and/or customer support, and to verify your identity. We do this on the basis of our legitimate business interests.', 'invoicing') . '</li>' .
51	51	'</ul>' .
52		- '<p>' . __( 'In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing' ) . '</p>' .
53		- '<h2>' . __( 'What we share with others', 'invoicing' ) . '</h2>' .
54		- '<p>' . __( 'We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing' ) . '</p>' .
55		- '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing' ) . '</p>' .
56		- '<p>' . __( 'We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing' ) . '</p>' .
57		- '<p>' . __( 'Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing' ) . '</p>' .
	52	+ '<p>' . __('In addition to collecting information at checkout we may also use and store your contact details when manually creating invoices for require payments relating to prior contractual agreements or agreed terms.', 'invoicing') . '</p>' .
	53	+ '<h2>' . __('What we share with others', 'invoicing') . '</h2>' .
	54	+ '<p>' . __('We share information with third parties who help us provide our payment and invoicing services to you; for example --', 'invoicing') . '</p>' .
	55	+ '<p class="privacy-policy-tutorial">' . __('In this subsection you should list which third party payment processors you’re using to take payments since these may handle customer data. We’ve included PayPal as an example, but you should remove this if you’re not using PayPal.', 'invoicing') . '</p>' .
	56	+ '<p>' . __('We accept payments through PayPal. When processing payments, some of your data will be passed to PayPal, including information required to process or support the payment, such as the purchase total and billing information.', 'invoicing') . '</p>' .
	57	+ '<p>' . __('Please see the <a href="https://www.paypal.com/us/webapps/mpp/ua/privacy-full">PayPal Privacy Policy</a> for more details.', 'invoicing') . '</p>' .
58	58	'</div>';
59	59
60		- return apply_filters( 'wpinv_privacy_policy_content', $content );
	60	+ return apply_filters('wpinv_privacy_policy_content', $content);
61	61	}
62	62
63	63	}

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	* Personal data exporters.
4	4	*/
5	5
6		-defined( 'ABSPATH' ) \|\| exit;
	6	+defined('ABSPATH') \|\| exit;
7	7
8	8	/**
9	9	* WPInv_Privacy_Exporters Class.
		@@ -17,39 +17,39 @@ discard block
		block discarded – undo
17	17	* @param int $page Page.
18	18	* @return array An array of invoice data in name value pairs
19	19	*/
20		- public static function customer_invoice_data_exporter( $email_address, $page ) {
	20	+ public static function customer_invoice_data_exporter($email_address, $page) {
21	21	$done = false;
22	22	$page = (int) $page;
23	23	$data_to_export = array();
24	24
25		- $user = get_user_by( 'email', $email_address );
26		- if ( ! $user instanceof WP_User ) {
	25	+ $user = get_user_by('email', $email_address);
	26	+ if (!$user instanceof WP_User) {
27	27	return array(
28	28	'data' => $data_to_export,
29	29	'done' => true,
30	30	);
31	31	}
32	32
33		- $args = array(
34		- 'limit' => get_option( 'posts_per_page' ),
	33	+ $args = array(
	34	+ 'limit' => get_option('posts_per_page'),
35	35	'page' => $page,
36	36	'user' => $user->ID,
37	37	'paginate' => false,
38	38	);
39	39
40		- $invoices = wpinv_get_invoices( $args );
	40	+ $invoices = wpinv_get_invoices($args);
41	41
42		- if ( 0 < count( $invoices ) ) {
43		- foreach ( $invoices as $invoice ) {
	42	+ if (0 < count($invoices)) {
	43	+ foreach ($invoices as $invoice) {
44	44	$data_to_export[] = array(
45	45	'group_id' => 'customer_invoices',
46		- 'group_label' => __( 'GetPaid: Invoices', 'invoicing' ),
47		- 'group_description' => __( 'Customer invoices.', 'invoicing' ),
	46	+ 'group_label' => __('GetPaid: Invoices', 'invoicing'),
	47	+ 'group_description' => __('Customer invoices.', 'invoicing'),
48	48	'item_id' => "wpinv-{$invoice->get_id()}",
49		- 'data' => self::get_customer_invoice_data( $invoice ),
	49	+ 'data' => self::get_customer_invoice_data($invoice),
50	50	);
51	51	}
52		- $done = get_option( 'posts_per_page' ) > count( $invoices );
	52	+ $done = get_option('posts_per_page') > count($invoices);
53	53	} else {
54	54	$done = true;
55	55	}
		@@ -67,116 +67,116 @@ discard block
		block discarded – undo
67	67	* @param WPInv_Invoice $invoice invoice object.
68	68	* @return array
69	69	*/
70		- public static function get_customer_invoice_data( $invoice ) {
	70	+ public static function get_customer_invoice_data($invoice) {
71	71
72	72	// Prepare basic properties.
73	73	$props_to_export = array(
74	74	'number' => array(
75		- 'name' => __( 'Invoice Number', 'invoicing' ),
	75	+ 'name' => __('Invoice Number', 'invoicing'),
76	76	'value' => $invoice->get_number(),
77	77	),
78	78	'created_date' => array(
79		- 'name' => __( 'Created Date', 'invoicing' ),
	79	+ 'name' => __('Created Date', 'invoicing'),
80	80	'value' => $invoice->get_date_created(),
81	81	),
82	82	'due_date' => array(
83		- 'name' => __( 'Due Date', 'invoicing' ),
	83	+ 'name' => __('Due Date', 'invoicing'),
84	84	'value' => $invoice->get_due_date(),
85	85	),
86	86	'items' => array(
87		- 'name' => __( 'Invoice Items', 'invoicing' ),
88		- 'value' => self::process_invoice_items( $invoice ),
	87	+ 'name' => __('Invoice Items', 'invoicing'),
	88	+ 'value' => self::process_invoice_items($invoice),
89	89	),
90	90	'discount' => array(
91		- 'name' => __( 'Invoice Discount', 'invoicing' ),
92		- 'value' => wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() ),
	91	+ 'name' => __('Invoice Discount', 'invoicing'),
	92	+ 'value' => wpinv_price($invoice->get_total_discount(), $invoice->get_currency()),
93	93	),
94	94	'total' => array(
95		- 'name' => __( 'Invoice Total', 'invoicing' ),
96		- 'value' => wpinv_price( $invoice->get_total(), $invoice->get_currency() ),
	95	+ 'name' => __('Invoice Total', 'invoicing'),
	96	+ 'value' => wpinv_price($invoice->get_total(), $invoice->get_currency()),
97	97	),
98	98	'status' => array(
99		- 'name' => __( 'Invoice Status', 'invoicing' ),
	99	+ 'name' => __('Invoice Status', 'invoicing'),
100	100	'value' => $invoice->get_status_nicename(),
101	101	),
102	102	'first_name' => array(
103		- 'name' => __( 'First Name', 'invoicing' ),
	103	+ 'name' => __('First Name', 'invoicing'),
104	104	'value' => $invoice->get_first_name(),
105	105	),
106	106	'last_name' => array(
107		- 'name' => __( 'Last Name', 'invoicing' ),
	107	+ 'name' => __('Last Name', 'invoicing'),
108	108	'value' => $invoice->get_last_name(),
109	109	),
110	110	'email' => array(
111		- 'name' => __( 'Email Address', 'invoicing' ),
	111	+ 'name' => __('Email Address', 'invoicing'),
112	112	'value' => $invoice->get_email(),
113	113	),
114	114	'company' => array(
115		- 'name' => __( 'Company', 'invoicing' ),
	115	+ 'name' => __('Company', 'invoicing'),
116	116	'value' => $invoice->get_company(),
117	117	),
118	118	'phone' => array(
119		- 'name' => __( 'Phone Number', 'invoicing' ),
	119	+ 'name' => __('Phone Number', 'invoicing'),
120	120	'value' => $invoice->get_phone(),
121	121	),
122	122	'address' => array(
123		- 'name' => __( 'Address', 'invoicing' ),
	123	+ 'name' => __('Address', 'invoicing'),
124	124	'value' => $invoice->get_address(),
125	125	),
126	126	'city' => array(
127		- 'name' => __( 'City', 'invoicing' ),
	127	+ 'name' => __('City', 'invoicing'),
128	128	'value' => $invoice->get_city(),
129	129	),
130	130	'state' => array(
131		- 'name' => __( 'State', 'invoicing' ),
	131	+ 'name' => __('State', 'invoicing'),
132	132	'value' => $invoice->get_state(),
133	133	),
134	134	'zip' => array(
135		- 'name' => __( 'Zip', 'invoicing' ),
	135	+ 'name' => __('Zip', 'invoicing'),
136	136	'value' => $invoice->get_zip(),
137	137	),
138	138	'vat_number' => array(
139		- 'name' => __( 'VAT Number', 'invoicing' ),
	139	+ 'name' => __('VAT Number', 'invoicing'),
140	140	'value' => $invoice->get_vat_number(),
141	141	),
142	142	'description' => array(
143		- 'name' => __( 'Description', 'invoicing' ),
	143	+ 'name' => __('Description', 'invoicing'),
144	144	'value' => $invoice->get_description(),
145	145	),
146	146	);
147	147
148	148	// In case the invoice is paid, add the payment date and gateway.
149		- if ( $invoice->is_paid() ) {
	149	+ if ($invoice->is_paid()) {
150	150
151	151	$props_to_export['completed_date'] = array(
152		- 'name' => __( 'Completed Date', 'invoicing' ),
	152	+ 'name' => __('Completed Date', 'invoicing'),
153	153	'value' => $invoice->get_completed_date(),
154	154	);
155	155
156	156	$props_to_export['gateway'] = array(
157		- 'name' => __( 'Paid Via', 'invoicing' ),
	157	+ 'name' => __('Paid Via', 'invoicing'),
158	158	'value' => $invoice->get_gateway(),
159	159	);
160	160
161	161	}
162	162
163	163	// Maybe add subscription details.
164		- $props_to_export = self::process_subscription( $invoice, $props_to_export );
	164	+ $props_to_export = self::process_subscription($invoice, $props_to_export);
165	165
166	166	// Add the ip address.
167	167	$props_to_export['ip'] = array(
168		- 'name' => __( 'IP Address', 'invoicing' ),
	168	+ 'name' => __('IP Address', 'invoicing'),
169	169	'value' => $invoice->get_ip(),
170	170	);
171	171
172	172	// Add the invoice url.
173	173	$props_to_export['view_url'] = array(
174		- 'name' => __( 'Invoice URL', 'invoicing' ),
	174	+ 'name' => __('Invoice URL', 'invoicing'),
175	175	'value' => $invoice->get_view_url(),
176	176	);
177	177
178	178	// Return the values.
179		- return apply_filters( 'getpaid_privacy_export_invoice_personal_data', array_values( $props_to_export ), $invoice );
	179	+ return apply_filters('getpaid_privacy_export_invoice_personal_data', array_values($props_to_export), $invoice);
180	180
181	181	}
182	182
		@@ -188,40 +188,40 @@ discard block
		block discarded – undo
188	188	* @param array $props invoice props.
189	189	* @return array
190	190	*/
191		- public static function process_subscription( $invoice, $props ) {
	191	+ public static function process_subscription($invoice, $props) {
192	192
193		- $subscription = wpinv_get_subscription( $invoice );
194		- if ( ! empty( $subscription ) ) {
	193	+ $subscription = wpinv_get_subscription($invoice);
	194	+ if (!empty($subscription)) {
195	195
196		- $frequency = getpaid_get_subscription_period_label( $subscription->get_period(),$subscription->get_frequency() );
197		- $period = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() ) . ' / ' . $frequency;
198		- $initial_amt = wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
199		- $bill_times = $subscription->get_times_billed() . ' / ' . ( ( $subscription->get_bill_times() == 0 ) ? __( 'Until Cancelled', 'invoicing' ) : $subscription->get_bill_times() );
200		- $renewal_date = getpaid_format_date_value( $subscription->get_expiration() );
	196	+ $frequency = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency());
	197	+ $period = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency()) . ' / ' . $frequency;
	198	+ $initial_amt = wpinv_price($subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency());
	199	+ $bill_times = $subscription->get_times_billed() . ' / ' . (($subscription->get_bill_times() == 0) ? __('Until Cancelled', 'invoicing') : $subscription->get_bill_times());
	200	+ $renewal_date = getpaid_format_date_value($subscription->get_expiration());
201	201
202	202	// Billing cycle.
203	203	$props['period'] = array(
204		- 'name' => __( 'Billing Cycle', 'invoicing' ),
	204	+ 'name' => __('Billing Cycle', 'invoicing'),
205	205	'value' => $period,
206	206	);
207	207
208	208	// Initial amount.
209	209	$props['initial_amount'] = array(
210		- 'name' => __( 'Initial Amount', 'invoicing' ),
	210	+ 'name' => __('Initial Amount', 'invoicing'),
211	211	'value' => $initial_amt,
212	212	);
213	213
214	214	// Bill times.
215	215	$props['bill_times'] = array(
216		- 'name' => __( 'Times Billed', 'invoicing' ),
	216	+ 'name' => __('Times Billed', 'invoicing'),
217	217	'value' => $bill_times,
218	218	);
219	219
220	220	// Add expiry date.
221		- if ( $subscription->is_active() ) {
	221	+ if ($subscription->is_active()) {
222	222
223	223	$props['renewal_date'] = array(
224		- 'name' => __( 'Expires', 'invoicing' ),
	224	+ 'name' => __('Expires', 'invoicing'),
225	225	'value' => $renewal_date,
226	226	);
227	227
		@@ -240,19 +240,19 @@ discard block
		block discarded – undo
240	240	* @param WPInv_Invoice $invoice invoice object.
241	241	* @return array
242	242	*/
243		- public static function process_invoice_items( $invoice ) {
	243	+ public static function process_invoice_items($invoice) {
244	244
245	245	$item_names = array();
246		- foreach ( $invoice->get_items() as $cart_item ) {
	246	+ foreach ($invoice->get_items() as $cart_item) {
247	247	$item_names[] = sprintf(
248	248	'%s x %s - %s',
249	249	$cart_item->get_name(),
250	250	$cart_item->get_quantity(),
251		- wpinv_price( $invoice->is_renewal() ? $cart_item->get_recurring_sub_total() : $cart_item->get_sub_total(), $invoice->get_currency() )
	251	+ wpinv_price($invoice->is_renewal() ? $cart_item->get_recurring_sub_total() : $cart_item->get_sub_total(), $invoice->get_currency())
252	252	);
253	253	}
254	254
255		- return implode( ', ', $item_names );
	255	+ return implode(', ', $item_names);
256	256
257	257	}
258	258

		@@ -7,11 +7,11 @@ discard block
		block discarded – undo
7	7	* @version 1.0.19
8	8	*/
9	9
10		-defined( 'ABSPATH' ) \|\| exit;
	10	+defined('ABSPATH') \|\| exit;
11	11
12	12	// Fetch the invoice.
13		-if ( empty( $invoice ) ) {
14		- $invoice = new WPInv_Invoice( $GLOBALS['post'] );
	13	+if (empty($invoice)) {
	14	+ $invoice = new WPInv_Invoice($GLOBALS['post']);
15	15	}
16	16
17	17	?><!DOCTYPE html>
		@@ -21,16 +21,16 @@ discard block
		block discarded – undo
21	21
22	22	<head>
23	23
24		- <meta charset="<?php bloginfo( 'charset' ); ?>">
	24	+ <meta charset="<?php bloginfo('charset'); ?>">
25	25	<meta name="viewport" content="width=device-width, initial-scale=1.0" >
26	26
27	27	<meta name="robots" content="noindex,nofollow">
28	28
29	29	<link rel="profile" href="https://gmpg.org/xfn/11">
30	30
31		- <title><?php _e( 'Invalid Access', 'invoicing' ); ?></title>
	31	+ <title><?php _e('Invalid Access', 'invoicing'); ?></title>
32	32
33		- <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
	33	+ <?php do_action('wpinv_invoice_print_head', $invoice); ?>
34	34
35	35	</head>
36	36
		@@ -39,20 +39,20 @@ discard block
		block discarded – undo
39	39
40	40	<?php
41	41
42		- if ( ! $invoice->exists() \|\| $invoice->is_draft() ) {
43		- $error = __( 'This invoice was deleted or is not visible.', 'invoicing' );
	42	+ if (!$invoice->exists() \|\| $invoice->is_draft()) {
	43	+ $error = __('This invoice was deleted or is not visible.', 'invoicing');
44	44	} else {
45	45
46	46	$user_id = get_current_user_id();
47		- if ( wpinv_require_login_to_checkout() && empty( $user_id ) ) {
48		- $error = __( 'You must be logged in to view this invoice.', 'invoicing' );
	47	+ if (wpinv_require_login_to_checkout() && empty($user_id)) {
	48	+ $error = __('You must be logged in to view this invoice.', 'invoicing');
49	49	$error .= sprintf(
50	50	' <a href="%s">%s</a>',
51		- wp_login_url( $invoice->get_view_url() ),
52		- __( 'Login.', 'invoicing' )
	51	+ wp_login_url($invoice->get_view_url()),
	52	+ __('Login.', 'invoicing')
53	53	);
54	54	} else {
55		- $error = __( 'This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing' );
	55	+ $error = __('This invoice is only viewable by clicking on the invoice link that was sent to you via email.', 'invoicing');
56	56	}
57	57
58	58	}
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61
62	62	<div class="container">
63	63	<div class="alert alert-danger m-5" role="alert">
64		- <h4 class="alert-heading"><?php _e( 'Access Denied', 'invoicing' ); ?></h4>
	64	+ <h4 class="alert-heading"><?php _e('Access Denied', 'invoicing'); ?></h4>
65	65	<p><?php echo $error; ?></p>
66	66	</div>
67	67	</div>

AyeCode / invoicing

Push — master ( d0e164...00f338 )

Status

Category

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +49 added lines, -49 removed lines patch added patch discarded remove patch

Spacing +55 added lines, -55 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

Spacing +59 added lines, -59 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch