AyeCode / invoicing

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

Indentation +13 added lines, -13 removed lines

@@ -6,7 +6,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -15,10 +15,10 @@ 
 class GetPaid_Meta_Box_Invoice_Subscription {
 
     /**
-	 * Output the subscription metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the subscription metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
 
         // Fetch the invoice.
@@ -34,10 +34,10 @@ 
     }
 
     /**
-	 * Output the subscription invoices.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the subscription invoices.
+     *
+     * @param WP_Post $post
+     */
     public static function output_invoices( $post ) {
 
         // Fetch the invoice.
@@ -53,10 +53,10 @@ 
     }
 
     /**
-	 * Outputs related subscriptions.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Outputs related subscriptions.
+     *
+     * @param WP_Post $post
+     */
     public static function output_related( $post ) {
 
         // Fetch the invoice.

Spacing +13 added lines, -13 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -19,16 +19,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_details_metabox( /** @scrutinizer ignore-type */$subscription );
+        getpaid_admin_subscription_details_metabox(/** @scrutinizer ignore-type */$subscription);
         echo '</div>';
 
     }
@@ -38,16 +38,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output_invoices( $post ) {
+    public static function output_invoices($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_invoice_details_metabox( /** @scrutinizer ignore-type */$subscription, false );
+        getpaid_admin_subscription_invoice_details_metabox(/** @scrutinizer ignore-type */$subscription, false);
         echo '</div>';
 
     }
@@ -57,16 +57,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output_related( $post ) {
+    public static function output_related($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_related_subscriptions_metabox( /** @scrutinizer ignore-type */$subscription, false );
+        getpaid_admin_subscription_related_subscriptions_metabox(/** @scrutinizer ignore-type */$subscription, false);
         echo '</div>';
 
     }

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

Indentation +160 added lines, -160 removed lines

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

Spacing +34 added lines, -34 removed lines

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

includes/admin/views/wizard-header.php

Indentation +4 added lines, -4 removed lines

@@ -20,13 +20,13 @@
 			<title><?php esc_html_e( 'GetPaid &rsaquo; Setup Wizard', 'invoicing' ); ?></title>
 			<?php
                 getpaid_admin()->enqeue_scripts();
-				wp_enqueue_style( 'font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(), 'v5.13.0' );
-				wp_print_styles( 'select2' );
+                wp_enqueue_style( 'font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(), 'v5.13.0' );
+                wp_print_styles( 'select2' );
                 wp_print_scripts( 'select2' );
-				wp_print_scripts( 'wpinv-admin-script' );
+                wp_print_scripts( 'wpinv-admin-script' );
                 do_action( 'admin_print_styles' );
                 do_action( 'admin_head' );
-			?>
+            ?>
 			<style>
 				body, p{
 					font-size: 16px;

Braces +5 added lines, -2 removed lines

@@ -57,9 +57,12 @@
                         </li>
                     <?php endforeach; ?>
                 </ol>
-            <?php else : ?>
+            <?php else {
+    : ?>
                 <div class='mb-3'>&nbsp;</div>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
 
             <div class="text-center pb-3 mt-5">
                 <a class=" text-decoration-none" href="https://wpgetpaid.com/">

Spacing +15 added lines, -15 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $aui_settings = AyeCode_UI_Settings::instance();
 $aui_settings->enqueue_scripts();
@@ -17,15 +17,15 @@ 
 		<head>
 			<meta name="viewport" content="width=device-width"/>
 			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-			<title><?php esc_html_e( 'GetPaid &rsaquo; Setup Wizard', 'invoicing' ); ?></title>
+			<title><?php esc_html_e('GetPaid &rsaquo; Setup Wizard', 'invoicing'); ?></title>
 			<?php
                 getpaid_admin()->enqeue_scripts();
-				wp_enqueue_style( 'font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(), 'v5.13.0' );
-				wp_print_styles( 'select2' );
-                wp_print_scripts( 'select2' );
-				wp_print_scripts( 'wpinv-admin-script' );
-                do_action( 'admin_print_styles' );
-                do_action( 'admin_head' );
+				wp_enqueue_style('font-awesome', 'https://use.fontawesome.com/releases/v5.13.0/css/all.css', array(), 'v5.13.0');
+				wp_print_styles('select2');
+                wp_print_scripts('select2');
+				wp_print_scripts('wpinv-admin-script');
+                do_action('admin_print_styles');
+                do_action('admin_head');
 			?>
 			<style>
 				body, p{
@@ -37,23 +37,23 @@ 
                     font-weight: 500;
                     margin-bottom: .1rem;
                 }
-				<?php echo esc_html( $aui_settings::css_primary( '#009874', true ) ); ?>
+				<?php echo esc_html($aui_settings::css_primary('#009874', true)); ?>
 			</style>
 		</head>
 
         <body class="gp-setup wp-core-ui bg-lightx mx-auto text-dark scrollbars-ios" style="background: #f3f6ff;">
 
-            <?php if ( isset( $_REQUEST['step'] ) ) : ?>
+            <?php if (isset($_REQUEST['step'])) : ?>
                 <ol class="gp-setup-steps mb-0 pb-4 mw-100 list-group list-group-horizontal text-center">
-                    <?php foreach ( $steps as $step => $data ) : ?>
+                    <?php foreach ($steps as $step => $data) : ?>
                         <li class="list-group-item flex-fill rounded-0 
                         <?php
                             echo $step == $current ? 'active' : 'd-none d-md-block';
-                            echo array_search( $current, array_keys( $steps ) ) > array_search( $step, array_keys( $steps ) ) ? ' done' : '';
+                            echo array_search($current, array_keys($steps)) > array_search($step, array_keys($steps)) ? ' done' : '';
                         ?>
                         ">
-                            <i class="far fa-check-circle <?php echo array_search( $current, array_keys( $steps ) ) > array_search( $step, array_keys( $steps ) ) ? 'text-success' : ''; ?>"></i>
-                            <?php echo esc_html( $data['name'] ); ?>
+                            <i class="far fa-check-circle <?php echo array_search($current, array_keys($steps)) > array_search($step, array_keys($steps)) ? 'text-success' : ''; ?>"></i>
+                            <?php echo esc_html($data['name']); ?>
                         </li>
                     <?php endforeach; ?>
                 </ol>
@@ -64,7 +64,7 @@ 
             <div class="text-center pb-3 mt-5">
                 <a class=" text-decoration-none" href="https://wpgetpaid.com/">
                     <span class="text-black-50">
-                        <img class="ml-n3x" src="<?php echo esc_url( WPINV_PLUGIN_URL . 'assets/images/getpaid-logo.png' ); ?>" />
+                        <img class="ml-n3x" src="<?php echo esc_url(WPINV_PLUGIN_URL . 'assets/images/getpaid-logo.png'); ?>" />
                     </span>
                 </a>
             </div>

vendor/ayecode/wp-deactivation-survey/plugin.php

Indentation +5 added lines, -5 removed lines

@@ -15,12 +15,12 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'AyeCode_Deactivation_Survey' ) ) {
-	// include the class if needed
-	include_once( dirname( __FILE__ ) . "/wp-deactivation-survey.php" );
+    // include the class if needed
+    include_once( dirname( __FILE__ ) . "/wp-deactivation-survey.php" );
 }
 
 
@@ -36,6 +36,6 @@ 
 //});
 
 AyeCode_Deactivation_Survey::instance(array(
-	'slug'		=> 'ayecode-deactivation-survey-testing',
-	'version'	=> '1.0.0'
+    'slug'		=> 'ayecode-deactivation-survey-testing',
+    'version'	=> '1.0.0'
 ));
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -14,13 +14,13 @@
  * Tested up to: 5.8
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'AyeCode_Deactivation_Survey' ) ) {
+if (!class_exists('AyeCode_Deactivation_Survey')) {
 	// include the class if needed
-	include_once( dirname( __FILE__ ) . "/wp-deactivation-survey.php" );
+	include_once(dirname(__FILE__) . "/wp-deactivation-survey.php");
 }
 
 

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

Spacing +2 added lines, -2 removed lines

@@ -7,10 +7,10 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 <span>{{form_element.text}}</span>
 <a target='_blank' href="#">
-    <?php echo esc_html( wpinv_get_ip() ); ?>&nbsp;&nbsp;<i class='fa fa-external-link-square' aria-hidden='true'></i>
+    <?php echo esc_html(wpinv_get_ip()); ?>&nbsp;&nbsp;<i class='fa fa-external-link-square' aria-hidden='true'></i>
 </a>

vendor/composer/autoload_static.php

Spacing +9 added lines, -9 removed lines

@@ -6,35 +6,35 @@ 
 
 class ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5
 {
-    public static $files = array (
+    public static $files = array(
         'e8d544c98e79f913e13eae1306ab635e' => __DIR__ . '/..' . '/ayecode/wp-ayecode-ui/ayecode-ui-loader.php',
         '24583d3588ebda5228dd453cfaa070da' => __DIR__ . '/..' . '/ayecode/wp-font-awesome-settings/wp-font-awesome-settings.php',
         '42671a413efb740d7040437ff2a982cd' => __DIR__ . '/..' . '/ayecode/wp-super-duper/sd-functions.php',
     );
 
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'M' => 
-        array (
+        array(
             'MaxMind\\Db\\' => 11,
         ),
         'C' => 
-        array (
+        array(
             'Composer\\Installers\\' => 20,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'MaxMind\\Db\\' => 
-        array (
+        array(
             0 => __DIR__ . '/..' . '/maxmind-db/reader/src/MaxMind/Db',
         ),
         'Composer\\Installers\\' => 
-        array (
+        array(
             0 => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers',
         ),
     );
 
-    public static $classMap = array (
+    public static $classMap = array(
         'AyeCode_Connect_Helper' => __DIR__ . '/..' . '/ayecode/ayecode-connect-helper/ayecode-connect-helper.php',
         'AyeCode_Deactivation_Survey' => __DIR__ . '/..' . '/ayecode/wp-deactivation-survey/wp-deactivation-survey.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -43,7 +43,7 @@ 
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInit8b6d4385c391849a80038f0b0e87c8b5::$classMap;

vendor/composer/platform_check.php

Spacing +2 added lines, -2 removed lines

@@ -14,9 +14,9 @@
     }
     if (!ini_get('display_errors')) {
         if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
+            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL . PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL . PHP_EOL);
         } elseif (!headers_sent()) {
-            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
+            echo 'Composer detected issues in your platform:' . PHP_EOL . PHP_EOL . str_replace('You are running ' . PHP_VERSION . '.', '', implode(PHP_EOL, $issues)) . PHP_EOL . PHP_EOL;
         }
     }
     trigger_error(

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

Braces +80 added lines, -33 removed lines

@@ -156,7 +156,9 @@ 
 
 		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;
@@ -177,8 +179,7 @@ 
 						if ($field['type'] == 'accordion')
 						{
 							$this->fields[$value['slug']]['is_sub_field'] = true;
-						}
-						else
+						} else
 						{
 							foreach ($value as $n => $param) {							
 								if (is_array($param) and ! empty($this->fields[$param['slug']])){
@@ -242,7 +243,9 @@ 
             if ( ! empty( $this->fields ) ) {
 
                 foreach ($this->fields as $field_slug => $field_params) {
-                    if (in_array($field_params['type'], array('title', 'plain_text', 'acf'))) continue;
+                    if (in_array($field_params['type'], array('title', 'plain_text', 'acf'))) {
+                        continue;
+                    }
                     $default_value = '';
                     if (!empty($field_params['enum_values'])){
                         foreach ($field_params['enum_values'] as $key => $value) {						
@@ -310,8 +313,9 @@ 
 
 		function post_saved( $importData ){
 
-			if (is_callable($this->post_saved_function))
-				call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
+			if (is_callable($this->post_saved_function)) {
+							call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
+			}
 			
 		}
 
@@ -336,7 +340,9 @@ 
 				$data = array();
 				if (!empty($this->fields)){
 					foreach ($this->fields as $field_slug => $field_params) {
-						if (in_array($field_params['type'], array('title', 'plain_text'))) continue;
+						if (in_array($field_params['type'], array('title', 'plain_text'))) {
+						    continue;
+						}
 						switch ($field_params['type']) {
 
 							case 'image':
@@ -421,7 +427,9 @@ 
 			$visible_fields = 0;
 
 			foreach ($this->fields as $field_slug => $field_params) {
-				if ($field_params['is_sub_field']) continue;
+				if ($field_params['is_sub_field']) {
+				    continue;
+				}
 				$visible_fields++;
 			}
 
@@ -430,7 +438,9 @@ 
 			foreach ($this->fields as $field_slug => $field_params) {				
 
 				// do not render sub fields
-				if ($field_params['is_sub_field']) continue;		
+				if ($field_params['is_sub_field']) {
+				    continue;
+				}
 
 				$counter++;		
 
@@ -561,7 +571,9 @@ 
 				$fieldData['id']    = $field_params['field_obj']->ID;
 				$fieldData['label'] = $field_params['field_obj']->post_title;
 				$fieldData['key']   = $field_params['field_obj']->post_name;
-				if (empty($fieldData['name'])) $fieldData['name'] = $field_params['field_obj']->post_excerpt;
+				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() );
 				}
@@ -573,9 +585,12 @@ 
 			} else if($field_params['type'] == 'plain_text'){
 				if ($field_params['is_html']):					
 					echo $field_params['name'];				
-				else:
+				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;
 			}
@@ -595,8 +610,7 @@ 
 					if (is_array($value)){
 						if ($field_params['type'] == 'accordion'){								
 							$sub_fields[$key][] = $this->convert_field($value, $current_values);
-						}
-						else
+						} else
 						{
 							foreach ($value as $k => $sub_field) {								
 								if (is_array($sub_field) and ! empty($this->fields[$sub_field['slug']]))
@@ -758,7 +772,9 @@ 
 
 		function add_title($title = '', $tooltip = ''){
 
-			if (empty($title)) return;
+			if (empty($title)) {
+			    return;
+			}
 
 			return $this->add_field(sanitize_key($title) . time(), $title, 'title', null, $tooltip);			
 
@@ -766,7 +782,9 @@ 
 
 		function add_text($text = '', $is_html = false){
 
-			if (empty($text)) return;
+			if (empty($text)) {
+			    return;
+			}
 
 			$count = is_array($this->fields) ? count($this->fields) : 0;
 
@@ -902,7 +920,9 @@ 
 		*/
 		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));
@@ -1005,8 +1025,7 @@ 
 								$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug]['xpaths'][$option_name], $file)->parse();
 								$tmp_files[] = $file;						
 							}
-						} 
-						else {							
+						} else {							
 							$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug][$option_name], $file)->parse();
 							$tmp_files[] = $file;
 						}
@@ -1036,13 +1055,23 @@ 
 			
 			$import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+			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'] == "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;
+			}
 
 			return false;
 
@@ -1056,13 +1085,23 @@ 
 			
 			$import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+			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'] == "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;
+			}
 
 			return false;
 
@@ -1072,11 +1111,17 @@ 
 
 			$import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+			if ($import_options['update_all_data'] == 'yes') {
+			    return true;
+			}
 
-			if (!$import_options['is_update_images']) return false;			
+			if (!$import_options['is_update_images']) {
+			    return false;
+			}
 
-			if ($import_options['is_update_images']) return true;			
+			if ($import_options['is_update_images']) {
+			    return true;
+			}
 
 			return false;
 		}
@@ -1153,7 +1198,9 @@ 
 
 				$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'])){ 					

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 esc_html_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 esc_html_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 echo wp_kses_post(__(
 		    		    	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;

Indentation +802 added lines, -802 removed lines

@@ -10,232 +10,232 @@ 
 
 if (!class_exists('RapidAddon')) {
 	
-	class RapidAddon {
-
-		public $name;
-		public $slug;
-		public $fields;
-		public $options = array();
-		public $accordions = array();
-		public $image_sections = array();
-		public $import_function;
-		public $post_saved_function;
-		public $notice_text;
-		public $logger = null;
-		public $when_to_run = false;
-		public $image_options = array(
-			'download_images' => 'yes', 
-			'download_featured_delim' => ',', 
-			'download_featured_image' => '',
-			'gallery_featured_image' => '',
-			'gallery_featured_delim' => ',',
-			'featured_image' => '',
-			'featured_delim' => ',', 
-			'search_existing_images' => 1,
-			'is_featured' => 0,
-			'create_draft' => 'no',
-			'set_image_meta_title' => 0,
-			'image_meta_title_delim' => ',',
-			'image_meta_title' => '',
-			'set_image_meta_caption' => 0,
-			'image_meta_caption_delim' => ',',
-			'image_meta_caption' => '',
-			'set_image_meta_alt' => 0,
-			'image_meta_alt_delim' => ',',
-			'image_meta_alt' => '',
-			'set_image_meta_description' => 0,
-			'image_meta_description_delim' => ',',
-			'image_meta_description_delim_logic' => 'separate',
-			'image_meta_description' => '',
-			'auto_rename_images' => 0,
-			'auto_rename_images_suffix' => '',
-			'auto_set_extension' => 0,
-			'new_extension' => '',
-			'do_not_remove_images' => 1,
+    class RapidAddon {
+
+        public $name;
+        public $slug;
+        public $fields;
+        public $options = array();
+        public $accordions = array();
+        public $image_sections = array();
+        public $import_function;
+        public $post_saved_function;
+        public $notice_text;
+        public $logger = null;
+        public $when_to_run = false;
+        public $image_options = array(
+            'download_images' => 'yes', 
+            'download_featured_delim' => ',', 
+            'download_featured_image' => '',
+            'gallery_featured_image' => '',
+            'gallery_featured_delim' => ',',
+            'featured_image' => '',
+            'featured_delim' => ',', 
+            'search_existing_images' => 1,
+            'is_featured' => 0,
+            'create_draft' => 'no',
+            'set_image_meta_title' => 0,
+            'image_meta_title_delim' => ',',
+            'image_meta_title' => '',
+            'set_image_meta_caption' => 0,
+            'image_meta_caption_delim' => ',',
+            'image_meta_caption' => '',
+            'set_image_meta_alt' => 0,
+            'image_meta_alt_delim' => ',',
+            'image_meta_alt' => '',
+            'set_image_meta_description' => 0,
+            'image_meta_description_delim' => ',',
+            'image_meta_description_delim_logic' => 'separate',
+            'image_meta_description' => '',
+            'auto_rename_images' => 0,
+            'auto_rename_images_suffix' => '',
+            'auto_set_extension' => 0,
+            'new_extension' => '',
+            'do_not_remove_images' => 1,
             'search_existing_images_logic' => 'by_url'
-		);
+        );
 
-		protected $isWizard = true;
+        protected $isWizard = true;
 
-		function __construct($name, $slug) {
-			$this->name = $name;
-			$this->slug = $slug;
-			if (!empty($_GET['id'])){
-				$this->isWizard = false;
-			}
+        function __construct($name, $slug) {
+            $this->name = $name;
+            $this->slug = $slug;
+            if (!empty($_GET['id'])){
+                $this->isWizard = false;
+            }
         }
         
-		function set_import_function($name) {
-			$this->import_function = $name;
-		}
+        function set_import_function($name) {
+            $this->import_function = $name;
+        }
 
-		function set_post_saved_function($name) {
-			$this->post_saved_function = $name;
-		}
+        function set_post_saved_function($name) {
+            $this->post_saved_function = $name;
+        }
 
-		function is_active_addon($post_type = null) {
+        function is_active_addon($post_type = null) {
 			
-			if ( ! class_exists( 'PMXI_Plugin' ) ) {
-				return false;
-			}
+            if ( ! class_exists( 'PMXI_Plugin' ) ) {
+                return false;
+            }
 
-			$addon_active = false;
+            $addon_active = false;
 
-			if ($post_type !== null) {
-				if (@in_array($post_type, $this->active_post_types) or empty($this->active_post_types)) {
-					$addon_active = true;
-				}
-			}
+            if ($post_type !== null) {
+                if (@in_array($post_type, $this->active_post_types) or empty($this->active_post_types)) {
+                    $addon_active = true;
+                }
+            }
 
-			if ($addon_active){
+            if ($addon_active){
 				
-				$current_theme = wp_get_theme();
+                $current_theme = wp_get_theme();
 
-				$parent_theme = $current_theme->parent();				
+                $parent_theme = $current_theme->parent();				
 
-				$theme_name = $current_theme->get('Name');
+                $theme_name = $current_theme->get('Name');
 				
-				$addon_active = (@in_array($theme_name, $this->active_themes) or empty($this->active_themes)) ? true : false;
+                $addon_active = (@in_array($theme_name, $this->active_themes) or empty($this->active_themes)) ? true : false;
 
-				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 $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) ) {
-							$addon_active = false;
-							break;
-						}
-					}					
-				}
+                    foreach ($this->active_plugins as $plugin) {
+                        if ( ! is_plugin_active($plugin) ) {
+                            $addon_active = false;
+                            break;
+                        }
+                    }					
+                }
 
-			}
+            }
 
-			if ($this->when_to_run == "always") {
-				$addon_active = true;
-			}
+            if ($this->when_to_run == "always") {
+                $addon_active = true;
+            }
 
-			return apply_filters('rapid_is_active_add_on', $addon_active, $post_type, $this->slug);
-		}
+            return apply_filters('rapid_is_active_add_on', $addon_active, $post_type, $this->slug);
+        }
 		
-		/**
-		* 
-		* Add-On Initialization
-		*
-		* @param array $conditions - list of supported themes and post types
-		*
-		*/
-		function run($conditions = array()) {
-
-			if (empty($conditions)) {
-				$this->when_to_run = "always";
-			}
+        /**
+         * 
+         * Add-On Initialization
+         *
+         * @param array $conditions - list of supported themes and post types
+         *
+         */
+        function run($conditions = array()) {
+
+            if (empty($conditions)) {
+                $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'));
-			add_filter('wp_all_import_addon_import', array($this, 'wpai_api_import'));
-			add_filter('wp_all_import_addon_saved_post', array($this, 'wpai_api_post_saved'));
-			add_filter('pmxi_options_options', array($this, 'wpai_api_options'));
+            add_filter('pmxi_addons', array($this, 'wpai_api_register'));
+            add_filter('wp_all_import_addon_parse', array($this, 'wpai_api_parse'));
+            add_filter('wp_all_import_addon_import', array($this, 'wpai_api_import'));
+            add_filter('wp_all_import_addon_saved_post', array($this, 'wpai_api_post_saved'));
+            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_action('pmxi_extend_options_featured',  array($this, 'wpai_api_metabox'), 10, 2);
             add_action('admin_init', array($this, 'admin_notice_ignore'));
         }        
 
-		function parse($data) {
+        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;
+            $parsedData = $this->helper_parse($data, $this->options_array());
+            return $parsedData;
 
-		}
+        }
 
 
-		function add_field($field_slug, $field_name, $field_type, $enum_values = null, $tooltip = "", $is_html = true, $default_text = '') {
+        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;
+            $this->fields[$field_slug] = $field;
 
-			if ( ! empty($enum_values) ){
-				foreach ($enum_values as $key => $value) {
-					if (is_array($value))
-					{
-						if ($field['type'] == 'accordion')
-						{
-							$this->fields[$value['slug']]['is_sub_field'] = true;
-						}
-						else
-						{
-							foreach ($value as $n => $param) {							
-								if (is_array($param) and ! empty($this->fields[$param['slug']])){
-									$this->fields[$param['slug']]['is_sub_field'] = true;								
-								}
-							}
-						}
-					}
-				}
-			}
+            if ( ! empty($enum_values) ){
+                foreach ($enum_values as $key => $value) {
+                    if (is_array($value))
+                    {
+                        if ($field['type'] == 'accordion')
+                        {
+                            $this->fields[$value['slug']]['is_sub_field'] = true;
+                        }
+                        else
+                        {
+                            foreach ($value as $n => $param) {							
+                                if (is_array($param) and ! empty($this->fields[$param['slug']])){
+                                    $this->fields[$param['slug']]['is_sub_field'] = true;								
+                                }
+                            }
+                        }
+                    }
+                }
+            }
 
-			return $field;
+            return $field;
 
-		}
+        }
 
-		function add_acf_field($field){
-			$this->fields[$field->post_name] = array(
-				'type' => 'acf',
-				'field_obj' => $field
-			);
-		}
+        function add_acf_field($field){
+            $this->fields[$field->post_name] = array(
+                'type' => 'acf',
+                'field_obj' => $field
+            );
+        }
 
-		private $acfGroups = array();
+        private $acfGroups = array();
 
-		function use_acf_group($acf_group){
-			$this->add_text(
-				'<div class="postbox acf_postbox default acf_signle_group rad4">
+        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>
 	    <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)){
-				foreach ($acf_fields as $field) {
-					$this->add_acf_field($field);
-				}
-			}
-			$this->add_text('</div></div>');
-			$this->acfGroups[] = $acf_group['ID'];
-			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){
-			return (in_array($acf_group['ID'], $this->acfGroups)) ? false : true;
-		}
-
-		/**
-		* 
-		* Add an option to WP All Import options list
-		*
-		* @param string $slug - option name
-		* @param string $default_value - default option value
-		*
-		*/
-		function add_option($slug, $default_value = ''){
-			$this->options[$slug] = $default_value;
-		}
+            $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)){
+                foreach ($acf_fields as $field) {
+                    $this->add_acf_field($field);
+                }
+            }
+            $this->add_text('</div></div>');
+            $this->acfGroups[] = $acf_group['ID'];
+            add_filter('wp_all_import_acf_is_show_group', array($this, 'acf_is_show_group'), 10, 2);
+        }
 
-		function options_array() {
+        function acf_is_show_group($is_show, $acf_group){
+            return (in_array($acf_group['ID'], $this->acfGroups)) ? false : true;
+        }
+
+        /**
+         * 
+         * Add an option to WP All Import options list
+         *
+         * @param string $slug - option name
+         * @param string $default_value - default option value
+         *
+         */
+        function add_option($slug, $default_value = ''){
+            $this->options[$slug] = $default_value;
+        }
+
+        function options_array() {
 
             $options_list = array();
             
@@ -255,528 +255,528 @@ 
 
             }			
 
-			if ( ! empty($this->options) ){
-				foreach ($this->options as $slug => $value) {
-					$options_arr[$slug] = $value;
-				}
-			}
+            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[$this->slug]   = $options_list;
+            $options_arr['rapid_addon'] = plugin_basename( __FILE__ );
 
-			return $options_arr;
+            return $options_arr;
 
-		}
+        }
 
-		function wpai_api_options($all_options) {
+        function wpai_api_options($all_options) {
 
-			$all_options = $all_options + $this->options_array();
+            $all_options = $all_options + $this->options_array();
 
-			return $all_options;
+            return $all_options;
 
-		}
+        }
 
 
-		function wpai_api_register($addons) {
+        function wpai_api_register($addons) {
 
-			if (empty($addons[$this->slug])) {
-				$addons[$this->slug] = 1;
-			}
+            if (empty($addons[$this->slug])) {
+                $addons[$this->slug] = 1;
+            }
 
-			return $addons;
+            return $addons;
 
-		}
+        }
 
 
-		function wpai_api_parse($functions) {
+        function wpai_api_parse($functions) {
 
-			$functions[$this->slug] = array($this, 'parse');
-			return $functions;
+            $functions[$this->slug] = array($this, 'parse');
+            return $functions;
 
-		}
+        }
 
-		function wpai_api_post_saved($functions){
-			$functions[$this->slug] = array($this, 'post_saved');
-			return $functions;
-		}
+        function wpai_api_post_saved($functions){
+            $functions[$this->slug] = array($this, 'post_saved');
+            return $functions;
+        }
 
 
-		function wpai_api_import($functions) {
+        function wpai_api_import($functions) {
 
-			$functions[$this->slug] = array($this, 'import');
-			return $functions;
+            $functions[$this->slug] = array($this, 'import');
+            return $functions;
 
-		}
+        }
 
-		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']);
+            if (is_callable($this->post_saved_function))
+                call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
 			
-		}
+        }
 
-		function import($importData, $parsedData) {
+        function import($importData, $parsedData) {
 
-			if (!$this->is_active_addon($importData['post_type'])) {
-				return;
-			}
+            if (!$this->is_active_addon($importData['post_type'])) {
+                return;
+            }
 
-			$import_options = $importData['import']['options'][$this->slug];
+            $import_options = $importData['import']['options'][$this->slug];
 
-	//		echo "<pre>";
-	//		print_r($import_options);
-	//		echo "</pre>";
+    //		echo "<pre>";
+    //		print_r($import_options);
+    //		echo "</pre>";
 
-			if ( ! empty($parsedData) )	{
+            if ( ! empty($parsedData) )	{
 
-				$this->logger = $importData['logger'];
+                $this->logger = $importData['logger'];
 
-				$post_id = $importData['pid'];
-				$index = $importData['i'];
-				$data = array();
-				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']) {
+                $post_id = $importData['pid'];
+                $index = $importData['i'];
+                $data = array();
+                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']) {
 
-							case 'image':
+                            case 'image':
 								
-								// import the specified image, then set the value of the field to the image ID in the media library
+                                // import the specified image, then set the value of the field to the image ID in the media library
 
-								$image_url_or_path = $parsedData[$field_slug][$index];
+                                $image_url_or_path = $parsedData[$field_slug][$index];
 
-								if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
-									continue 2;
-								}
+                                if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
+                                    continue 2;
+                                }
 
-								$download = $import_options['download_image'][$field_slug];
+                                $download = $import_options['download_image'][$field_slug];
 
-								$uploaded_image = PMXI_API::upload_image($post_id, $image_url_or_path, $download, $importData['logger'], true, "", "images", true, $importData['articleData']);
+                                $uploaded_image = PMXI_API::upload_image($post_id, $image_url_or_path, $download, $importData['logger'], true, "", "images", true, $importData['articleData']);
 
-								$data[$field_slug] = array(
-									"attachment_id" => $uploaded_image,
-									"image_url_or_path" => $image_url_or_path,
-									"download" => $download
-								);
+                                $data[$field_slug] = array(
+                                    "attachment_id" => $uploaded_image,
+                                    "image_url_or_path" => $image_url_or_path,
+                                    "download" => $download
+                                );
 
-								break;
+                                break;
 
-							case 'file':
+                            case 'file':
 
-								$image_url_or_path = $parsedData[$field_slug][$index];
+                                $image_url_or_path = $parsedData[$field_slug][$index];
 
-								if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
-									continue 2;
-								}
+                                if ( ! array_key_exists( $field_slug, $import_options['download_image'] ) ) {
+                                    continue 2;
+                                }
 
-								$download = $import_options['download_image'][$field_slug];
+                                $download = $import_options['download_image'][$field_slug];
 
-								$uploaded_file = PMXI_API::upload_image($post_id, $image_url_or_path, $download, $importData['logger'], true, "", "files", true, $importData['articleData']);
+                                $uploaded_file = PMXI_API::upload_image($post_id, $image_url_or_path, $download, $importData['logger'], true, "", "files", true, $importData['articleData']);
 
-								$data[$field_slug] = array(
-									"attachment_id" => $uploaded_file,
-									"image_url_or_path" => $image_url_or_path,
-									"download" => $download
-								);
+                                $data[$field_slug] = array(
+                                    "attachment_id" => $uploaded_file,
+                                    "image_url_or_path" => $image_url_or_path,
+                                    "download" => $download
+                                );
 
-								break;
+                                break;
 							
-							default:
-								// set the field data to the value of the field after it's been parsed
-								$data[$field_slug] = $parsedData[$field_slug][$index];
-								break;
-						}					
+                            default:
+                                // set the field data to the value of the field after it's been parsed
+                                $data[$field_slug] = $parsedData[$field_slug][$index];
+                                break;
+                        }					
+
+                        // apply mapping rules if they exist
+                        if (!empty($import_options['mapping'][$field_slug])) {
+                            $mapping_rules = json_decode($import_options['mapping'][$field_slug], true);
+
+                            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])])){
+                                        $data[$field_slug] = trim($map_to[trim($data[$field_slug])]);
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        // --------------------
+                    }
+                }				
 
