AyeCode / invoicing

includes/class-wpinv.php

Spacing +178 added lines, -178 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Invoicing class.
@@ -56,8 +56,8 @@ 
 	 * @param string $prop The prop to set.
 	 * @param mixed $value The value to retrieve.
 	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
+	public function set($prop, $value) {
+		$this->data[$prop] = $value;
 	}
 
 	/**
@@ -66,10 +66,10 @@ 
 	 * @param string $prop The prop to set.
 	 * @return mixed The value.
 	 */
-	public function get( $prop ) {
+	public function get($prop) {
 
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
+		if (isset($this->data[$prop])) {
+			return $this->data[$prop];
 		}
 
 		return null;
@@ -81,23 +81,23 @@ 
 	public function set_properties() {
 
 		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+		$this->set('session', new WPInv_Session_Handler());
+		$GLOBALS['wpi_session'] = $this->get('session'); // Backwards compatibility.
 		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
 
 		// Init other objects.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+		$this->set('session', new WPInv_Session_Handler());
+		$this->set('notes', new WPInv_Notes());
+		$this->set('api', new WPInv_API());
+		$this->set('post_types', new GetPaid_Post_Types());
+		$this->set('template', new GetPaid_Template());
+		$this->set('admin', new GetPaid_Admin());
+		$this->set('subscriptions', new WPInv_Subscriptions());
+		$this->set('invoice_emails', new GetPaid_Invoice_Notification_Emails());
+		$this->set('subscription_emails', new GetPaid_Subscription_Notification_Emails());
+		$this->set('daily_maintenace', new GetPaid_Daily_Maintenance());
+		$this->set('payment_forms', new GetPaid_Payment_Forms());
+		$this->set('maxmind', new GetPaid_MaxMind_Geolocation());
 
 	}
 
@@ -105,8 +105,8 @@ 
 	 * Define plugin constants.
 	 */
 	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+		define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+		define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
 		$this->version = WPINV_VERSION;
 	}
 
@@ -117,27 +117,27 @@ 
 	 */
 	protected function init_hooks() {
 		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+		add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
 
 		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( $this, 'wp_footer' ) );
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
-        add_action( 'init', array( $this, 'add_rewrite_rule' ), 10, 0 );
-		add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
+		add_action('init', array($this, 'init'), 1);
+		add_action('init', array($this, 'maybe_process_ipn'), 10);
+		add_action('init', array($this, 'wpinv_actions'));
+		add_action('init', array($this, 'maybe_do_authenticated_action'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 11);
+		add_action('wp_footer', array($this, 'wp_footer'));
+		add_action('wp_head', array($this, 'wp_head'));
+		add_action('widgets_init', array($this, 'register_widgets'));
+		add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
+		add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
+
+		add_filter('query_vars', array($this, 'custom_query_vars'));
+        add_action('init', array($this, 'add_rewrite_rule'), 10, 0);
+		add_action('pre_get_posts', array($this, 'maybe_process_new_ipn'), 1);
 
 		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
+		do_action('wpinv_actions', $this);
+		do_action('getpaid_actions', $this);
 
 	}
 
@@ -145,10 +145,10 @@ 
 		/* Internationalize the text strings used. */
 		$this->load_textdomain();
 
-		do_action( 'wpinv_loaded' );
+		do_action('wpinv_loaded');
 
 		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
+		if (function_exists('ct_css_output')) {
 			wpinv_oxygen_fix_conflict();
 		}
 	}
@@ -169,7 +169,7 @@ 
 		load_plugin_textdomain(
 			'invoicing',
 			false,
-			plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/'
+			plugin_basename(dirname(WPINV_PLUGIN_FILE)) . '/languages/'
 		);
 
 	}
@@ -180,78 +180,78 @@ 
 	public function includes() {
 
 		// Start with the settings.
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
 
 		// Packages/libraries.
-		require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
-		require_once( WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php' );
+		require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
+		require_once(WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php');
 
 		// Load functions.
-		require_once( WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/invoice-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/subscription-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/user-functions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/error-functions.php' );
+		require_once(WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/invoice-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/subscription-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/user-functions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/error-functions.php');
 
 		// Register autoloader.
 		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+			spl_autoload_register(array($this, 'autoload'), true);
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), '', __FILE__, 149, true);
 		}
 
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/checkout.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-history.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/subscriptions.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/buy-item.php' );
-		require_once( WPINV_PLUGIN_DIR . 'widgets/getpaid.php' );
-		require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/checkout.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-history.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/subscriptions.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/buy-item.php');
+		require_once(WPINV_PLUGIN_DIR . 'widgets/getpaid.php');
+		require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
+
+		if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 			GetPaid_Post_Types_Admin::init();
 
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
-			require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php' );
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
+			require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php');
 			// load the user class only on the users.php page
 			global $pagenow;
-			if($pagenow=='users.php'){
+			if ($pagenow == 'users.php') {
 				new WPInv_Admin_Users();
 			}
 		}
 
 		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php' );
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+		if (defined('WP_CLI') && WP_CLI) {
+			require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php');
+			WP_CLI::add_command('invoicing', 'WPInv_CLI');
 		}
 
 	}
@@ -264,21 +264,21 @@ 
 	 * @since       1.0.19
 	 * @return      void
 	 */
-	public function autoload( $class_name ) {
+	public function autoload($class_name) {
 
 		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
+		$class_name = strtolower($class_name);
 
 		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+		if (false === strpos($class_name, 'getpaid_') && false === strpos($class_name, 'wpinv_')) {
 			return;
 		}
 
 		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+		$file_name = 'class-' . str_replace('_', '-', $class_name) . '.php';
 
 		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+		$plugin_path = untrailingslashit(WPINV_PLUGIN_DIR);
 
 		// And an array of possible locations in order of importance.
 		$locations = array(
@@ -293,10 +293,10 @@ 
 			"$plugin_path/includes/admin/meta-boxes",
 		);
 
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+		foreach (apply_filters('getpaid_autoload_locations', $locations) as $location) {
 
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
+			if (file_exists(trailingslashit($location) . $file_name)) {
+				include trailingslashit($location) . $file_name;
 				break;
 			}
 
@@ -310,7 +310,7 @@ 
 	public function init() {
 
 		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
+		do_action('before_getpaid_init', $this);
 
 		// Maybe upgrade.
 		$this->maybe_upgrade_database();
@@ -327,17 +327,17 @@ 
 			)
 		);
 
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
+		foreach ($gateways as $id => $class) {
+			$this->gateways[$id] = new $class();
 		}
 
-		if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
+		if ('yes' != get_option('wpinv_renamed_gateways')) {
 			GetPaid_Installer::rename_gateways_label();
-			update_option( 'wpinv_renamed_gateways', 'yes' );
+			update_option('wpinv_renamed_gateways', 'yes');
 		}
 
 		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
+		do_action('getpaid_init', $this);
 
 	}
 
@@ -347,14 +347,14 @@ 
 	public function maybe_process_ipn() {
 
 		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+		if (empty($_GET['wpi-listener']) || 'IPN' !== $_GET['wpi-listener'] || empty($_GET['wpi-gateway'])) {
 			return;
 		}
 
-		$gateway = wpinv_clean( $_GET['wpi-gateway'] );
+		$gateway = wpinv_clean($_GET['wpi-gateway']);
 
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
+		do_action('wpinv_verify_payment_ipn', $gateway);
+		do_action("wpinv_verify_{$gateway}_ipn");
 		exit;
 
 	}
@@ -362,33 +362,33 @@ 
 	public function enqueue_scripts() {
 
 		// Fires before adding scripts.
-		do_action( 'getpaid_enqueue_scripts' );
+		do_action('getpaid_enqueue_scripts');
 
 		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+		$localize['ajax_url']             = admin_url('admin-ajax.php');
 		$localize['thousands']            = wpinv_thousands_separator();
 		$localize['decimals']             = wpinv_decimal_separator();
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
+		$localize['nonce']                = wp_create_nonce('wpinv-nonce');
+		$localize['txtComplete']          = __('Continue', 'invoicing');
 		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['loading']              = __( 'Loading...', 'invoicing' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+		$localize['formNonce']            = wp_create_nonce('getpaid_form_nonce');
+		$localize['loading']              = __('Loading...', 'invoicing');
+		$localize['connectionError']      = __('Could not establish a connection to the server.', 'invoicing');
 
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
+		$localize = apply_filters('wpinv_front_js_localize', $localize);
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ),  $version, true );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+		wp_enqueue_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('jquery'), $version, true);
+		wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 	}
 
 	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+		if (isset($_REQUEST['wpi_action'])) {
+			do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
 		}
 
-		if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
-			include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
+		if (defined('WP_ALL_IMPORT_ROOT_DIR')) {
+			include plugin_dir_path(__FILE__) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
 		}
 	}
 