-						// apply mapping rules if they exist
-						if (!empty($import_options['mapping'][$field_slug])) {
-							$mapping_rules = json_decode($import_options['mapping'][$field_slug], true);
+                call_user_func($this->import_function, $post_id, $data, $importData['import'], $importData['articleData'], $importData['logger']);
+            }
 
-							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])])){
-										$data[$field_slug] = trim($map_to[trim($data[$field_slug])]);
-										break;
-									}
-								}
-							}
-						}
-						// --------------------
-					}
-				}				
+        }
 
-				call_user_func($this->import_function, $post_id, $data, $importData['import'], $importData['articleData'], $importData['logger']);
-			}
 
-		}
+        function wpai_api_metabox($post_type, $current_values) {
 
+            if (!$this->is_active_addon($post_type)) {
+                return;
+            }
 
-		function wpai_api_metabox($post_type, $current_values) {
+            echo $this->helper_metabox_top($this->name);
 
-			if (!$this->is_active_addon($post_type)) {
-				return;
-			}
+            $visible_fields = 0;
 
-			echo $this->helper_metabox_top($this->name);
+            foreach ($this->fields as $field_slug => $field_params) {
+                if ($field_params['is_sub_field']) continue;
+                $visible_fields++;
+            }
 
-			$visible_fields = 0;
+            $counter = 0;
 
-			foreach ($this->fields as $field_slug => $field_params) {
-				if ($field_params['is_sub_field']) continue;
-				$visible_fields++;
-			}
+            foreach ($this->fields as $field_slug => $field_params) {				
 
-			$counter = 0;
+                // do not render sub fields
+                if ($field_params['is_sub_field']) continue;		
 
-			foreach ($this->fields as $field_slug => $field_params) {				
+                $counter++;		
 
-				// do not render sub fields
-				if ($field_params['is_sub_field']) continue;		
+                $this->render_field($field_params, $field_slug, $current_values, $visible_fields == $counter);										
 
-				$counter++;		
+                //if ( $field_params['type'] != 'accordion' ) echo "<br />";				
 
-				$this->render_field($field_params, $field_slug, $current_values, $visible_fields == $counter);										
+            }
 
-				//if ( $field_params['type'] != 'accordion' ) echo "<br />";				
+            echo $this->helper_metabox_bottom();
+
+            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 ){
+                        $section_options[$section['slug'] . 'is_featured'] = 1;
+                    }
+                    PMXI_API::add_additional_images_section($section['title'], $section['slug'], $current_values, '', true, false, $section['type']);
+                }
+            }
 
-			}
+        }		
 
-			echo $this->helper_metabox_bottom();
+        function render_field($field_params, $field_slug, $current_values, $in_the_bottom = false){
 
-			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 ){
-						$section_options[$section['slug'] . 'is_featured'] = 1;
-					}
-					PMXI_API::add_additional_images_section($section['title'], $section['slug'], $current_values, '', true, false, $section['type']);
-				}
-			}
-
-		}		
-
-		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'] : '';
-			}
-
-			if ($field_params['type'] == 'text') {
-
-				PMXI_API::add_field(
-					'simple',
-					$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]
-					)
-				);
-
-			} else if ($field_params['type'] == 'textarea') {
-
-				PMXI_API::add_field(
-					'textarea',
-					$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]
-					)
-				);
-
-			} else if ($field_params['type'] == 'wp_editor') {
-
-				PMXI_API::add_field(
-					'wp_editor',
-					$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]
-					)
-				);
-
-			} else if ($field_params['type'] == 'image' or $field_params['type'] == 'file') {
+            if (!isset($current_values[$this->slug][$field_slug])) {
+                $current_values[$this->slug][$field_slug] = isset($field_params['default_text']) ? $field_params['default_text'] : '';
+            }
+
+            if ($field_params['type'] == 'text') {
+
+                PMXI_API::add_field(
+                    'simple',
+                    $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]
+                    )
+                );
+
+            } else if ($field_params['type'] == 'textarea') {
+
+                PMXI_API::add_field(
+                    'textarea',
+                    $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]
+                    )
+                );
+
+            } else if ($field_params['type'] == 'wp_editor') {
+
+                PMXI_API::add_field(
+                    'wp_editor',
+                    $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]
+                    )
+                );
+
+            } else if ($field_params['type'] == 'image' or $field_params['type'] == 'file') {
 				
-				if (!isset($current_values[$this->slug]['download_image'][$field_slug])) { $current_values[$this->slug]['download_image'][$field_slug] = ''; }
-
-				PMXI_API::add_field(
-					$field_params['type'],
-					$field_params['name'],
-					array(
-						'tooltip' => $field_params['tooltip'],
-						'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,
-						'addon_prefix' => $this->slug
-
-					)
-				);
-
-			} else if ($field_params['type'] == 'radio') {					
+                if (!isset($current_values[$this->slug]['download_image'][$field_slug])) { $current_values[$this->slug]['download_image'][$field_slug] = ''; }
+
+                PMXI_API::add_field(
+                    $field_params['type'],
+                    $field_params['name'],
+                    array(
+                        'tooltip' => $field_params['tooltip'],
+                        '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,
+                        'addon_prefix' => $this->slug
+
+                    )
+                );
+
+            } else if ($field_params['type'] == 'radio') {					
 				
-				if (!isset($current_values[$this->slug]['mapping'][$field_slug])) { $current_values[$this->slug]['mapping'][$field_slug] = array(); }
-				if (!isset($current_values[$this->slug]['xpaths'][$field_slug])) { $current_values[$this->slug]['xpaths'][$field_slug] = ''; }
-
-				PMXI_API::add_field(
-					'enum',
-					$field_params['name'],
-					array(
-						'tooltip' => $field_params['tooltip'],
-						'field_name' => $this->slug."[".$field_slug."]",
-						'field_value' => $current_values[$this->slug][$field_slug],
-						'enum_values' => $field_params['enum_values'],
-						'mapping' => true,
-						'field_key' => $field_slug,
-						'mapping_rules' => $current_values[$this->slug]['mapping'][$field_slug],
-						'xpath' => $current_values[$this->slug]['xpaths'][$field_slug],
-						'addon_prefix' => $this->slug,
-						'sub_fields' => $this->get_sub_fields($field_params, $field_slug, $current_values)
-					)
-				);
-
-			} 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_key' => $field_slug,								
-						'addon_prefix' => $this->slug,
-						'sub_fields' => $this->get_sub_fields($field_params, $field_slug, $current_values),
-						'in_the_bottom' => $in_the_bottom						
-					)
-				);
-
-			} 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;
-				$fieldData['label'] = $field_params['field_obj']->post_title;
-				$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() );
-				}
-			} else if($field_params['type'] == 'title'){
-				?>
+                if (!isset($current_values[$this->slug]['mapping'][$field_slug])) { $current_values[$this->slug]['mapping'][$field_slug] = array(); }
+                if (!isset($current_values[$this->slug]['xpaths'][$field_slug])) { $current_values[$this->slug]['xpaths'][$field_slug] = ''; }
+
+                PMXI_API::add_field(
+                    'enum',
+                    $field_params['name'],
+                    array(
+                        'tooltip' => $field_params['tooltip'],
+                        'field_name' => $this->slug."[".$field_slug."]",
+                        'field_value' => $current_values[$this->slug][$field_slug],
+                        'enum_values' => $field_params['enum_values'],
+                        'mapping' => true,
+                        'field_key' => $field_slug,
+                        'mapping_rules' => $current_values[$this->slug]['mapping'][$field_slug],
+                        'xpath' => $current_values[$this->slug]['xpaths'][$field_slug],
+                        'addon_prefix' => $this->slug,
+                        'sub_fields' => $this->get_sub_fields($field_params, $field_slug, $current_values)
+                    )
+                );
+
+            } 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_key' => $field_slug,								
+                        'addon_prefix' => $this->slug,
+                        'sub_fields' => $this->get_sub_fields($field_params, $field_slug, $current_values),
+                        'in_the_bottom' => $in_the_bottom						
+                    )
+                );
+
+            } 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;
+                $fieldData['label'] = $field_params['field_obj']->post_title;
+                $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() );
+                }
+            } else if($field_params['type'] == 'title'){
+                ?>
 				<h4 class="wpallimport-add-on-options-title"><?php esc_html_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'){
-				if ($field_params['is_html']):					
-					echo $field_params['name'];				
-				else:
-					?>
+            } 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>
 					<?php