@@ -400,24 +400,24 @@ 
      */
     public function maybe_do_authenticated_action() {
 
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+		if (isset($_REQUEST['getpaid-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
 
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
+			$key  = sanitize_key($_REQUEST['getpaid-action']);
+			$data = wp_unslash($_REQUEST);
+			if (is_user_logged_in()) {
+				do_action("getpaid_authenticated_action_$key", $data);
 			}
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+			do_action("getpaid_unauthenticated_action_$key", $data);
 
 		}
 
     }
 
-	public function pre_get_posts( $wp_query ) {
+	public function pre_get_posts($wp_query) {
 
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+		if (!is_admin() && !empty($wp_query->query_vars['post_type']) && getpaid_is_invoice_post_type($wp_query->query_vars['post_type']) && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+			$wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses(false, false, $wp_query->query_vars['post_type']));
 		}
 
 		return $wp_query;
@@ -432,18 +432,18 @@ 
 
 		// Currently, UX Builder does not work particulaly well with SuperDuper.
 		// So we disable our widgets when editing a page with UX Builder.
-		if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
+		if (function_exists('ux_builder_is_active') && ux_builder_is_active()) {
 			return;
 		}
 
 		$block_widget_init_screens = function_exists('sd_pagenow_exclude') ? sd_pagenow_exclude() : array();
 
-		if ( is_admin() && $pagenow && in_array($pagenow, $block_widget_init_screens)) {
+		if (is_admin() && $pagenow && in_array($pagenow, $block_widget_init_screens)) {
 			// don't initiate in these conditions.
-		}else{
+		} else {
 
 			// Only load allowed widgets.
-			$exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
+			$exclude = function_exists('sd_widget_exclude') ? sd_widget_exclude() : array();
 			$widgets = apply_filters(
 				'getpaid_widget_classes',
 				array(
@@ -458,16 +458,16 @@ 
 			);
 
 			// For each widget...
-			foreach ( $widgets as $widget ) {
+			foreach ($widgets as $widget) {
 
 				// Abort early if it is excluded for this page.
-				if ( in_array( $widget, $exclude ) ) {
+				if (in_array($widget, $exclude)) {
 					continue;
 				}
 
 				// SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
-				if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
-					register_widget( $widget );
+				if (is_subclass_of($widget, 'WP_Widget')) {
+					register_widget($widget);
 				} else {
 					new $widget();
 				}
@@ -485,29 +485,29 @@ 
 	 */
 	public function maybe_upgrade_database() {
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+		$wpi_version = get_option('wpinv_version', 0);
 
-		if ( $wpi_version == WPINV_VERSION ) {
+		if ($wpi_version == WPINV_VERSION) {
 			return;
 		}
 
 		$installer = new GetPaid_Installer();
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
+		if (empty($wpi_version)) {
+			return $installer->upgrade_db(0);
 		}
 
-		$upgrades  = array(
+		$upgrades = array(
 			'0.0.5' => '004',
 			'1.0.3' => '102',
 			'2.0.0' => '118',
 			'2.0.8' => '207',
 		);
 
-		foreach ( $upgrades as $key => $method ) {
+		foreach ($upgrades as $key => $method) {
 
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
+			if (version_compare($wpi_version, $key, '<')) {
+				return $installer->upgrade_db($method);
 			}
 
 		}
@@ -521,11 +521,11 @@ 
 	 */
 	public function maybe_flush_permalinks() {
 
-		$flush = get_option( 'wpinv_flush_permalinks', 0 );
+		$flush = get_option('wpinv_flush_permalinks', 0);
 
-		if ( ! empty( $flush ) ) {
+		if (!empty($flush)) {
 			flush_rewrite_rules();
-			delete_option( 'wpinv_flush_permalinks' );
+			delete_option('wpinv_flush_permalinks');
 		}
 
 	}
@@ -536,10 +536,10 @@ 
 	 * @since 1.0.19
 	 * @param int[] $excluded_posts_ids
 	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ){
+	public function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 
 		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
+		if (!is_array($excluded_posts_ids)) {
 			$excluded_posts_ids = array();
 		}
 
@@ -547,24 +547,24 @@ 
 		$our_pages = array();
 
 		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+		$our_pages[] = wpinv_get_option('checkout_page', false);
 
 		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+		$our_pages[] = wpinv_get_option('success_page', false);
 
 		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+		$our_pages[] = wpinv_get_option('failure_page', false);
 
 		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+		$our_pages[] = wpinv_get_option('invoice_history_page', false);
 
 		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+		$our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+		$our_pages   = array_map('intval', array_filter($our_pages));
 
 		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-		return array_unique( $excluded_posts_ids );
+		return array_unique($excluded_posts_ids);
 
 	}
 
@@ -574,7 +574,7 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_footer() {
-		wpinv_get_template( 'frontend-footer.php' );
+		wpinv_get_template('frontend-footer.php');
 	}
 
 	/**
@@ -583,14 +583,14 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_head() {
-		wpinv_get_template( 'frontend-head.php' );
+		wpinv_get_template('frontend-head.php');
 	}
 
 	/**
 	 * Custom query vars.
 	 *
 	 */
-	public function custom_query_vars( $vars ) {
+	public function custom_query_vars($vars) {
         $vars[] = 'getpaid-ipn';
         return $vars;
 	}
@@ -601,28 +601,28 @@ 
 	 */
 	public function add_rewrite_rule() {
         $tag = 'getpaid-ipn';
-        add_rewrite_tag( "%$tag%", '([^&]+)' );
-        add_rewrite_rule( "^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]",'top' );
+        add_rewrite_tag("%$tag%", '([^&]+)');
+        add_rewrite_rule("^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top');
 	}
 
 	/**
 	 * Processes non-query string ipns.
 	 *
 	 */
-	public function maybe_process_new_ipn( $query ) {
+	public function maybe_process_new_ipn($query) {
 
-        if ( is_admin() || ! $query->is_main_query() ) {
+        if (is_admin() || !$query->is_main_query()) {
             return;
         }
 
-		$gateway = get_query_var( 'getpaid-ipn' );
+		$gateway = get_query_var('getpaid-ipn');
 
-        if ( ! empty( $gateway ) ){
+        if (!empty($gateway)) {
 
-			$gateway = sanitize_text_field( $gateway );
+			$gateway = sanitize_text_field($gateway);
 			nocache_headers();
-			do_action( 'wpinv_verify_payment_ipn', $gateway );
-			do_action( "wpinv_verify_{$gateway}_ipn" );
+			do_action('wpinv_verify_payment_ipn', $gateway);
+			do_action("wpinv_verify_{$gateway}_ipn");
 			exit;
 
         }

includes/libraries/wp-all-import/rapid-addon.php

Spacing +153 added lines, -153 removed lines

@@ -60,7 +60,7 @@ 
 		function __construct($name, $slug) {
 			$this->name = $name;
 			$this->slug = $slug;
-			if (!empty($_GET['id'])){
+			if (!empty($_GET['id'])) {
 				$this->isWizard = false;
 			}
         }
@@ -75,7 +75,7 @@ 
 
 		function is_active_addon($post_type = null) {
 			
-			if ( ! class_exists( 'PMXI_Plugin' ) ) {
+			if (!class_exists('PMXI_Plugin')) {
 				return false;
 			}
 
@@ -87,7 +87,7 @@ 
 				}
 			}
 
-			if ($addon_active){
+			if ($addon_active) {
 				
 				$current_theme = wp_get_theme();
 
@@ -97,18 +97,18 @@ 
 				
 				$addon_active = (@in_array($theme_name, $this->active_themes) or empty($this->active_themes)) ? true : false;
 
-				if ( ! $addon_active and $parent_theme ){
+				if (!$addon_active and $parent_theme) {
 					$parent_theme_name = $parent_theme->get('Name');
 					$addon_active = (@in_array($parent_theme_name, $this->active_themes) or empty($this->active_themes)) ? true : false;
 
 				}
 				
-				if ( $addon_active and ! empty($this->active_plugins) ){
+				if ($addon_active and !empty($this->active_plugins)) {
 
-					include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+					include_once(ABSPATH . 'wp-admin/includes/plugin.php');
 
 					foreach ($this->active_plugins as $plugin) {
-						if ( ! is_plugin_active($plugin) ) {
+						if (!is_plugin_active($plugin)) {
 							$addon_active = false;
 							break;
 						}
@@ -137,9 +137,9 @@ 
 				$this->when_to_run = "always";
 			}
 
-			@$this->active_post_types = ( ! empty($conditions['post_types'])) ? $conditions['post_types'] : array();
-			@$this->active_themes = ( ! empty($conditions['themes'])) ? $conditions['themes'] : array();
-			@$this->active_plugins = ( ! empty($conditions['plugins'])) ? $conditions['plugins'] : array();			
+			@$this->active_post_types = (!empty($conditions['post_types'])) ? $conditions['post_types'] : array();
+			@$this->active_themes = (!empty($conditions['themes'])) ? $conditions['themes'] : array();
+			@$this->active_plugins = (!empty($conditions['plugins'])) ? $conditions['plugins'] : array();			
 
 			add_filter('pmxi_addons', array($this, 'wpai_api_register'));
 			add_filter('wp_all_import_addon_parse', array($this, 'wpai_api_parse'));
@@ -148,15 +148,15 @@ 
 			add_filter('pmxi_options_options', array($this, 'wpai_api_options'));
             add_filter('wp_all_import_image_sections', array($this, 'additional_sections'), 10, 1);
             add_filter('pmxi_custom_types', array($this, 'filter_post_types'), 10, 2);
-            add_filter('pmxi_post_list_order', array($this,'sort_post_types'), 10, 1);
-            add_filter('wp_all_import_post_type_image', array($this, 'post_type_image'), 10, 1 );
-			add_action('pmxi_extend_options_featured',  array($this, 'wpai_api_metabox'), 10, 2);
+            add_filter('pmxi_post_list_order', array($this, 'sort_post_types'), 10, 1);
+            add_filter('wp_all_import_post_type_image', array($this, 'post_type_image'), 10, 1);
+			add_action('pmxi_extend_options_featured', array($this, 'wpai_api_metabox'), 10, 2);
             add_action('admin_init', array($this, 'admin_notice_ignore'));
         }        
 
 		function parse($data) {
 			
-			if ( ! $this->is_active_addon($data['import']->options['custom_type'])) return false;
+			if (!$this->is_active_addon($data['import']->options['custom_type'])) return false;
 
 			$parsedData = $this->helper_parse($data, $this->options_array());
 			return $parsedData;
@@ -166,11 +166,11 @@ 
 
 		function add_field($field_slug, $field_name, $field_type, $enum_values = null, $tooltip = "", $is_html = true, $default_text = '') {
 
-			$field =  array("name" => $field_name, "type" => $field_type, "enum_values" => $enum_values, "tooltip" => $tooltip, "is_sub_field" => false, "is_main_field" => false, "slug" => $field_slug, "is_html" => $is_html, 'default_text' => $default_text);
+			$field = array("name" => $field_name, "type" => $field_type, "enum_values" => $enum_values, "tooltip" => $tooltip, "is_sub_field" => false, "is_main_field" => false, "slug" => $field_slug, "is_html" => $is_html, 'default_text' => $default_text);
 
 			$this->fields[$field_slug] = $field;
 
-			if ( ! empty($enum_values) ){
+			if (!empty($enum_values)) {
 				foreach ($enum_values as $key => $value) {
 					if (is_array($value))
 					{
@@ -181,7 +181,7 @@ 
 						else
 						{
 							foreach ($value as $n => $param) {							
-								if (is_array($param) and ! empty($this->fields[$param['slug']])){
+								if (is_array($param) and !empty($this->fields[$param['slug']])) {
 									$this->fields[$param['slug']]['is_sub_field'] = true;								
 								}
 							}
@@ -194,7 +194,7 @@ 
 
 		}
 
-		function add_acf_field($field){
+		function add_acf_field($field) {
 			$this->fields[$field->post_name] = array(
 				'type' => 'acf',
 				'field_obj' => $field
@@ -203,13 +203,13 @@ 
 
 		private $acfGroups = array();
 
-		function use_acf_group($acf_group){
+		function use_acf_group($acf_group) {
 			$this->add_text(
 				'<div class="postbox acf_postbox default acf_signle_group rad4">
-    <h3 class="hndle" style="margin-top:0;"><span>'.$acf_group['title'].'</span></h3>
+    <h3 class="hndle" style="margin-top:0;"><span>'.$acf_group['title'] . '</span></h3>
 	    <div class="inside">');
 			$acf_fields = get_posts(array('posts_per_page' => -1, 'post_type' => 'acf-field', 'post_parent' => $acf_group['ID'], 'post_status' => 'publish', 'orderby' => 'menu_order', 'order' => 'ASC'));
-			if (!empty($acf_fields)){
+			if (!empty($acf_fields)) {
 				foreach ($acf_fields as $field) {
 					$this->add_acf_field($field);
 				}
@@ -219,7 +219,7 @@ 
 			add_filter('wp_all_import_acf_is_show_group', array($this, 'acf_is_show_group'), 10, 2);
 		}
 
-		function acf_is_show_group($is_show, $acf_group){
+		function acf_is_show_group($is_show, $acf_group) {
 			return (in_array($acf_group['ID'], $this->acfGroups)) ? false : true;
 		}
 
@@ -231,7 +231,7 @@ 
 		* @param string $default_value - default option value
 		*
 		*/
-		function add_option($slug, $default_value = ''){
+		function add_option($slug, $default_value = '') {
 			$this->options[$slug] = $default_value;
 		}
 
@@ -239,12 +239,12 @@ 
 
             $options_list = array();
             
-            if ( ! empty( $this->fields ) ) {
+            if (!empty($this->fields)) {
 
                 foreach ($this->fields as $field_slug => $field_params) {
                     if (in_array($field_params['type'], array('title', 'plain_text', 'acf'))) continue;
                     $default_value = '';
-                    if (!empty($field_params['enum_values'])){
+                    if (!empty($field_params['enum_values'])) {
                         foreach ($field_params['enum_values'] as $key => $value) {						
                             $default_value = $key;
                             break;
@@ -255,14 +255,14 @@ 
 
             }			
 
-			if ( ! empty($this->options) ){
+			if (!empty($this->options)) {
 				foreach ($this->options as $slug => $value) {
 					$options_arr[$slug] = $value;
 				}
 			}
 
 			$options_arr[$this->slug]   = $options_list;
-			$options_arr['rapid_addon'] = plugin_basename( __FILE__ );
+			$options_arr['rapid_addon'] = plugin_basename(__FILE__);
 
 			return $options_arr;
 
@@ -295,7 +295,7 @@ 
 
 		}
 
-		function wpai_api_post_saved($functions){
+		function wpai_api_post_saved($functions) {
 			$functions[$this->slug] = array($this, 'post_saved');
 			return $functions;
 		}
@@ -308,7 +308,7 @@ 
 
 		}
 
-		function post_saved( $importData ){
+		function post_saved($importData) {
 
 			if (is_callable($this->post_saved_function))
 				call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
@@ -327,14 +327,14 @@ 
 	//		print_r($import_options);
 	//		echo "</pre>";
 
-			if ( ! empty($parsedData) )	{
+			if (!empty($parsedData)) {
 
 				$this->logger = $importData['logger'];
 
 				$post_id = $importData['pid'];
 				$index = $importData['i'];
 				$data = array();
-				if (!empty($this->fields)){
+				if (!empty($this->fields)) {
 					foreach ($this->fields as $field_slug => $field_params) {
 						if (in_array($field_params['type'], array('title', 'plain_text'))) continue;
 						switch ($field_params['type']) {
@@ -345,7 +345,7 @@ 
 
 								$image_url_or_path = $parsedData[$field_slug][$index];
 
-								if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
+								if (!array_key_exists($field_slug, $import_options['download_image'])) {
 									continue 2;
 								}
 
@@ -365,7 +365,7 @@ 
 
 								$image_url_or_path = $parsedData[$field_slug][$index];
 
-								if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
+								if (!array_key_exists($field_slug, $import_options['download_image'])) {
 									continue 2;
 								}
 
@@ -393,7 +393,7 @@ 
 
 							if (!empty($mapping_rules) and is_array($mapping_rules)) {
 								foreach ($mapping_rules as $rule_number => $map_to) {
-									if (isset($map_to[trim($data[$field_slug])])){
+									if (isset($map_to[trim($data[$field_slug])])) {
 										$data[$field_slug] = trim($map_to[trim($data[$field_slug])]);
 										break;
 									}
@@ -442,14 +442,14 @@ 
 
 			echo $this->helper_metabox_bottom();
 
-			if ( ! empty($this->image_sections) ){				
+			if (!empty($this->image_sections)) {				
 				$is_images_section_enabled = apply_filters('wp_all_import_is_images_section_enabled', true, $post_type);						
 				foreach ($this->image_sections as $k => $section) {
 					$section_options = array();
 					foreach ($this->image_options as $slug => $value) {
 						$section_options[$section['slug'] . $slug] = $value;
 					}										
-					if ( ! $is_images_section_enabled and ! $k ){
+					if (!$is_images_section_enabled and !$k) {
 						$section_options[$section['slug'] . 'is_featured'] = 1;
 					}
 					PMXI_API::add_additional_images_section($section['title'], $section['slug'], $current_values, '', true, false, $section['type']);
@@ -458,7 +458,7 @@ 
 
 		}		
 
-		function render_field($field_params, $field_slug, $current_values, $in_the_bottom = false){
+		function render_field($field_params, $field_slug, $current_values, $in_the_bottom = false) {
 
 			if (!isset($current_values[$this->slug][$field_slug])) {
 				$current_values[$this->slug][$field_slug] = isset($field_params['default_text']) ? $field_params['default_text'] : '';
@@ -471,8 +471,8 @@ 
 					$field_params['name'],
 					array(
 						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
-						'field_value' => ( $current_values[$this->slug][$field_slug] == '' && $this->isWizard ) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
+						'field_name' => $this->slug . "[" . $field_slug . "]",
+						'field_value' => ($current_values[$this->slug][$field_slug] == '' && $this->isWizard) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
 					)
 				);
 
@@ -483,8 +483,8 @@ 
 					$field_params['name'],
 					array(
 						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
-						'field_value' => ( $current_values[$this->slug][$field_slug] == '' && $this->isWizard ) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
+						'field_name' => $this->slug . "[" . $field_slug . "]",
+						'field_value' => ($current_values[$this->slug][$field_slug] == '' && $this->isWizard) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
 					)
 				);
 
@@ -495,8 +495,8 @@ 
 					$field_params['name'],
 					array(
 						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
-						'field_value' => ( $current_values[$this->slug][$field_slug] == '' && $this->isWizard ) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
+						'field_name' => $this->slug . "[" . $field_slug . "]",
+						'field_value' => ($current_values[$this->slug][$field_slug] == '' && $this->isWizard) ? $field_params['default_text'] : $current_values[$this->slug][$field_slug]
 					)
 				);
 
@@ -509,7 +509,7 @@ 
 					$field_params['name'],
 					array(
 						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
+						'field_name' => $this->slug . "[" . $field_slug . "]",
 						'field_value' => $current_values[$this->slug][$field_slug],
 						'download_image' => $current_values[$this->slug]['download_image'][$field_slug],
 						'field_key' => $field_slug,
@@ -528,7 +528,7 @@ 
 					$field_params['name'],
 					array(
 						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
+						'field_name' => $this->slug . "[" . $field_slug . "]",
 						'field_value' => $current_values[$this->slug][$field_slug],
 						'enum_values' => $field_params['enum_values'],
 						'mapping' => true,
@@ -540,14 +540,14 @@ 
 					)
 				);
 
-			} else if($field_params['type'] == 'accordion') {
+			} else if ($field_params['type'] == 'accordion') {
 
 				PMXI_API::add_field(
 					'accordion',
 					$field_params['name'],
 					array(						
 						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",																
+						'field_name' => $this->slug . "[" . $field_slug . "]",																
 						'field_key' => $field_slug,								
 						'addon_prefix' => $this->slug,
 						'sub_fields' => $this->get_sub_fields($field_params, $field_slug, $current_values),
@@ -555,7 +555,7 @@ 
 					)
 				);
 
-			} else if($field_params['type'] == 'acf') {
+			} else if ($field_params['type'] == 'acf') {
 				$fieldData = (!empty($field_params['field_obj']->post_content)) ? unserialize($field_params['field_obj']->post_content) : array();
 				$fieldData['ID']    = $field_params['field_obj']->ID;
 				$fieldData['id']    = $field_params['field_obj']->ID;
@@ -563,19 +563,19 @@ 
 				$fieldData['key']   = $field_params['field_obj']->post_name;
 				if (empty($fieldData['name'])) $fieldData['name'] = $field_params['field_obj']->post_excerpt;
 				if (function_exists('pmai_render_field')) {
-					echo pmai_render_field($fieldData, ( ! empty($current_values) ) ? $current_values : array() );
+					echo pmai_render_field($fieldData, (!empty($current_values)) ? $current_values : array());
 				}
-			} else if($field_params['type'] == 'title'){
+			} else if ($field_params['type'] == 'title') {
 				?>
-				<h4 class="wpallimport-add-on-options-title"><?php _e($field_params['name'], 'wp_all_import_plugin'); ?><?php if ( ! empty($field_params['tooltip'])): ?><a href="#help" class="wpallimport-help" title="<?php echo $field_params['tooltip']; ?>" style="position:relative; top: -1px;">?</a><?php endif; ?></h4>				
+				<h4 class="wpallimport-add-on-options-title"><?php _e($field_params['name'], 'wp_all_import_plugin'); ?><?php if (!empty($field_params['tooltip'])): ?><a href="#help" class="wpallimport-help" title="<?php echo $field_params['tooltip']; ?>" style="position:relative; top: -1px;">?</a><?php endif; ?></h4>				
 				<?php
 
-			} else if($field_params['type'] == 'plain_text'){
+			} else if ($field_params['type'] == 'plain_text') {
 				if ($field_params['is_html']):					
 					echo $field_params['name'];				
 				else:
 					?>
-					<p style="margin: 0 0 12px 0;"><?php echo $field_params['name'];?></p>
+					<p style="margin: 0 0 12px 0;"><?php echo $field_params['name']; ?></p>
 					<?php
 				endif;
 			}
@@ -587,19 +587,19 @@ 
 		* Helper function for nested radio fields
 		*
 		*/
-		function get_sub_fields($field_params, $field_slug, $current_values){
+		function get_sub_fields($field_params, $field_slug, $current_values) {
 			$sub_fields = array();	
-			if ( ! empty($field_params['enum_values']) ){										
+			if (!empty($field_params['enum_values'])) {										
 				foreach ($field_params['enum_values'] as $key => $value) {					
 					$sub_fields[$key] = array();	
-					if (is_array($value)){
-						if ($field_params['type'] == 'accordion'){								
+					if (is_array($value)) {
+						if ($field_params['type'] == 'accordion') {								
 							$sub_fields[$key][] = $this->convert_field($value, $current_values);
 						}
 						else
 						{
 							foreach ($value as $k => $sub_field) {								
-								if (is_array($sub_field) and ! empty($this->fields[$sub_field['slug']]))
+								if (is_array($sub_field) and !empty($this->fields[$sub_field['slug']]))
 								{									
 									$sub_fields[$key][] = $this->convert_field($sub_field, $current_values);
 								}								
@@ -611,7 +611,7 @@ 
 			return $sub_fields;
 		}			
 
-		function convert_field($sub_field, $current_values){
+		function convert_field($sub_field, $current_values) {
 			$field = array();
 			if (!isset($current_values[$this->slug][$sub_field['slug']])) {
 				$current_values[$this->slug][$sub_field['slug']] = isset($sub_field['default_text']) ? $sub_field['default_text'] : '';
@@ -623,7 +623,7 @@ 
 						'label'  => $this->fields[$sub_field['slug']]['name'],
 						'params' => array(
 							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
+							'field_name' => $this->slug . "[" . $sub_field['slug'] . "]",
 							'field_value' => ($current_values[$this->slug][$sub_field['slug']] == '' && $this->isWizard) ? $sub_field['default_text'] : $current_values[$this->slug][$sub_field['slug']],
 							'is_main_field' => $sub_field['is_main_field']
 						)
@@ -635,7 +635,7 @@ 
 						'label'  => $this->fields[$sub_field['slug']]['name'],
 						'params' => array(
 							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
+							'field_name' => $this->slug . "[" . $sub_field['slug'] . "]",
 							'field_value' => ($current_values[$this->slug][$sub_field['slug']] == '' && $this->isWizard) ? $sub_field['default_text'] : $current_values[$this->slug][$sub_field['slug']],
 							'is_main_field' => $sub_field['is_main_field']
 						)
@@ -647,7 +647,7 @@ 
 						'label'  => $this->fields[$sub_field['slug']]['name'],
 						'params' => array(
 							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
+							'field_name' => $this->slug . "[" . $sub_field['slug'] . "]",
 							'field_value' => ($current_values[$this->slug][$sub_field['slug']] == '' && $this->isWizard) ? $sub_field['default_text'] : $current_values[$this->slug][$sub_field['slug']],
 							'is_main_field' => $sub_field['is_main_field']
 						)
@@ -659,7 +659,7 @@ 
 						'label'  => $this->fields[$sub_field['slug']]['name'],
 						'params' => array(
 							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
+							'field_name' => $this->slug . "[" . $sub_field['slug'] . "]",
 							'field_value' => $current_values[$this->slug][$sub_field['slug']],
 							'download_image' => null,
 							'field_key' => $sub_field['slug'],
@@ -668,7 +668,7 @@ 
 						)
 					);
 
-					if ( array_key_exists( 'download_image', $current_values[$this->slug] ) && array_key_exists( $sub_field['slug'], $current_values[$this->slug]['download_image'] ) ) {
+					if (array_key_exists('download_image', $current_values[$this->slug]) && array_key_exists($sub_field['slug'], $current_values[$this->slug]['download_image'])) {
 						$field['params']['download_image'] = $current_values[$this->slug]['download_image'][$sub_field['slug']];
 					}
                     break;
@@ -678,7 +678,7 @@ 
 						'label'  => $this->fields[$sub_field['slug']]['name'],
 						'params' => array(
 							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
+							'field_name' => $this->slug . "[" . $sub_field['slug'] . "]",
 							'field_value' => $current_values[$this->slug][$sub_field['slug']],
 							'download_image' => null,
 							'field_key' => $sub_field['slug'],
@@ -687,7 +687,7 @@ 
 						)
 					);
 
-					if ( array_key_exists( 'download_image', $current_values[$this->slug] )  && array_key_exists( $sub_field['slug'], $current_values[$this->slug]['download_image'] ) ) {
+					if (array_key_exists('download_image', $current_values[$this->slug]) && array_key_exists($sub_field['slug'], $current_values[$this->slug]['download_image'])) {
 						$field['params']['download_image'] = $current_values[$this->slug]['download_image'][$sub_field['slug']];
 					}
 
@@ -698,7 +698,7 @@ 
 						'label'  => $this->fields[$sub_field['slug']]['name'],
 						'params' => array(
 							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
+							'field_name' => $this->slug . "[" . $sub_field['slug'] . "]",
 							'field_value' => $current_values[$this->slug][$sub_field['slug']],
 							'enum_values' => $this->fields[$sub_field['slug']]['enum_values'],
 							'mapping' => true,
@@ -717,7 +717,7 @@ 
 						'label'  => $this->fields[$sub_field['slug']]['name'],
 						'params' => array(
 							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",																
+							'field_name' => $this->slug . "[" . $sub_field['slug'] . "]",																
 							'field_key' => $sub_field['slug'],								
 							'addon_prefix' => $this->slug,
 							'sub_fields' => $this->get_sub_fields($this->fields[$sub_field['slug']], $sub_field['slug'], $current_values),
@@ -738,12 +738,12 @@ 
 		*
 		*
 		*/
-		function add_options( $main_field = false, $title = '', $fields = array() ){
+		function add_options($main_field = false, $title = '', $fields = array()) {
 			
-			if ( ! empty($fields) )
+			if (!empty($fields))
 			{				
 				
-				if ($main_field){
+				if ($main_field) {
 
 					$main_field['is_main_field'] = true;
 					$fields[] = $main_field;
@@ -756,7 +756,7 @@ 
 
 		}			
 
-		function add_title($title = '', $tooltip = ''){
+		function add_title($title = '', $tooltip = '') {
 
 			if (empty($title)) return;
 
@@ -764,7 +764,7 @@ 
 
 		}		
 
-		function add_text($text = '', $is_html = false){
+		function add_text($text = '', $is_html = false) {
 
 			if (empty($text)) return;
 
@@ -862,10 +862,10 @@ 
   					margin: 45px 0 15px 0;
 				}
 			</style>
-			<div class="wpallimport-collapsed wpallimport-section wpallimport-addon '.$this->slug.' closed">
+			<div class="wpallimport-collapsed wpallimport-section wpallimport-addon '.$this->slug . ' closed">
 				<div class="wpallimport-content-section">
 					<div class="wpallimport-collapsed-header">
-						<h3>'.__($name,'pmxi_plugin').'</h3>	
+						<h3>'.__($name, 'pmxi_plugin') . '</h3>	
 					</div>
 					<div class="wpallimport-collapsed-content" style="padding: 0;">
 						<div class="wpallimport-collapsed-content-inner">
@@ -891,8 +891,8 @@ 
 		* simply add an additional section for attachments
 		*
 		*/
-		function import_files( $slug, $title, $callback = NULL ){
-			$this->import_images( $slug, $title, 'files', $callback);
+		function import_files($slug, $title, $callback = NULL) {
+			$this->import_images($slug, $title, 'files', $callback);
 		}
 
 		/**
@@ -900,9 +900,9 @@ 
 		* simply add an additional section 
 		*
 		*/
-		function import_images( $slug, $title, $type = 'images', $callback = NULL ){
+		function import_images($slug, $title, $type = 'images', $callback = NULL) {
 			
-			if ( empty($title) or empty($slug) ) return;
+			if (empty($title) or empty($slug)) return;
 
 			if (is_array($slug)) {
                 $section_slug = 'pmxi_' . md5(serialize($slug));
@@ -920,17 +920,17 @@ 
 				$this->add_option($section_slug . $option_slug, $value);
 			}
 
-			if (count($this->image_sections) > 1){
+			if (count($this->image_sections) > 1) {
 				add_filter('wp_all_import_is_show_add_new_images', array($this, 'filter_is_show_add_new_images'), 10, 2);
 			}
 
 			add_filter('wp_all_import_is_allow_import_images', array($this, 'is_allow_import_images'), 10, 2);			
 
 			if ($callback && is_callable($callback)) {
-                add_action( $section_slug, $callback, 10, 4);
+                add_action($section_slug, $callback, 10, 4);
             } else {
                 if (function_exists($slug)) {
-                    add_action( $section_slug, $slug, 10, 4);
+                    add_action($section_slug, $slug, 10, 4);
                 }
             }
 		}			
@@ -939,7 +939,7 @@ 
 			* filter to allow import images for free edition of WP All Import
 			*
 			*/
-			function is_allow_import_images($is_allow, $post_type){
+			function is_allow_import_images($is_allow, $post_type) {
 				return ($this->is_active_addon($post_type)) ? true : $is_allow;
 			}
 
@@ -948,8 +948,8 @@ 
 		* filter to control additional images sections
 		*
 		*/
-		function additional_sections($sections){
-			if ( ! empty($this->image_sections) ){
+		function additional_sections($sections) {
+			if (!empty($this->image_sections)) {
 				foreach ($this->image_sections as $add_section) {
 					$sections[] = $add_section;
 				}
@@ -962,7 +962,7 @@ 
 			* remove the 'Don't touch existing images, append new images' when more than one image section is in use.
 			*
 			*/
-			function filter_is_show_add_new_images($is_show, $post_type){
+			function filter_is_show_add_new_images($is_show, $post_type) {
 				return ($this->is_active_addon($post_type)) ? false : $is_show;
 			}
 
@@ -971,12 +971,12 @@ 
 		* disable the default images section
 		*
 		*/		
-		function disable_default_images($post_type = false){
+		function disable_default_images($post_type = false) {
 									
 			add_filter('wp_all_import_is_images_section_enabled', array($this, 'is_enable_default_images_section'), 10, 2);
 
 		}
-			function is_enable_default_images_section($is_enabled, $post_type){						
+			function is_enable_default_images_section($is_enabled, $post_type) {						
 				
 				return ($this->is_active_addon($post_type)) ? false : true;
 								
@@ -988,7 +988,7 @@ 
 
 			$data = array(); // parsed data
 
-			if ( ! empty($import->options[$this->slug])){
+			if (!empty($import->options[$this->slug])) {
 
 				$this->logger = $parsingData['logger'];
 
@@ -997,9 +997,9 @@ 
 				$tmp_files = array();
 
 				foreach ($options[$this->slug] as $option_name => $option_value) {					
-					if ( isset($import->options[$this->slug][$option_name]) and $import->options[$this->slug][$option_name] != '') {						
+					if (isset($import->options[$this->slug][$option_name]) and $import->options[$this->slug][$option_name] != '') {						
 						if ($import->options[$this->slug][$option_name] == "xpath") {
-							if ($import->options[$this->slug]['xpaths'][$option_name] == ""){
+							if ($import->options[$this->slug]['xpaths'][$option_name] == "") {
 								$count and $data[$option_name] = array_fill(0, $count, "");
 							} else {
 								$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug]['xpaths'][$option_name], $file)->parse();
@@ -1038,11 +1038,11 @@ 
 
 			if ($import_options['update_all_data'] == 'yes') return true;
 
-			if ( ! $import_options['is_update_custom_fields'] ) return false;			
+			if (!$import_options['is_update_custom_fields']) return false;			
 
 			if ($import_options['update_custom_fields_logic'] == "full_update") return true;
-			if ($import_options['update_custom_fields_logic'] == "only" and ! empty($import_options['custom_fields_list']) and is_array($import_options['custom_fields_list']) and in_array($meta_key, $import_options['custom_fields_list']) ) return true;
-			if ($import_options['update_custom_fields_logic'] == "all_except" and ( empty($import_options['custom_fields_list']) or ! in_array($meta_key, $import_options['custom_fields_list']) )) return true;
+			if ($import_options['update_custom_fields_logic'] == "only" and !empty($import_options['custom_fields_list']) and is_array($import_options['custom_fields_list']) and in_array($meta_key, $import_options['custom_fields_list'])) return true;
+			if ($import_options['update_custom_fields_logic'] == "all_except" and (empty($import_options['custom_fields_list']) or !in_array($meta_key, $import_options['custom_fields_list']))) return true;
 
 			return false;
 
@@ -1058,11 +1058,11 @@ 
 
 			if ($import_options['update_all_data'] == 'yes') return true;
 
-			if ( ! $import_options['is_update_categories'] ) return false;			
+			if (!$import_options['is_update_categories']) return false;			
 
 			if ($import_options['update_categories_logic'] == "full_update") return true;
-			if ($import_options['update_categories_logic'] == "only" and ! empty($import_options['taxonomies_list']) and is_array($import_options['taxonomies_list']) and in_array($tax_name, $import_options['taxonomies_list']) ) return true;
-			if ($import_options['update_categories_logic'] == "all_except" and ( empty($import_options['taxonomies_list']) or ! in_array($tax_name, $import_options['taxonomies_list']) )) return true;
+			if ($import_options['update_categories_logic'] == "only" and !empty($import_options['taxonomies_list']) and is_array($import_options['taxonomies_list']) and in_array($tax_name, $import_options['taxonomies_list'])) return true;
+			if ($import_options['update_categories_logic'] == "all_except" and (empty($import_options['taxonomies_list']) or !in_array($tax_name, $import_options['taxonomies_list']))) return true;
 
 			return false;
 
@@ -1083,8 +1083,8 @@ 
 
 
 		function admin_notice_ignore() {
-			if (isset($_GET[$this->slug.'_ignore']) && '0' == $_GET[$this->slug.'_ignore'] ) {
-				update_option($this->slug.'_ignore', 'true');
+			if (isset($_GET[$this->slug . '_ignore']) && '0' == $_GET[$this->slug . '_ignore']) {
+				update_option($this->slug . '_ignore', 'true');
 			}
 		}
 
@@ -1094,10 +1094,10 @@ 
 			if ($this->notice_text) {
 				$notice_text = $this->notice_text;
 			} else {
-				$notice_text = $this->name.' requires WP All Import <a href="http://www.wpallimport.com/" target="_blank">Pro</a> or <a href="http://wordpress.org/plugins/wp-all-import" target="_blank">Free</a>.';
+				$notice_text = $this->name . ' requires WP All Import <a href="http://www.wpallimport.com/" target="_blank">Pro</a> or <a href="http://wordpress.org/plugins/wp-all-import" target="_blank">Free</a>.';
 			}
 
-			if (!get_option(sanitize_key($this->slug).'_notice_ignore')) {
+			if (!get_option(sanitize_key($this->slug) . '_notice_ignore')) {
 
 				?>
 
@@ -1105,9 +1105,9 @@ 
 	    		    <p><?php _e(
 		    		    	sprintf(
 	    			    		$notice_text,
-	    			    		'?'.$this->slug.'_ignore=0'
+	    			    		'?' . $this->slug . '_ignore=0'
 	    			    	), 
-	    		    		'rapid_addon_'.$this->slug
+	    		    		'rapid_addon_' . $this->slug
 	    		    	); ?></p>
 			    </div>
 
@@ -1126,14 +1126,14 @@ 
 
 			$is_show_notice = false;
 
-			include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+			include_once(ABSPATH . 'wp-admin/includes/plugin.php');
 
-			if ( ! class_exists( 'PMXI_Plugin' ) ) {
+			if (!class_exists('PMXI_Plugin')) {
 				$is_show_notice = true;
 			}
 
 			// Supported Themes
-			if ( ! $is_show_notice and ! empty($conditions['themes']) ){
+			if (!$is_show_notice and !empty($conditions['themes'])) {
 
 				$themeInfo    = wp_get_theme();
 				$parentInfo = $themeInfo->parent();				
@@ -1141,7 +1141,7 @@ 
 				
 				$is_show_notice = in_array($currentTheme, $conditions['themes']) ? false : true;				
 
-				if ( $is_show_notice and $parentInfo ){
+				if ($is_show_notice and $parentInfo) {
 					$parent_theme = $parentInfo->get('Name');
 					$is_show_notice = in_array($parent_theme, $conditions['themes']) ? false : true;					
 				}
@@ -1149,22 +1149,22 @@ 
 			}			
 
 			// Required Plugins
-			if ( ! $is_show_notice and ! empty($conditions['plugins']) ){				
+			if (!$is_show_notice and !empty($conditions['plugins'])) {				
 
 				$requires_counter = 0;
 				foreach ($conditions['plugins'] as $plugin) {
-					if ( is_plugin_active($plugin) ) $requires_counter++;
+					if (is_plugin_active($plugin)) $requires_counter++;
 				}
 
-				if ($requires_counter != count($conditions['plugins'])){ 					
+				if ($requires_counter != count($conditions['plugins'])) { 					
 					$is_show_notice = true;			
 				}
 
 			}
 
-			if ( $is_show_notice ){
+			if ($is_show_notice) {
 
-				if ( $notice_text != '' ) {
+				if ($notice_text != '') {
 					$this->notice_text = $notice_text;
 				}
 
@@ -1173,34 +1173,34 @@ 
 
 		}
 
-		function log( $m = false){		
+		function log($m = false) {		
 
 			$m and $this->logger and call_user_func($this->logger, $m);
 
         }
         
-        public function remove_post_type( $type = '' ) {
-            if ( ! empty( $type ) ) {
-                $this->add_option( 'post_types_to_remove', $type );
+        public function remove_post_type($type = '') {
+            if (!empty($type)) {
+                $this->add_option('post_types_to_remove', $type);
             }
         }
 
-        public function filter_post_types( $custom_types = array(), $custom_type = '' ) {
+        public function filter_post_types($custom_types = array(), $custom_type = '') {
             $options = $this->options_array();
             $option_key = 'post_types_to_remove';
 
-            if ( array_key_exists( $option_key, $options ) ) {
-                $type = $options[ $option_key ];
+            if (array_key_exists($option_key, $options)) {
+                $type = $options[$option_key];
                 
-                if ( ! empty( $type ) ) {
-                    if ( ! is_array( $type ) ) {
-                        if ( array_key_exists( $type, $custom_types )  ) {
-                            unset( $custom_types[ $type ] );
+                if (!empty($type)) {
+                    if (!is_array($type)) {
+                        if (array_key_exists($type, $custom_types)) {
+                            unset($custom_types[$type]);
                         }
                     } else {
-                        foreach ( $type as $key => $post_type ) {
-                            if ( array_key_exists( $post_type, $custom_types ) ) {
-                                unset( $custom_types[ $post_type ] );
+                        foreach ($type as $key => $post_type) {
+                            if (array_key_exists($post_type, $custom_types)) {
+                                unset($custom_types[$post_type]);
                             }
                         }
                     }
@@ -1209,26 +1209,26 @@ 
             return $custom_types;
         }
 
-        public function sort_post_types( array $order ) {
+        public function sort_post_types(array $order) {
             $options = $this->options_array();
             $option_key = 'post_type_move';
 
-            if ( array_key_exists( $option_key, $options ) ) {
-                $move_rules = maybe_unserialize( $options[ $option_key ] );
+            if (array_key_exists($option_key, $options)) {
+                $move_rules = maybe_unserialize($options[$option_key]);
 
-                foreach ( $move_rules as $rule ) {
+                foreach ($move_rules as $rule) {
                     $move_this  = $rule['move_this'];
                     $move_to    = $rule['move_to'];
-                    if ( $move_to > count( $order ) ) {
-                        if ( ( $rm_key = array_search( $move_this, $order ) ) !== false ) {
-                            unset( $order[ $rm_key ] );
+                    if ($move_to > count($order)) {
+                        if (($rm_key = array_search($move_this, $order)) !== false) {
+                            unset($order[$rm_key]);
                         }
-                        array_push( $order, $move_this );                        
+                        array_push($order, $move_this);                        
                     } else {
-                        if ( ( $rm_key = array_search( $move_this, $order ) ) !== false ) {
-                            unset( $order[ $rm_key ] );
+                        if (($rm_key = array_search($move_this, $order)) !== false) {
+                            unset($order[$rm_key]);
                         }
-                        array_splice( $order, $move_to, 0, $move_this );
+                        array_splice($order, $move_to, 0, $move_this);
                     }
                 }
 
@@ -1238,57 +1238,57 @@ 
             return $order;
         }
 
-        public function move_post_type( $move_this = null, $move_to = null ) {
+        public function move_post_type($move_this = null, $move_to = null) {
             $move_rules = array();
 
-            if ( ! is_array( $move_this ) && ! is_array( $move_to ) ) {
+            if (!is_array($move_this) && !is_array($move_to)) {
                 $move_rules[] = array(
                     'move_this' => $move_this,
                     'move_to'   => $move_to
                 );
             } else {
-                foreach ( $move_this as $key => $move_post ) {                    
+                foreach ($move_this as $key => $move_post) {                    
                     $move_rules[] = array(
                         'move_this' => $move_post,
-                        'move_to'   => $move_to[ $key ]
+                        'move_to'   => $move_to[$key]
                     );
                 }
             }
 
-            $this->add_option( 'post_type_move', $move_rules );
+            $this->add_option('post_type_move', $move_rules);
         }
 
-        public function set_post_type_image( $post_type = null, $image = null ) {
+        public function set_post_type_image($post_type = null, $image = null) {
             $post_type_image_rules = array();
 
-            if ( ! is_array( $post_type ) ) {
+            if (!is_array($post_type)) {
 
-                $post_type_image_rules[ $post_type ] = array(
+                $post_type_image_rules[$post_type] = array(
                         'post_type' => $post_type,
                         'image'     => $image
                 );
 
             } else {
 
-                if ( count( $post_type ) == count( $image ) ) {
+                if (count($post_type) == count($image)) {
 
-                    foreach ( $post_type as $key => $post_name ) {
-                        $post_type_image_rules[ $post_name ] = array(
+                    foreach ($post_type as $key => $post_name) {
+                        $post_type_image_rules[$post_name] = array(
                             'post_type' => $post_name,
-                            'image'     => $image[ $key ]
+                            'image'     => $image[$key]
                         );
                     }
                 }
             }
 
-            $this->add_option( 'post_type_image', $post_type_image_rules );
+            $this->add_option('post_type_image', $post_type_image_rules);
         }
 
-        public function post_type_image( $image ) {
+        public function post_type_image($image) {
             $options = $this->options_array();
             $option_key = 'post_type_image';
-            if ( array_key_exists( $option_key, $options ) ) {
-                $post_type_image_rules = maybe_unserialize( $options[ $option_key ] );
+            if (array_key_exists($option_key, $options)) {
+                $post_type_image_rules = maybe_unserialize($options[$option_key]);
                 return $post_type_image_rules;
             }
             return $image;

includes/libraries/wp-all-import/class-getpaid-wp-all-import.php

Spacing +30 added lines, -30 removed lines

@@ -5,9 +5,9 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-include plugin_dir_path( __FILE__ ) . 'rapid-addon.php';
+include plugin_dir_path(__FILE__) . 'rapid-addon.php';
 
 /**
  * WP All Import class.
@@ -34,8 +34,8 @@ 
     public function __construct() {
 
 		// Init each store separately.
-		foreach ( array_keys( $this->datastores ) as $key ) {
-			$this->init_store( $key );
+		foreach (array_keys($this->datastores) as $key) {
+			$this->init_store($key);
 		}
 
 	}
@@ -43,51 +43,51 @@ 
 	/**
 	 * Inits a store.
 	 */
-    public function init_store( $key ) {
+    public function init_store($key) {
 
 		// Register the add-on.
-		$this->add_ons[ $key ] = new RapidAddon( 'GetPaid', 'getpaid_wp_al_import_' . $key );
+		$this->add_ons[$key] = new RapidAddon('GetPaid', 'getpaid_wp_al_import_' . $key);
 
 		// Create import function.
-		$import_function = function ( $post_id, $data, $import_options, $_post ) use ( $key ) {
-			$this->import_store( $key, $post_id, $data, $import_options, $_post );
+		$import_function = function($post_id, $data, $import_options, $_post) use ($key) {
+			$this->import_store($key, $post_id, $data, $import_options, $_post);
         };
 
-		$this->add_ons[ $key ]->set_import_function( $import_function );
+		$this->add_ons[$key]->set_import_function($import_function);
 
 		// Register store fields.
-		$this->add_store_fields( $key );
+		$this->add_store_fields($key);
 
 		// Only load on the correct post type.
-		$this->add_ons[ $key ]->run( array( 'post_types' => array( 'wpi_' . $key ) ) );
+		$this->add_ons[$key]->run(array('post_types' => array('wpi_' . $key)));
 
 		// Disable images.
-		$this->add_ons[ $key ]->disable_default_images();
+		$this->add_ons[$key]->disable_default_images();
 
 	}
 
 	/**
 	 * Retrieves store fields.
 	 */
-    public function get_store_fields( $key ) {
+    public function get_store_fields($key) {
 
 		// Fetch from data/invoice-schema.php, from data/discount-schema.php, from data/item-schema.php
-		$fields = wpinv_get_data( $key . '-schema' );
+		$fields = wpinv_get_data($key . '-schema');
 
-		if ( empty( $fields ) ) {
+		if (empty($fields)) {
 			return array();
 		}
 
 		// Clean the fields.
 		$prepared = array();
-		foreach ( $fields as $id => $field ) {
+		foreach ($fields as $id => $field) {
 
 			// Skip read only fields.
-			if ( ! empty( $field['readonly'] ) ) {
+			if (!empty($field['readonly'])) {
 				continue;
 			}
 
-			$prepared[ $id ] = $field;
+			$prepared[$id] = $field;
 
 		}
 
@@ -98,10 +98,10 @@ 
 	/**
 	 * Registers store fields.
 	 */
-    public function add_store_fields( $key ) {
+    public function add_store_fields($key) {
 
-		foreach ( $this->get_store_fields( $key ) as $field_id => $data ) {
-			$this->add_ons[ $key ]->add_field( $field_id, $data['description'], 'text' );
+		foreach ($this->get_store_fields($key) as $field_id => $data) {
+			$this->add_ons[$key]->add_field($field_id, $data['description'], 'text');
 		}
 
     }
@@ -109,36 +109,36 @@ 
 	/**
 	 * Handles store imports.
 	 */
-    public function import_store( $key, $post_id, $data, $import_options, $_post ) {
+    public function import_store($key, $post_id, $data, $import_options, $_post) {
 
 		// Is the store class set?
-		if ( ! isset( $this->datastores[ $key ] ) ) {
+		if (!isset($this->datastores[$key])) {
 			return;
 		}
 
 		/**@var GetPaid_Data */
-		$data_store = new $this->datastores[ $key ]( $post_id );
+		$data_store = new $this->datastores[$key]($post_id);
 
 		// Abort if the invoice/item/discount does not exist.
-		if ( ! $data_store->exists() ) {
+		if (!$data_store->exists()) {
 			return;
 		}
 
 		// Prepare data props.
 		$prepared = array();
 
-		foreach ( array_keys( $this->get_store_fields( $key ) ) as $field ) { 
+		foreach (array_keys($this->get_store_fields($key)) as $field) { 
 			// Make sure the user has allowed this field to be updated.
-			if ( empty( $_post['ID'] ) || $this->add_ons[ $key ]->can_update_meta( $field, $import_options ) ) { 
+			if (empty($_post['ID']) || $this->add_ons[$key]->can_update_meta($field, $import_options)) { 
 	
 				// Update the custom field with the imported data.
-				$prepared[ $field ] = $data[ $field ];
+				$prepared[$field] = $data[$field];
 			} 
 		}
 
 		// Only update if we have something to update.
-		if ( ! empty( $prepared ) ) {
-			$data_store->set_props( $prepared );
+		if (!empty($prepared)) {
+			$data_store->set_props($prepared);
 			$data_store->save();
 		}
 

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

Spacing +51 added lines, -51 removed lines

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

includes/payments/class-getpaid-payment-form-submission-refresh-prices.php

Spacing +81 added lines, -81 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Payment form submission refresh prices class
@@ -23,24 +23,24 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 
 		$this->response = array(
 			'submission_id'                    => $submission->id,
             'has_recurring'                    => $submission->has_recurring,
 			'has_subscription_group'           => $submission->has_subscription_group(),
 			'has_multiple_subscription_groups' => $submission->has_multiple_subscription_groups(),
-            'is_free'                          => ! $submission->should_collect_payment_details(),
+            'is_free'                          => !$submission->should_collect_payment_details(),
 		);
 
-		$this->add_totals( $submission );
-		$this->add_texts( $submission );
-		$this->add_items( $submission );
-		$this->add_fees( $submission );
-		$this->add_discounts( $submission );
-		$this->add_taxes( $submission );
-		$this->add_gateways( $submission );
-		$this->add_data( $submission );
+		$this->add_totals($submission);
+		$this->add_texts($submission);
+		$this->add_items($submission);
+		$this->add_fees($submission);
+		$this->add_discounts($submission);
+		$this->add_taxes($submission);
+		$this->add_gateways($submission);
+		$this->add_data($submission);
 
 	}
 
@@ -49,30 +49,30 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_totals( $submission ) {
+	public function add_totals($submission) {
 
 		$this->response = array_merge(
 			$this->response,
 			array(
 
 				'totals'        => array(
-					'subtotal'  => $submission->format_amount( $submission->get_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_tax() ),
-					'total'     => $submission->format_amount( $submission->get_total() ),
-					'raw_total' => html_entity_decode( sanitize_text_field( $submission->format_amount( $submission->get_total() ) ), ENT_QUOTES ),
+					'subtotal'  => $submission->format_amount($submission->get_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_discount()),
+					'fees'      => $submission->format_amount($submission->get_fee()),
+					'tax'       => $submission->format_amount($submission->get_tax()),
+					'total'     => $submission->format_amount($submission->get_total()),
+					'raw_total' => html_entity_decode(sanitize_text_field($submission->format_amount($submission->get_total())), ENT_QUOTES),
 				),
 
 				'recurring'     => array(
-					'subtotal'  => $submission->format_amount( $submission->get_recurring_subtotal() ),
-					'discount'  => $submission->format_amount( $submission->get_recurring_discount() ),
-					'fees'      => $submission->format_amount( $submission->get_recurring_fee() ),
-					'tax'       => $submission->format_amount( $submission->get_recurring_tax() ),
-					'total'     => $submission->format_amount( $submission->get_recurring_total() ),
+					'subtotal'  => $submission->format_amount($submission->get_recurring_subtotal()),
+					'discount'  => $submission->format_amount($submission->get_recurring_discount()),
+					'fees'      => $submission->format_amount($submission->get_recurring_fee()),
+					'tax'       => $submission->format_amount($submission->get_recurring_tax()),
+					'total'     => $submission->format_amount($submission->get_recurring_total()),
 				),
 
-				'initial_amt'   => wpinv_round_amount( $submission->get_total(), null, true ),
+				'initial_amt'   => wpinv_round_amount($submission->get_total(), null, true),
 				'currency'      => $submission->get_currency(),
 
 			)
@@ -85,53 +85,53 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_texts( $submission ) {
+	public function add_texts($submission) {
 
-		$payable = $submission->format_amount( $submission->get_total() );
-		$groups  = getpaid_get_subscription_groups( $submission );
+		$payable = $submission->format_amount($submission->get_total());
+		$groups  = getpaid_get_subscription_groups($submission);
 
-		if ( $submission->has_recurring && 2 > count( $groups ) ) {
+		if ($submission->has_recurring && 2 > count($groups)) {
 
-			$recurring = new WPInv_Item( $submission->has_recurring );
-			$period    = getpaid_get_subscription_period_label( $recurring->get_recurring_period( true ), $recurring->get_recurring_interval(), '' );
-			$main_item = reset( $groups );
+			$recurring = new WPInv_Item($submission->has_recurring);
+			$period    = getpaid_get_subscription_period_label($recurring->get_recurring_period(true), $recurring->get_recurring_interval(), '');
+			$main_item = reset($groups);
 
-			if ( $submission->get_total() == $submission->get_recurring_total() ) {
+			if ($submission->get_total() == $submission->get_recurring_total()) {
 				$payable = "$payable / $period";
-			} else if ( $main_item ) {
+			} else if ($main_item) {
 
-				$main_item = reset( $main_item );
+				$main_item = reset($main_item);
 
 				// Calculate the next renewal date.
-				$_period      = $main_item->get_recurring_period( true );
+				$_period      = $main_item->get_recurring_period(true);
 				$_interval    = $main_item->get_recurring_interval();
 
 				// If the subscription item has a trial period...
-				if ( $main_item->has_free_trial() ) {
-					$_period   = $main_item->get_trial_period( true );
+				if ($main_item->has_free_trial()) {
+					$_period   = $main_item->get_trial_period(true);
 					$_interval = $main_item->get_trial_interval();
 				}
 
 				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
+					__('%1$s (renews at %2$s / %3$s)', 'invoicing'),
+					$submission->format_amount($submission->get_total()),
+					$submission->format_amount($submission->get_recurring_total()),
 					$period
 				);
 
 				$payable .= sprintf(
 					'<small class="text-muted form-text">%s</small>',
 					sprintf(
-						__( 'First renewal on %s', 'invoicing' ),
-						getpaid_format_date( date( 'Y-m-d H:i:s', strtotime( "+$_interval $_period", current_time( 'timestamp' ) ) ) )
+						__('First renewal on %s', 'invoicing'),
+						getpaid_format_date(date('Y-m-d H:i:s', strtotime("+$_interval $_period", current_time('timestamp'))))
 					)
 				);
 
 			} else {
 				$payable = sprintf(
-					__( '%1$s (renews at %2$s / %3$s)', 'invoicing' ),
-					$submission->format_amount( $submission->get_total() ),
-					$submission->format_amount( $submission->get_recurring_total() ),
+					__('%1$s (renews at %2$s / %3$s)', 'invoicing'),
+					$submission->format_amount($submission->get_total()),
+					$submission->format_amount($submission->get_recurring_total()),
 					$period
 				);
 			}
@@ -142,20 +142,20 @@ 
 			'.getpaid-checkout-total-payable' => $payable,
 		);
 
-		foreach ( $submission->get_items() as $item ) {
+		foreach ($submission->get_items() as $item) {
 			$item_id                                               = $item->get_id();
-			$initial_price                                         = $submission->format_amount( $item->get_sub_total() - $item->item_discount );
-			$recurring_price                                       = $submission->format_amount( $item->get_recurring_sub_total() - $item->recurring_item_discount );
-			$texts[".item-$item_id .getpaid-form-item-price-desc"] = getpaid_item_recurring_price_help_text( $item, $submission->get_currency(), $initial_price, $recurring_price );
-			$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = sprintf( __( 'Subtotal: %s', 'invoicing' ), $submission->format_amount( $item->get_sub_total() ) );
+			$initial_price                                         = $submission->format_amount($item->get_sub_total() - $item->item_discount);
+			$recurring_price                                       = $submission->format_amount($item->get_recurring_sub_total() - $item->recurring_item_discount);
+			$texts[".item-$item_id .getpaid-form-item-price-desc"] = getpaid_item_recurring_price_help_text($item, $submission->get_currency(), $initial_price, $recurring_price);
+			$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = sprintf(__('Subtotal: %s', 'invoicing'), $submission->format_amount($item->get_sub_total()));
 
-			if ( $item->get_quantity() == 1 ) {
+			if ($item->get_quantity() == 1) {
 				$texts[".item-$item_id .getpaid-mobile-item-subtotal"] = '';
 			}
 
 		}
 
-		$this->response = array_merge( $this->response, array( 'texts' => $texts ) );
+		$this->response = array_merge($this->response, array('texts' => $texts));
 
 	}
 
@@ -164,19 +164,19 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_items( $submission ) {
+	public function add_items($submission) {
 
 		// Add items.
 		$items = array();
 
-        foreach ( $submission->get_items() as $item ) {
+        foreach ($submission->get_items() as $item) {
 			$item_id           = $item->get_id();
-			$items["$item_id"] = $submission->format_amount( $item->get_sub_total() );
+			$items["$item_id"] = $submission->format_amount($item->get_sub_total());
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'items' => $items )
+			array('items' => $items)
 		);
 
 	}
@@ -186,17 +186,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_fees( $submission ) {
+	public function add_fees($submission) {
 
 		$fees = array();
 
-        foreach ( $submission->get_fees() as $name => $data ) {
-			$fees[$name] = $submission->format_amount( $data['initial_fee'] );
+        foreach ($submission->get_fees() as $name => $data) {
+			$fees[$name] = $submission->format_amount($data['initial_fee']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'fees' => $fees )
+			array('fees' => $fees)
 		);
 
 	}
@@ -206,17 +206,17 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_discounts( $submission ) {
+	public function add_discounts($submission) {
 
 		$discounts = array();
 
-        foreach ( $submission->get_discounts() as $name => $data ) {
-			$discounts[$name] = $submission->format_amount( $data['initial_discount'] );
+        foreach ($submission->get_discounts() as $name => $data) {
+			$discounts[$name] = $submission->format_amount($data['initial_discount']);
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'discounts' => $discounts )
+			array('discounts' => $discounts)
 		);
 
 	}
@@ -226,24 +226,24 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_taxes( $submission ) {
+	public function add_taxes($submission) {
 
 		$taxes  = array();
 		$markup = '';
-        foreach ( $submission->get_taxes() as $name => $data ) {
-			$name          = sanitize_text_field( $name );
-			$amount        = $submission->format_amount( $data['initial_tax'] );
+        foreach ($submission->get_taxes() as $name => $data) {
+			$name          = sanitize_text_field($name);
+			$amount        = $submission->format_amount($data['initial_tax']);
 			$taxes[$name]  = $amount;
 			$markup       .= "<small class='form-text'>$name : $amount</small>";
 		}
 
-		if ( wpinv_display_individual_tax_rates() && ! empty( $taxes ) ) {
+		if (wpinv_display_individual_tax_rates() && !empty($taxes)) {
 			$this->response['texts']['.getpaid-form-cart-totals-total-tax'] = $markup;
 		}
 
 		$this->response = array_merge(
 			$this->response,
-			array( 'taxes' => $taxes )
+			array('taxes' => $taxes)
 		);
 
 	}
@@ -253,29 +253,29 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_gateways( $submission ) {
+	public function add_gateways($submission) {
 
-		$gateways = array_keys( wpinv_get_enabled_payment_gateways() );
+		$gateways = array_keys(wpinv_get_enabled_payment_gateways());
 
-		if ( $this->response['has_recurring'] ) {
+		if ($this->response['has_recurring']) {
 
-			foreach ( $gateways as $i => $gateway ) {
+			foreach ($gateways as $i => $gateway) {
 
 				if (
-					! getpaid_payment_gateway_supports( $gateway, 'subscription' )
-					|| ( $this->response['has_subscription_group'] && ! getpaid_payment_gateway_supports( $gateway, 'single_subscription_group' ) )
-					|| ( $this->response['has_multiple_subscription_groups'] && ! getpaid_payment_gateway_supports( $gateway, 'multiple_subscription_groups' ) ) ) {
-					unset( $gateways[ $i ] );
+					!getpaid_payment_gateway_supports($gateway, 'subscription')
+					|| ($this->response['has_subscription_group'] && !getpaid_payment_gateway_supports($gateway, 'single_subscription_group'))
+					|| ($this->response['has_multiple_subscription_groups'] && !getpaid_payment_gateway_supports($gateway, 'multiple_subscription_groups')) ) {
+					unset($gateways[$i]);
 				}
 
 			}
 
 		}
 
-		$gateways = apply_filters( 'getpaid_submission_gateways', $gateways, $submission );
+		$gateways = apply_filters('getpaid_submission_gateways', $gateways, $submission);
 		$this->response = array_merge(
 			$this->response,
-			array( 'gateways' => $gateways )
+			array('gateways' => $gateways)
 		);
 
 	}
@@ -285,7 +285,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function add_data( $submission ) {
+	public function add_data($submission) {
 
 		$this->response = array_merge(
 			$this->response,

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

Spacing +145 added lines, -145 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Paypal Payment Gateway class.
@@ -24,7 +24,7 @@ 
 	 *
 	 * @var array
 	 */
-    protected $supports = array( 'subscription', 'sandbox', 'single_subscription_group' );
+    protected $supports = array('subscription', 'sandbox', 'single_subscription_group');
 
     /**
 	 * Payment method order.
@@ -59,7 +59,7 @@ 
 	 *
 	 * @var array
 	 */
-	public $currencies = array( 'AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR' );
+	public $currencies = array('AUD', 'BRL', 'CAD', 'MXN', 'NZD', 'HKD', 'SGD', 'USD', 'EUR', 'JPY', 'TRY', 'NOK', 'CZK', 'DKK', 'HUF', 'ILS', 'MYR', 'PHP', 'PLN', 'SEK', 'CHF', 'TWD', 'THB', 'GBP', 'RMB', 'RUB', 'INR');
 
     /**
 	 * URL to view a transaction.
@@ -80,15 +80,15 @@ 
 	 */
 	public function __construct() {
 
-        $this->title                = __( 'PayPal Standard', 'invoicing' );
-        $this->method_title         = __( 'PayPal Standard', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed to PayPal', 'invoicing' );
-        $this->notify_url           = wpinv_get_ipn_url( $this->id );
+        $this->title                = __('PayPal Standard', 'invoicing');
+        $this->method_title         = __('PayPal Standard', 'invoicing');
+        $this->checkout_button_text = __('Proceed to PayPal', 'invoicing');
+        $this->notify_url           = wpinv_get_ipn_url($this->id);
 
-		add_filter( 'getpaid_paypal_args', array( $this, 'process_subscription' ), 10, 2 );
-        add_filter( 'getpaid_paypal_sandbox_notice', array( $this, 'sandbox_notice' ) );
-		add_filter( 'getpaid_get_paypal_connect_url', array( $this, 'maybe_get_connect_url' ), 10, 2 );
-		add_action( 'getpaid_authenticated_admin_action_connect_paypal', array( $this, 'connect_paypal' ) );
+		add_filter('getpaid_paypal_args', array($this, 'process_subscription'), 10, 2);
+        add_filter('getpaid_paypal_sandbox_notice', array($this, 'sandbox_notice'));
+		add_filter('getpaid_get_paypal_connect_url', array($this, 'maybe_get_connect_url'), 10, 2);
+		add_action('getpaid_authenticated_admin_action_connect_paypal', array($this, 'connect_paypal'));
 
 		parent::__construct();
     }
@@ -102,16 +102,16 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Get redirect url.
-        $paypal_redirect = $this->get_request_url( $invoice );
+        $paypal_redirect = $this->get_request_url($invoice);
 
         // Add a note about the request url.
         $invoice->add_note(
             sprintf(
-                __( 'Redirecting to PayPal: %s', 'invoicing' ),
-                esc_url( $paypal_redirect )
+                __('Redirecting to PayPal: %s', 'invoicing'),
+                esc_url($paypal_redirect)
             ),
             false,
             false,
@@ -119,7 +119,7 @@ 
         );
 
         // Redirect to PayPal
-        wp_redirect( $paypal_redirect );
+        wp_redirect($paypal_redirect);
         exit;
 
     }
@@ -130,21 +130,21 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_request_url( $invoice ) {
+	public function get_request_url($invoice) {
 
         // Endpoint for this request
-		$this->endpoint    = $this->is_sandbox( $invoice ) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
+		$this->endpoint = $this->is_sandbox($invoice) ? 'https://www.sandbox.paypal.com/cgi-bin/webscr?test_ipn=1&' : 'https://www.paypal.com/cgi-bin/webscr?';
 
         // Retrieve paypal args.
-        $paypal_args       = map_deep( $this->get_paypal_args( $invoice ), 'urlencode' );
+        $paypal_args = map_deep($this->get_paypal_args($invoice), 'urlencode');
 
-        if ( $invoice->is_recurring() ) {
+        if ($invoice->is_recurring()) {
             $paypal_args['bn'] = 'GetPaid_Subscribe_WPS_US';
         } else {
             $paypal_args['bn'] = 'GetPaid_ShoppingCart_WPS_US';
         }
 
-        return add_query_arg( $paypal_args, $this->endpoint );
+        return add_query_arg($paypal_args, $this->endpoint);
 
 	}
 
@@ -154,25 +154,25 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_paypal_args( $invoice ) {
+	protected function get_paypal_args($invoice) {
 
         // Whether or not to send the line items as one item.
-		$force_one_line_item = apply_filters( 'getpaid_paypal_force_one_line_item', true, $invoice );
+		$force_one_line_item = apply_filters('getpaid_paypal_force_one_line_item', true, $invoice);
 
-		if ( $invoice->is_recurring() || ( wpinv_use_taxes() && wpinv_prices_include_tax() ) ) {
+		if ($invoice->is_recurring() || (wpinv_use_taxes() && wpinv_prices_include_tax())) {
 			$force_one_line_item = true;
 		}
 
 		$paypal_args = apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, $force_one_line_item )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, $force_one_line_item)
 			),
 			$invoice
 		);
 
-		return $this->fix_request_length( $invoice, $paypal_args );
+		return $this->fix_request_length($invoice, $paypal_args);
     }
 
     /**
@@ -181,9 +181,9 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_transaction_args( $invoice ) {
+	protected function get_transaction_args($invoice) {
 
-		$email = $this->is_sandbox( $invoice ) ? wpinv_get_option( 'paypal_sandbox_email', wpinv_get_option( 'paypal_email', '' ) ) : wpinv_get_option( 'paypal_email', '' );
+		$email = $this->is_sandbox($invoice) ? wpinv_get_option('paypal_sandbox_email', wpinv_get_option('paypal_email', '')) : wpinv_get_option('paypal_email', '');
 		return array(
             'cmd'           => '_cart',
             'business'      => $email,
@@ -194,16 +194,16 @@ 
             'rm'            => is_ssl() ? 2 : 1,
             'upload'        => 1,
             'currency_code' => $invoice->get_currency(), // https://developer.paypal.com/docs/nvp-soap-api/currency-codes/#paypal
-            'return'        => esc_url_raw( $this->get_return_url( $invoice ) ),
-            'cancel_return' => esc_url_raw( $invoice->get_checkout_payment_url() ),
-            'notify_url'    => getpaid_limit_length( $this->notify_url, 255 ),
-            'invoice'       => getpaid_limit_length( $invoice->get_number(), 127 ),
+            'return'        => esc_url_raw($this->get_return_url($invoice)),
+            'cancel_return' => esc_url_raw($invoice->get_checkout_payment_url()),
+            'notify_url'    => getpaid_limit_length($this->notify_url, 255),
+            'invoice'       => getpaid_limit_length($invoice->get_number(), 127),
             'custom'        => $invoice->get_id(),
-            'first_name'    => getpaid_limit_length( $invoice->get_first_name(), 32 ),
-            'last_name'     => getpaid_limit_length( $invoice->get_last_name(), 64 ),
-            'country'       => getpaid_limit_length( $invoice->get_country(), 2 ),
-            'email'         => getpaid_limit_length( $invoice->get_email(), 127 ),
-            'cbt'           => get_bloginfo( 'name' )
+            'first_name'    => getpaid_limit_length($invoice->get_first_name(), 32),
+            'last_name'     => getpaid_limit_length($invoice->get_last_name(), 64),
+            'country'       => getpaid_limit_length($invoice->get_country(), 2),
+            'email'         => getpaid_limit_length($invoice->get_email(), 127),
+            'cbt'           => get_bloginfo('name')
         );
 
     }
@@ -215,30 +215,30 @@ 
 	 * @param  bool     $force_one_line_item Create only one item for this invoice.
 	 * @return array
 	 */
-	protected function get_line_item_args( $invoice, $force_one_line_item = false ) {
+	protected function get_line_item_args($invoice, $force_one_line_item = false) {
 
         // Maybe send invoice as a single item.
-		if ( $force_one_line_item ) {
-            return $this->get_line_item_args_single_item( $invoice );
+		if ($force_one_line_item) {
+            return $this->get_line_item_args_single_item($invoice);
         }
 
         // Send each line item individually.
         $line_item_args = array();
 
         // Prepare line items.
-        $this->prepare_line_items( $invoice );
+        $this->prepare_line_items($invoice);
 
         // Add taxes to the cart
-        if ( wpinv_use_taxes() && $invoice->is_taxable() ) {
-            $line_item_args['tax_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_tax(), 2 );
+        if (wpinv_use_taxes() && $invoice->is_taxable()) {
+            $line_item_args['tax_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_tax(), 2);
         }
 
         // Add discount.
-        if ( $invoice->get_total_discount() > 0 ) {
-            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount( (float) $invoice->get_total_discount(), 2 );
+        if ($invoice->get_total_discount() > 0) {
+            $line_item_args['discount_amount_cart'] = wpinv_sanitize_amount((float) $invoice->get_total_discount(), 2);
         }
 
-		return array_merge( $line_item_args, $this->get_line_items() );
+		return array_merge($line_item_args, $this->get_line_items());
 
     }
 
@@ -248,11 +248,11 @@ 
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 * @return array
 	 */
-	protected function get_line_item_args_single_item( $invoice ) {
+	protected function get_line_item_args_single_item($invoice) {
 		$this->delete_line_items();
 
-        $item_name = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
-		$this->add_line_item( $item_name, 1, wpinv_round_amount( (float) $invoice->get_total(), 2, true ), $invoice->get_id() );
+        $item_name = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
+		$this->add_line_item($item_name, 1, wpinv_round_amount((float) $invoice->get_total(), 2, true), $invoice->get_id());
 
 		return $this->get_line_items();
     }
@@ -276,19 +276,19 @@ 
 	 *
 	 * @param  WPInv_Invoice $invoice Invoice object.
 	 */
-	protected function prepare_line_items( $invoice ) {
+	protected function prepare_line_items($invoice) {
 		$this->delete_line_items();
 
 		// Items.
-		foreach ( $invoice->get_items() as $item ) {
+		foreach ($invoice->get_items() as $item) {
 			$amount   = $item->get_price();
 			$quantity = $invoice->get_template() == 'amount' ? 1 : $item->get_quantity();
-			$this->add_line_item( $item->get_raw_name(), $quantity, $amount, $item->get_id() );
+			$this->add_line_item($item->get_raw_name(), $quantity, $amount, $item->get_id());
         }
 
         // Fees.
-		foreach ( $invoice->get_fees() as $fee => $data ) {
-            $this->add_line_item( $fee, 1, wpinv_sanitize_amount( $data['initial_fee'] ) );
+		foreach ($invoice->get_fees() as $fee => $data) {
+            $this->add_line_item($fee, 1, wpinv_sanitize_amount($data['initial_fee']));
         }
 
     }
@@ -301,15 +301,15 @@ 
 	 * @param  float  $amount Amount.
 	 * @param  string $item_number Item number.
 	 */
-	protected function add_line_item( $item_name, $quantity = 1, $amount = 0.0, $item_number = '' ) {
-		$index = ( count( $this->line_items ) / 4 ) + 1;
+	protected function add_line_item($item_name, $quantity = 1, $amount = 0.0, $item_number = '') {
+		$index = (count($this->line_items) / 4) + 1;
 
 		$item = apply_filters(
 			'getpaid_paypal_line_item',
 			array(
-				'item_name'   => html_entity_decode( getpaid_limit_length( $item_name ? wp_strip_all_tags( $item_name ) : __( 'Item', 'invoicing' ), 127 ), ENT_NOQUOTES, 'UTF-8' ),
+				'item_name'   => html_entity_decode(getpaid_limit_length($item_name ? wp_strip_all_tags($item_name) : __('Item', 'invoicing'), 127), ENT_NOQUOTES, 'UTF-8'),
 				'quantity'    => (float) $quantity,
-				'amount'      => wpinv_sanitize_amount( (float) $amount, 2 ),
+				'amount'      => wpinv_sanitize_amount((float) $amount, 2),
 				'item_number' => $item_number,
 			),
 			$item_name,
@@ -318,12 +318,12 @@ 
 			$item_number
 		);
 
-		$this->line_items[ 'item_name_' . $index ]   = getpaid_limit_length( $item['item_name'], 127 );
-        $this->line_items[ 'quantity_' . $index ]    = $item['quantity'];
+		$this->line_items['item_name_' . $index] = getpaid_limit_length($item['item_name'], 127);
+        $this->line_items['quantity_' . $index] = $item['quantity'];
 
         // The price or amount of the product, service, or contribution, not including shipping, handling, or tax.
-		$this->line_items[ 'amount_' . $index ]      = $item['amount'] * $item['quantity'];
-		$this->line_items[ 'item_number_' . $index ] = getpaid_limit_length( $item['item_number'], 127 );
+		$this->line_items['amount_' . $index]      = $item['amount'] * $item['quantity'];
+		$this->line_items['item_number_' . $index] = getpaid_limit_length($item['item_number'], 127);
     }
 
     /**
@@ -335,19 +335,19 @@ 
 	 * @param array    $paypal_args Arguments sent to Paypal in the request.
 	 * @return array
 	 */
-	protected function fix_request_length( $invoice, $paypal_args ) {
+	protected function fix_request_length($invoice, $paypal_args) {
 		$max_paypal_length = 2083;
-		$query_candidate   = http_build_query( $paypal_args, '', '&' );
+		$query_candidate   = http_build_query($paypal_args, '', '&');
 
-		if ( strlen( $this->endpoint . $query_candidate ) <= $max_paypal_length ) {
+		if (strlen($this->endpoint . $query_candidate) <= $max_paypal_length) {
 			return $paypal_args;
 		}
 
 		return apply_filters(
 			'getpaid_paypal_args',
 			array_merge(
-				$this->get_transaction_args( $invoice ),
-				$this->get_line_item_args( $invoice, true )
+				$this->get_transaction_args($invoice),
+				$this->get_line_item_args($invoice, true)
 			),
 			$invoice
 		);
@@ -360,10 +360,10 @@ 
 	 * @param  array $paypal_args PayPal args.
 	 * @param  WPInv_Invoice    $invoice Invoice object.
 	 */
-	public function process_subscription( $paypal_args, $invoice ) {
+	public function process_subscription($paypal_args, $invoice) {
 
         // Make sure this is a subscription.
-        if ( ! $invoice->is_recurring() || ! $subscription = getpaid_get_invoice_subscription( $invoice ) ) {
+        if (!$invoice->is_recurring() || !$subscription = getpaid_get_invoice_subscription($invoice)) {
             return $paypal_args;
         }
 
@@ -371,23 +371,23 @@ 
         $paypal_args['cmd'] = '_xclick-subscriptions';
 
         // Subscription name.
-        $paypal_args['item_name'] = sprintf( __( 'Invoice #%s', 'invoicing' ), $invoice->get_number() );
+        $paypal_args['item_name'] = sprintf(__('Invoice #%s', 'invoicing'), $invoice->get_number());
 
         // Get subscription args.
-        $period                 = strtoupper( substr( $subscription->get_period(), 0, 1) );
+        $period                 = strtoupper(substr($subscription->get_period(), 0, 1));
         $interval               = (int) $subscription->get_frequency();
         $bill_times             = (int) $subscription->get_bill_times();
-        $initial_amount         = (float) wpinv_sanitize_amount( $invoice->get_initial_total(), 2 );
-        $recurring_amount       = (float) wpinv_sanitize_amount( $invoice->get_recurring_total(), 2 );
-        $subscription_item      = $invoice->get_recurring( true );
+        $initial_amount         = (float) wpinv_sanitize_amount($invoice->get_initial_total(), 2);
+        $recurring_amount       = (float) wpinv_sanitize_amount($invoice->get_recurring_total(), 2);
+        $subscription_item      = $invoice->get_recurring(true);
 
 		// Convert 365 days to 1 year.
-		if ( 'D' == $period && 365 == $interval ) {
+		if ('D' == $period && 365 == $interval) {
 			$period = 'Y';
 			$interval = 1;
 		}
 
-        if ( $subscription_item->has_free_trial() ) {
+        if ($subscription_item->has_free_trial()) {
 
             $paypal_args['a1'] = 0 == $initial_amount ? 0 : $initial_amount;
 
@@ -397,28 +397,28 @@ 
 			// Trial period.
 			$paypal_args['t1'] = $subscription_item->get_trial_period();
 
-        } else if ( $initial_amount != $recurring_amount ) {
+        } else if ($initial_amount != $recurring_amount) {
 
             // No trial period, but initial amount includes a sign-up fee and/or other items, so charge it as a separate period.
 
-            if ( 1 == $bill_times ) {
+            if (1 == $bill_times) {
                 $param_number = 3;
             } else {
                 $param_number = 1;
             }
 
-            $paypal_args[ 'a' . $param_number ] = $initial_amount ? $initial_amount : 0;
+            $paypal_args['a' . $param_number] = $initial_amount ? $initial_amount : 0;
 
             // Sign Up interval
-            $paypal_args[ 'p' . $param_number ] = $interval;
+            $paypal_args['p' . $param_number] = $interval;
 
             // Sign Up unit of duration
-            $paypal_args[ 't' . $param_number ] = $period;
+            $paypal_args['t' . $param_number] = $period;
 
         }
 
         // We have a recurring payment
-		if ( ! isset( $param_number ) || 1 == $param_number ) {
+		if (!isset($param_number) || 1 == $param_number) {
 
 			// Subscription price
 			$paypal_args['a3'] = $recurring_amount;
@@ -432,7 +432,7 @@ 
         }
 
         // Recurring payments
-		if ( 1 == $bill_times || ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() && 2 == $bill_times ) ) {
+		if (1 == $bill_times || ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial() && 2 == $bill_times)) {
 
 			// Non-recurring payments
 			$paypal_args['src'] = 0;
@@ -441,15 +441,15 @@ 
 
 			$paypal_args['src'] = 1;
 
-			if ( $bill_times > 0 ) {
+			if ($bill_times > 0) {
 
 				// An initial period is being used to charge a sign-up fee
-				if ( $initial_amount != $recurring_amount && ! $subscription_item->has_free_trial() ) {
+				if ($initial_amount != $recurring_amount && !$subscription_item->has_free_trial()) {
 					$bill_times--;
 				}
 
                 // Make sure it's not over the max of 52
-                $paypal_args['srt'] = ( $bill_times <= 52 ? absint( $bill_times ) : 52 );
+                $paypal_args['srt'] = ($bill_times <= 52 ? absint($bill_times) : 52);
 
 			}
         }
@@ -458,10 +458,10 @@ 
         $paypal_args['rm'] = 2;
 
         // Get rid of redudant items.
-        foreach ( array( 'item_name_1', 'quantity_1', 'amount_1', 'item_number_1' ) as $arg ) {
+        foreach (array('item_name_1', 'quantity_1', 'amount_1', 'item_number_1') as $arg) {
 
-            if ( isset( $paypal_args[ $arg ] ) ) {
-                unset( $paypal_args[ $arg ] );
+            if (isset($paypal_args[$arg])) {
+                unset($paypal_args[$arg]);
             }
 
         }
@@ -480,7 +480,7 @@ 
 	 * @return void
 	 */
 	public function verify_ipn() {
-        new GetPaid_Paypal_Gateway_IPN_Handler( $this );
+        new GetPaid_Paypal_Gateway_IPN_Handler($this);
     }
 
     /**
@@ -489,7 +489,7 @@ 
     public function sandbox_notice() {
 
         return sprintf(
-			__( 'SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing' ),
+			__('SANDBOX ENABLED. You can use sandbox testing accounts only. See the %sPayPal Sandbox Testing Guide%s for more details.', 'invoicing'),
 			'<a href="https://developer.paypal.com/docs/classic/lifecycle/ug_sandbox/">',
 			'</a>'
 		);
@@ -501,30 +501,30 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
         $currencies = sprintf(
-            __( 'Supported Currencies: %s', 'invoicing' ),
-            implode( ', ', $this->currencies )
+            __('Supported Currencies: %s', 'invoicing'),
+            implode(', ', $this->currencies)
         );
 
         $admin_settings['paypal_active']['desc'] .= " ($currencies)";
-        $admin_settings['paypal_desc']['std']     = __( 'Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing' );
+        $admin_settings['paypal_desc']['std']     = __('Pay via PayPal: you can pay with your credit card if you don\'t have a PayPal account.', 'invoicing');
 
 		// Access tokens.
-		$live_email      = wpinv_get_option( 'paypal_email' );
-		$sandbox_email   = wpinv_get_option( 'paypal_sandbox_email' );
+		$live_email      = wpinv_get_option('paypal_email');
+		$sandbox_email   = wpinv_get_option('paypal_sandbox_email');
 
 		$admin_settings['paypal_connect'] = array(
 			'type'       => 'raw_html',
 			'id'         => 'paypal_connect',
-			'name'       => __( 'Connect to PayPal', 'invoicing' ),
+			'name'       => __('Connect to PayPal', 'invoicing'),
 			'desc'       => sprintf(
 				'<div class="wpinv-paypal-connect-live"><a class="button button-primary" href="%s">%s</a></div><div class="wpinv-paypal-connect-sandbox"><a class="button button-primary" href="%s">%s</a></div>%s',
-				esc_url( self::get_connect_url( false ) ),
-				__( 'Connect to PayPal', 'invoicing' ),
-				esc_url( self::get_connect_url( true ) ),
-				__( 'Connect to PayPal Sandox', 'invoicing' ),
+				esc_url(self::get_connect_url(false)),
+				__('Connect to PayPal', 'invoicing'),
+				esc_url(self::get_connect_url(true)),
+				__('Connect to PayPal Sandox', 'invoicing'),
 				$this->get_js()
 			),
 		);
@@ -533,25 +533,25 @@ 
             'type'  => 'text',
 			'class' => 'live-auth-data',
             'id'    => 'paypal_email',
-            'name'  => __( 'Live Email Address', 'invoicing' ),
-            'desc'  => __( 'The email address of your PayPal account.', 'invoicing' ),
+            'name'  => __('Live Email Address', 'invoicing'),
+            'desc'  => __('The email address of your PayPal account.', 'invoicing'),
         );
 
 		$admin_settings['paypal_sandbox_email'] = array(
             'type'  => 'text',
 			'class' => 'sandbox-auth-data',
             'id'    => 'paypal_sandbox_email',
-            'name'  => __( 'Sandbox Email Address', 'invoicing' ),
-            'desc'  => __( 'The email address of your sandbox PayPal account.', 'invoicing' ),
-			'std'   => wpinv_get_option( 'paypal_email', '' ),
+            'name'  => __('Sandbox Email Address', 'invoicing'),
+            'desc'  => __('The email address of your sandbox PayPal account.', 'invoicing'),
+			'std'   => wpinv_get_option('paypal_email', ''),
         );
 
         $admin_settings['paypal_ipn_url'] = array(
             'type'     => 'ipn_url',
             'id'       => 'paypal_ipn_url',
-            'name'     => __( 'IPN Url', 'invoicing' ),
+            'name'     => __('IPN Url', 'invoicing'),
             'std'      => $this->notify_url,
-            'desc'     => __( "If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing' ) . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __( 'Learn more.', 'invoicing' ) . '</em></a>',
+            'desc'     => __("If you've not enabled IPNs in your paypal account, use the above URL to enable them.", 'invoicing') . ' <a href="https://developer.paypal.com/docs/api-basics/notifications/ipn/"><em>' . __('Learn more.', 'invoicing') . '</em></a>',
             'readonly' => true,
         );
 
@@ -565,8 +565,8 @@ 
      * @param array $data
      * @return string
 	 */
-	public static function maybe_get_connect_url( $url = '', $data = array() ) {
-		return self::get_connect_url( false, urldecode( $data['redirect'] ) );
+	public static function maybe_get_connect_url($url = '', $data = array()) {
+		return self::get_connect_url(false, urldecode($data['redirect']));
 	}
 
 	/**
@@ -577,25 +577,25 @@ 
 	 * @param string $redirect
      * @return string
 	 */
-	public static function get_connect_url( $is_sandbox, $redirect = '' ) {
+	public static function get_connect_url($is_sandbox, $redirect = '') {
 
         $redirect_url = add_query_arg(
             array(
                 'getpaid-admin-action' => 'connect_paypal',
                 'page'                 => 'wpinv-settings',
-                'live_mode'            => (int) empty( $is_sandbox ),
+                'live_mode'            => (int) empty($is_sandbox),
                 'tab'                  => 'gateways',
                 'section'              => 'paypal',
-                'getpaid-nonce'        => wp_create_nonce( 'getpaid-nonce' ),
-				'redirect'             => urlencode( $redirect ),
+                'getpaid-nonce'        => wp_create_nonce('getpaid-nonce'),
+				'redirect'             => urlencode($redirect),
             ),
-            admin_url( 'admin.php' )
+            admin_url('admin.php')
         );
 
         return add_query_arg(
             array(
-                'live_mode'    => (int) empty( $is_sandbox ),
-                'redirect_url' => urlencode( str_replace( '&amp;', '&', $redirect_url ) )
+                'live_mode'    => (int) empty($is_sandbox),
+                'redirect_url' => urlencode(str_replace('&amp;', '&', $redirect_url))
             ),
             'https://ayecode.io/oauth/paypal'
         );
@@ -649,26 +649,26 @@ 
 	 * @param array $data Connection data.
 	 * @return void
 	 */
-	public function connect_paypal( $data ) {
+	public function connect_paypal($data) {
 
 		$sandbox      = $this->is_sandbox();
-		$data         = wp_unslash( $data );
-		$access_token = empty( $data['access_token'] ) ? '' : sanitize_text_field( $data['access_token'] );
+		$data         = wp_unslash($data);
+		$access_token = empty($data['access_token']) ? '' : sanitize_text_field($data['access_token']);
 
-		if ( isset( $data['live_mode'] ) ) {
-			$sandbox = empty( $data['live_mode'] );
+		if (isset($data['live_mode'])) {
+			$sandbox = empty($data['live_mode']);
 		}
 
-		wpinv_update_option( 'paypal_sandbox', (int) $sandbox );
-		wpinv_update_option( 'paypal_active', 1 );
+		wpinv_update_option('paypal_sandbox', (int) $sandbox);
+		wpinv_update_option('paypal_active', 1);
 
-		if ( ! empty( $data['error_description'] ) ) {
-			getpaid_admin()->show_error( wp_kses_post( urldecode( $data['error_description'] ) ) );
+		if (!empty($data['error_description'])) {
+			getpaid_admin()->show_error(wp_kses_post(urldecode($data['error_description'])));
 		} else {
 
 			// Retrieve the user info.
 			$user_info = wp_remote_get(
-				! $sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
+				!$sandbox ? 'https://api-m.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1' : 'https://api-m.sandbox.paypal.com/v1/identity/oauth2/userinfo?schema=paypalv1.1',
 				array(
 
 					'headers' => array(
@@ -679,35 +679,35 @@ 
 				)
 			);
 
-			if ( is_wp_error( $user_info ) ) {
-				getpaid_admin()->show_error( wp_kses_post( $user_info->get_error_message() ) );
+			if (is_wp_error($user_info)) {
+				getpaid_admin()->show_error(wp_kses_post($user_info->get_error_message()));
 			} else {
 
 				// Create application.
-				$user_info = json_decode( wp_remote_retrieve_body( $user_info ) );
+				$user_info = json_decode(wp_remote_retrieve_body($user_info));
 
-				if ( $sandbox ) {
-					wpinv_update_option( 'paypal_sandbox_email', sanitize_email( $user_info->emails[0]->value ) );
-					wpinv_update_option( 'paypal_sandbox_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-					set_transient( 'getpaid_paypal_sandbox_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-					getpaid_admin()->show_success( __( 'Successfully connected your PayPal sandbox account', 'invoicing' ) );
+				if ($sandbox) {
+					wpinv_update_option('paypal_sandbox_email', sanitize_email($user_info->emails[0]->value));
+					wpinv_update_option('paypal_sandbox_refresh_token', sanitize_text_field(urldecode($data['refresh_token'])));
+					set_transient('getpaid_paypal_sandbox_access_token', sanitize_text_field(urldecode($data['access_token'])), (int) $data['expires_in']);
+					getpaid_admin()->show_success(__('Successfully connected your PayPal sandbox account', 'invoicing'));
 				} else {
-					wpinv_update_option( 'paypal_email', sanitize_email( $user_info->emails[0]->value ) );
-					wpinv_update_option( 'paypal_refresh_token', sanitize_text_field( urldecode( $data['refresh_token'] ) ) );
-					set_transient( 'getpaid_paypal_access_token', sanitize_text_field( urldecode( $data['access_token'] ) ), (int) $data['expires_in'] );
-					getpaid_admin()->show_success( __( 'Successfully connected your PayPal account', 'invoicing' ) );
+					wpinv_update_option('paypal_email', sanitize_email($user_info->emails[0]->value));
+					wpinv_update_option('paypal_refresh_token', sanitize_text_field(urldecode($data['refresh_token'])));
+					set_transient('getpaid_paypal_access_token', sanitize_text_field(urldecode($data['access_token'])), (int) $data['expires_in']);
+					getpaid_admin()->show_success(__('Successfully connected your PayPal account', 'invoicing'));
 				}
 
 			}
 
 		}
 
-		$redirect = empty( $data['redirect'] ) ? admin_url( 'admin.php?page=wpinv-settings&tab=gateways&section=paypal' ) : urldecode( $data['redirect'] );
+		$redirect = empty($data['redirect']) ? admin_url('admin.php?page=wpinv-settings&tab=gateways&section=paypal') : urldecode($data['redirect']);
 
-		if ( isset( $data['step'] ) ) {
-			$redirect = add_query_arg( 'step', $data['step'], $redirect );
+		if (isset($data['step'])) {
+			$redirect = add_query_arg('step', $data['step'], $redirect);
 		}
-		wp_redirect( $redirect );
+		wp_redirect($redirect);
 		exit;
 	}
 

includes/deprecated-functions.php

Spacing +93 added lines, -93 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * @deprecated
@@ -19,48 +19,48 @@ 
  * @deprecated
  */
 function wpinv_get_invoice_cart() {
-    return wpinv_get_invoice( getpaid_get_current_invoice_id() );
+    return wpinv_get_invoice(getpaid_get_current_invoice_id());
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_description( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_description($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_description();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_currency_code( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_currency_code($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_currency();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_payment_user_email( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_user_email($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_email();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_user_id( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_user_id($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_user_id();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_status( $invoice, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_status($invoice, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice);
     
-    if ( $return_label ) {
+    if ($return_label) {
         return $invoice->get_status_nicename();
     }
 
@@ -70,10 +70,10 @@ 
 /**
  * @deprecated
  */
-function wpinv_get_payment_gateway( $invoice, $return_label = false ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_gateway($invoice, $return_label = false) {
+    $invoice = new WPInv_Invoice($invoice);
 
-    if ( $return_label ) {
+    if ($return_label) {
         return $invoice->get_gateway_title();
     }
 
@@ -83,75 +83,75 @@ 
 /**
  * @deprecated
  */
-function wpinv_get_payment_gateway_name( $invoice ) {
-    return wpinv_get_payment_gateway( $invoice, true );
+function wpinv_get_payment_gateway_name($invoice) {
+    return wpinv_get_payment_gateway($invoice, true);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_payment_transaction_id( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_transaction_id($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_transaction_id();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_meta( $invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
-    return $invoice->get_meta( $meta_key, $single );
+function wpinv_get_invoice_meta($invoice_id = 0, $meta_key = '_wpinv_payment_meta', $single = true) {
+    $invoice = new WPInv_Invoice($invoice_id);
+    return $invoice->get_meta($meta_key, $single);
 }
 
 /**
  * @deprecated
  */
-function wpinv_update_invoice_meta( $invoice_id = 0, $meta_key = '', $meta_value = '' ) {
-    $invoice = new WPInv_Invoice( $invoice_id );
-    return $invoice->update_meta_data( $meta_key, $meta_value );
+function wpinv_update_invoice_meta($invoice_id = 0, $meta_key = '', $meta_value = '') {
+    $invoice = new WPInv_Invoice($invoice_id);
+    return $invoice->update_meta_data($meta_key, $meta_value);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_items( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_items($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_items();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_fees( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_fees($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_fees();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_ip( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_ip($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_ip();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_user_info( $invoice ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_user_info($invoice) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_user_info();
 }
 
 /**
  * @deprecated
  */
-function wpinv_subtotal( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_subtotal($invoice = 0, $currency = false) {
+    $invoice  = new WPInv_Invoice($invoice);
     $subtotal = $invoice->get_subtotal();
 
-    if ( $currency ) {
-        return wpinv_price( $subtotal, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($subtotal, $invoice->get_currency());
     }
 
     return $subtotal;
@@ -160,12 +160,12 @@ 
 /**
  * @deprecated
  */
-function wpinv_tax( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_tax($invoice = 0, $currency = false) {
+    $invoice  = new WPInv_Invoice($invoice);
     $tax      = $invoice->get_total_tax();
 
-    if ( $currency ) {
-        return wpinv_price( $tax, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($tax, $invoice->get_currency());
     }
 
     return $tax;
@@ -174,12 +174,12 @@ 
 /**
  * @deprecated
  */
-function wpinv_discount( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_discount($invoice = 0, $currency = false) {
+    $invoice  = new WPInv_Invoice($invoice);
     $discount = $invoice->get_total_discount();
 
-    if ( $currency ) {
-        return wpinv_price( $discount, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($discount, $invoice->get_currency());
     }
 
     return $discount;
@@ -188,20 +188,20 @@ 
 /**
  * @deprecated
  */
-function wpinv_discount_code( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_discount_code($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_discount_code();
 }
 
 /**
  * @deprecated
  */
-function wpinv_payment_total( $invoice = 0, $currency = false ) {
-    $invoice  = new WPInv_Invoice( $invoice );
+function wpinv_payment_total($invoice = 0, $currency = false) {
+    $invoice = new WPInv_Invoice($invoice);
     $total = $invoice->get_total();
 
-    if ( $currency ) {
-        return wpinv_price( $total, $invoice->get_currency() );
+    if ($currency) {
+        return wpinv_price($total, $invoice->get_currency());
     }
 
     return $total;
@@ -210,51 +210,51 @@ 
 /**
  * @deprecated
  */
-function wpinv_get_date_created( $invoice = 0, $format = '' ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_date_created($invoice = 0, $format = '') {
+    $invoice = new WPInv_Invoice($invoice);
 
-    $format         = ! empty( $format ) ? $format : get_option( 'date_format' );
+    $format         = !empty($format) ? $format : get_option('date_format');
     $date_created   = $invoice->get_created_date();
 
-    return empty( $date_created ) ? date_i18n( $format, strtotime( $date_created ) ) : '';
+    return empty($date_created) ? date_i18n($format, strtotime($date_created)) : '';
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_date( $invoice = 0, $format = '' ) {
-    wpinv_get_date_created( $invoice, $format );
+function wpinv_get_invoice_date($invoice = 0, $format = '') {
+    wpinv_get_date_created($invoice, $format);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_vat_number( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_vat_number($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_vat_number();
 }
 
 /**
  * @deprecated
  */
-function wpinv_insert_payment_note( $invoice = 0, $note = '', $user_type = false, $added_by_user = false, $system = false ) {
-    $invoice = new WPInv_Invoice( $invoice );
-    return $invoice->add_note( $note, $user_type, $added_by_user, $system );
+function wpinv_insert_payment_note($invoice = 0, $note = '', $user_type = false, $added_by_user = false, $system = false) {
+    $invoice = new WPInv_Invoice($invoice);
+    return $invoice->add_note($note, $user_type, $added_by_user, $system);
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_payment_key( $invoice = 0 ) {
-	$invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_payment_key($invoice = 0) {
+	$invoice = new WPInv_Invoice($invoice);
     return $invoice->get_key();
 }
 
 /**
  * @deprecated
  */
-function wpinv_get_invoice_number( $invoice = 0 ) {
-    $invoice = new WPInv_Invoice( $invoice );
+function wpinv_get_invoice_number($invoice = 0) {
+    $invoice = new WPInv_Invoice($invoice);
     return $invoice->get_number();
 }
 
@@ -401,9 +401,9 @@ 
 /**
  * @deprecated
  */
-function wpinv_update_payment_status( $invoice, $new_status = 'publish' ) {    
-    $invoice = new WPInv_Invoice( $invoice );
-    return $invoice->update_status( $new_status );
+function wpinv_update_payment_status($invoice, $new_status = 'publish') {    
+    $invoice = new WPInv_Invoice($invoice);
+    return $invoice->update_status($new_status);
 }
 
 /**
@@ -456,22 +456,22 @@ 
 /**
  * @deprecated
  */
-function wpinv_set_payment_transaction_id( $invoice_id = 0, $transaction_id = '' ) {
+function wpinv_set_payment_transaction_id($invoice_id = 0, $transaction_id = '') {
 
     // Fetch the invoice.
-    $invoice = new WPInv_Invoice( $invoice_id );
+    $invoice = new WPInv_Invoice($invoice_id);
 
-    if ( 0 ==  $invoice->get_id() ) {
+    if (0 == $invoice->get_id()) {
         return false;
     }
 
     // Prepare the transaction id.
-    if ( empty( $transaction_id ) ) {
+    if (empty($transaction_id)) {
         $transaction_id = $invoice_id;
     }
 
     // Set the transaction id;
-    $invoice->set_transaction_id( apply_filters( 'wpinv_set_payment_transaction_id', $transaction_id, $invoice ) );
+    $invoice->set_transaction_id(apply_filters('wpinv_set_payment_transaction_id', $transaction_id, $invoice));
 
     // Save the invoice.
     return $invoice->save();
@@ -484,12 +484,12 @@ 
  * @param WPInv_Invoice $invoice
  * @param string $gateway
  */
-function wpinv_send_to_gateway( $gateway, $invoice ) {
+function wpinv_send_to_gateway($gateway, $invoice) {
 
     $payment_data = array(
         'invoice_id'        => $invoice->get_id(),
         'items'             => $invoice->get_cart_details(),
-        'cart_discounts'    => array( $invoice->get_discount_code() ),
+        'cart_discounts'    => array($invoice->get_discount_code()),
         'fees'              => $invoice->get_total_fees(),
         'subtotal'          => $invoice->get_subtotal(),
         'discount'          => $invoice->get_total_discount(),
@@ -497,16 +497,16 @@ 
         'price'             => $invoice->get_total(),
         'invoice_key'       => $invoice->get_key(),
         'user_email'        => $invoice->get_email(),
-        'date'              => date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ),
+        'date'              => date('Y-m-d H:i:s', current_time('timestamp')),
         'user_info'         => $invoice->get_user_info(),
-        'post_data'         => stripslashes_deep( $_POST ),
+        'post_data'         => stripslashes_deep($_POST),
         'cart_details'      => $invoice->get_cart_details(),
         'gateway'           => $gateway,
         'card_info'         => array(),
         'gateway_nonce'     => wp_create_nonce('wpi-gateway'),
     );
 
-    do_action( 'wpinv_gateway_' . $gateway, $payment_data );
+    do_action('wpinv_gateway_' . $gateway, $payment_data);
 }
 
 /**
@@ -519,10 +519,10 @@ 
 /**
  * @deprecated
  */
-function wpinv_die( $message = '', $title = '', $status = 400 ) {
-    add_filter( 'wp_die_ajax_handler', 'wpinv_die_handler', 10, 3 );
-    add_filter( 'wp_die_handler', 'wpinv_die_handler', 10, 3 );
-    wp_die( $message, $title, array( 'response' => $status ));
+function wpinv_die($message = '', $title = '', $status = 400) {
+    add_filter('wp_die_ajax_handler', 'wpinv_die_handler', 10, 3);
+    add_filter('wp_die_handler', 'wpinv_die_handler', 10, 3);
+    wp_die($message, $title, array('response' => $status));
 }
 
 /**
@@ -640,14 +640,14 @@ 
 /**
  * @deprecated
  */
-function wpinv_invoice_status_label( $status, $status_display = '' ) {
-    return empty( $status_display ) ? sanitize_text_field( $status ) : sanitize_text_field( $status_display );
+function wpinv_invoice_status_label($status, $status_display = '') {
+    return empty($status_display) ? sanitize_text_field($status) : sanitize_text_field($status_display);
 }
 
 /**
  * @deprecated
  */
-function wpinv_clean_invoice_number( $number ) {
+function wpinv_clean_invoice_number($number) {
     return $number;
 }
 
@@ -852,12 +852,12 @@ 
 /**
  * @deprecated
  */
-function wpinv_item_show_price( $item_id = 0, $echo = true ) {
+function wpinv_item_show_price($item_id = 0, $echo = true) {
 
-    if ( $echo ) {
-        echo wpinv_item_price( $item_id );
+    if ($echo) {
+        echo wpinv_item_price($item_id);
     } else {
-        return wpinv_item_price( $item_id );
+        return wpinv_item_price($item_id);
     }
 
 }
@@ -1272,6 +1272,6 @@ 
  * @return WPInv_Subscription|bool
  * @deprecated
  */
-function wpinv_get_subscription( $invoice ) {
-	return wpinv_get_invoice_subscription( $invoice );
+function wpinv_get_subscription($invoice) {
+	return wpinv_get_invoice_subscription($invoice);
 }

includes/gateways/class-getpaid-authorize-net-legacy-gateway.php

Spacing +68 added lines, -68 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Authorize.net Legacy Payment Gateway class.
@@ -28,8 +28,8 @@ 
 	 * @param WPInv_Invoice $invoice Invoice.
 	 * @return string
 	 */
-	public function get_api_url( $invoice ) {
-        return $this->is_sandbox( $invoice ) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
+	public function get_api_url($invoice) {
+        return $this->is_sandbox($invoice) ? 'https://apitest.authorize.net/xml/v1/request.api' : 'https://api.authorize.net/xml/v1/request.api';
     }
 
     /**
@@ -40,48 +40,48 @@ 
      * @param WPInv_Invoice $invoice Invoice.
 	 * @return stdClass|WP_Error
 	 */
-    public function post( $post, $invoice ){
+    public function post($post, $invoice) {
 
-        $url      = $this->get_api_url( $invoice );
+        $url      = $this->get_api_url($invoice);
         $response = wp_remote_post(
             $url,
             array(
                 'headers'          => array(
                     'Content-Type' => 'application/json; charset=utf-8'
                 ),
-                'body'             => json_encode( $post ),
+                'body'             => json_encode($post),
                 'method'           => 'POST'
             )
         );
 
-        if ( is_wp_error( $response ) ) {
+        if (is_wp_error($response)) {
             return $response;
         }
 
-        $response = wp_unslash( wp_remote_retrieve_body( $response ) );
+        $response = wp_unslash(wp_remote_retrieve_body($response));
         $response = preg_replace('/\xEF\xBB\xBF/', '', $response); // https://community.developer.authorize.net/t5/Integration-and-Testing/JSON-issues/td-p/48851
-        $response = json_decode( $response );
+        $response = json_decode($response);
 
-        if ( empty( $response ) ) {
-            return new WP_Error( 'invalid_reponse', __( 'Invalid gateway response', 'invoicing' ) );
+        if (empty($response)) {
+            return new WP_Error('invalid_reponse', __('Invalid gateway response', 'invoicing'));
         }
 
-        if ( $response->messages->resultCode == 'Error' ) {
+        if ($response->messages->resultCode == 'Error') {
 
-            if ( $this->is_sandbox( $invoice ) ) {
-                wpinv_error_log( $response );
+            if ($this->is_sandbox($invoice)) {
+                wpinv_error_log($response);
             }
 
-            if ( $response->messages->message[0]->code == 'E00039' && ! empty( $response->customerProfileId )  && ! empty( $response->customerPaymentProfileId ) ) {
-                return new WP_Error( 'dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId );
+            if ($response->messages->message[0]->code == 'E00039' && !empty($response->customerProfileId) && !empty($response->customerPaymentProfileId)) {
+                return new WP_Error('dup_payment_profile', $response->customerProfileId . '.' . $response->customerPaymentProfileId);
             }
 
-            if ( ! empty( $response->transactionResponse ) && ! empty( $response->transactionResponse->errors ) ) {
+            if (!empty($response->transactionResponse) && !empty($response->transactionResponse->errors)) {
                 $error = $response->transactionResponse->errors[0];
-                return new WP_Error( $error->errorCode, $error->errorText );
+                return new WP_Error($error->errorCode, $error->errorText);
             }
 
-            return new WP_Error( $response->messages->message[0]->code, $response->messages->message[0]->text );
+            return new WP_Error($response->messages->message[0]->code, $response->messages->message[0]->text);
         }
 
         return $response;
@@ -97,8 +97,8 @@ 
 	public function get_auth_params() {
 
         return array(
-            'name'           => $this->get_option( 'login_id' ),
-            'transactionKey' => $this->get_option( 'transaction_key' ),
+            'name'           => $this->get_option('login_id'),
+            'transactionKey' => $this->get_option('transaction_key'),
         );
 
     }
@@ -110,7 +110,7 @@ 
 	 * @param WPInv_Subscription $subscription Subscription.
      * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function cancel_subscription( $subscription, $invoice ) {
+	public function cancel_subscription($subscription, $invoice) {
 
         // Backwards compatibility. New version do not use authorize.net subscriptions.
         $this->post(
@@ -135,38 +135,38 @@ 
         $this->maybe_process_old_ipn();
 
         // Validate the IPN.
-        if ( empty( $_POST ) || ! $this->validate_ipn() ) {
-		    wp_die( 'Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array( 'response' => 200 ) );
+        if (empty($_POST) || !$this->validate_ipn()) {
+		    wp_die('Authorize.NET IPN Request Failure', 'Authorize.NET IPN', array('response' => 200));
         }
 
         // Event type.
-        $posted = json_decode( file_get_contents( 'php://input' ) );
-        if ( empty( $posted ) ) {
-            wp_die( 'Invalid JSON', 'Authorize.NET IPN', array( 'response' => 200 ) );
+        $posted = json_decode(file_get_contents('php://input'));
+        if (empty($posted)) {
+            wp_die('Invalid JSON', 'Authorize.NET IPN', array('response' => 200));
         }
 
         // Process the IPN.
-        $posted = (object) wp_unslash( $posted );
+        $posted = (object) wp_unslash($posted);
 
         // Process refunds.
-        if ( 'net.authorize.payment.refund.created' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->merchantReferenceId );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
+        if ('net.authorize.payment.refund.created' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->merchantReferenceId);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
             $invoice->refund();
         }
 
         // Held funds approved.
-        if ( 'net.authorize.payment.fraud.approved' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->id );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
-            $invoice->mark_paid( false, __( 'Payment released', 'invoicing' ) );
+        if ('net.authorize.payment.fraud.approved' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->id);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
+            $invoice->mark_paid(false, __('Payment released', 'invoicing'));
         }
 
         // Held funds declined.
-        if ( 'net.authorize.payment.fraud.declined' == $posted->eventType ) {
-            $invoice = new WPInv_Invoice( $posted->payload->id );
-            $this->validate_ipn_invoice( $invoice, $posted->payload );
-            $invoice->set_status( 'wpi-failed', __( 'Payment declined', 'invoicing' ) );
+        if ('net.authorize.payment.fraud.declined' == $posted->eventType) {
+            $invoice = new WPInv_Invoice($posted->payload->id);
+            $this->validate_ipn_invoice($invoice, $posted->payload);
+            $invoice->set_status('wpi-failed', __('Payment declined', 'invoicing'));
             $invoice->save();
         }
 
@@ -181,8 +181,8 @@ 
      * @param object $payload
 	 * @return void
 	 */
-	public function validate_ipn_invoice( $invoice, $payload ) {
-        if ( ! $invoice->exists() || $payload->id != $invoice->get_transaction_id() ) {
+	public function validate_ipn_invoice($invoice, $payload) {
+        if (!$invoice->exists() || $payload->id != $invoice->get_transaction_id()) {
             exit;
         }
     }
@@ -194,32 +194,32 @@ 
 	 */
 	public function maybe_process_old_ipn() {
 
-        $data = wp_kses_post_deep( wp_unslash( $_POST ) );
+        $data = wp_kses_post_deep(wp_unslash($_POST));
 
         // Only process subscriptions subscriptions.
-        if ( empty( $data['x_subscription_id'] ) ) {
+        if (empty($data['x_subscription_id'])) {
             return;
         }
 
         // Check validity.
-        $this->validate_old_ipn_signature( $data );
+        $this->validate_old_ipn_signature($data);
 
         // Fetch the associated subscription.
-        $subscription_id = WPInv_Subscription::get_subscription_id_by_field( $data['x_subscription_id'] );
-        $subscription    = new WPInv_Subscription( $subscription_id );
+        $subscription_id = WPInv_Subscription::get_subscription_id_by_field($data['x_subscription_id']);
+        $subscription    = new WPInv_Subscription($subscription_id);
 
         // Abort if it is missing or completed.
-        if ( ! $subscription->get_id() || $subscription->has_status( 'completed' ) ) {
+        if (!$subscription->get_id() || $subscription->has_status('completed')) {
             return;
         }
 
         // Payment status.
-        if ( 1 == $data['x_response_code'] ) {
+        if (1 == $data['x_response_code']) {
 
             // Renew the subscription.
             $subscription->add_payment(
                 array(
-                    'transaction_id' => sanitize_text_field( $data['x_trans_id'] ),
+                    'transaction_id' => sanitize_text_field($data['x_trans_id']),
                     'gateway'        => $this->id
                 )
             );
@@ -238,17 +238,17 @@ 
      *
      * @param array $posted
 	 */
-	public function validate_old_ipn_signature( $posted ) {
+	public function validate_old_ipn_signature($posted) {
 
-        $signature = $this->get_option( 'signature_key' );
-        if ( ! empty( $signature ) ) {
-            $login_id  = $this->get_option( 'login_id' );
-            $trans_id  = wpinv_clean( $_POST['x_trans_id'] );
-            $amount    = wpinv_clean( $_POST['x_amount'] );
-            $hash      = hash_hmac ( 'sha512', "^$login_id^$trans_id^$amount^", hex2bin( $signature ) );
+        $signature = $this->get_option('signature_key');
+        if (!empty($signature)) {
+            $login_id  = $this->get_option('login_id');
+            $trans_id  = wpinv_clean($_POST['x_trans_id']);
+            $amount    = wpinv_clean($_POST['x_amount']);
+            $hash      = hash_hmac('sha512', "^$login_id^$trans_id^$amount^", hex2bin($signature));
 
-            if ( ! hash_equals( $hash, $posted['x_SHA2_Hash'] ) ) {
-                wpinv_error_log( $posted['x_SHA2_Hash'], "Invalid signature. Expected $hash" );
+            if (!hash_equals($hash, $posted['x_SHA2_Hash'])) {
+                wpinv_error_log($posted['x_SHA2_Hash'], "Invalid signature. Expected $hash");
                 exit;
             }
 
@@ -261,28 +261,28 @@ 
 	 */
 	public function validate_ipn() {
 
-        wpinv_error_log( 'Validating Authorize.NET IPN response' );
+        wpinv_error_log('Validating Authorize.NET IPN response');
 
-        if ( empty( $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
+        if (empty($_SERVER['HTTP_X_ANET_SIGNATURE'])) {
             return false;
         }
 
-        $signature = $this->get_option( 'signature_key' );
+        $signature = $this->get_option('signature_key');
 
-        if ( empty( $signature ) ) {
-            wpinv_error_log( 'Error: You have not set a signature key' );
+        if (empty($signature)) {
+            wpinv_error_log('Error: You have not set a signature key');
             return false;
         }
 
-        $hash  = hash_hmac ( 'sha512', file_get_contents( 'php://input' ), hex2bin( $signature ) );
+        $hash = hash_hmac('sha512', file_get_contents('php://input'), hex2bin($signature));
 
-        if ( hash_equals( $hash, $_SERVER['HTTP_X_ANET_SIGNATURE'] ) ) {
-            wpinv_error_log( 'Successfully validated the IPN' );
+        if (hash_equals($hash, $_SERVER['HTTP_X_ANET_SIGNATURE'])) {
+            wpinv_error_log('Successfully validated the IPN');
             return true;
         }
 
-        wpinv_error_log( 'IPN hash is not valid' );
-        wpinv_error_log(  $_SERVER['HTTP_X_ANET_SIGNATURE']  );
+        wpinv_error_log('IPN hash is not valid');
+        wpinv_error_log($_SERVER['HTTP_X_ANET_SIGNATURE']);
         return false;
 
     }

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

Spacing +127 added lines, -127 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Abstaract Payment Gateway class.
@@ -139,51 +139,51 @@ 
 	public function __construct() {
 
 		// Register gateway.
-		add_filter( 'wpinv_payment_gateways', array( $this, 'register_gateway' ) );
+		add_filter('wpinv_payment_gateways', array($this, 'register_gateway'));
 
-		$this->enabled = wpinv_is_gateway_active( $this->id );
+		$this->enabled = wpinv_is_gateway_active($this->id);
 
 		// Add support for various features.
-		foreach ( $this->supports as $feature ) {
-			add_filter( "wpinv_{$this->id}_support_{$feature}", '__return_true' );
-			add_filter( "getpaid_{$this->id}_support_{$feature}", '__return_true' );
-			add_filter( "getpaid_{$this->id}_supports_{$feature}", '__return_true' );
+		foreach ($this->supports as $feature) {
+			add_filter("wpinv_{$this->id}_support_{$feature}", '__return_true');
+			add_filter("getpaid_{$this->id}_support_{$feature}", '__return_true');
+			add_filter("getpaid_{$this->id}_supports_{$feature}", '__return_true');
 		}
 
 		// Invoice addons.
-		if ( $this->supports( 'addons' ) ) {
-			add_action( "getpaid_process_{$this->id}_invoice_addons", array( $this, 'process_addons' ), 10, 2 );
+		if ($this->supports('addons')) {
+			add_action("getpaid_process_{$this->id}_invoice_addons", array($this, 'process_addons'), 10, 2);
 		}
 
 		// Gateway settings.
-		add_filter( "wpinv_gateway_settings_{$this->id}", array( $this, 'admin_settings' ) );
+		add_filter("wpinv_gateway_settings_{$this->id}", array($this, 'admin_settings'));
 		
 
 		// Gateway checkout fiellds.
-		add_action( "wpinv_{$this->id}_cc_form", array( $this, 'payment_fields' ), 10, 2 );
+		add_action("wpinv_{$this->id}_cc_form", array($this, 'payment_fields'), 10, 2);
 
 		// Process payment.
-		add_action( "getpaid_gateway_{$this->id}", array( $this, 'process_payment' ), 10, 3 );
+		add_action("getpaid_gateway_{$this->id}", array($this, 'process_payment'), 10, 3);
 
 		// Change the checkout button text.
-		if ( ! empty( $this->checkout_button_text ) ) {
-			add_filter( "getpaid_gateway_{$this->id}_checkout_button_label", array( $this, 'rename_checkout_button' ) );
+		if (!empty($this->checkout_button_text)) {
+			add_filter("getpaid_gateway_{$this->id}_checkout_button_label", array($this, 'rename_checkout_button'));
 		}
 
 		// Check if a gateway is valid for a given currency.
-		add_filter( "getpaid_gateway_{$this->id}_is_valid_for_currency", array( $this, 'validate_currency' ), 10, 2 );
+		add_filter("getpaid_gateway_{$this->id}_is_valid_for_currency", array($this, 'validate_currency'), 10, 2);
 
 		// Generate the transaction url.
-		add_filter( "getpaid_gateway_{$this->id}_transaction_url", array( $this, 'filter_transaction_url' ), 10, 2 );
+		add_filter("getpaid_gateway_{$this->id}_transaction_url", array($this, 'filter_transaction_url'), 10, 2);
 
 		// Generate the subscription url.
-		add_filter( 'getpaid_remote_subscription_profile_url', array( $this, 'generate_subscription_url' ), 10, 2 );
+		add_filter('getpaid_remote_subscription_profile_url', array($this, 'generate_subscription_url'), 10, 2);
 
 		// Confirm payments.
-		add_filter( "wpinv_payment_confirm_{$this->id}", array( $this, 'confirm_payment' ), 10, 2 );
+		add_filter("wpinv_payment_confirm_{$this->id}", array($this, 'confirm_payment'), 10, 2);
 
 		// Verify IPNs.
-		add_action( "wpinv_verify_{$this->id}_ipn", array( $this, 'verify_ipn' ) );
+		add_action("wpinv_verify_{$this->id}_ipn", array($this, 'verify_ipn'));
 
 	}
 
@@ -193,7 +193,7 @@ 
 	 * @since 1.0.19
 	 * @return bool
 	 */
-	public function is( $gateway ) {
+	public function is($gateway) {
 		return $gateway == $this->id;
 	}
 
@@ -203,24 +203,24 @@ 
 	 * @since 1.0.19
 	 * @return array
 	 */
-	public function get_tokens( $sandbox = null ) {
+	public function get_tokens($sandbox = null) {
 
-		if ( is_user_logged_in() && $this->supports( 'tokens' ) && 0 == count( $this->tokens ) ) {
-			$tokens = get_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", true );
+		if (is_user_logged_in() && $this->supports('tokens') && 0 == count($this->tokens)) {
+			$tokens = get_user_meta(get_current_user_id(), "getpaid_{$this->id}_tokens", true);
 
-			if ( is_array( $tokens ) ) {
+			if (is_array($tokens)) {
 				$this->tokens = $tokens;
 			}
 
 		}
 
-		if ( ! is_bool( $sandbox ) ) {
+		if (!is_bool($sandbox)) {
 			return $this->tokens;
 		}
 
 		// Filter tokens.
-		$args = array( 'type' => $sandbox ? 'sandbox' : 'live' );
-		return wp_list_filter( $this->tokens, $args );
+		$args = array('type' => $sandbox ? 'sandbox' : 'live');
+		return wp_list_filter($this->tokens, $args);
 
 	}
 
@@ -229,12 +229,12 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function save_token( $token ) {
+	public function save_token($token) {
 
 		$tokens   = $this->get_tokens();
 		$tokens[] = $token;
 
-		update_user_meta( get_current_user_id(), "getpaid_{$this->id}_tokens", $tokens );
+		update_user_meta(get_current_user_id(), "getpaid_{$this->id}_tokens", $tokens);
 
 		$this->tokens = $tokens;
 
@@ -246,7 +246,7 @@ 
 	 * @return string
 	 */
 	public function get_method_title() {
-		return apply_filters( 'getpaid_gateway_method_title', $this->method_title, $this );
+		return apply_filters('getpaid_gateway_method_title', $this->method_title, $this);
 	}
 
 	/**
@@ -255,7 +255,7 @@ 
 	 * @return string
 	 */
 	public function get_method_description() {
-		return apply_filters( 'getpaid_gateway_method_description', $this->method_description, $this );
+		return apply_filters('getpaid_gateway_method_description', $this->method_description, $this);
 	}
 
 	/**
@@ -264,7 +264,7 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return string
 	 */
-	public function get_return_url( $invoice ) {
+	public function get_return_url($invoice) {
 
 		// Payment success url
 		$return_url = add_query_arg(
@@ -276,7 +276,7 @@ 
 			wpinv_get_success_page_uri()
 		);
 
-		return apply_filters( 'getpaid_gateway_success_url', $return_url, $invoice, $this );
+		return apply_filters('getpaid_gateway_success_url', $return_url, $invoice, $this);
 	}
 
 	/**
@@ -285,24 +285,24 @@ 
 	 * @param string $content Success page content.
 	 * @return string
 	 */
-	public function confirm_payment( $content ) {
+	public function confirm_payment($content) {
 
 		// Retrieve the invoice.
 		$invoice_id = getpaid_get_current_invoice_id();
-		$invoice    = wpinv_get_invoice( $invoice_id );
+		$invoice    = wpinv_get_invoice($invoice_id);
 
 		// Ensure that it exists and that it is pending payment.
-		if ( empty( $invoice_id ) || ! $invoice->needs_payment() ) {
+		if (empty($invoice_id) || !$invoice->needs_payment()) {
 			return $content;
 		}
 
 		// Can the user view this invoice??
-		if ( ! wpinv_user_can_view_invoice( $invoice ) ) {
+		if (!wpinv_user_can_view_invoice($invoice)) {
 			return $content;
 		}
 
 		// Show payment processing indicator.
-		return wpinv_get_template_html( 'wpinv-payment-processing.php', compact( 'invoice' ) );
+		return wpinv_get_template_html('wpinv-payment-processing.php', compact('invoice'));
 	}
 
 	/**
@@ -319,7 +319,7 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
 	}
 
@@ -330,14 +330,14 @@ 
 	 * @param WPInv_Invoice $invoice Invoice object.
 	 * @return string transaction URL, or empty string.
 	 */
-	public function filter_transaction_url( $transaction_url, $invoice ) {
+	public function filter_transaction_url($transaction_url, $invoice) {
 
-		$transaction_id  = $invoice->get_transaction_id();
+		$transaction_id = $invoice->get_transaction_id();
 
-		if ( ! empty( $this->view_transaction_url ) && ! empty( $transaction_id ) ) {
-			$transaction_url = sprintf( $this->view_transaction_url, $transaction_id );
-			$replace         = $this->is_sandbox( $invoice ) ? 'sandbox' : '';
-			$transaction_url = str_replace( '{sandbox}', $replace, $transaction_url );
+		if (!empty($this->view_transaction_url) && !empty($transaction_id)) {
+			$transaction_url = sprintf($this->view_transaction_url, $transaction_id);
+			$replace         = $this->is_sandbox($invoice) ? 'sandbox' : '';
+			$transaction_url = str_replace('{sandbox}', $replace, $transaction_url);
 		}
 
 		return $transaction_url;
@@ -350,15 +350,15 @@ 
 	 * @param WPInv_Subscription $subscription Subscription objectt.
 	 * @return string subscription URL, or empty string.
 	 */
-	public function generate_subscription_url( $subscription_url, $subscription ) {
+	public function generate_subscription_url($subscription_url, $subscription) {
 
-		$profile_id      = $subscription->get_profile_id();
+		$profile_id = $subscription->get_profile_id();
 
-		if ( $this->id == $subscription->get_gateway() && ! empty( $this->view_subscription_url ) && ! empty( $profile_id ) ) {
+		if ($this->id == $subscription->get_gateway() && !empty($this->view_subscription_url) && !empty($profile_id)) {
 
-			$subscription_url = sprintf( $this->view_subscription_url, $profile_id );
-			$replace          = $this->is_sandbox( $subscription->get_parent_invoice() ) ? 'sandbox' : '';
-			$subscription_url = str_replace( '{sandbox}', $replace, $subscription_url );
+			$subscription_url = sprintf($this->view_subscription_url, $profile_id);
+			$replace          = $this->is_sandbox($subscription->get_parent_invoice()) ? 'sandbox' : '';
+			$subscription_url = str_replace('{sandbox}', $replace, $subscription_url);
 
 		}
 
@@ -371,7 +371,7 @@ 
 	 * @return bool
 	 */
 	public function is_available() {
-		return ! empty( $this->enabled );
+		return !empty($this->enabled);
 	}
 
 	/**
@@ -380,7 +380,7 @@ 
 	 * @return string
 	 */
 	public function get_title() {
-		return apply_filters( 'getpaid_gateway_title', $this->title, $this );
+		return apply_filters('getpaid_gateway_title', $this->title, $this);
 	}
 
 	/**
@@ -389,7 +389,7 @@ 
 	 * @return string
 	 */
 	public function get_description() {
-		return apply_filters( 'getpaid_gateway_description', $this->description, $this );
+		return apply_filters('getpaid_gateway_description', $this->description, $this);
 	}
 
 	/**
@@ -401,9 +401,9 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return void
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 		// Process the payment then either redirect to the success page or the gateway.
-		do_action( 'getpaid_process_invoice_payment_' . $this->id, $invoice, $submission_data, $submission );
+		do_action('getpaid_process_invoice_payment_' . $this->id, $invoice, $submission_data, $submission);
 	}
 
 	/**
@@ -417,8 +417,8 @@ 
 	 * @param  string $reason Refund reason.
 	 * @return WP_Error|bool True or false based on success, or a WP_Error object.
 	 */
-	public function process_refund( $invoice, $amount = null, $reason = '' ) {
-		return apply_filters( 'getpaid_process_invoice_refund_' . $this->id, false, $invoice, $amount, $reason );
+	public function process_refund($invoice, $amount = null, $reason = '') {
+		return apply_filters('getpaid_process_invoice_refund_' . $this->id, false, $invoice, $amount, $reason);
 	}
 
 	/**
@@ -427,8 +427,8 @@ 
 	 * @param int $invoice_id 0 or invoice id.
 	 * @param GetPaid_Payment_Form $form Current payment form.
 	 */
-	public function payment_fields( $invoice_id, $form ) {
-		do_action( 'getpaid_getpaid_gateway_payment_fields_' . $this->id, $invoice_id, $form );
+	public function payment_fields($invoice_id, $form) {
+		do_action('getpaid_getpaid_gateway_payment_fields_' . $this->id, $invoice_id, $form);
 	}
 
 	/**
@@ -436,7 +436,7 @@ 
 	 * 
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 		return $admin_settings;
 	}
 
@@ -445,8 +445,8 @@ 
 	 * 
 	 * @param string $option
 	 */
-	public function get_option( $option, $default = false ) {
-		return wpinv_get_option( $this->id . '_' . $option, $default );
+	public function get_option($option, $default = false) {
+		return wpinv_get_option($this->id . '_' . $option, $default);
 	}
 
 	/**
@@ -459,8 +459,8 @@ 
 	 * @return bool True if the gateway supports the feature, false otherwise.
 	 * @since 1.0.19
 	 */
-	public function supports( $feature ) {
-		return getpaid_payment_gateway_supports( $this->id, $feature );
+	public function supports($feature) {
+		return getpaid_payment_gateway_supports($this->id, $feature);
 	}
 
 	/**
@@ -468,36 +468,36 @@ 
 	 * 
 	 * @param bool $save whether or not to display the save button.
 	 */
-    public function get_cc_form( $save = false ) {
+    public function get_cc_form($save = false) {
 
 		ob_start();
 
-        $id_prefix = esc_attr( uniqid( $this->id ) );
+        $id_prefix = esc_attr(uniqid($this->id));
 
         $months = array(
-            '01' => __( 'January', 'invoicing' ),
-            '02' => __( 'February', 'invoicing' ),
-            '03' => __( 'March', 'invoicing' ),
-            '04' => __( 'April', 'invoicing' ),
-            '05' => __( 'May', 'invoicing' ),
-            '06' => __( 'June', 'invoicing' ),
-            '07' => __( 'July', 'invoicing' ),
-            '08' => __( 'August', 'invoicing' ),
-            '09' => __( 'September', 'invoicing' ),
-            '10' => __( 'October', 'invoicing' ),
-            '11' => __( 'November', 'invoicing' ),
-            '12' => __( 'December', 'invoicing' ),
+            '01' => __('January', 'invoicing'),
+            '02' => __('February', 'invoicing'),
+            '03' => __('March', 'invoicing'),
+            '04' => __('April', 'invoicing'),
+            '05' => __('May', 'invoicing'),
+            '06' => __('June', 'invoicing'),
+            '07' => __('July', 'invoicing'),
+            '08' => __('August', 'invoicing'),
+            '09' => __('September', 'invoicing'),
+            '10' => __('October', 'invoicing'),
+            '11' => __('November', 'invoicing'),
+            '12' => __('December', 'invoicing'),
         );
 
-        $year  = (int) date( 'Y', current_time( 'timestamp' ) );
+        $year  = (int) date('Y', current_time('timestamp'));
         $years = array();
 
-        for ( $i = 0; $i <= 10; $i++ ) {
-            $years[ $year + $i ] = $year + $i;
+        for ($i = 0; $i <= 10; $i++) {
+            $years[$year + $i] = $year + $i;
         }
 
         ?>
-            <div class="<?php echo esc_attr( $this->id );?>-cc-form getpaid-cc-form mt-1">
+            <div class="<?php echo esc_attr($this->id); ?>-cc-form getpaid-cc-form mt-1">
 
 
                 <div class="getpaid-cc-card-inner">
@@ -506,14 +506,14 @@ 
                         <div class="col-12">
 
 							<div class="form-group">
-								<label for="<?php echo esc_attr( "$id_prefix-cc-number" ) ?>"><?php _e( 'Card number', 'invoicing' ); ?></label>
+								<label for="<?php echo esc_attr("$id_prefix-cc-number") ?>"><?php _e('Card number', 'invoicing'); ?></label>
 								<div class="input-group input-group-sm">
 									<div class="input-group-prepend ">
 										<span class="input-group-text">
 											<i class="fa fa-credit-card"></i>
 										</span>
 									</div>
-									<input type="text" name="<?php echo esc_attr( $this->id . '[cc_number]' ) ?>" id="<?php echo esc_attr( "$id_prefix-cc-number" ) ?>" class="form-control form-control-sm" autocomplete="cc-number">
+									<input type="text" name="<?php echo esc_attr($this->id . '[cc_number]') ?>" id="<?php echo esc_attr("$id_prefix-cc-number") ?>" class="form-control form-control-sm" autocomplete="cc-number">
 								</div>
 							</div>
 
@@ -521,17 +521,17 @@ 
 
                         <div class="col-12">
                             <div class="form-group">
-                                <label><?php _e( 'Expiration', 'invoicing' ); ?></label>
+                                <label><?php _e('Expiration', 'invoicing'); ?></label>
                                 <div class="form-row">
 
                                     <div class="col">
-                                        <select class="form-control form-control-sm" autocomplete="cc-exp-month" name="<?php echo esc_attr( $this->id );?>[cc_expire_month]">
-                                            <option disabled selected="selected"><?php _e( 'MM', 'invoicing' ); ?></option>
+                                        <select class="form-control form-control-sm" autocomplete="cc-exp-month" name="<?php echo esc_attr($this->id); ?>[cc_expire_month]">
+                                            <option disabled selected="selected"><?php _e('MM', 'invoicing'); ?></option>
 
                                             <?php
-                                                foreach ( $months as $key => $month ) {
-                                                    $key   = esc_attr( $key );
-                                                    $month = wpinv_clean( $month );
+                                                foreach ($months as $key => $month) {
+                                                    $key   = esc_attr($key);
+                                                    $month = wpinv_clean($month);
                                                     echo "<option value='$key'>$month</option>" . PHP_EOL;
                                                 }
                                             ?>
@@ -540,13 +540,13 @@ 
                                     </div>
 
                                     <div class="col">
-                                        <select class="form-control form-control-sm" autocomplete="cc-exp-year" name="<?php echo esc_attr( $this->id );?>[cc_expire_year]">
-                                            <option disabled selected="selected"><?php _e( 'YY', 'invoicing' ); ?></option>
+                                        <select class="form-control form-control-sm" autocomplete="cc-exp-year" name="<?php echo esc_attr($this->id); ?>[cc_expire_year]">
+                                            <option disabled selected="selected"><?php _e('YY', 'invoicing'); ?></option>
 
                                             <?php
-                                                foreach ( $years as $key => $year ) {
-                                                    $key   = esc_attr( $key );
-                                                    $year  = wpinv_clean( $year );
+                                                foreach ($years as $key => $year) {
+                                                    $key   = esc_attr($key);
+                                                    $year  = wpinv_clean($year);
                                                     echo "<option value='$key'>$year</option>" . PHP_EOL;
                                                 }
                                             ?>
@@ -564,7 +564,7 @@ 
                                     array(
                                         'name'              => $this->id . '[cc_cvv2]',
                                         'id'                => "$id_prefix-cc-cvv2",
-                                        'label'             => __( 'CCV', 'invoicing' ),
+                                        'label'             => __('CCV', 'invoicing'),
 										'label_type'        => 'vertical',
 										'class'             => 'form-control-sm',
 										'extra_attributes'  => array(
@@ -579,7 +579,7 @@ 
 					
 					<?php
 
-						if ( $save ) {
+						if ($save) {
 							echo $this->save_payment_method_checkbox();
 						}
 
@@ -598,7 +598,7 @@ 
 	 *
 	 * @since 1.0.19
 	 */
-	public function new_payment_method_entry( $form ) {
+	public function new_payment_method_entry($form) {
 		echo "<div class='getpaid-new-payment-method-form' style='display:none;'>$form</div>";
 	}
 
@@ -608,16 +608,16 @@ 
 	 * @since 1.0.19
 	 */
 	public function saved_payment_methods() {
-		$html = '<ul class="getpaid-saved-payment-methods list-unstyled m-0 mt-2" data-count="' . esc_attr( count( $this->get_tokens( $this->is_sandbox() ) ) ) . '">';
+		$html = '<ul class="getpaid-saved-payment-methods list-unstyled m-0 mt-2" data-count="' . esc_attr(count($this->get_tokens($this->is_sandbox()))) . '">';
 
-		foreach ( $this->get_tokens( $this->is_sandbox() ) as $token ) {
-			$html .= $this->get_saved_payment_method_option_html( $token );
+		foreach ($this->get_tokens($this->is_sandbox()) as $token) {
+			$html .= $this->get_saved_payment_method_option_html($token);
 		}
 
 		$html .= $this->get_new_payment_method_option_html();
 		$html .= '</ul>';
 
-		echo apply_filters( 'getpaid_payment_gateway_form_saved_payment_methods_html', $html, $this );
+		echo apply_filters('getpaid_payment_gateway_form_saved_payment_methods_html', $html, $this);
 	}
 
 	/**
@@ -627,7 +627,7 @@ 
 	 * @param  array $token Payment Token.
 	 * @return string Generated payment method HTML
 	 */
-	public function get_saved_payment_method_option_html( $token ) {
+	public function get_saved_payment_method_option_html($token) {
 
 		return sprintf(
 			'<li class="getpaid-payment-method form-group">
@@ -636,11 +636,11 @@ 
 					<span>%3$s</span>
 				</label>
 			</li>',
-			esc_attr( $this->id ),
-			esc_attr( $token['id'] ),
-			esc_html( $token['name'] ),
-			checked( empty( $token['default'] ), false, false ),
-			empty( $token['currency'] ) ? 'none' : esc_attr( $token['currency'] )
+			esc_attr($this->id),
+			esc_attr($token['id']),
+			esc_html($token['name']),
+			checked(empty($token['default']), false, false),
+			empty($token['currency']) ? 'none' : esc_attr($token['currency'])
 		);
 
 	}
@@ -652,7 +652,7 @@ 
 	 */
 	public function get_new_payment_method_option_html() {
 
-		$label = apply_filters( 'getpaid_new_payment_method_label', $this->new_method_label ? $this->new_method_label : __( 'Use a new payment method', 'invoicing' ), $this );
+		$label = apply_filters('getpaid_new_payment_method_label', $this->new_method_label ? $this->new_method_label : __('Use a new payment method', 'invoicing'), $this);
 
 		return sprintf(
 			'<li class="getpaid-new-payment-method">
@@ -661,8 +661,8 @@ 
 					<span>%2$s</span>
 				</label>
 			</li>',
-			esc_attr( $this->id ),
-			esc_html( $label )
+			esc_attr($this->id),
+			esc_html($label)
 		);
 
 	}
@@ -677,10 +677,10 @@ 
 		return aui()->input(
 			array(
 				'type'       => 'checkbox',
-				'name'       => esc_attr( "getpaid-$this->id-new-payment-method" ),
-				'id'         => esc_attr( uniqid( $this->id ) ),
+				'name'       => esc_attr("getpaid-$this->id-new-payment-method"),
+				'id'         => esc_attr(uniqid($this->id)),
 				'required'   => false,
-				'label'      => esc_html__( 'Save payment method', 'invoicing' ),
+				'label'      => esc_html__('Save payment method', 'invoicing'),
 				'value'      => 'true',
 				'checked'    => true,
 				'wrap_class' => 'getpaid-save-payment-method pt-1 pb-1',
@@ -694,9 +694,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function register_gateway( $gateways ) {
+	public function register_gateway($gateways) {
 
-		$gateways[ $this->id ] = array(
+		$gateways[$this->id] = array(
 
 			'admin_label'    => $this->method_title,
             'checkout_label' => $this->title,
@@ -714,13 +714,13 @@ 
 	 * @param  WPInv_Invoice|null $invoice Invoice object or null.
 	 * @return bool
 	 */
-	public function is_sandbox( $invoice = null ) {
+	public function is_sandbox($invoice = null) {
 
-		if ( ! empty( $invoice ) && ! $invoice->needs_payment() ) {
+		if (!empty($invoice) && !$invoice->needs_payment()) {
 			return $invoice->get_mode() == 'test';
 		}
 
-		return wpinv_is_test_mode( $this->id );
+		return wpinv_is_test_mode($this->id);
 
 	}
 
@@ -738,15 +738,15 @@ 
 	 *
 	 * @return bool
 	 */
-	public function validate_currency( $validation, $currency ) {
+	public function validate_currency($validation, $currency) {
 
 		// Required currencies.
-		if ( ! empty( $this->currencies ) && ! in_array( $currency, $this->currencies ) ) {
+		if (!empty($this->currencies) && !in_array($currency, $this->currencies)) {
 			return false;
 		}
 
 		// Excluded currencies.
-		if ( ! empty( $this->exclude_currencies ) && in_array( $currency, $this->exclude_currencies ) ) {
+		if (!empty($this->exclude_currencies) && in_array($currency, $this->exclude_currencies)) {
 			return false;
 		}
 
@@ -757,13 +757,13 @@ 
 	 * Displays an error
 	 *
 	 */
-	public function show_error( $code, $message, $type ) {
+	public function show_error($code, $message, $type) {
 
-		if ( is_admin() ) {
-			getpaid_admin()->{"show_$type"}( $message );
+		if (is_admin()) {
+			getpaid_admin()->{"show_$type"}($message);
 		}
 
-		wpinv_set_error( $code, $message, $type );
+		wpinv_set_error($code, $message, $type);
 
 	}