-				endif;
-			}
+                endif;
+            }
 
 
-		}
-		/**
-		*
-		* Helper function for nested radio fields
-		*
-		*/
-		function get_sub_fields($field_params, $field_slug, $current_values){
-			$sub_fields = array();	
-			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'){								
-							$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']]))
-								{									
-									$sub_fields[$key][] = $this->convert_field($sub_field, $current_values);
-								}								
-							}
-						}
-					}
-				}
-			}
-			return $sub_fields;
-		}			
-
-		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'] : '';
-			}
-			switch ($this->fields[$sub_field['slug']]['type']) {
-				case 'text':
-					$field = array(
-						'type'   => 'simple',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'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']
-						)
-					);
-					break;
-				case 'textarea':
-					$field = array(
-						'type'   => 'textarea',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'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']
-						)
-					);
-					break;
-				case 'wp_editor':
-					$field = array(
-						'type'   => 'wp_editor',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'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']
-						)
-					);
-					break;
-				case 'image':
-					$field = array(
-						'type'   => 'image',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
-							'field_value' => $current_values[$this->slug][$sub_field['slug']],
-							'download_image' => null,
-							'field_key' => $sub_field['slug'],
-							'addon_prefix' => $this->slug,
-							'is_main_field' => $sub_field['is_main_field']
-						)
-					);
-
-					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']];
-					}
+        }
+        /**
+         *
+         * Helper function for nested radio fields
+         *
+         */
+        function get_sub_fields($field_params, $field_slug, $current_values){
+            $sub_fields = array();	
+            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'){								
+                            $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']]))
+                                {									
+                                    $sub_fields[$key][] = $this->convert_field($sub_field, $current_values);
+                                }								
+                            }
+                        }
+                    }
+                }
+            }
+            return $sub_fields;
+        }			
+
+        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'] : '';
+            }
+            switch ($this->fields[$sub_field['slug']]['type']) {
+                case 'text':
+                    $field = array(
+                        'type'   => 'simple',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            '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']
+                        )
+                    );
                     break;
-				case 'file':
-					$field = array(
-						'type'   => 'file',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'field_name' => $this->slug."[".$sub_field['slug']."]",
-							'field_value' => $current_values[$this->slug][$sub_field['slug']],
-							'download_image' => null,
-							'field_key' => $sub_field['slug'],
-							'addon_prefix' => $this->slug,
-							'is_main_field' => $sub_field['is_main_field']
-						)
-					);
-
-					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;
-				case 'radio':
-					$field = array(
-						'type'   => 'enum',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'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,
-							'field_key' => $sub_field['slug'],
-							'mapping_rules' => isset($current_values[$this->slug]['mapping'][$sub_field['slug']]) ? $current_values[$this->slug]['mapping'][$sub_field['slug']] : array(),
-							'xpath' => isset($current_values[$this->slug]['xpaths'][$sub_field['slug']]) ? $current_values[$this->slug]['xpaths'][$sub_field['slug']] : '',
-							'addon_prefix' => $this->slug,
-							'sub_fields' => $this->get_sub_fields($this->fields[$sub_field['slug']], $sub_field['slug'], $current_values),
-							'is_main_field' => $sub_field['is_main_field']
-						)
-					);
-					break;
-				case 'accordion':
-					$field = array(
-						'type'   => 'accordion',
-						'label'  => $this->fields[$sub_field['slug']]['name'],
-						'params' => array(
-							'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
-							'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),
-							'in_the_bottom' => false
-						)
-					);						
-					break;
-				default:
-					# code...
-					break;
-			}
-			return $field;
-		}				
-
-		/**
-		* 
-		* Add accordion options
-		*
-		*
-		*/
-		function add_options( $main_field = false, $title = '', $fields = array() ){
+                case 'textarea':
+                    $field = array(
+                        'type'   => 'textarea',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            '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']
+                        )
+                    );
+                    break;
+                case 'wp_editor':
+                    $field = array(
+                        'type'   => 'wp_editor',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            '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']
+                        )
+                    );
+                    break;
+                case 'image':
+                    $field = array(
+                        'type'   => 'image',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            'field_name' => $this->slug."[".$sub_field['slug']."]",
+                            'field_value' => $current_values[$this->slug][$sub_field['slug']],
+                            'download_image' => null,
+                            'field_key' => $sub_field['slug'],
+                            'addon_prefix' => $this->slug,
+                            'is_main_field' => $sub_field['is_main_field']
+                        )
+                    );
+
+                    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;
+                case 'file':
+                    $field = array(
+                        'type'   => 'file',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            'field_name' => $this->slug."[".$sub_field['slug']."]",
+                            'field_value' => $current_values[$this->slug][$sub_field['slug']],
+                            'download_image' => null,
+                            'field_key' => $sub_field['slug'],
+                            'addon_prefix' => $this->slug,
+                            'is_main_field' => $sub_field['is_main_field']
+                        )
+                    );
+
+                    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;
+                case 'radio':
+                    $field = array(
+                        'type'   => 'enum',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            '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,
+                            'field_key' => $sub_field['slug'],
+                            'mapping_rules' => isset($current_values[$this->slug]['mapping'][$sub_field['slug']]) ? $current_values[$this->slug]['mapping'][$sub_field['slug']] : array(),
+                            'xpath' => isset($current_values[$this->slug]['xpaths'][$sub_field['slug']]) ? $current_values[$this->slug]['xpaths'][$sub_field['slug']] : '',
+                            'addon_prefix' => $this->slug,
+                            'sub_fields' => $this->get_sub_fields($this->fields[$sub_field['slug']], $sub_field['slug'], $current_values),
+                            'is_main_field' => $sub_field['is_main_field']
+                        )
+                    );
+                    break;
+                case 'accordion':
+                    $field = array(
+                        'type'   => 'accordion',
+                        'label'  => $this->fields[$sub_field['slug']]['name'],
+                        'params' => array(
+                            'tooltip' => $this->fields[$sub_field['slug']]['tooltip'],
+                            '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),
+                            'in_the_bottom' => false
+                        )
+                    );						
+                    break;
+                default:
+                    # code...
+                    break;
+            }
+            return $field;
+        }				
+
+        /**
+         * 
+         * Add accordion options
+         *
+         *
+         */
+        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;
+                    $main_field['is_main_field'] = true;
+                    $fields[] = $main_field;
 
-				}
+                }
 
-				return $this->add_field('accordion_' . $fields[0]['slug'], $title, 'accordion', $fields);							
+                return $this->add_field('accordion_' . $fields[0]['slug'], $title, 'accordion', $fields);							
 			
-			}
+            }
 
-		}			
+        }			
 
-		function add_title($title = '', $tooltip = ''){
+        function add_title($title = '', $tooltip = ''){
 
-			if (empty($title)) return;
+            if (empty($title)) return;
 
-			return $this->add_field(sanitize_key($title) . time(), $title, 'title', null, $tooltip);			
+            return $this->add_field(sanitize_key($title) . time(), $title, 'title', null, $tooltip);			
 
-		}		
+        }		
 
-		function add_text($text = '', $is_html = false){
+        function add_text($text = '', $is_html = false){
 
-			if (empty($text)) return;
+            if (empty($text)) return;
 
-			$count = is_array($this->fields) ? count($this->fields) : 0;
+            $count = is_array($this->fields) ? count($this->fields) : 0;
 
-			return $this->add_field(sanitize_key($text) . time() . uniqid() . $count, $text, 'plain_text', null, "", $is_html);
+            return $this->add_field(sanitize_key($text) . time() . uniqid() . $count, $text, 'plain_text', null, "", $is_html);
 
-		}			
+        }			
 
-		function helper_metabox_top($name) {
+        function helper_metabox_top($name) {
 
-			return '
+            return '
 			<style type="text/css">
 				.wpallimport-plugin .wpallimport-addon div.input {
 					margin-bottom: 15px;
@@ -872,11 +872,11 @@ 
 							<table class="form-table" style="max-width:none;">
 								<tr>
 									<td colspan="3">';
-		}
+        }
 
-		function helper_metabox_bottom() {
+        function helper_metabox_bottom() {
 
-			return '				</td>
+            return '				</td>
 								</tr>
 							</table>
 						</div>
@@ -884,298 +884,298 @@ 
 				</div>
 			</div>';
 
-		}
+        }
 
-		/**
-		*
-		* simply add an additional section for attachments
-		*
-		*/
-		function import_files( $slug, $title, $callback = NULL ){
-			$this->import_images( $slug, $title, 'files', $callback);
-		}
+        /**
+         *
+         * simply add an additional section for attachments
+         *
+         */
+        function import_files( $slug, $title, $callback = NULL ){
+            $this->import_images( $slug, $title, 'files', $callback);
+        }
 
-		/**
-		*
-		* simply add an additional section 
-		*
-		*/
-		function import_images( $slug, $title, $type = 'images', $callback = NULL ){
+        /**
+         *
+         * simply add an additional section 
+         *
+         */
+        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)) {
+            if (is_array($slug)) {
                 $section_slug = 'pmxi_' . md5(serialize($slug));
             } else {
                 $section_slug = 'pmxi_' . $slug;
             }
 
-			$this->image_sections[] = array(
-				'title' => $title,
-				'slug'  => $section_slug,
-				'type'  => $type
-			);			
+            $this->image_sections[] = array(
+                'title' => $title,
+                'slug'  => $section_slug,
+                'type'  => $type
+            );			
 			
-			foreach ($this->image_options as $option_slug => $value) {
-				$this->add_option($section_slug . $option_slug, $value);
-			}
+            foreach ($this->image_options as $option_slug => $value) {
+                $this->add_option($section_slug . $option_slug, $value);
+            }
 
-			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);
-			}
+            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);			
+            add_filter('wp_all_import_is_allow_import_images', array($this, 'is_allow_import_images'), 10, 2);			
 
-			if ($callback && is_callable($callback)) {
+            if ($callback && is_callable($callback)) {
                 add_action( $section_slug, $callback, 10, 4);
             } else {
                 if (function_exists($slug)) {
                     add_action( $section_slug, $slug, 10, 4);
                 }
             }
-		}			
-			/**
-			*
-			* filter to allow import images for free edition of WP All Import
-			*
-			*/
-			function is_allow_import_images($is_allow, $post_type){
-				return ($this->is_active_addon($post_type)) ? true : $is_allow;
-			}
-
-		/**
-		*
-		* filter to control additional images sections
-		*
-		*/
-		function additional_sections($sections){
-			if ( ! empty($this->image_sections) ){
-				foreach ($this->image_sections as $add_section) {
-					$sections[] = $add_section;
-				}
-			}
+        }			
+            /**
+             *
+             * filter to allow import images for free edition of WP All Import
+             *
+             */
+            function is_allow_import_images($is_allow, $post_type){
+                return ($this->is_active_addon($post_type)) ? true : $is_allow;
+            }
+
+        /**
+         *
+         * filter to control additional images sections
+         *
+         */
+        function additional_sections($sections){
+            if ( ! empty($this->image_sections) ){
+                foreach ($this->image_sections as $add_section) {
+                    $sections[] = $add_section;
+                }
+            }
 			
-			return $sections;
-		}
-			/**
-			*
-			* 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){
-				return ($this->is_active_addon($post_type)) ? false : $is_show;
-			}
-
-		/**
-		*
-		* disable the default images section
-		*
-		*/		
-		function disable_default_images($post_type = false){
+            return $sections;
+        }
+            /**
+             *
+             * 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){
+                return ($this->is_active_addon($post_type)) ? false : $is_show;
+            }
+
+        /**
+         *
+         * disable the default images section
+         *
+         */		
+        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);
+            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;
+                return ($this->is_active_addon($post_type)) ? false : true;
 								
-			}
+            }
 
-		function helper_parse($parsingData, $options) {
+        function helper_parse($parsingData, $options) {
 
-			extract($parsingData);
+            extract($parsingData);
 
-			$data = array(); // parsed data
+            $data = array(); // parsed data
 
-			if ( ! empty($import->options[$this->slug])){
+            if ( ! empty($import->options[$this->slug])){
 
-				$this->logger = $parsingData['logger'];
+                $this->logger = $parsingData['logger'];
 
-				$cxpath = $xpath_prefix . $import->xpath;
+                $cxpath = $xpath_prefix . $import->xpath;
 
-				$tmp_files = array();
+                $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 ($import->options[$this->slug][$option_name] == "xpath") {
-							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();
-								$tmp_files[] = $file;						
-							}
-						} 
-						else {							
-							$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug][$option_name], $file)->parse();
-							$tmp_files[] = $file;
-						}
+                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 ($import->options[$this->slug][$option_name] == "xpath") {
+                            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();
+                                $tmp_files[] = $file;						
+                            }
+                        } 
+                        else {							
+                            $data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug][$option_name], $file)->parse();
+                            $tmp_files[] = $file;
+                        }
 
 
-					} else {
-						$data[$option_name] = array_fill(0, $count, "");
-					}
+                    } else {
+                        $data[$option_name] = array_fill(0, $count, "");
+                    }
 
-				}
+                }
 
-				foreach ($tmp_files as $file) { // remove all temporary files created
-					unlink($file);
-				}
+                foreach ($tmp_files as $file) { // remove all temporary files created
+                    unlink($file);
+                }
 
-			}
+            }
 
-			return $data;
-		}
+            return $data;
+        }
 
 
-		function can_update_meta($meta_key, $import_options) {
+        function can_update_meta($meta_key, $import_options) {
 
-			//echo "<pre>";
-			//print_r($import_options['options']);
-			//echo "</pre>";
+            //echo "<pre>";
+            //print_r($import_options['options']);
+            //echo "</pre>";
 			
-			$import_options = $import_options['options'];
+            $import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+            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'] == "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;
 
-			return false;
+            return false;
 
-		}
+        }
 
-		function can_update_taxonomy($tax_name, $import_options) {
+        function can_update_taxonomy($tax_name, $import_options) {
 
-			//echo "<pre>";
-			//print_r($import_options['options']);
-			//echo "</pre>";
+            //echo "<pre>";
+            //print_r($import_options['options']);
+            //echo "</pre>";
 			
-			$import_options = $import_options['options'];
+            $import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+            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'] == "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;
 
-			return false;
+            return false;
 
-		}
+        }
 
-		function can_update_image($import_options) {
+        function can_update_image($import_options) {
 
-			$import_options = $import_options['options'];
+            $import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+            if ($import_options['update_all_data'] == 'yes') return true;
 
-			if (!$import_options['is_update_images']) return false;			
+            if (!$import_options['is_update_images']) return false;			
 
-			if ($import_options['is_update_images']) return true;			
+            if ($import_options['is_update_images']) return true;			
 
-			return false;
-		}
+            return false;
+        }
 
 
-		function admin_notice_ignore() {
-			if (isset($_GET[$this->slug.'_ignore']) && '0' == $_GET[$this->slug.'_ignore'] ) {
-				update_option($this->slug.'_ignore', 'true');
-			}
-		}
+        function admin_notice_ignore() {
+            if (isset($_GET[$this->slug.'_ignore']) && '0' == $_GET[$this->slug.'_ignore'] ) {
+                update_option($this->slug.'_ignore', 'true');
+            }
+        }
 
-		function display_admin_notice() {
+        function display_admin_notice() {
 
 
-			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>.';
-			}
+            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>.';
+            }
 
-			if (!get_option(sanitize_key($this->slug).'_notice_ignore')) {
+            if (!get_option(sanitize_key($this->slug).'_notice_ignore')) {
 
-				?>
+                ?>
 
 	    		<div class="error notice is-dismissible wpallimport-dismissible" style="margin-top: 10px;" rel="<?php echo esc_attr($this->slug); ?>">
 	    		    <p><?php echo wp_kses_post(__(
-		    		    	sprintf(
-	    			    		$notice_text,
-	    			    		'?'.$this->slug.'_ignore=0'
-	    			    	), 
-	    		    		'rapid_addon_'.$this->slug
-	    		    	)); ?></p>
+                            sprintf(
+                                $notice_text,
+                                '?'.$this->slug.'_ignore=0'
+                            ), 
+                            'rapid_addon_'.$this->slug
+                        )); ?></p>
 			    </div>
 
 				<?php
 
-			}
+            }
 
-		}
+        }
 
-		/*
+        /*
 		*
 		* $conditions - array('themes' => array('Realia'), 'plugins' => array('plugin-directory/plugin-file.php', 'plugin-directory2/plugin-file.php')) 
 		*
 		*/
-		function admin_notice($notice_text = '', $conditions = array()) {
+        function admin_notice($notice_text = '', $conditions = array()) {
 
-			$is_show_notice = false;
+            $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' ) ) {
-				$is_show_notice = true;
-			}
+            if ( ! class_exists( 'PMXI_Plugin' ) ) {
+                $is_show_notice = true;
+            }
 
-			// Supported Themes
-			if ( ! $is_show_notice and ! empty($conditions['themes']) ){
+            // Supported Themes
+            if ( ! $is_show_notice and ! empty($conditions['themes']) ){
 
-				$themeInfo    = wp_get_theme();
-				$parentInfo = $themeInfo->parent();				
-				$currentTheme = $themeInfo->get('Name');
+                $themeInfo    = wp_get_theme();
+                $parentInfo = $themeInfo->parent();				
+                $currentTheme = $themeInfo->get('Name');
 				
-				$is_show_notice = in_array($currentTheme, $conditions['themes']) ? false : true;				
+                $is_show_notice = in_array($currentTheme, $conditions['themes']) ? false : true;				
 
-				if ( $is_show_notice and $parentInfo ){
-					$parent_theme = $parentInfo->get('Name');
-					$is_show_notice = in_array($parent_theme, $conditions['themes']) ? false : true;					
-				}
+                if ( $is_show_notice and $parentInfo ){
+                    $parent_theme = $parentInfo->get('Name');
+                    $is_show_notice = in_array($parent_theme, $conditions['themes']) ? false : true;					
+                }
 
-			}			
+            }			
 
-			// Required Plugins
-			if ( ! $is_show_notice and ! empty($conditions['plugins']) ){				
+            // Required Plugins
+            if ( ! $is_show_notice and ! empty($conditions['plugins']) ){				
 
-				$requires_counter = 0;
-				foreach ($conditions['plugins'] as $plugin) {
-					if ( is_plugin_active($plugin) ) $requires_counter++;
-				}
+                $requires_counter = 0;
+                foreach ($conditions['plugins'] as $plugin) {
+                    if ( is_plugin_active($plugin) ) $requires_counter++;
+                }
 
-				if ($requires_counter != count($conditions['plugins'])){ 					
-					$is_show_notice = true;			
-				}
+                if ($requires_counter != count($conditions['plugins'])){ 					
+                    $is_show_notice = true;			
+                }
 
-			}
+            }
 
-			if ( $is_show_notice ){
+            if ( $is_show_notice ){
 
-				if ( $notice_text != '' ) {
-					$this->notice_text = $notice_text;
-				}
+                if ( $notice_text != '' ) {
+                    $this->notice_text = $notice_text;
+                }
 
-				add_action('admin_notices', array($this, 'display_admin_notice'));
-			}
+                add_action('admin_notices', array($this, 'display_admin_notice'));
+            }
 
-		}
+        }
 
-		function log( $m = false){		
+        function log( $m = false){		
 
-			$m and $this->logger and call_user_func($this->logger, $m);
+            $m and $this->logger and call_user_func($this->logger, $m);
 
         }
         
@@ -1293,5 +1293,5 @@ 
             }
             return $image;
         }
-	}	
+    }	
 }
\ No newline at end of file

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

Indentation +89 added lines, -89 removed lines

@@ -14,133 +14,133 @@
  */
 class GetPaid_WP_All_Import {
 
-	/**
-	 * @var RapidAddon[]
-	 */
-	protected $add_ons;
-
-	/**
-	 * @var array
-	 */
-	protected $datastores = array(
-		'item'     =>'WPInv_Item',
-		'invoice'  =>'WPInv_Invoice',
-		'discount' =>'WPInv_Discount',
-	);
+    /**
+     * @var RapidAddon[]
+     */
+    protected $add_ons;
+
+    /**
+     * @var array
+     */
+    protected $datastores = array(
+        'item'     =>'WPInv_Item',
+        'invoice'  =>'WPInv_Invoice',
+        'discount' =>'WPInv_Discount',
+    );
 
     /**
-	 * Class constructor.
-	 */
+     * Class constructor.
+     */
     public function __construct() {
 
-		// Init each store separately.
-		foreach ( array_keys( $this->datastores ) as $key ) {
-			$this->init_store( $key );
-		}
+        // Init each store separately.
+        foreach ( array_keys( $this->datastores ) as $key ) {
+            $this->init_store( $key );
+        }
 
-	}
+    }
 
-	/**
-	 * Inits a store.
-	 */
+    /**
+     * Inits a store.
+     */
     public function init_store( $key ) {
 
-		// Register the add-on.
-		$this->add_ons[ $key ] = new RapidAddon( 'GetPaid', 'getpaid_wp_al_import_' . $key );
+        // Register the add-on.
+        $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 );
+        // Create import function.
+        $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 );
+        // Register store fields.
+        $this->add_store_fields( $key );
 
-		// Only load on the correct post type.
-		$this->add_ons[ $key ]->run( array( 'post_types' => array( 'wpi_' . $key ) ) );
+        // Only load on the correct post type.
+        $this->add_ons[ $key ]->run( array( 'post_types' => array( 'wpi_' . $key ) ) );
 
-		// Disable images.
-		$this->add_ons[ $key ]->disable_default_images();
+        // Disable images.
+        $this->add_ons[ $key ]->disable_default_images();
 
-	}
+    }
 
-	/**
-	 * Retrieves store fields.
-	 */
+    /**
+     * Retrieves store fields.
+     */
     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' );
+        // Fetch from data/invoice-schema.php, from data/discount-schema.php, from data/item-schema.php
+        $fields = wpinv_get_data( $key . '-schema' );
 
-		if ( empty( $fields ) ) {
-			return array();
-		}
+        if ( empty( $fields ) ) {
+            return array();
+        }
 
-		// Clean the fields.
-		$prepared = array();
-		foreach ( $fields as $id => $field ) {
+        // Clean the fields.
+        $prepared = array();
+        foreach ( $fields as $id => $field ) {
 
-			// Skip read only fields.
-			if ( ! empty( $field['readonly'] ) ) {
-				continue;
-			}
+            // Skip read only fields.
+            if ( ! empty( $field['readonly'] ) ) {
+                continue;
+            }
 
-			$prepared[ $id ] = $field;
+            $prepared[ $id ] = $field;
 
-		}
+        }
 
-		return $prepared;
+        return $prepared;
 
-	}
+    }
 
-	/**
-	 * Registers store fields.
-	 */
+    /**
+     * Registers store fields.
+     */
     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' );
+        }
 
     }
 
-	/**
-	 * Handles store imports.
-	 */
+    /**
+     * Handles store imports.
+     */
     public function import_store( $key, $post_id, $data, $import_options, $_post ) {
 
-		// Is the store class set?
-		if ( ! isset( $this->datastores[ $key ] ) ) {
-			return;
-		}
+        // Is the store class set?
+        if ( ! isset( $this->datastores[ $key ] ) ) {
+            return;
+        }
 
-		/**@var GetPaid_Data */
-		$data_store = new $this->datastores[ $key ]( $post_id );
+        /**@var GetPaid_Data */
+        $data_store = new $this->datastores[ $key ]( $post_id );
 
-		// Abort if the invoice/item/discount does not exist.
-		if ( ! $data_store->exists() ) {
-			return;
-		}
+        // Abort if the invoice/item/discount does not exist.
+        if ( ! $data_store->exists() ) {
+            return;
+        }
 
-		// Prepare data props.
-		$prepared = array();
+        // Prepare data props.
+        $prepared = array();
 
-		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 ) ) { 
+        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 ) ) { 
 	
-				// Update the custom field with the imported data.
-				$prepared[ $field ] = $data[ $field ];
-			} 
-		}
-
-		// Only update if we have something to update.
-		if ( ! empty( $prepared ) ) {
-			$data_store->set_props( $prepared );
-			$data_store->save();
-		}
+                // Update the custom field with the imported data.
+                $prepared[ $field ] = $data[ $field ];
+            } 
+        }
+
+        // Only update if we have something to update.
+        if ( ! empty( $prepared ) ) {
+            $data_store->set_props( $prepared );
+            $data_store->save();
+        }
 
     }
 

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();
 		}