AyeCode / invoicing

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

Indentation +77 added lines, -77 removed lines

@@ -1,103 +1,103 @@
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'AyeCode_Deactivation_Survey' ) ) {
 
-	class AyeCode_Deactivation_Survey {
+    class AyeCode_Deactivation_Survey {
 
-		/**
-		 * AyeCode_Deactivation_Survey instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    AyeCode_Deactivation_Survey There can be only one!
-		 */
-		private static $instance = null;
+        /**
+         * AyeCode_Deactivation_Survey instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    AyeCode_Deactivation_Survey There can be only one!
+         */
+        private static $instance = null;
 
-		public static $plugins;
+        public static $plugins;
 
-		public $version = "1.0.4";
+        public $version = "1.0.4";
 
-		public static function instance( $plugin = array() ) {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_Deactivation_Survey ) ) {
-				self::$instance = new AyeCode_Deactivation_Survey;
-				self::$plugins = array();
+        public static function instance( $plugin = array() ) {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_Deactivation_Survey ) ) {
+                self::$instance = new AyeCode_Deactivation_Survey;
+                self::$plugins = array();
 
-				add_action( 'admin_enqueue_scripts', array( self::$instance, 'scripts' ) );
+                add_action( 'admin_enqueue_scripts', array( self::$instance, 'scripts' ) );
 
-				do_action( 'ayecode_deactivation_survey_loaded' );
-			}
+                do_action( 'ayecode_deactivation_survey_loaded' );
+            }
 
-			if(!empty($plugin)){
-				self::$plugins[] = (object)$plugin;
-			}
+            if(!empty($plugin)){
+                self::$plugins[] = (object)$plugin;
+            }
 
-			return self::$instance;
-		}
+            return self::$instance;
+        }
 
-		public function scripts() {
-			global $pagenow;
+        public function scripts() {
+            global $pagenow;
 
-			// Bail if we are not on the plugins page
-			if ( $pagenow != "plugins.php" ) {
-				return;
-			}
+            // Bail if we are not on the plugins page
+            if ( $pagenow != "plugins.php" ) {
+                return;
+            }
 
-			// Enqueue scripts
-			add_thickbox();
-			wp_enqueue_script('ayecode-deactivation-survey', plugin_dir_url(__FILE__) . 'ayecode-ds.js');
+            // Enqueue scripts
+            add_thickbox();
+            wp_enqueue_script('ayecode-deactivation-survey', plugin_dir_url(__FILE__) . 'ayecode-ds.js');
 
-			/*
+            /*
 			 * Localized strings. Strings can be localised by plugins using this class.
 			 * We deliberately don't add textdomains here so that double textdomain warning is not given in theme review.
 			 */
-			wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_strings', array(
-				'quick_feedback'			=> 'Quick Feedback',
-				'foreword'					=> 'If you would be kind enough, please tell us why you\'re deactivating?',
-				'better_plugins_name'		=> 'Please tell us which plugin?',
-				'please_tell_us'			=> 'Please tell us the reason so we can improve the plugin',
-				'do_not_attach_email'		=> 'Do not send my e-mail address with this feedback',
-				'brief_description'			=> 'Please give us any feedback that could help us improve',
-				'cancel'					=> 'Cancel',
-				'skip_and_deactivate'		=> 'Skip &amp; Deactivate',
-				'submit_and_deactivate'		=> 'Submit &amp; Deactivate',
-				'please_wait'				=> 'Please wait',
-				'get_support'				=> 'Get Support',
-				'documentation'				=> 'Documentation',
-				'thank_you'					=> 'Thank you!',
-			));
-
-			// Plugins
-			$plugins = apply_filters('ayecode_deactivation_survey_plugins', self::$plugins);
-
-			// Reasons
-			$defaultReasons = array(
-				'suddenly-stopped-working'	=> 'The plugin suddenly stopped working',
-				'plugin-broke-site'			=> 'The plugin broke my site',
-				'plugin-setup-difficult'	=> 'Too difficult to setup',
-				'plugin-design-difficult'	=> 'Too difficult to get the design i want',
-				'no-longer-needed'			=> 'I don\'t need this plugin any more',
-				'found-better-plugin'		=> 'I found a better plugin',
-				'temporary-deactivation'	=> 'It\'s a temporary deactivation, I\'m troubleshooting',
-				'other'						=> 'Other',
-			);
-
-			foreach($plugins as $plugin)
-			{
-				$plugin->reasons = apply_filters('ayecode_deactivation_survey_reasons', $defaultReasons, $plugin);
-				$plugin->url = home_url();
-				$plugin->activated = 0;
-			}
-
-			// Send plugin data
-			wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_plugins', $plugins);
-
-		}
+            wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_strings', array(
+                'quick_feedback'			=> 'Quick Feedback',
+                'foreword'					=> 'If you would be kind enough, please tell us why you\'re deactivating?',
+                'better_plugins_name'		=> 'Please tell us which plugin?',
+                'please_tell_us'			=> 'Please tell us the reason so we can improve the plugin',
+                'do_not_attach_email'		=> 'Do not send my e-mail address with this feedback',
+                'brief_description'			=> 'Please give us any feedback that could help us improve',
+                'cancel'					=> 'Cancel',
+                'skip_and_deactivate'		=> 'Skip &amp; Deactivate',
+                'submit_and_deactivate'		=> 'Submit &amp; Deactivate',
+                'please_wait'				=> 'Please wait',
+                'get_support'				=> 'Get Support',
+                'documentation'				=> 'Documentation',
+                'thank_you'					=> 'Thank you!',
+            ));
+
+            // Plugins
+            $plugins = apply_filters('ayecode_deactivation_survey_plugins', self::$plugins);
+
+            // Reasons
+            $defaultReasons = array(
+                'suddenly-stopped-working'	=> 'The plugin suddenly stopped working',
+                'plugin-broke-site'			=> 'The plugin broke my site',
+                'plugin-setup-difficult'	=> 'Too difficult to setup',
+                'plugin-design-difficult'	=> 'Too difficult to get the design i want',
+                'no-longer-needed'			=> 'I don\'t need this plugin any more',
+                'found-better-plugin'		=> 'I found a better plugin',
+                'temporary-deactivation'	=> 'It\'s a temporary deactivation, I\'m troubleshooting',
+                'other'						=> 'Other',
+            );
+
+            foreach($plugins as $plugin)
+            {
+                $plugin->reasons = apply_filters('ayecode_deactivation_survey_reasons', $defaultReasons, $plugin);
+                $plugin->url = home_url();
+                $plugin->activated = 0;
+            }
+
+            // Send plugin data
+            wp_localize_script('ayecode-deactivation-survey', 'ayecodeds_deactivate_feedback_form_plugins', $plugins);
+
+        }
 		
 
-	}
+    }
 
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'AyeCode_Deactivation_Survey' ) ) {
+if (!class_exists('AyeCode_Deactivation_Survey')) {
 
 	class AyeCode_Deactivation_Survey {
 
@@ -21,18 +21,18 @@ 
 
 		public $version = "1.0.4";
 
-		public static function instance( $plugin = array() ) {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_Deactivation_Survey ) ) {
+		public static function instance($plugin = array()) {
+			if (!isset(self::$instance) && !(self::$instance instanceof AyeCode_Deactivation_Survey)) {
 				self::$instance = new AyeCode_Deactivation_Survey;
 				self::$plugins = array();
 
-				add_action( 'admin_enqueue_scripts', array( self::$instance, 'scripts' ) );
+				add_action('admin_enqueue_scripts', array(self::$instance, 'scripts'));
 
-				do_action( 'ayecode_deactivation_survey_loaded' );
+				do_action('ayecode_deactivation_survey_loaded');
 			}
 
-			if(!empty($plugin)){
-				self::$plugins[] = (object)$plugin;
+			if (!empty($plugin)) {
+				self::$plugins[] = (object) $plugin;
 			}
 
 			return self::$instance;
@@ -42,7 +42,7 @@ 
 			global $pagenow;
 
 			// Bail if we are not on the plugins page
-			if ( $pagenow != "plugins.php" ) {
+			if ($pagenow != "plugins.php") {
 				return;
 			}
 
@@ -85,7 +85,7 @@ 
 				'other'						=> 'Other',
 			);
 
-			foreach($plugins as $plugin)
+			foreach ($plugins as $plugin)
 			{
 				$plugin->reasons = apply_filters('ayecode_deactivation_survey_reasons', $defaultReasons, $plugin);
 				$plugin->url = home_url();

templates/payment-forms/elements/paragraph.php

Spacing +3 added lines, -3 removed lines

@@ -7,10 +7,10 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$text = isset( $element['text'] ) ? wp_kses_post( trim( $element['text'] ) ) : '';
+$text = isset($element['text']) ? wp_kses_post(trim($element['text'])) : '';
 
-if ( ! empty( $text ) ) {
+if (!empty($text)) {
     echo "<p>$text</p>";
 }

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'])){ 					

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 sanitize_key($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

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;

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

vendor/ayecode/wp-ayecode-ui/includes/components/class-aui-component-input.php

Braces +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
 						$help_text = '';
 						//$label_args['class'] .= ' d-inline ';
 						$args['wrap_class'] .= ' align-items-center ';
-					}else{
+					} else{
 
 					}
 

Indentation +1186 added lines, -1186 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,1210 +11,1210 @@ 
  */
 class AUI_Component_Input {
 
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function input( $args = array() ) {
-		$defaults = array(
-			'type'                     => 'text',
-			'name'                     => '',
-			'class'                    => '',
-			'wrap_class'               => '',
-			'id'                       => '',
-			'placeholder'              => '',
-			'title'                    => '',
-			'value'                    => '',
-			'required'                 => false,
-			'label'                    => '',
-			'label_after'              => false,
-			'label_class'              => '',
-			'label_col'                => '2',
-			'label_type'               => '',
-			'label_force_left'         => false, // used to force checkbox label left when using horizontal
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'                => '',
-			'validation_text'          => '',
-			'validation_pattern'       => '',
-			'no_wrap'                  => false,
-			'input_group_right'        => '',
-			'input_group_left'         => '',
-			'input_group_right_inside' => false,
-			// forces the input group inside the input
-			'input_group_left_inside'  => false,
-			// forces the input group inside the input
-			'step'                     => '',
-			'switch'                   => false,
-			// to show checkbox as a switch
-			'checked'                  => false,
-			// set a checkbox or radio as selected
-			'password_toggle'          => true,
-			// toggle view/hide password
-			'element_require'          => '',
-			// [%element_id%] == "1"
-			'extra_attributes'         => array(),
-			// an array of extra attributes
-			'wrap_attributes'          => array()
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( ! empty( $args['type'] ) ) {
-			// hidden label option needs to be empty
-			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-			$type = sanitize_html_class( $args['type'] );
-
-			$help_text   = '';
-			$label       = '';
-			$label_after = $args['label_after'];
-			$label_args  = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-
-			// floating labels need label after
-			if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
-				$label_after         = true;
-				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-			}
-
-			// Some special sauce for files
-			if ( $type == 'file' ) {
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= ' custom-file-input ';
-			} elseif ( $type == 'checkbox' ) {
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= ' custom-control-input ';
-			} elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
-				$type = 'text';
-				//$args['class'] .= ' aui-flatpickr bg-initial ';
-				$args['class'] .= ' bg-initial ';
-
-				$args['extra_attributes']['data-aui-init'] = 'flatpickr';
-				// enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_flatpickr();
-			} elseif ( $type == 'iconpicker' ) {
-				$type = 'text';
-				//$args['class'] .= ' aui-flatpickr bg-initial ';
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function input( $args = array() ) {
+        $defaults = array(
+            'type'                     => 'text',
+            'name'                     => '',
+            'class'                    => '',
+            'wrap_class'               => '',
+            'id'                       => '',
+            'placeholder'              => '',
+            'title'                    => '',
+            'value'                    => '',
+            'required'                 => false,
+            'label'                    => '',
+            'label_after'              => false,
+            'label_class'              => '',
+            'label_col'                => '2',
+            'label_type'               => '',
+            'label_force_left'         => false, // used to force checkbox label left when using horizontal
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'help_text'                => '',
+            'validation_text'          => '',
+            'validation_pattern'       => '',
+            'no_wrap'                  => false,
+            'input_group_right'        => '',
+            'input_group_left'         => '',
+            'input_group_right_inside' => false,
+            // forces the input group inside the input
+            'input_group_left_inside'  => false,
+            // forces the input group inside the input
+            'step'                     => '',
+            'switch'                   => false,
+            // to show checkbox as a switch
+            'checked'                  => false,
+            // set a checkbox or radio as selected
+            'password_toggle'          => true,
+            // toggle view/hide password
+            'element_require'          => '',
+            // [%element_id%] == "1"
+            'extra_attributes'         => array(),
+            // an array of extra attributes
+            'wrap_attributes'          => array()
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        if ( ! empty( $args['type'] ) ) {
+            // hidden label option needs to be empty
+            $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+            $type = sanitize_html_class( $args['type'] );
+
+            $help_text   = '';
+            $label       = '';
+            $label_after = $args['label_after'];
+            $label_args  = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+
+            // floating labels need label after
+            if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
+                $label_after         = true;
+                $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+            }
+
+            // Some special sauce for files
+            if ( $type == 'file' ) {
+                $label_after = true; // if type file we need the label after
+                $args['class'] .= ' custom-file-input ';
+            } elseif ( $type == 'checkbox' ) {
+                $label_after = true; // if type file we need the label after
+                $args['class'] .= ' custom-control-input ';
+            } elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
+                $type = 'text';
+                //$args['class'] .= ' aui-flatpickr bg-initial ';
+                $args['class'] .= ' bg-initial ';
+
+                $args['extra_attributes']['data-aui-init'] = 'flatpickr';
+                // enqueue the script
+                $aui_settings = AyeCode_UI_Settings::instance();
+                $aui_settings->enqueue_flatpickr();
+            } elseif ( $type == 'iconpicker' ) {
+                $type = 'text';
+                //$args['class'] .= ' aui-flatpickr bg-initial ';
 //				$args['class'] .= ' bg-initial ';
 
-				$args['extra_attributes']['data-aui-init'] = 'iconpicker';
-				$args['extra_attributes']['data-placement'] = 'bottomRight';
+                $args['extra_attributes']['data-aui-init'] = 'iconpicker';
+                $args['extra_attributes']['data-placement'] = 'bottomRight';
 
-				$args['input_group_right'] = '<span class="input-group-addon input-group-text c-pointer"></span>';
+                $args['input_group_right'] = '<span class="input-group-addon input-group-text c-pointer"></span>';
 //				$args['input_group_right_inside'] = true;
-				// enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_iconpicker();
-			}
-
-			if ( $type == 'checkbox' && !empty($args['name'] ) && strpos($args['name'], '[') === false ) {
-				$output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
-			}
-
-
-			// open/type
-			$output .= '<input type="' . $type . '" ';
-
-			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
-			}
-
-			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
-			}
-
-			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
-			}
-
-			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
-			}
-
-			// value
-			if ( ! empty( $args['value'] ) ) {
-				$output .= AUI_Component_Helper::value( $args['value'] );
-			}
-
-			// checked, for radio and checkboxes
-			if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
-				$output .= ' checked ';
-			}
-
-			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
-			}
-
-			// step (for numbers)
-			if ( ! empty( $args['step'] ) ) {
-				$output .= ' step="' . $args['step'] . '" ';
-			}
-
-			// required
-			if ( ! empty( $args['required'] ) ) {
-				$output .= ' required ';
-			}
-
-			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="form-control ' . $class . '" ';
-
-			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes( $args );
-
-			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-			}
-
-			// close
-			$output .= ' >';
-
-			// help text
-			if ( ! empty( $args['help_text'] ) ) {
-				$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
-			}
-
-			// label
-			if ( ! empty( $args['label'] ) ) {
-				$label_base_class = '';
-				if ( $type == 'file' ) {
-					$label_base_class = ' custom-file-label';
-				} elseif ( $type == 'checkbox' ) {
-					if ( ! empty( $args['label_force_left'] ) ) {
-						$label_args['title'] = wp_kses_post( $args['help_text'] );
-						$help_text = '';
-						//$label_args['class'] .= ' d-inline ';
-						$args['wrap_class'] .= ' align-items-center ';
-					}else{
-
-					}
-
-					$label_base_class = ' custom-control-label';
-				}
-				$label_args['class'] .= $label_base_class;
-				$temp_label_args = $label_args;
-				if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
-				$label = self::label( $temp_label_args, $type );
-			}
-
-
-
-
-			// set help text in the correct position
-			if ( $label_after ) {
-				$output .= $label . $help_text;
-			}
-
-			// some input types need a separate wrap
-			if ( $type == 'file' ) {
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => 'form-group custom-file'
-				) );
-			} elseif ( $type == 'checkbox' ) {
-
-				$label_args['title'] = $args['label'];
-				$label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
-				$label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
-				$switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
-				$wrap_class = $args['switch'] ? 'custom-switch'.$switch_size_class : 'custom-checkbox';
-				if ( ! empty( $args['label_force_left'] ) ) {
-					$wrap_class .= ' d-flex align-content-center';
-					$label = str_replace("custom-control-label","", self::label( $label_args, 'cb' ) );
-				}
-				$output     = self::wrap( array(
-					'content' => $output,
-					'class'   => 'custom-control ' . $wrap_class
-				) );
-
-				if ( $args['label_type'] == 'horizontal' ) {
-					$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-					$output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
-				}
-			} elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
-
-
-				// allow password field to toggle view
-				$args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
+                // enqueue the script
+                $aui_settings = AyeCode_UI_Settings::instance();
+                $aui_settings->enqueue_iconpicker();
+            }
+
+            if ( $type == 'checkbox' && !empty($args['name'] ) && strpos($args['name'], '[') === false ) {
+                $output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+            }
+
+
+            // open/type
+            $output .= '<input type="' . $type . '" ';
+
+            // name
+            if ( ! empty( $args['name'] ) ) {
+                $output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+            }
+
+            // id
+            if ( ! empty( $args['id'] ) ) {
+                $output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+            }
+
+            // placeholder
+            if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
+                $output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+            }
+
+            // title
+            if ( ! empty( $args['title'] ) ) {
+                $output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+            }
+
+            // value
+            if ( ! empty( $args['value'] ) ) {
+                $output .= AUI_Component_Helper::value( $args['value'] );
+            }
+
+            // checked, for radio and checkboxes
+            if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
+                $output .= ' checked ';
+            }
+
+            // validation text
+            if ( ! empty( $args['validation_text'] ) ) {
+                $output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
+                $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+            }
+
+            // validation_pattern
+            if ( ! empty( $args['validation_pattern'] ) ) {
+                $output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+            }
+
+            // step (for numbers)
+            if ( ! empty( $args['step'] ) ) {
+                $output .= ' step="' . $args['step'] . '" ';
+            }
+
+            // required
+            if ( ! empty( $args['required'] ) ) {
+                $output .= ' required ';
+            }
+
+            // class
+            $class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+            $output .= ' class="form-control ' . $class . '" ';
+
+            // data-attributes
+            $output .= AUI_Component_Helper::data_attributes( $args );
+
+            // extra attributes
+            if ( ! empty( $args['extra_attributes'] ) ) {
+                $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+            }
+
+            // close
+            $output .= ' >';
+
+            // help text
+            if ( ! empty( $args['help_text'] ) ) {
+                $help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+            }
+
+            // label
+            if ( ! empty( $args['label'] ) ) {
+                $label_base_class = '';
+                if ( $type == 'file' ) {
+                    $label_base_class = ' custom-file-label';
+                } elseif ( $type == 'checkbox' ) {
+                    if ( ! empty( $args['label_force_left'] ) ) {
+                        $label_args['title'] = wp_kses_post( $args['help_text'] );
+                        $help_text = '';
+                        //$label_args['class'] .= ' d-inline ';
+                        $args['wrap_class'] .= ' align-items-center ';
+                    }else{
+
+                    }
+
+                    $label_base_class = ' custom-control-label';
+                }
+                $label_args['class'] .= $label_base_class;
+                $temp_label_args = $label_args;
+                if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
+                $label = self::label( $temp_label_args, $type );
+            }
+
+
+
+
+            // set help text in the correct position
+            if ( $label_after ) {
+                $output .= $label . $help_text;
+            }
+
+            // some input types need a separate wrap
+            if ( $type == 'file' ) {
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => 'form-group custom-file'
+                ) );
+            } elseif ( $type == 'checkbox' ) {
+
+                $label_args['title'] = $args['label'];
+                $label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
+                $label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
+                $switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
+                $wrap_class = $args['switch'] ? 'custom-switch'.$switch_size_class : 'custom-checkbox';
+                if ( ! empty( $args['label_force_left'] ) ) {
+                    $wrap_class .= ' d-flex align-content-center';
+                    $label = str_replace("custom-control-label","", self::label( $label_args, 'cb' ) );
+                }
+                $output     = self::wrap( array(
+                    'content' => $output,
+                    'class'   => 'custom-control ' . $wrap_class
+                ) );
+
+                if ( $args['label_type'] == 'horizontal' ) {
+                    $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+                    $output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
+                }
+            } elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
+
+
+                // allow password field to toggle view
+                $args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
 onclick="var $el = jQuery(this).find(\'i\');$el.toggleClass(\'fa-eye fa-eye-slash\');
 var $eli = jQuery(this).parent().parent().find(\'input\');
 if($el.hasClass(\'fa-eye\'))
 {$eli.attr(\'type\',\'text\');}
 else{$eli.attr(\'type\',\'password\');}"
 ><i class="far fa-fw fa-eye-slash"></i></span>';
-			}
-
-			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
-						'content'                 => $output,
-						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_left'        => $args['input_group_left'],
-						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
-				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
-						'content'                  => $output,
-						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_right'        => $args['input_group_right'],
-						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
-				}
-
-			}
-
-			if ( ! $label_after ) {
-				$output .= $help_text;
-			}
-
-
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-				) );
-			}
-
-			if ( ! $label_after ) {
-				$output = $label . $output;
-			}
-
-			// wrap
-			if ( ! $args['no_wrap'] ) {
-				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
-				$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-				$output           = self::wrap( array(
-					'content'         => $output,
-					'class'           => $wrap_class,
-					'element_require' => $args['element_require'],
-					'argument_id'     => $args['id'],
-					'wrap_attributes' => $args['wrap_attributes'],
-				) );
-			}
-		}
-
-		return $output;
-	}
-
-	public static function label( $args = array(), $type = '' ) {
-		//<label for="exampleInputEmail1">Email address</label>
-		$defaults = array(
-			'title'      => 'div',
-			'for'        => '',
-			'class'      => '',
-			'label_type' => '', // empty = hidden, top, horizontal
-			'label_col'  => '',
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		if ( $args['title'] ) {
-
-			// maybe hide labels //@todo set a global option for visibility class
-			if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
-				$class = $args['class'];
-			} else {
-				$class = 'sr-only ' . $args['class'];
-			}
-
-			// maybe horizontal
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label';
-			}
-
-			// open
-			$output .= '<label ';
-
-			// for
-			if ( ! empty( $args['for'] ) ) {
-				$output .= ' for="' . esc_attr( $args['for'] ) . '" ';
-			}
-
-			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
-			$output .= ' class="' . $class . '" ';
-
-			// close
-			$output .= '>';
-
-
-			// title, don't escape fully as can contain html
-			if ( ! empty( $args['title'] ) ) {
-				$output .= wp_kses_post( $args['title'] );
-			}
-
-			// close wrap
-			$output .= '</label>';
-
-
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Wrap some content in a HTML wrapper.
-	 *
-	 * @param array $args
-	 *
-	 * @return string
-	 */
-	public static function wrap( $args = array() ) {
-		$defaults = array(
-			'type'                     => 'div',
-			'class'                    => 'form-group',
-			'content'                  => '',
-			'input_group_left'         => '',
-			'input_group_right'        => '',
-			'input_group_left_inside'  => false,
-			'input_group_right_inside' => false,
-			'element_require'          => '',
-			'argument_id'              => '',
-			'wrap_attributes'          => array()
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( $args['type'] ) {
-
-			// open
-			$output .= '<' . sanitize_html_class( $args['type'] );
-
-			// element require
-			if ( ! empty( $args['element_require'] ) ) {
-				$output .= AUI_Component_Helper::element_require( $args['element_require'] );
-				$args['class'] .= " aui-conditional-field";
-			}
-
-			// argument_id
-			if ( ! empty( $args['argument_id'] ) ) {
-				$output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
-			}
-
-			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="' . $class . '" ';
-
-			// Attributes
-			if ( ! empty( $args['wrap_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
-			}
-
-			// close wrap
-			$output .= ' >';
-
-
-			// Input group left
-			if ( ! empty( $args['input_group_left'] ) ) {
-				$position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
-				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
-			}
-
-			// content
-			$output .= $args['content'];
-
-			// Input group right
-			if ( ! empty( $args['input_group_right'] ) ) {
-				$position_class    = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
-				$output .= '<div class="input-group-append ' . $position_class . '">' . $input_group_right . '</div>';
-			}
-
-
-			// close wrap
-			$output .= '</' . sanitize_html_class( $args['type'] ) . '>';
-
-
-		} else {
-			$output = $args['content'];
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function textarea( $args = array() ) {
-		$defaults = array(
-			'name'               => '',
-			'class'              => '',
-			'wrap_class'         => '',
-			'id'                 => '',
-			'placeholder'        => '',
-			'title'              => '',
-			'value'              => '',
-			'required'           => false,
-			'label'              => '',
-			'label_after'        => false,
-			'label_class'        => '',
-			'label_type'         => '',
-			'label_col'          => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'input_group_right'        => '',
-			'input_group_left'         => '',
-			'input_group_right_inside' => false,
-			'help_text'          => '',
-			'validation_text'    => '',
-			'validation_pattern' => '',
-			'no_wrap'            => false,
-			'rows'               => '',
-			'wysiwyg'            => false,
-			'allow_tags'         => false,
-			// Allow HTML tags
-			'element_require'    => '',
-			// [%element_id%] == "1"
-			'extra_attributes'   => array(),
-			// an array of extra attributes
-			'wrap_attributes'    => array(),
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-		// floating labels don't work with wysiwyg so set it as top
-		if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
-			$args['label_type'] = 'top';
-		}
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
-			$label_after         = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$output .= self::label( $label_args );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-			$output .= '<div class="' . $input_col . '">';
-		}
-
-		if ( ! empty( $args['wysiwyg'] ) ) {
-			ob_start();
-			$content   = $args['value'];
-			$editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
-			$settings  = array(
-				'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
-				'quicktags'     => false,
-				'media_buttons' => false,
-				'editor_class'  => 'form-control',
-				'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
-				'teeny'         => true,
-			);
-
-			// maybe set settings if array
-			if ( is_array( $args['wysiwyg'] ) ) {
-				$settings = wp_parse_args( $args['wysiwyg'], $settings );
-			}
-
-			wp_editor( $content, $editor_id, $settings );
-			$output .= ob_get_clean();
-		} else {
-
-			// open
-			$output .= '<textarea ';
-
-			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
-			}
-
-			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
-			}
-
-			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
-			}
-
-			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
-			}
-
-			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
-			}
-
-			// required
-			if ( ! empty( $args['required'] ) ) {
-				$output .= ' required ';
-			}
-
-			// rows
-			if ( ! empty( $args['rows'] ) ) {
-				$output .= ' rows="' . absint( $args['rows'] ) . '" ';
-			}
-
-
-			// class
-			$class = ! empty( $args['class'] ) ? $args['class'] : '';
-			$output .= ' class="form-control ' . $class . '" ';
-
-			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-			}
-
-			// close tag
-			$output .= ' >';
-
-			// value
-			if ( ! empty( $args['value'] ) ) {
-				if ( ! empty( $args['allow_tags'] ) ) {
-					$output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
-				} else {
-					$output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
-				}
-			}
-
-			// closing tag
-			$output .= '</textarea>';
-
-
-			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
-						'content'                 => $output,
-						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_left'        => $args['input_group_left'],
-						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
-				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
-						'content'                  => $output,
-						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_right'        => $args['input_group_right'],
-						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
-				}
-
-			}
-
-
-		}
-
-		if ( ! empty( $args['label'] ) && $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$output .= self::label( $label_args );
-		}
-
-		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$output .= AUI_Component_Helper::help_text( $args['help_text'] );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output .= '</div>';
-		}
-
-
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : 'form-group';
-			$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output           = self::wrap( array(
-				'content'         => $output,
-				'class'           => $wrap_class,
-				'element_require' => $args['element_require'],
-				'argument_id'     => $args['id'],
-				'wrap_attributes' => $args['wrap_attributes'],
-			) );
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function select( $args = array() ) {
-		$defaults = array(
-			'class'            => '',
-			'wrap_class'       => '',
-			'id'               => '',
-			'title'            => '',
-			'value'            => '',
-			// can be an array or a string
-			'required'         => false,
-			'label'            => '',
-			'label_after'      => false,
-			'label_type'       => '',
-			'label_col'        => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'label_class'      => '',
-			'help_text'        => '',
-			'placeholder'      => '',
-			'options'          => array(),
-			// array or string
-			'icon'             => '',
-			'multiple'         => false,
-			'select2'          => false,
-			'no_wrap'          => false,
-			'input_group_right' => '',
-			'input_group_left' => '',
-			'input_group_right_inside' => false, // forces the input group inside the input
-			'input_group_left_inside' => false, // forces the input group inside the input
-			'element_require'  => '',
-			// [%element_id%] == "1"
-			'extra_attributes' => array(),
-			// an array of extra attributes
-			'wrap_attributes'  => array(),
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		// for now lets hide floating labels
-		if ( $args['label_type'] == 'floating' ) {
-			$args['label_type'] = 'hidden';
-		}
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if ( $args['label_type'] == 'floating' ) {
-			$label_after         = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// Maybe setup select2
-		$is_select2 = false;
-		if ( ! empty( $args['select2'] ) ) {
-			$args['class'] .= ' aui-select2';
-			$is_select2 = true;
-		} elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
-			$is_select2 = true;
-		}
-
-		// select2 tags
-		if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
-			$args['data-tags']             = 'true';
-			$args['data-token-separators'] = "[',']";
-			$args['multiple']              = true;
-		}
-
-		// select2 placeholder
-		if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
-			$args['data-placeholder'] = esc_attr( $args['placeholder'] );
-			$args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
-		}
-
-
-
-		// maybe horizontal label
+            }
+
+            // input group wraps
+            if ( $args['input_group_left'] || $args['input_group_right'] ) {
+                $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+                if ( $args['input_group_left'] ) {
+                    $output = self::wrap( array(
+                        'content'                 => $output,
+                        'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                        'input_group_left'        => $args['input_group_left'],
+                        'input_group_left_inside' => $args['input_group_left_inside']
+                    ) );
+                }
+                if ( $args['input_group_right'] ) {
+                    $output = self::wrap( array(
+                        'content'                  => $output,
+                        'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                        'input_group_right'        => $args['input_group_right'],
+                        'input_group_right_inside' => $args['input_group_right_inside']
+                    ) );
+                }
+
+            }
+
+            if ( ! $label_after ) {
+                $output .= $help_text;
+            }
+
+
+            if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
+                ) );
+            }
+
+            if ( ! $label_after ) {
+                $output = $label . $output;
+            }
+
+            // wrap
+            if ( ! $args['no_wrap'] ) {
+                $form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
+                $wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+                $wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+                $output           = self::wrap( array(
+                    'content'         => $output,
+                    'class'           => $wrap_class,
+                    'element_require' => $args['element_require'],
+                    'argument_id'     => $args['id'],
+                    'wrap_attributes' => $args['wrap_attributes'],
+                ) );
+            }
+        }
+
+        return $output;
+    }
+
+    public static function label( $args = array(), $type = '' ) {
+        //<label for="exampleInputEmail1">Email address</label>
+        $defaults = array(
+            'title'      => 'div',
+            'for'        => '',
+            'class'      => '',
+            'label_type' => '', // empty = hidden, top, horizontal
+            'label_col'  => '',
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        if ( $args['title'] ) {
+
+            // maybe hide labels //@todo set a global option for visibility class
+            if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
+                $class = $args['class'];
+            } else {
+                $class = 'sr-only ' . $args['class'];
+            }
+
+            // maybe horizontal
+            if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
+                $class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label';
+            }
+
+            // open
+            $output .= '<label ';
+
+            // for
+            if ( ! empty( $args['for'] ) ) {
+                $output .= ' for="' . esc_attr( $args['for'] ) . '" ';
+            }
+
+            // class
+            $class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
+            $output .= ' class="' . $class . '" ';
+
+            // close
+            $output .= '>';
+
+
+            // title, don't escape fully as can contain html
+            if ( ! empty( $args['title'] ) ) {
+                $output .= wp_kses_post( $args['title'] );
+            }
+
+            // close wrap
+            $output .= '</label>';
+
+
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Wrap some content in a HTML wrapper.
+     *
+     * @param array $args
+     *
+     * @return string
+     */
+    public static function wrap( $args = array() ) {
+        $defaults = array(
+            'type'                     => 'div',
+            'class'                    => 'form-group',
+            'content'                  => '',
+            'input_group_left'         => '',
+            'input_group_right'        => '',
+            'input_group_left_inside'  => false,
+            'input_group_right_inside' => false,
+            'element_require'          => '',
+            'argument_id'              => '',
+            'wrap_attributes'          => array()
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        if ( $args['type'] ) {
+
+            // open
+            $output .= '<' . sanitize_html_class( $args['type'] );
+
+            // element require
+            if ( ! empty( $args['element_require'] ) ) {
+                $output .= AUI_Component_Helper::element_require( $args['element_require'] );
+                $args['class'] .= " aui-conditional-field";
+            }
+
+            // argument_id
+            if ( ! empty( $args['argument_id'] ) ) {
+                $output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
+            }
+
+            // class
+            $class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+            $output .= ' class="' . $class . '" ';
+
+            // Attributes
+            if ( ! empty( $args['wrap_attributes'] ) ) {
+                $output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
+            }
+
+            // close wrap
+            $output .= ' >';
+
+
+            // Input group left
+            if ( ! empty( $args['input_group_left'] ) ) {
+                $position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
+                $input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+                $output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
+            }
+
+            // content
+            $output .= $args['content'];
+
+            // Input group right
+            if ( ! empty( $args['input_group_right'] ) ) {
+                $position_class    = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
+                $input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+                $output .= '<div class="input-group-append ' . $position_class . '">' . $input_group_right . '</div>';
+            }
+
+
+            // close wrap
+            $output .= '</' . sanitize_html_class( $args['type'] ) . '>';
+
+
+        } else {
+            $output = $args['content'];
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function textarea( $args = array() ) {
+        $defaults = array(
+            'name'               => '',
+            'class'              => '',
+            'wrap_class'         => '',
+            'id'                 => '',
+            'placeholder'        => '',
+            'title'              => '',
+            'value'              => '',
+            'required'           => false,
+            'label'              => '',
+            'label_after'        => false,
+            'label_class'        => '',
+            'label_type'         => '',
+            'label_col'          => '',
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'input_group_right'        => '',
+            'input_group_left'         => '',
+            'input_group_right_inside' => false,
+            'help_text'          => '',
+            'validation_text'    => '',
+            'validation_pattern' => '',
+            'no_wrap'            => false,
+            'rows'               => '',
+            'wysiwyg'            => false,
+            'allow_tags'         => false,
+            // Allow HTML tags
+            'element_require'    => '',
+            // [%element_id%] == "1"
+            'extra_attributes'   => array(),
+            // an array of extra attributes
+            'wrap_attributes'    => array(),
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        // hidden label option needs to be empty
+        $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+        // floating labels don't work with wysiwyg so set it as top
+        if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
+            $args['label_type'] = 'top';
+        }
+
+        $label_after = $args['label_after'];
+
+        // floating labels need label after
+        if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
+            $label_after         = true;
+            $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+        }
+
+        // label
+        if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+        } elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+            $label_args = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+            $output .= self::label( $label_args );
+        }
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+            $output .= '<div class="' . $input_col . '">';
+        }
+
+        if ( ! empty( $args['wysiwyg'] ) ) {
+            ob_start();
+            $content   = $args['value'];
+            $editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
+            $settings  = array(
+                'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
+                'quicktags'     => false,
+                'media_buttons' => false,
+                'editor_class'  => 'form-control',
+                'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
+                'teeny'         => true,
+            );
+
+            // maybe set settings if array
+            if ( is_array( $args['wysiwyg'] ) ) {
+                $settings = wp_parse_args( $args['wysiwyg'], $settings );
+            }
+
+            wp_editor( $content, $editor_id, $settings );
+            $output .= ob_get_clean();
+        } else {
+
+            // open
+            $output .= '<textarea ';
+
+            // name
+            if ( ! empty( $args['name'] ) ) {
+                $output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+            }
+
+            // id
+            if ( ! empty( $args['id'] ) ) {
+                $output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+            }
+
+            // placeholder
+            if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
+                $output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+            }
+
+            // title
+            if ( ! empty( $args['title'] ) ) {
+                $output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+            }
+
+            // validation text
+            if ( ! empty( $args['validation_text'] ) ) {
+                $output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
+                $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+            }
+
+            // validation_pattern
+            if ( ! empty( $args['validation_pattern'] ) ) {
+                $output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+            }
+
+            // required
+            if ( ! empty( $args['required'] ) ) {
+                $output .= ' required ';
+            }
+
+            // rows
+            if ( ! empty( $args['rows'] ) ) {
+                $output .= ' rows="' . absint( $args['rows'] ) . '" ';
+            }
+
+
+            // class
+            $class = ! empty( $args['class'] ) ? $args['class'] : '';
+            $output .= ' class="form-control ' . $class . '" ';
+
+            // extra attributes
+            if ( ! empty( $args['extra_attributes'] ) ) {
+                $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+            }
+
+            // close tag
+            $output .= ' >';
+
+            // value
+            if ( ! empty( $args['value'] ) ) {
+                if ( ! empty( $args['allow_tags'] ) ) {
+                    $output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
+                } else {
+                    $output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
+                }
+            }
+
+            // closing tag
+            $output .= '</textarea>';
+
+
+            // input group wraps
+            if ( $args['input_group_left'] || $args['input_group_right'] ) {
+                $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+                if ( $args['input_group_left'] ) {
+                    $output = self::wrap( array(
+                        'content'                 => $output,
+                        'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                        'input_group_left'        => $args['input_group_left'],
+                        'input_group_left_inside' => $args['input_group_left_inside']
+                    ) );
+                }
+                if ( $args['input_group_right'] ) {
+                    $output = self::wrap( array(
+                        'content'                  => $output,
+                        'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                        'input_group_right'        => $args['input_group_right'],
+                        'input_group_right_inside' => $args['input_group_right_inside']
+                    ) );
+                }
+
+            }
+
+
+        }
+
+        if ( ! empty( $args['label'] ) && $label_after ) {
+            $label_args = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+            $output .= self::label( $label_args );
+        }
+
+        // help text
+        if ( ! empty( $args['help_text'] ) ) {
+            $output .= AUI_Component_Helper::help_text( $args['help_text'] );
+        }
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $output .= '</div>';
+        }
+
+
+        // wrap
+        if ( ! $args['no_wrap'] ) {
+            $form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : 'form-group';
+            $wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+            $wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+            $output           = self::wrap( array(
+                'content'         => $output,
+                'class'           => $wrap_class,
+                'element_require' => $args['element_require'],
+                'argument_id'     => $args['id'],
+                'wrap_attributes' => $args['wrap_attributes'],
+            ) );
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function select( $args = array() ) {
+        $defaults = array(
+            'class'            => '',
+            'wrap_class'       => '',
+            'id'               => '',
+            'title'            => '',
+            'value'            => '',
+            // can be an array or a string
+            'required'         => false,
+            'label'            => '',
+            'label_after'      => false,
+            'label_type'       => '',
+            'label_col'        => '',
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'label_class'      => '',
+            'help_text'        => '',
+            'placeholder'      => '',
+            'options'          => array(),
+            // array or string
+            'icon'             => '',
+            'multiple'         => false,
+            'select2'          => false,
+            'no_wrap'          => false,
+            'input_group_right' => '',
+            'input_group_left' => '',
+            'input_group_right_inside' => false, // forces the input group inside the input
+            'input_group_left_inside' => false, // forces the input group inside the input
+            'element_require'  => '',
+            // [%element_id%] == "1"
+            'extra_attributes' => array(),
+            // an array of extra attributes
+            'wrap_attributes'  => array(),
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        // for now lets hide floating labels
+        if ( $args['label_type'] == 'floating' ) {
+            $args['label_type'] = 'hidden';
+        }
+
+        // hidden label option needs to be empty
+        $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+
+        $label_after = $args['label_after'];
+
+        // floating labels need label after
+        if ( $args['label_type'] == 'floating' ) {
+            $label_after         = true;
+            $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+        }
+
+        // Maybe setup select2
+        $is_select2 = false;
+        if ( ! empty( $args['select2'] ) ) {
+            $args['class'] .= ' aui-select2';
+            $is_select2 = true;
+        } elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
+            $is_select2 = true;
+        }
+
+        // select2 tags
+        if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
+            $args['data-tags']             = 'true';
+            $args['data-token-separators'] = "[',']";
+            $args['multiple']              = true;
+        }
+
+        // select2 placeholder
+        if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
+            $args['data-placeholder'] = esc_attr( $args['placeholder'] );
+            $args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
+        }
+
+
+
+        // maybe horizontal label
 //		if ( $args['label_type'] == 'horizontal' ) {
 //			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
 //			$output .= '<div class="' . $input_col . '">';
 //		}
 
-		// Set hidden input to save empty value for multiselect.
-		if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
-			$output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value=""/>';
-		}
-
-		// open/type
-		$output .= '<select ';
-
-		// style
-		if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
-			$output .= " style='width:100%;' ";
-		}
-
-		// element require
-		if ( ! empty( $args['element_require'] ) ) {
-			$output .= AUI_Component_Helper::element_require( $args['element_require'] );
-			$args['class'] .= " aui-conditional-field";
-		}
-
-		// class
-		$class = ! empty( $args['class'] ) ? $args['class'] : '';
-		$output .= AUI_Component_Helper::class_attr( 'custom-select ' . $class );
-
-		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
-		}
-
-		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] );
-		}
-
-		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
-
-		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-		}
-
-		// required
-		if ( ! empty( $args['required'] ) ) {
-			$output .= ' required ';
-		}
-
-		// multiple
-		if ( ! empty( $args['multiple'] ) ) {
-			$output .= ' multiple ';
-		}
-
-		// close opening tag
-		$output .= ' >';
-
-		// placeholder
-		if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
-			$output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
-		} elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
-			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
-		}
-
-		// Options
-		if ( ! empty( $args['options'] ) ) {
-
-			if ( ! is_array( $args['options'] ) ) {
-				$output .= $args['options']; // not the preferred way but an option
-			} else {
-				foreach ( $args['options'] as $val => $name ) {
-					$selected = '';
-					if ( is_array( $name ) ) {
-						if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-
-							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
-						} else {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-							$option_value = isset( $name['value'] ) ? $name['value'] : '';
-							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
-							if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
-								$selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
-							} elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
-								$selected = selected( $option_value, $args['value'], false );
-							}
-
-							$output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
-						}
-					} else {
-						if ( ! empty( $args['value'] ) ) {
-							if ( is_array( $args['value'] ) ) {
-								$selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $args['value'], $val, false );
-							}
-						} elseif ( $args['value'] === $val ) {
-							$selected = selected( $args['value'], $val, false );
-						}
-						$output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
-					}
-				}
-			}
-
-		}
-
-		// closing tag
-		$output .= '</select>';
-
-		$label = '';
-		$help_text = '';
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$label = self::label( $label_args );
-		}
-
-		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
-		}
-
-		// input group wraps
-		if ( $args['input_group_left'] || $args['input_group_right'] ) {
-			$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-			if ( $args['input_group_left'] ) {
-				$output = self::wrap( array(
-					'content'                 => $output,
-					'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-					'input_group_left'        => $args['input_group_left'],
-					'input_group_left_inside' => $args['input_group_left_inside']
-				) );
-			}
-			if ( $args['input_group_right'] ) {
-				$output = self::wrap( array(
-					'content'                  => $output,
-					'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-					'input_group_right'        => $args['input_group_right'],
-					'input_group_right_inside' => $args['input_group_right_inside']
-				) );
-			}
-
-		}
-
-		if ( ! $label_after ) {
-			$output .= $help_text;
-		}
-
-
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output = self::wrap( array(
-				'content' => $output,
-				'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-			) );
-		}
-
-		if ( ! $label_after ) {
-			$output = $label . $output;
-		}
-
-		// maybe horizontal label
+        // Set hidden input to save empty value for multiselect.
+        if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
+            $output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value=""/>';
+        }
+
+        // open/type
+        $output .= '<select ';
+
+        // style
+        if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
+            $output .= " style='width:100%;' ";
+        }
+
+        // element require
+        if ( ! empty( $args['element_require'] ) ) {
+            $output .= AUI_Component_Helper::element_require( $args['element_require'] );
+            $args['class'] .= " aui-conditional-field";
+        }
+
+        // class
+        $class = ! empty( $args['class'] ) ? $args['class'] : '';
+        $output .= AUI_Component_Helper::class_attr( 'custom-select ' . $class );
+
+        // name
+        if ( ! empty( $args['name'] ) ) {
+            $output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
+        }
+
+        // id
+        if ( ! empty( $args['id'] ) ) {
+            $output .= AUI_Component_Helper::id( $args['id'] );
+        }
+
+        // title
+        if ( ! empty( $args['title'] ) ) {
+            $output .= AUI_Component_Helper::title( $args['title'] );
+        }
+
+        // data-attributes
+        $output .= AUI_Component_Helper::data_attributes( $args );
+
+        // aria-attributes
+        $output .= AUI_Component_Helper::aria_attributes( $args );
+
+        // extra attributes
+        if ( ! empty( $args['extra_attributes'] ) ) {
+            $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+        }
+
+        // required
+        if ( ! empty( $args['required'] ) ) {
+            $output .= ' required ';
+        }
+
+        // multiple
+        if ( ! empty( $args['multiple'] ) ) {
+            $output .= ' multiple ';
+        }
+
+        // close opening tag
+        $output .= ' >';
+
+        // placeholder
+        if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
+            $output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
+        } elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
+            $output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
+        }
+
+        // Options
+        if ( ! empty( $args['options'] ) ) {
+
+            if ( ! is_array( $args['options'] ) ) {
+                $output .= $args['options']; // not the preferred way but an option
+            } else {
+                foreach ( $args['options'] as $val => $name ) {
+                    $selected = '';
+                    if ( is_array( $name ) ) {
+                        if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
+                            $option_label = isset( $name['label'] ) ? $name['label'] : '';
+
+                            $output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
+                        } else {
+                            $option_label = isset( $name['label'] ) ? $name['label'] : '';
+                            $option_value = isset( $name['value'] ) ? $name['value'] : '';
+                            $extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
+                            if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
+                                $selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
+                            } elseif ( ! empty( $args['value'] ) ) {
+                                $selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
+                            } elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
+                                $selected = selected( $option_value, $args['value'], false );
+                            }
+
+                            $output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
+                        }
+                    } else {
+                        if ( ! empty( $args['value'] ) ) {
+                            if ( is_array( $args['value'] ) ) {
+                                $selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
+                            } elseif ( ! empty( $args['value'] ) ) {
+                                $selected = selected( $args['value'], $val, false );
+                            }
+                        } elseif ( $args['value'] === $val ) {
+                            $selected = selected( $args['value'], $val, false );
+                        }
+                        $output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+                    }
+                }
+            }
+
+        }
+
+        // closing tag
+        $output .= '</select>';
+
+        $label = '';
+        $help_text = '';
+        // label
+        if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+        } elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+            $label_args = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+            $label = self::label( $label_args );
+        }
+
+        // help text
+        if ( ! empty( $args['help_text'] ) ) {
+            $help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+        }
+
+        // input group wraps
+        if ( $args['input_group_left'] || $args['input_group_right'] ) {
+            $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+            if ( $args['input_group_left'] ) {
+                $output = self::wrap( array(
+                    'content'                 => $output,
+                    'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                    'input_group_left'        => $args['input_group_left'],
+                    'input_group_left_inside' => $args['input_group_left_inside']
+                ) );
+            }
+            if ( $args['input_group_right'] ) {
+                $output = self::wrap( array(
+                    'content'                  => $output,
+                    'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                    'input_group_right'        => $args['input_group_right'],
+                    'input_group_right_inside' => $args['input_group_right_inside']
+                ) );
+            }
+
+        }
+
+        if ( ! $label_after ) {
+            $output .= $help_text;
+        }
+
+
+        if ( $args['label_type'] == 'horizontal' ) {
+            $output = self::wrap( array(
+                'content' => $output,
+                'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
+            ) );
+        }
+
+        if ( ! $label_after ) {
+            $output = $label . $output;
+        }
+
+        // maybe horizontal label
 //		if ( $args['label_type'] == 'horizontal' ) {
 //			$output .= '</div>';
 //		}
 
 
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
-			$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output     = self::wrap( array(
-				'content'         => $output,
-				'class'           => $wrap_class,
-				'element_require' => $args['element_require'],
-				'argument_id'     => $args['id'],
-				'wrap_attributes' => $args['wrap_attributes'],
-			) );
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function radio( $args = array() ) {
-		$defaults = array(
-			'class'            => '',
-			'wrap_class'       => '',
-			'id'               => '',
-			'title'            => '',
-			'horizontal'       => false,
-			// sets the lable horizontal
-			'value'            => '',
-			'label'            => '',
-			'label_class'      => '',
-			'label_type'       => '',
-			'label_col'        => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'        => '',
-			'inline'           => true,
-			'required'         => false,
-			'options'          => array(),
-			'icon'             => '',
-			'no_wrap'          => false,
-			'element_require'  => '',
-			// [%element_id%] == "1"
-			'extra_attributes' => array(),
-			// an array of extra attributes
-			'wrap_attributes'  => array()
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		// for now lets use horizontal for floating
-		if ( $args['label_type'] == 'floating' ) {
-			$args['label_type'] = 'horizontal';
-		}
-
-		$label_args = array(
-			'title'      => $args['label'],
-			'class'      => $args['label_class'] . " pt-0 ",
-			'label_type' => $args['label_type'],
-			'label_col'  => $args['label_col']
-		);
-
-		$output = '';
-
-
-		// label before
-		if ( ! empty( $args['label'] ) ) {
-			$output .= self::label( $label_args, 'radio' );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-			$output .= '<div class="' . $input_col . '">';
-		}
-
-		if ( ! empty( $args['options'] ) ) {
-			$count = 0;
-			foreach ( $args['options'] as $value => $label ) {
-				$option_args            = $args;
-				$option_args['value']   = $value;
-				$option_args['label']   = $label;
-				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option( $option_args, $count );
-				$count ++;
-			}
-		}
-
-		// help text
-		$help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
-		$output .= $help_text;
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output .= '</div>';
-		}
-
-		// wrap
-		$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
-		$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-		$output     = self::wrap( array(
-			'content'         => $output,
-			'class'           => $wrap_class,
-			'element_require' => $args['element_require'],
-			'argument_id'     => $args['id'],
-			'wrap_attributes' => $args['wrap_attributes'],
-		) );
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function radio_option( $args = array(), $count = '' ) {
-		$defaults = array(
-			'class'            => '',
-			'id'               => '',
-			'title'            => '',
-			'value'            => '',
-			'required'         => false,
-			'inline'           => true,
-			'label'            => '',
-			'options'          => array(),
-			'icon'             => '',
-			'no_wrap'          => false,
-			'extra_attributes' => array() // an array of extra attributes
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-		// open/type
-		$output .= '<input type="radio"';
-
-		// class
-		$output .= ' class="form-check-input" ';
-
-		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'] );
-		}
-
-		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] . $count );
-		}
-
-		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
-		}
-
-		// value
-		if ( isset( $args['value'] ) ) {
-			$output .= AUI_Component_Helper::value( $args['value'] );
-		}
-
-		// checked, for radio and checkboxes
-		if ( $args['checked'] ) {
-			$output .= ' checked ';
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
-
-		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-		}
-
-		// required
-		if ( ! empty( $args['required'] ) ) {
-			$output .= ' required ';
-		}
-
-		// close opening tag
-		$output .= ' >';
-
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) ) {
-			$output .= self::label( array(
-				'title' => $args['label'],
-				'for'   => $args['id'] . $count,
-				'class' => 'form-check-label'
-			), 'radio' );
-		}
-
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
-
-			// Unique wrap class
-			$uniq_class = 'fwrap';
-			if ( ! empty( $args['name'] ) ) {
-				$uniq_class .= '-' . $args['name'];
-			} else if ( ! empty( $args['id'] ) ) {
-				$uniq_class .= '-' . $args['id'];
-			}
-
-			if ( isset( $args['value'] ) || $args['value'] !== "" ) {
-				$uniq_class .= '-' . $args['value'];
-			} else {
-				$uniq_class .= '-' . $count;
-			}
-			$wrap_class .= ' ' . sanitize_html_class( $uniq_class );
-
-			$output = self::wrap( array(
-				'content' => $output,
-				'class'   => $wrap_class
-			) );
-		}
-
-		return $output;
-	}
+        // wrap
+        if ( ! $args['no_wrap'] ) {
+            $wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
+            $wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+            $output     = self::wrap( array(
+                'content'         => $output,
+                'class'           => $wrap_class,
+                'element_require' => $args['element_require'],
+                'argument_id'     => $args['id'],
+                'wrap_attributes' => $args['wrap_attributes'],
+            ) );
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function radio( $args = array() ) {
+        $defaults = array(
+            'class'            => '',
+            'wrap_class'       => '',
+            'id'               => '',
+            'title'            => '',
+            'horizontal'       => false,
+            // sets the lable horizontal
+            'value'            => '',
+            'label'            => '',
+            'label_class'      => '',
+            'label_type'       => '',
+            'label_col'        => '',
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'help_text'        => '',
+            'inline'           => true,
+            'required'         => false,
+            'options'          => array(),
+            'icon'             => '',
+            'no_wrap'          => false,
+            'element_require'  => '',
+            // [%element_id%] == "1"
+            'extra_attributes' => array(),
+            // an array of extra attributes
+            'wrap_attributes'  => array()
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        // for now lets use horizontal for floating
+        if ( $args['label_type'] == 'floating' ) {
+            $args['label_type'] = 'horizontal';
+        }
+
+        $label_args = array(
+            'title'      => $args['label'],
+            'class'      => $args['label_class'] . " pt-0 ",
+            'label_type' => $args['label_type'],
+            'label_col'  => $args['label_col']
+        );
+
+        $output = '';
+
+
+        // label before
+        if ( ! empty( $args['label'] ) ) {
+            $output .= self::label( $label_args, 'radio' );
+        }
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+            $output .= '<div class="' . $input_col . '">';
+        }
+
+        if ( ! empty( $args['options'] ) ) {
+            $count = 0;
+            foreach ( $args['options'] as $value => $label ) {
+                $option_args            = $args;
+                $option_args['value']   = $value;
+                $option_args['label']   = $label;
+                $option_args['checked'] = $value == $args['value'] ? true : false;
+                $output .= self::radio_option( $option_args, $count );
+                $count ++;
+            }
+        }
+
+        // help text
+        $help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
+        $output .= $help_text;
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $output .= '</div>';
+        }
+
+        // wrap
+        $wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
+        $wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+        $output     = self::wrap( array(
+            'content'         => $output,
+            'class'           => $wrap_class,
+            'element_require' => $args['element_require'],
+            'argument_id'     => $args['id'],
+            'wrap_attributes' => $args['wrap_attributes'],
+        ) );
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function radio_option( $args = array(), $count = '' ) {
+        $defaults = array(
+            'class'            => '',
+            'id'               => '',
+            'title'            => '',
+            'value'            => '',
+            'required'         => false,
+            'inline'           => true,
+            'label'            => '',
+            'options'          => array(),
+            'icon'             => '',
+            'no_wrap'          => false,
+            'extra_attributes' => array() // an array of extra attributes
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        $output = '';
+
+        // open/type
+        $output .= '<input type="radio"';
+
+        // class
+        $output .= ' class="form-check-input" ';
+
+        // name
+        if ( ! empty( $args['name'] ) ) {
+            $output .= AUI_Component_Helper::name( $args['name'] );
+        }
+
+        // id
+        if ( ! empty( $args['id'] ) ) {
+            $output .= AUI_Component_Helper::id( $args['id'] . $count );
+        }
+
+        // title
+        if ( ! empty( $args['title'] ) ) {
+            $output .= AUI_Component_Helper::title( $args['title'] );
+        }
+
+        // value
+        if ( isset( $args['value'] ) ) {
+            $output .= AUI_Component_Helper::value( $args['value'] );
+        }
+
+        // checked, for radio and checkboxes
+        if ( $args['checked'] ) {
+            $output .= ' checked ';
+        }
+
+        // data-attributes
+        $output .= AUI_Component_Helper::data_attributes( $args );
+
+        // aria-attributes
+        $output .= AUI_Component_Helper::aria_attributes( $args );
+
+        // extra attributes
+        if ( ! empty( $args['extra_attributes'] ) ) {
+            $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+        }
+
+        // required
+        if ( ! empty( $args['required'] ) ) {
+            $output .= ' required ';
+        }
+
+        // close opening tag
+        $output .= ' >';
+
+        // label
+        if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+        } elseif ( ! empty( $args['label'] ) ) {
+            $output .= self::label( array(
+                'title' => $args['label'],
+                'for'   => $args['id'] . $count,
+                'class' => 'form-check-label'
+            ), 'radio' );
+        }
+
+        // wrap
+        if ( ! $args['no_wrap'] ) {
+            $wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
+
+            // Unique wrap class
+            $uniq_class = 'fwrap';
+            if ( ! empty( $args['name'] ) ) {
+                $uniq_class .= '-' . $args['name'];
+            } else if ( ! empty( $args['id'] ) ) {
+                $uniq_class .= '-' . $args['id'];
+            }
+
+            if ( isset( $args['value'] ) || $args['value'] !== "" ) {
+                $uniq_class .= '-' . $args['value'];
+            } else {
+                $uniq_class .= '-' . $count;
+            }
+            $wrap_class .= ' ' . sanitize_html_class( $uniq_class );
+
+            $output = self::wrap( array(
+                'content' => $output,
+                'class'   => $wrap_class
+            ) );
+        }
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +284 added lines, -284 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function input( $args = array() ) {
+	public static function input($args = array()) {
 		$defaults = array(
 			'type'                     => 'text',
 			'name'                     => '',
@@ -63,13 +63,13 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( ! empty( $args['type'] ) ) {
+		if (!empty($args['type'])) {
 			// hidden label option needs to be empty
 			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
-			$type = sanitize_html_class( $args['type'] );
+			$type = sanitize_html_class($args['type']);
 
 			$help_text   = '';
 			$label       = '';
@@ -83,19 +83,19 @@ 
 			);
 
 			// floating labels need label after
-			if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
+			if ($args['label_type'] == 'floating' && $type != 'checkbox') {
 				$label_after         = true;
 				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 			}
 
 			// Some special sauce for files
-			if ( $type == 'file' ) {
+			if ($type == 'file') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-file-input ';
-			} elseif ( $type == 'checkbox' ) {
+			} elseif ($type == 'checkbox') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-control-input ';
-			} elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
+			} elseif ($type == 'datepicker' || $type == 'timepicker') {
 				$type = 'text';
 				//$args['class'] .= ' aui-flatpickr bg-initial ';
 				$args['class'] .= ' bg-initial ';
@@ -104,7 +104,7 @@ 
 				// enqueue the script
 				$aui_settings = AyeCode_UI_Settings::instance();
 				$aui_settings->enqueue_flatpickr();
-			} elseif ( $type == 'iconpicker' ) {
+			} elseif ($type == 'iconpicker') {
 				$type = 'text';
 				//$args['class'] .= ' aui-flatpickr bg-initial ';
 //				$args['class'] .= ' bg-initial ';
@@ -119,8 +119,8 @@ 
 				$aui_settings->enqueue_iconpicker();
 			}
 
-			if ( $type == 'checkbox' && !empty($args['name'] ) && strpos($args['name'], '[') === false ) {
-				$output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+			if ($type == 'checkbox' && !empty($args['name']) && strpos($args['name'], '[') === false) {
+				$output .= '<input type="hidden" name="' . esc_attr($args['name']) . '" value="0" />';
 			}
 
 
@@ -128,88 +128,88 @@ 
 			$output .= '<input type="' . $type . '" ';
 
 			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			if (isset($args['placeholder']) && '' != $args['placeholder']) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// value
-			if ( ! empty( $args['value'] ) ) {
-				$output .= AUI_Component_Helper::value( $args['value'] );
+			if (!empty($args['value'])) {
+				$output .= AUI_Component_Helper::value($args['value']);
 			}
 
 			// checked, for radio and checkboxes
-			if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
+			if (($type == 'checkbox' || $type == 'radio') && $args['checked']) {
 				$output .= ' checked ';
 			}
 
 			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($args['validation_text']) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . esc_attr($args['validation_pattern']) . '" ';
 			}
 
 			// step (for numbers)
-			if ( ! empty( $args['step'] ) ) {
+			if (!empty($args['step'])) {
 				$output .= ' step="' . $args['step'] . '" ';
 			}
 
 			// required
-			if ( ! empty( $args['required'] ) ) {
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
 			$output .= ' class="form-control ' . $class . '" ';
 
 			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes( $args );
+			$output .= AUI_Component_Helper::data_attributes($args);
 
 			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			if (!empty($args['extra_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
 			// close
 			$output .= ' >';
 
 			// help text
-			if ( ! empty( $args['help_text'] ) ) {
-				$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+			if (!empty($args['help_text'])) {
+				$help_text = AUI_Component_Helper::help_text($args['help_text']);
 			}
 
 			// label
-			if ( ! empty( $args['label'] ) ) {
+			if (!empty($args['label'])) {
 				$label_base_class = '';
-				if ( $type == 'file' ) {
+				if ($type == 'file') {
 					$label_base_class = ' custom-file-label';
-				} elseif ( $type == 'checkbox' ) {
-					if ( ! empty( $args['label_force_left'] ) ) {
-						$label_args['title'] = wp_kses_post( $args['help_text'] );
+				} elseif ($type == 'checkbox') {
+					if (!empty($args['label_force_left'])) {
+						$label_args['title'] = wp_kses_post($args['help_text']);
 						$help_text = '';
 						//$label_args['class'] .= ' d-inline ';
 						$args['wrap_class'] .= ' align-items-center ';
-					}else{
+					} else {
 
 					}
 
@@ -217,45 +217,45 @@ 
 				}
 				$label_args['class'] .= $label_base_class;
 				$temp_label_args = $label_args;
-				if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
-				$label = self::label( $temp_label_args, $type );
+				if (!empty($args['label_force_left'])) {$temp_label_args['class'] = $label_base_class . " text-muted"; }
+				$label = self::label($temp_label_args, $type);
 			}
 
 
 
 
 			// set help text in the correct position
-			if ( $label_after ) {
+			if ($label_after) {
 				$output .= $label . $help_text;
 			}
 
 			// some input types need a separate wrap
-			if ( $type == 'file' ) {
-				$output = self::wrap( array(
+			if ($type == 'file') {
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => 'form-group custom-file'
-				) );
-			} elseif ( $type == 'checkbox' ) {
+				));
+			} elseif ($type == 'checkbox') {
 
 				$label_args['title'] = $args['label'];
-				$label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
-				$label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
-				$switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
-				$wrap_class = $args['switch'] ? 'custom-switch'.$switch_size_class : 'custom-checkbox';
-				if ( ! empty( $args['label_force_left'] ) ) {
+				$label_col = AUI_Component_Helper::get_column_class($args['label_col'], 'label');
+				$label = !empty($args['label_force_left']) ? self::label($label_args, 'cb') : '<div class="' . $label_col . ' col-form-label"></div>';
+				$switch_size_class = $args['switch'] && !is_bool($args['switch']) ? ' custom-switch-' . esc_attr($args['switch']) : '';
+				$wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class : 'custom-checkbox';
+				if (!empty($args['label_force_left'])) {
 					$wrap_class .= ' d-flex align-content-center';
-					$label = str_replace("custom-control-label","", self::label( $label_args, 'cb' ) );
+					$label = str_replace("custom-control-label", "", self::label($label_args, 'cb'));
 				}
-				$output     = self::wrap( array(
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => 'custom-control ' . $wrap_class
-				) );
+				));
 
-				if ( $args['label_type'] == 'horizontal' ) {
-					$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+				if ($args['label_type'] == 'horizontal') {
+					$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 					$output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
 				}
-			} elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
+			} elseif ($type == 'password' && $args['password_toggle'] && !$args['input_group_right']) {
 
 
 				// allow password field to toggle view
@@ -269,62 +269,62 @@ 
 			}
 
 			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
+			if ($args['input_group_left'] || $args['input_group_right']) {
+				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content'                 => $output,
 						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_left'        => $args['input_group_left'],
 						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content'                  => $output,
 						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_right'        => $args['input_group_right'],
 						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
 
-			if ( ! $label_after ) {
+			if (!$label_after) {
 				$output .= $help_text;
 			}
 
 
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$output = self::wrap( array(
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$output = self::wrap(array(
 					'content' => $output,
-					'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-				) );
+					'class'   => AUI_Component_Helper::get_column_class($args['label_col'], 'input')
+				));
 			}
 
-			if ( ! $label_after ) {
+			if (!$label_after) {
 				$output = $label . $output;
 			}
 
 			// wrap
-			if ( ! $args['no_wrap'] ) {
+			if (!$args['no_wrap']) {
 				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
 				$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-				$output           = self::wrap( array(
+				$wrap_class       = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+				$output           = self::wrap(array(
 					'content'         => $output,
 					'class'           => $wrap_class,
 					'element_require' => $args['element_require'],
 					'argument_id'     => $args['id'],
 					'wrap_attributes' => $args['wrap_attributes'],
-				) );
+				));
 			}
 		}
 
 		return $output;
 	}
 
-	public static function label( $args = array(), $type = '' ) {
+	public static function label($args = array(), $type = '') {
 		//<label for="exampleInputEmail1">Email address</label>
 		$defaults = array(
 			'title'      => 'div',
@@ -337,33 +337,33 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
-		if ( $args['title'] ) {
+		if ($args['title']) {
 
 			// maybe hide labels //@todo set a global option for visibility class
-			if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
+			if ($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type'])) {
 				$class = $args['class'];
 			} else {
 				$class = 'sr-only ' . $args['class'];
 			}
 
 			// maybe horizontal
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label';
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$class .= ' ' . AUI_Component_Helper::get_column_class($args['label_col'], 'label') . ' col-form-label';
 			}
 
 			// open
 			$output .= '<label ';
 
 			// for
-			if ( ! empty( $args['for'] ) ) {
-				$output .= ' for="' . esc_attr( $args['for'] ) . '" ';
+			if (!empty($args['for'])) {
+				$output .= ' for="' . esc_attr($args['for']) . '" ';
 			}
 
 			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
+			$class = $class ? AUI_Component_Helper::esc_classes($class) : '';
 			$output .= ' class="' . $class . '" ';
 
 			// close
@@ -371,8 +371,8 @@ 
 
 
 			// title, don't escape fully as can contain html
-			if ( ! empty( $args['title'] ) ) {
-				$output .= wp_kses_post( $args['title'] );
+			if (!empty($args['title'])) {
+				$output .= wp_kses_post($args['title']);
 			}
 
 			// close wrap
@@ -392,7 +392,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function wrap( $args = array() ) {
+	public static function wrap($args = array()) {
 		$defaults = array(
 			'type'                     => 'div',
 			'class'                    => 'form-group',
@@ -409,31 +409,31 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( $args['type'] ) {
+		if ($args['type']) {
 
 			// open
-			$output .= '<' . sanitize_html_class( $args['type'] );
+			$output .= '<' . sanitize_html_class($args['type']);
 
 			// element require
-			if ( ! empty( $args['element_require'] ) ) {
-				$output .= AUI_Component_Helper::element_require( $args['element_require'] );
+			if (!empty($args['element_require'])) {
+				$output .= AUI_Component_Helper::element_require($args['element_require']);
 				$args['class'] .= " aui-conditional-field";
 			}
 
 			// argument_id
-			if ( ! empty( $args['argument_id'] ) ) {
-				$output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
+			if (!empty($args['argument_id'])) {
+				$output .= ' data-argument="' . esc_attr($args['argument_id']) . '"';
 			}
 
 			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
 			$output .= ' class="' . $class . '" ';
 
 			// Attributes
-			if ( ! empty( $args['wrap_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
+			if (!empty($args['wrap_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['wrap_attributes']);
 			}
 
 			// close wrap
@@ -441,9 +441,9 @@ 
 
 
 			// Input group left
-			if ( ! empty( $args['input_group_left'] ) ) {
-				$position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+			if (!empty($args['input_group_left'])) {
+				$position_class   = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
+				$input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
 				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
 			}
 
@@ -451,15 +451,15 @@ 
 			$output .= $args['content'];
 
 			// Input group right
-			if ( ! empty( $args['input_group_right'] ) ) {
-				$position_class    = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+			if (!empty($args['input_group_right'])) {
+				$position_class    = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
+				$input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
 				$output .= '<div class="input-group-append ' . $position_class . '">' . $input_group_right . '</div>';
 			}
 
 
 			// close wrap
-			$output .= '</' . sanitize_html_class( $args['type'] ) . '>';
+			$output .= '</' . sanitize_html_class($args['type']) . '>';
 
 
 		} else {
@@ -476,7 +476,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function textarea( $args = array() ) {
+	public static function textarea($args = array()) {
 		$defaults = array(
 			'name'               => '',
 			'class'              => '',
@@ -513,28 +513,28 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// hidden label option needs to be empty
 		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
 		// floating labels don't work with wysiwyg so set it as top
-		if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
+		if ($args['label_type'] == 'floating' && !empty($args['wysiwyg'])) {
 			$args['label_type'] = 'top';
 		}
 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
+		if ($args['label_type'] == 'floating' && empty($args['wysiwyg'])) {
 			$label_after         = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -542,34 +542,34 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+		if ($args['label_type'] == 'horizontal') {
+			$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 			$output .= '<div class="' . $input_col . '">';
 		}
 
-		if ( ! empty( $args['wysiwyg'] ) ) {
+		if (!empty($args['wysiwyg'])) {
 			ob_start();
 			$content   = $args['value'];
-			$editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
+			$editor_id = !empty($args['id']) ? sanitize_html_class($args['id']) : 'wp_editor';
 			$settings  = array(
-				'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
+				'textarea_rows' => !empty(absint($args['rows'])) ? absint($args['rows']) : 4,
 				'quicktags'     => false,
 				'media_buttons' => false,
 				'editor_class'  => 'form-control',
-				'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
+				'textarea_name' => !empty($args['name']) ? sanitize_html_class($args['name']) : sanitize_html_class($args['id']),
 				'teeny'         => true,
 			);
 
 			// maybe set settings if array
-			if ( is_array( $args['wysiwyg'] ) ) {
-				$settings = wp_parse_args( $args['wysiwyg'], $settings );
+			if (is_array($args['wysiwyg'])) {
+				$settings = wp_parse_args($args['wysiwyg'], $settings);
 			}
 
-			wp_editor( $content, $editor_id, $settings );
+			wp_editor($content, $editor_id, $settings);
 			$output .= ob_get_clean();
 		} else {
 
@@ -577,65 +577,65 @@ 
 			$output .= '<textarea ';
 
 			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			if (isset($args['placeholder']) && '' != $args['placeholder']) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( $args['validation_text'] ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($args['validation_text']) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . esc_attr($args['validation_pattern']) . '" ';
 			}
 
 			// required
-			if ( ! empty( $args['required'] ) ) {
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// rows
-			if ( ! empty( $args['rows'] ) ) {
-				$output .= ' rows="' . absint( $args['rows'] ) . '" ';
+			if (!empty($args['rows'])) {
+				$output .= ' rows="' . absint($args['rows']) . '" ';
 			}
 
 
 			// class
-			$class = ! empty( $args['class'] ) ? $args['class'] : '';
+			$class = !empty($args['class']) ? $args['class'] : '';
 			$output .= ' class="form-control ' . $class . '" ';
 
 			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			if (!empty($args['extra_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
 			// close tag
 			$output .= ' >';
 
 			// value
-			if ( ! empty( $args['value'] ) ) {
-				if ( ! empty( $args['allow_tags'] ) ) {
-					$output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
+			if (!empty($args['value'])) {
+				if (!empty($args['allow_tags'])) {
+					$output .= AUI_Component_Helper::sanitize_html_field($args['value'], $args); // Sanitize HTML.
 				} else {
-					$output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
+					$output .= AUI_Component_Helper::sanitize_textarea_field($args['value']);
 				}
 			}
 
@@ -644,23 +644,23 @@ 
 
 
 			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
+			if ($args['input_group_left'] || $args['input_group_right']) {
+				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content'                 => $output,
 						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_left'        => $args['input_group_left'],
 						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content'                  => $output,
 						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_right'        => $args['input_group_right'],
 						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
@@ -668,7 +668,7 @@ 
 
 		}
 
-		if ( ! empty( $args['label'] ) && $label_after ) {
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -676,32 +676,32 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$output .= AUI_Component_Helper::help_text( $args['help_text'] );
+		if (!empty($args['help_text'])) {
+			$output .= AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
+		if (!$args['no_wrap']) {
 			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : 'form-group';
 			$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output           = self::wrap( array(
+			$wrap_class       = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			$output           = self::wrap(array(
 				'content'         => $output,
 				'class'           => $wrap_class,
 				'element_require' => $args['element_require'],
 				'argument_id'     => $args['id'],
 				'wrap_attributes' => $args['wrap_attributes'],
-			) );
+			));
 		}
 
 
@@ -715,7 +715,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function select( $args = array() ) {
+	public static function select($args = array()) {
 		$defaults = array(
 			'class'            => '',
 			'wrap_class'       => '',
@@ -752,11 +752,11 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// for now lets hide floating labels
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$args['label_type'] = 'hidden';
 		}
 
@@ -767,31 +767,31 @@ 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$label_after         = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// Maybe setup select2
 		$is_select2 = false;
-		if ( ! empty( $args['select2'] ) ) {
+		if (!empty($args['select2'])) {
 			$args['class'] .= ' aui-select2';
 			$is_select2 = true;
-		} elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
+		} elseif (strpos($args['class'], 'aui-select2') !== false) {
 			$is_select2 = true;
 		}
 
 		// select2 tags
-		if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
+		if (!empty($args['select2']) && $args['select2'] === 'tags') { // triple equals needed here for some reason
 			$args['data-tags']             = 'true';
 			$args['data-token-separators'] = "[',']";
 			$args['multiple']              = true;
 		}
 
 		// select2 placeholder
-		if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
-			$args['data-placeholder'] = esc_attr( $args['placeholder'] );
-			$args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
+		if ($is_select2 && isset($args['placeholder']) && '' != $args['placeholder'] && empty($args['data-placeholder'])) {
+			$args['data-placeholder'] = esc_attr($args['placeholder']);
+			$args['data-allow-clear'] = isset($args['data-allow-clear']) ? (bool) $args['data-allow-clear'] : true;
 		}
 
 
@@ -803,61 +803,61 @@ 
 //		}
 
 		// Set hidden input to save empty value for multiselect.
-		if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
-			$output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value=""/>';
+		if (!empty($args['multiple']) && !empty($args['name'])) {
+			$output .= '<input type="hidden" ' . AUI_Component_Helper::name($args['name']) . ' value=""/>';
 		}
 
 		// open/type
 		$output .= '<select ';
 
 		// style
-		if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
+		if ($is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
 			$output .= " style='width:100%;' ";
 		}
 
 		// element require
-		if ( ! empty( $args['element_require'] ) ) {
-			$output .= AUI_Component_Helper::element_require( $args['element_require'] );
+		if (!empty($args['element_require'])) {
+			$output .= AUI_Component_Helper::element_require($args['element_require']);
 			$args['class'] .= " aui-conditional-field";
 		}
 
 		// class
-		$class = ! empty( $args['class'] ) ? $args['class'] : '';
-		$output .= AUI_Component_Helper::class_attr( 'custom-select ' . $class );
+		$class = !empty($args['class']) ? $args['class'] : '';
+		$output .= AUI_Component_Helper::class_attr('custom-select ' . $class);
 
 		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name'], $args['multiple']);
 		}
 
 		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] );
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id']);
 		}
 
 		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
+		if (!empty($args['title'])) {
+			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
+		$output .= AUI_Component_Helper::data_attributes($args);
 
 		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
+		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		if (!empty($args['extra_attributes'])) {
+			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if ( ! empty( $args['required'] ) ) {
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
 		// multiple
-		if ( ! empty( $args['multiple'] ) ) {
+		if (!empty($args['multiple'])) {
 			$output .= ' multiple ';
 		}
 
@@ -865,50 +865,50 @@ 
 		$output .= ' >';
 
 		// placeholder
-		if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
-			$output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
-		} elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
+		if (isset($args['placeholder']) && '' != $args['placeholder'] && !$is_select2) {
+			$output .= '<option value="" disabled selected hidden>' . esc_attr($args['placeholder']) . '</option>';
+		} elseif ($is_select2 && !empty($args['placeholder'])) {
 			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
 		}
 
 		// Options
-		if ( ! empty( $args['options'] ) ) {
+		if (!empty($args['options'])) {
 
-			if ( ! is_array( $args['options'] ) ) {
+			if (!is_array($args['options'])) {
 				$output .= $args['options']; // not the preferred way but an option
 			} else {
-				foreach ( $args['options'] as $val => $name ) {
+				foreach ($args['options'] as $val => $name) {
 					$selected = '';
-					if ( is_array( $name ) ) {
-						if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
+					if (is_array($name)) {
+						if (isset($name['optgroup']) && ($name['optgroup'] == 'start' || $name['optgroup'] == 'end')) {
+							$option_label = isset($name['label']) ? $name['label'] : '';
 
-							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
+							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
 						} else {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-							$option_value = isset( $name['value'] ) ? $name['value'] : '';
-							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
-							if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
-								$selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
-							} elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
-								$selected = selected( $option_value, $args['value'], false );
+							$option_label = isset($name['label']) ? $name['label'] : '';
+							$option_value = isset($name['value']) ? $name['value'] : '';
+							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes($name['extra_attributes']) : '';
+							if (!empty($args['multiple']) && !empty($args['value']) && is_array($args['value'])) {
+								$selected = in_array($option_value, stripslashes_deep($args['value'])) ? "selected" : "";
+							} elseif (!empty($args['value'])) {
+								$selected = selected($option_value, stripslashes_deep($args['value']), false);
+							} elseif (empty($args['value']) && $args['value'] === $option_value) {
+								$selected = selected($option_value, $args['value'], false);
 							}
 
-							$output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
+							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . ' ' . $extra_attributes . '>' . $option_label . '</option>';
 						}
 					} else {
-						if ( ! empty( $args['value'] ) ) {
-							if ( is_array( $args['value'] ) ) {
-								$selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $args['value'], $val, false );
+						if (!empty($args['value'])) {
+							if (is_array($args['value'])) {
+								$selected = in_array($val, $args['value']) ? 'selected="selected"' : '';
+							} elseif (!empty($args['value'])) {
+								$selected = selected($args['value'], $val, false);
 							}
-						} elseif ( $args['value'] === $val ) {
-							$selected = selected( $args['value'], $val, false );
+						} elseif ($args['value'] === $val) {
+							$selected = selected($args['value'], $val, false);
 						}
-						$output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+						$output .= '<option value="' . esc_attr($val) . '" ' . $selected . '>' . esc_attr($name) . '</option>';
 					}
 				}
 			}
@@ -921,8 +921,8 @@ 
 		$label = '';
 		$help_text = '';
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -930,49 +930,49 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$label = self::label( $label_args );
+			$label = self::label($label_args);
 		}
 
 		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+		if (!empty($args['help_text'])) {
+			$help_text = AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// input group wraps
-		if ( $args['input_group_left'] || $args['input_group_right'] ) {
-			$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-			if ( $args['input_group_left'] ) {
-				$output = self::wrap( array(
+		if ($args['input_group_left'] || $args['input_group_right']) {
+			$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+			if ($args['input_group_left']) {
+				$output = self::wrap(array(
 					'content'                 => $output,
 					'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 					'input_group_left'        => $args['input_group_left'],
 					'input_group_left_inside' => $args['input_group_left_inside']
-				) );
+				));
 			}
-			if ( $args['input_group_right'] ) {
-				$output = self::wrap( array(
+			if ($args['input_group_right']) {
+				$output = self::wrap(array(
 					'content'                  => $output,
 					'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 					'input_group_right'        => $args['input_group_right'],
 					'input_group_right_inside' => $args['input_group_right_inside']
-				) );
+				));
 			}
 
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output .= $help_text;
 		}
 
 
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output = self::wrap( array(
+		if ($args['label_type'] == 'horizontal') {
+			$output = self::wrap(array(
 				'content' => $output,
-				'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-			) );
+				'class'   => AUI_Component_Helper::get_column_class($args['label_col'], 'input')
+			));
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output = $label . $output;
 		}
 
@@ -983,16 +983,16 @@ 
 
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
+		if (!$args['no_wrap']) {
 			$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
-			$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output     = self::wrap( array(
+			$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			$output     = self::wrap(array(
 				'content'         => $output,
 				'class'           => $wrap_class,
 				'element_require' => $args['element_require'],
 				'argument_id'     => $args['id'],
 				'wrap_attributes' => $args['wrap_attributes'],
-			) );
+			));
 		}
 
 
@@ -1006,7 +1006,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio( $args = array() ) {
+	public static function radio($args = array()) {
 		$defaults = array(
 			'class'            => '',
 			'wrap_class'       => '',
@@ -1036,10 +1036,10 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		// for now lets use horizontal for floating
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$args['label_type'] = 'horizontal';
 		}
 
@@ -1054,47 +1054,47 @@ 
 
 
 		// label before
-		if ( ! empty( $args['label'] ) ) {
-			$output .= self::label( $label_args, 'radio' );
+		if (!empty($args['label'])) {
+			$output .= self::label($label_args, 'radio');
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+		if ($args['label_type'] == 'horizontal') {
+			$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 			$output .= '<div class="' . $input_col . '">';
 		}
 
-		if ( ! empty( $args['options'] ) ) {
+		if (!empty($args['options'])) {
 			$count = 0;
-			foreach ( $args['options'] as $value => $label ) {
+			foreach ($args['options'] as $value => $label) {
 				$option_args            = $args;
 				$option_args['value']   = $value;
 				$option_args['label']   = $label;
 				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option( $option_args, $count );
-				$count ++;
+				$output .= self::radio_option($option_args, $count);
+				$count++;
 			}
 		}
 
 		// help text
-		$help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
+		$help_text = !empty($args['help_text']) ? AUI_Component_Helper::help_text($args['help_text']) : '';
 		$output .= $help_text;
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 		// wrap
 		$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
-		$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-		$output     = self::wrap( array(
+		$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+		$output     = self::wrap(array(
 			'content'         => $output,
 			'class'           => $wrap_class,
 			'element_require' => $args['element_require'],
 			'argument_id'     => $args['id'],
 			'wrap_attributes' => $args['wrap_attributes'],
-		) );
+		));
 
 
 		return $output;
@@ -1107,7 +1107,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio_option( $args = array(), $count = '' ) {
+	public static function radio_option($args = array(), $count = '') {
 		$defaults = array(
 			'class'            => '',
 			'id'               => '',
@@ -1125,7 +1125,7 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$output = '';
 
@@ -1136,43 +1136,43 @@ 
 		$output .= ' class="form-check-input" ';
 
 		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'] );
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name']);
 		}
 
 		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] . $count );
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id'] . $count);
 		}
 
 		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
+		if (!empty($args['title'])) {
+			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// value
-		if ( isset( $args['value'] ) ) {
-			$output .= AUI_Component_Helper::value( $args['value'] );
+		if (isset($args['value'])) {
+			$output .= AUI_Component_Helper::value($args['value']);
 		}
 
 		// checked, for radio and checkboxes
-		if ( $args['checked'] ) {
+		if ($args['checked']) {
 			$output .= ' checked ';
 		}
 
 		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
+		$output .= AUI_Component_Helper::data_attributes($args);
 
 		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
+		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		if (!empty($args['extra_attributes'])) {
+			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if ( ! empty( $args['required'] ) ) {
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
@@ -1180,38 +1180,38 @@ 
 		$output .= ' >';
 
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) ) {
-			$output .= self::label( array(
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label'])) {
+			$output .= self::label(array(
 				'title' => $args['label'],
 				'for'   => $args['id'] . $count,
 				'class' => 'form-check-label'
-			), 'radio' );
+			), 'radio');
 		}
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
+		if (!$args['no_wrap']) {
 			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
 
 			// Unique wrap class
 			$uniq_class = 'fwrap';
-			if ( ! empty( $args['name'] ) ) {
+			if (!empty($args['name'])) {
 				$uniq_class .= '-' . $args['name'];
-			} else if ( ! empty( $args['id'] ) ) {
+			} else if (!empty($args['id'])) {
 				$uniq_class .= '-' . $args['id'];
 			}
 
-			if ( isset( $args['value'] ) || $args['value'] !== "" ) {
+			if (isset($args['value']) || $args['value'] !== "") {
 				$uniq_class .= '-' . $args['value'];
 			} else {
 				$uniq_class .= '-' . $count;
 			}
-			$wrap_class .= ' ' . sanitize_html_class( $uniq_class );
+			$wrap_class .= ' ' . sanitize_html_class($uniq_class);
 
-			$output = self::wrap( array(
+			$output = self::wrap(array(
 				'content' => $output,
 				'class'   => $wrap_class
-			) );
+			));
 		}
 
 		return $output;

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

Indentation +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -17,10 +17,10 @@ 
 class GetPaid_Meta_Box_Invoice_Address {
 
     /**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
 
         // Prepare the invoice.
@@ -366,18 +366,18 @@ 
     }
 
     /**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 */
-	public static function save( $post_id ) {
+     * Save meta box data.
+     *
+     * @param int $post_id
+     */
+    public static function save( $post_id ) {
 
         // Prepare the invoice.
         $invoice = new WPInv_Invoice( $post_id );
 
         // Load new data.
         $invoice->set_props(
-			array(
+            array(
                 'template'             => isset( $_POST['wpinv_template'] ) ? wpinv_clean( $_POST['wpinv_template'] ) : null,
                 'email_cc'             => isset( $_POST['wpinv_cc'] ) ? wpinv_clean( $_POST['wpinv_cc'] ) : null,
                 'disable_taxes'        => ! empty( $_POST['disable_taxes'] ),
@@ -400,7 +400,7 @@ 
                 'due_date'             => isset( $_POST['wpinv_due_date'] ) ? wpinv_clean( $_POST['wpinv_due_date'] ) : null,
                 'number'               => isset( $_POST['wpinv_number'] ) ? wpinv_clean( $_POST['wpinv_number'] ) : null,
                 'status'               => isset( $_POST['wpinv_status'] ) ? wpinv_clean( $_POST['wpinv_status'] ) : null,
-			)
+            )
         );
 
         // Discount code.
@@ -465,6 +465,6 @@ 
         }
 
         // Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
-	}
+        do_action( 'wpinv_invoice_metabox_saved', $invoice );
+    }
 }

Spacing +97 added lines, -97 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,14 +21,14 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Prepare the invoice.
-        $invoice  = new WPInv_Invoice( $post );
-        $customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-        $customer = new WP_User( $customer );
-        $display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+        $invoice  = new WPInv_Invoice($post);
+        $customer = $invoice->exists() ? $invoice->get_user_id('edit') : get_current_user_id();
+        $customer = new WP_User($customer);
+        $display  = sprintf(_x('%1$s (%2$s)', 'user dropdown', 'invoicing'), $customer->display_name, $customer->user_email);
+        wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
 
         ?>
 
@@ -43,11 +43,11 @@ 
                         <div class="col-12 col-sm-6">
                             <div id="getpaid-invoice-user-id-wrapper" class="form-group">
                                 <div>
-                                    <label for="post_author_override"><?php esc_html_e( 'Customer', 'invoicing' );?></label>
+                                    <label for="post_author_override"><?php esc_html_e('Customer', 'invoicing'); ?></label>
                                 </div>
                                 <div>
-                                    <select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e( 'Search for a customer by email or name', 'invoicing' ); ?>">
-                                        <option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html( $display ); ?> </option>)
+                                    <select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e('Search for a customer by email or name', 'invoicing'); ?>">
+                                        <option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html($display); ?> </option>)
                                     </select>
                                 </div>
                             </div>
@@ -60,7 +60,7 @@ 
                                             'type'        => 'text',
                                             'id'          => 'getpaid-invoice-new-user-email',
                                             'name'        => 'wpinv_email',
-                                            'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+                                            'label'       => __('Email', 'invoicing') . '<span class="required">*</span>',
                                             'label_type'  => 'vertical',
                                             'placeholder' => 'john@doe.com',
                                             'class'       => 'form-control-sm',
@@ -70,18 +70,18 @@ 
                             </div>
                         </div>
                         <div class="col-12 col-sm-6 form-group mt-sm-4">
-                            <?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
+                            <?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
                                 <a id="getpaid-invoice-fill-user-details" class="button button-small button-secondary" href="javascript:void(0)">
                                     <i aria-hidden="true" class="fa fa-refresh"></i>
-                                    <?php esc_html_e( 'Fill User Details', 'invoicing' );?>
+                                    <?php esc_html_e('Fill User Details', 'invoicing'); ?>
                                 </a>
                                 <a id="getpaid-invoice-create-new-user-button" class="button button-small button-secondary" href="javascript:void(0)">
                                     <i aria-hidden="true" class="fa fa-plus"></i>
-                                    <?php esc_html_e( 'Add New User', 'invoicing' );?>
+                                    <?php esc_html_e('Add New User', 'invoicing'); ?>
                                 </a>
                                 <a id="getpaid-invoice-cancel-create-new-user" class="button button-small button-secondary d-none" href="javascript:void(0)">
                                     <i aria-hidden="true" class="fa fa-close"></i>
-                                    <?php esc_html_e( 'Cancel', 'invoicing' );?>
+                                    <?php esc_html_e('Cancel', 'invoicing'); ?>
                                 </a>
                             <?php endif; ?>
                         </div>
@@ -94,11 +94,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_first_name',
                                         'name'        => 'wpinv_first_name',
-                                        'label'       => __( 'First Name', 'invoicing' ),
+                                        'label'       => __('First Name', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_first_name( 'edit' ),
+                                        'value'       => $invoice->get_first_name('edit'),
                                     )
                                 );
                             ?>
@@ -110,11 +110,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_last_name',
                                         'name'        => 'wpinv_last_name',
-                                        'label'       => __( 'Last Name', 'invoicing' ),
+                                        'label'       => __('Last Name', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_last_name( 'edit' ),
+                                        'value'       => $invoice->get_last_name('edit'),
                                     )
                                 );
                             ?>
@@ -129,11 +129,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_company',
                                         'name'        => 'wpinv_company',
-                                        'label'       => __( 'Company', 'invoicing' ),
+                                        'label'       => __('Company', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_company( 'edit' ),
+                                        'value'       => $invoice->get_company('edit'),
                                     )
                                 );
                             ?>
@@ -145,11 +145,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_vat_number',
                                         'name'        => 'wpinv_vat_number',
-                                        'label'       => __( 'Vat Number', 'invoicing' ),
+                                        'label'       => __('Vat Number', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-                                        'value'       => $invoice->get_vat_number( 'edit' ),
+                                        'value'       => $invoice->get_vat_number('edit'),
                                     )
                                 );
                             ?>
@@ -164,11 +164,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_address',
                                         'name'        => 'wpinv_address',
-                                        'label'       => __( 'Address', 'invoicing' ),
+                                        'label'       => __('Address', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_address( 'edit' ),
+                                        'value'       => $invoice->get_address('edit'),
                                     )
                                 );
                             ?>
@@ -180,11 +180,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_city',
                                         'name'        => 'wpinv_city',
-                                        'label'       => __( 'City', 'invoicing' ),
+                                        'label'       => __('City', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_city( 'edit' ),
+                                        'value'       => $invoice->get_city('edit'),
                                     )
                                 );
                             ?>
@@ -198,11 +198,11 @@ 
                                     array(
                                         'id'          => 'wpinv_country',
                                         'name'        => 'wpinv_country',
-                                        'label'       => __( 'Country', 'invoicing' ),
+                                        'label'       => __('Country', 'invoicing'),
                                         'label_type'  => 'vertical',
-                                        'placeholder' => __( 'Choose a country', 'invoicing' ),
+                                        'placeholder' => __('Choose a country', 'invoicing'),
                                         'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-                                        'value'       => $invoice->get_country( 'edit' ),
+                                        'value'       => $invoice->get_country('edit'),
                                         'options'     => wpinv_get_country_list(),
                                         'data-allow-clear' => 'false',
                                         'select2'          => true,
@@ -213,20 +213,20 @@ 
                         <div class="col-12 col-sm-6">
                             <?php
 
-                                $states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+                                $states = wpinv_get_country_states($invoice->get_country('edit'));
 
-                                if ( empty( $states ) ) {
+                                if (empty($states)) {
 
                                     echo aui()->input(
                                         array(
                                             'type'        => 'text',
                                             'id'          => 'wpinv_state',
                                             'name'        => 'wpinv_state',
-                                            'label'       => __( 'State', 'invoicing' ),
+                                            'label'       => __('State', 'invoicing'),
                                             'label_type'  => 'vertical',
                                             'placeholder' => '',
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_state( 'edit' ),
+                                            'value'       => $invoice->get_state('edit'),
                                         )
                                     );
 
@@ -236,11 +236,11 @@ 
                                         array(
                                             'id'          => 'wpinv_state',
                                             'name'        => 'wpinv_state',
-                                            'label'       => __( 'State', 'invoicing' ),
+                                            'label'       => __('State', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Select a state', 'invoicing' ),
+                                            'placeholder' => __('Select a state', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_state( 'edit' ),
+                                            'value'       => $invoice->get_state('edit'),
                                             'options'     => $states,
                                             'data-allow-clear' => 'false',
                                             'select2'          => true,
@@ -261,11 +261,11 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_zip',
                                         'name'        => 'wpinv_zip',
-                                        'label'       => __( 'Zip / Postal Code', 'invoicing' ),
+                                        'label'       => __('Zip / Postal Code', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_zip( 'edit' ),
+                                        'value'       => $invoice->get_zip('edit'),
                                     )
                                 );
                             ?>
@@ -277,19 +277,19 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_phone',
                                         'name'        => 'wpinv_phone',
-                                        'label'       => __( 'Phone', 'invoicing' ),
+                                        'label'       => __('Phone', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_phone( 'edit' ),
+                                        'value'       => $invoice->get_phone('edit'),
                                     )
                                 );
                             ?>
                         </div>
                     </div>
 
-                    <?php if ( ! apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) : ?>
-                        <?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
+                    <?php if (!apply_filters('getpaid_use_new_invoice_items_metabox', false)) : ?>
+                        <?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
 
                         <div class="row">
                             <div class="col-12 col-sm-6">
@@ -298,14 +298,14 @@ 
                                         array(
                                             'id'          => 'wpinv_template',
                                             'name'        => 'wpinv_template',
-                                            'label'       => __( 'Template', 'invoicing' ),
+                                            'label'       => __('Template', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Choose a template', 'invoicing' ),
+                                            'placeholder' => __('Choose a template', 'invoicing'),
                                             'class'       => 'form-control-sm',
-                                            'value'       => $invoice->get_template( 'edit' ),
+                                            'value'       => $invoice->get_template('edit'),
                                             'options'     => array(
-                                                'quantity' => __( 'Quantity', 'invoicing' ),
-                                                'hours'    => __( 'Hours', 'invoicing' ),
+                                                'quantity' => __('Quantity', 'invoicing'),
+                                                'hours'    => __('Hours', 'invoicing'),
                                                 //'amount'   => __( 'Amount Only', 'invoicing' ),
                                             ),
                                             'data-allow-clear' => 'false',
@@ -322,11 +322,11 @@ 
                                         array(
                                             'id'          => 'wpinv_currency',
                                             'name'        => 'wpinv_currency',
-                                            'label'       => __( 'Currency', 'invoicing' ),
+                                            'label'       => __('Currency', 'invoicing'),
                                             'label_type'  => 'vertical',
-                                            'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+                                            'placeholder' => __('Select Invoice Currency', 'invoicing'),
                                             'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-                                            'value'       => $invoice->get_currency( 'edit' ),
+                                            'value'       => $invoice->get_currency('edit'),
                                             'required'    => false,
                                             'data-allow-clear' => 'false',
                                             'select2'          => true,
@@ -338,7 +338,7 @@ 
                             </div>
                         </div>
 
-                        <?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
+                        <?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
                     <?php endif; ?>
 
                     <div class="row">
@@ -349,18 +349,18 @@ 
                                         'type'        => 'text',
                                         'id'          => 'wpinv_company_id',
                                         'name'        => 'wpinv_company_id',
-                                        'label'       => __( 'Company ID', 'invoicing' ),
+                                        'label'       => __('Company ID', 'invoicing'),
                                         'label_type'  => 'vertical',
                                         'placeholder' => '',
                                         'class'       => 'form-control-sm',
-                                        'value'       => $invoice->get_company_id( 'edit' ),
+                                        'value'       => $invoice->get_company_id('edit'),
                                     )
                                 );
                             ?>
                         </div>
                     </div>
 
-                    <?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
+                    <?php do_action('getpaid_after_metabox_invoice_address', $invoice); ?>
             </div>
         <?php
     }
@@ -370,51 +370,51 @@ 
 	 *
 	 * @param int $post_id
 	 */
-	public static function save( $post_id ) {
+	public static function save($post_id) {
 
         // Prepare the invoice.
-        $invoice = new WPInv_Invoice( $post_id );
+        $invoice = new WPInv_Invoice($post_id);
 
         // Load new data.
         $invoice->set_props(
 			array(
-                'template'             => isset( $_POST['wpinv_template'] ) ? wpinv_clean( $_POST['wpinv_template'] ) : null,
-                'email_cc'             => isset( $_POST['wpinv_cc'] ) ? wpinv_clean( $_POST['wpinv_cc'] ) : null,
-                'disable_taxes'        => ! empty( $_POST['disable_taxes'] ),
-                'currency'             => isset( $_POST['wpinv_currency'] ) ? wpinv_clean( $_POST['wpinv_currency'] ) : null,
-                'gateway'              => ( $invoice->needs_payment() && isset( $_POST['wpinv_gateway'] ) ) ? wpinv_clean( $_POST['wpinv_gateway'] ) : null,
-                'address'              => isset( $_POST['wpinv_address'] ) ? wpinv_clean( $_POST['wpinv_address'] ) : null,
-                'vat_number'           => isset( $_POST['wpinv_vat_number'] ) ? wpinv_clean( $_POST['wpinv_vat_number'] ) : null,
-                'company'              => isset( $_POST['wpinv_company'] ) ? wpinv_clean( $_POST['wpinv_company'] ) : null,
-                'company_id'           => isset( $_POST['wpinv_company_id'] ) ? wpinv_clean( $_POST['wpinv_company_id'] ) : null,
-                'zip'                  => isset( $_POST['wpinv_zip'] ) ? wpinv_clean( $_POST['wpinv_zip'] ) : null,
-                'state'                => isset( $_POST['wpinv_state'] ) ? wpinv_clean( $_POST['wpinv_state'] ) : null,
-                'city'                 => isset( $_POST['wpinv_city'] ) ? wpinv_clean( $_POST['wpinv_city'] ) : null,
-                'country'              => isset( $_POST['wpinv_country'] ) ? wpinv_clean( $_POST['wpinv_country'] ) : null,
-                'phone'                => isset( $_POST['wpinv_phone'] ) ? wpinv_clean( $_POST['wpinv_phone'] ) : null,
-                'first_name'           => isset( $_POST['wpinv_first_name'] ) ? wpinv_clean( $_POST['wpinv_first_name'] ) : null,
-                'last_name'            => isset( $_POST['wpinv_last_name'] ) ? wpinv_clean( $_POST['wpinv_last_name'] ) : null,
-                'author'               => isset( $_POST['post_author_override'] ) ? wpinv_clean( $_POST['post_author_override'] ) : null,
-                'date_created'         => isset( $_POST['date_created'] ) ? wpinv_clean( $_POST['date_created'] ) : null,
-                'date_completed'       => isset( $_POST['wpinv_date_completed'] ) ? wpinv_clean( $_POST['wpinv_date_completed'] ) : null,
-                'due_date'             => isset( $_POST['wpinv_due_date'] ) ? wpinv_clean( $_POST['wpinv_due_date'] ) : null,
-                'number'               => isset( $_POST['wpinv_number'] ) ? wpinv_clean( $_POST['wpinv_number'] ) : null,
-                'status'               => isset( $_POST['wpinv_status'] ) ? wpinv_clean( $_POST['wpinv_status'] ) : null,
+                'template'             => isset($_POST['wpinv_template']) ? wpinv_clean($_POST['wpinv_template']) : null,
+                'email_cc'             => isset($_POST['wpinv_cc']) ? wpinv_clean($_POST['wpinv_cc']) : null,
+                'disable_taxes'        => !empty($_POST['disable_taxes']),
+                'currency'             => isset($_POST['wpinv_currency']) ? wpinv_clean($_POST['wpinv_currency']) : null,
+                'gateway'              => ($invoice->needs_payment() && isset($_POST['wpinv_gateway'])) ? wpinv_clean($_POST['wpinv_gateway']) : null,
+                'address'              => isset($_POST['wpinv_address']) ? wpinv_clean($_POST['wpinv_address']) : null,
+                'vat_number'           => isset($_POST['wpinv_vat_number']) ? wpinv_clean($_POST['wpinv_vat_number']) : null,
+                'company'              => isset($_POST['wpinv_company']) ? wpinv_clean($_POST['wpinv_company']) : null,
+                'company_id'           => isset($_POST['wpinv_company_id']) ? wpinv_clean($_POST['wpinv_company_id']) : null,
+                'zip'                  => isset($_POST['wpinv_zip']) ? wpinv_clean($_POST['wpinv_zip']) : null,
+                'state'                => isset($_POST['wpinv_state']) ? wpinv_clean($_POST['wpinv_state']) : null,
+                'city'                 => isset($_POST['wpinv_city']) ? wpinv_clean($_POST['wpinv_city']) : null,
+                'country'              => isset($_POST['wpinv_country']) ? wpinv_clean($_POST['wpinv_country']) : null,
+                'phone'                => isset($_POST['wpinv_phone']) ? wpinv_clean($_POST['wpinv_phone']) : null,
+                'first_name'           => isset($_POST['wpinv_first_name']) ? wpinv_clean($_POST['wpinv_first_name']) : null,
+                'last_name'            => isset($_POST['wpinv_last_name']) ? wpinv_clean($_POST['wpinv_last_name']) : null,
+                'author'               => isset($_POST['post_author_override']) ? wpinv_clean($_POST['post_author_override']) : null,
+                'date_created'         => isset($_POST['date_created']) ? wpinv_clean($_POST['date_created']) : null,
+                'date_completed'       => isset($_POST['wpinv_date_completed']) ? wpinv_clean($_POST['wpinv_date_completed']) : null,
+                'due_date'             => isset($_POST['wpinv_due_date']) ? wpinv_clean($_POST['wpinv_due_date']) : null,
+                'number'               => isset($_POST['wpinv_number']) ? wpinv_clean($_POST['wpinv_number']) : null,
+                'status'               => isset($_POST['wpinv_status']) ? wpinv_clean($_POST['wpinv_status']) : null,
 			)
         );
 
         // Discount code.
-        if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+        if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
-            if ( isset( $_POST['wpinv_discount_code'] ) ) {
-                $invoice->set_discount_code( wpinv_clean( $_POST['wpinv_discount_code'] ) );
+            if (isset($_POST['wpinv_discount_code'])) {
+                $invoice->set_discount_code(wpinv_clean($_POST['wpinv_discount_code']));
             }
 
-            $discount = new WPInv_Discount( $invoice->get_discount_code() );
-            if ( $discount->exists() ) {
-                $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+            $discount = new WPInv_Discount($invoice->get_discount_code());
+            if ($discount->exists()) {
+                $invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
             } else {
-                $invoice->remove_discount( 'discount_code' );
+                $invoice->remove_discount('discount_code');
             }
 
             // Recalculate totals.
@@ -423,17 +423,17 @@ 
         }
 
         // If we're creating a new user...
-        if ( ! empty( $_POST['wpinv_new_user'] ) && is_email( stripslashes( $_POST['wpinv_email'] ) ) ) {
+        if (!empty($_POST['wpinv_new_user']) && is_email(stripslashes($_POST['wpinv_email']))) {
 
             // Attempt to create the user.
-            $user = wpinv_create_user( sanitize_email( stripslashes( $_POST['wpinv_email'] ) ) );
+            $user = wpinv_create_user(sanitize_email(stripslashes($_POST['wpinv_email'])));
 
 
             // If successful, update the invoice author.
-            if ( is_numeric( $user ) ) {
-                $invoice->set_author( $user );
+            if (is_numeric($user)) {
+                $invoice->set_author($user);
             } else {
-                wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+                wpinv_error_log($user->get_error_message(), __('Invoice add new user', 'invoicing'), __FILE__, __LINE__);
             }
         }
 
@@ -447,16 +447,16 @@ 
         $GLOBALS['wpinv_skip_invoice_notification'] = false;
 
         // (Maybe) send new user notification.
-        $should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-        if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-            wp_send_new_user_notifications( $user, 'user' );
+        $should_send_notification = wpinv_get_option('disable_new_user_emails');
+        if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification))) {
+            wp_send_new_user_notifications($user, 'user');
         }
 
-        if ( ! empty( $_POST['send_to_customer'] ) && ! $invoice->is_draft() ) {
-            getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+        if (!empty($_POST['send_to_customer']) && !$invoice->is_draft()) {
+            getpaid()->get('invoice_emails')->user_invoice($invoice, true);
         }
 
         // Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
+		do_action('wpinv_invoice_metabox_saved', $invoice);
 	}
 }

includes/class-getpaid-notification-email.php

Indentation +56 added lines, -56 removed lines

@@ -13,36 +13,36 @@ 
 class GetPaid_Notification_Email {
 
     /**
-	 * Contains the type of this notification email.
-	 *
-	 * @var string
-	 */
+     * Contains the type of this notification email.
+     *
+     * @var string
+     */
     public $id;
 
     /**
-	 * Contains any object to use in filters.
-	 *
-	 * @var false|WPInv_Invoice|WPInv_Item|WPInv_Subscription
-	 */
+     * Contains any object to use in filters.
+     *
+     * @var false|WPInv_Invoice|WPInv_Item|WPInv_Subscription
+     */
     public $object;
 
     /**
-	 * Class constructor.
-	 *
+     * Class constructor.
+     *
      * @param string $id Email Type.
      * @param mixed $object Optional. Associated object.
-	 */
-	public function __construct( $id, $object = false ) {
+     */
+    public function __construct( $id, $object = false ) {
         $this->id     = $id;
         $this->object = $object;
     }
 
     /**
-	 * Retrieves an option
-	 *
+     * Retrieves an option
+     *
      * @return mixed
-	 */
-	public function get_option( $key ) {
+     */
+    public function get_option( $key ) {
 
         $key   = "email_{$this->id}_$key";
         $value = wpinv_get_option( $key, null );
@@ -60,80 +60,80 @@ 
     }
 
     /**
-	 * Retrieves the email body.
-	 *
+     * Retrieves the email body.
+     *
      * @return string
-	 */
-	public function get_body() {
+     */
+    public function get_body() {
         $body = $this->get_option( 'body' );
         return apply_filters( 'getpaid_get_email_body', $body, $this->id, $this->object );
     }
 
     /**
-	 * Retrieves the email subject.
-	 *
+     * Retrieves the email subject.
+     *
      * @return string
-	 */
-	public function get_subject() {
+     */
+    public function get_subject() {
         $subject = $this->get_option( 'subject' );
         return apply_filters( 'getpaid_get_email_subject', $subject, $this->id, $this->object );
     }
 
     /**
-	 * Retrieves the email heading.
-	 *
+     * Retrieves the email heading.
+     *
      * @return string
-	 */
-	public function get_heading() {
+     */
+    public function get_heading() {
         $heading = $this->get_option( 'heading' );
         return apply_filters( 'getpaid_get_email_heading', $heading, $this->id, $this->object );
     }
 
     /**
-	 * Checks if an email is active.
-	 *
+     * Checks if an email is active.
+     *
      * @return bool
-	 */
-	public function is_active() {
+     */
+    public function is_active() {
         $is_active = ! empty( $this->get_option( 'active' ) );
         return apply_filters( 'getpaid_email_type_is_active', $is_active, $this->id, $this->object );
     }
 
     /**
-	 * Checks if the site's admin should receive email notifications.
-	 *
+     * Checks if the site's admin should receive email notifications.
+     *
      * @return bool
-	 */
-	public function include_admin_bcc() {
+     */
+    public function include_admin_bcc() {
         $include_admin_bcc = ! empty( $this->get_option( 'admin_bcc' ) );
         return apply_filters( 'getpaid_email_type_include_admin_bcc', $include_admin_bcc, $this->id, $this->object );
     }
 
     /**
-	 * Checks whether this email should be sent to the customer or admin.
-	 *
+     * Checks whether this email should be sent to the customer or admin.
+     *
      * @return bool
-	 */
-	public function is_admin_email() {
+     */
+    public function is_admin_email() {
         $is_admin_email = in_array( $this->id, array( 'new_invoice', 'failed_invoice' ) );
         return apply_filters( 'getpaid_email_type_is_admin_email', $is_admin_email, $this->id, $this->object );
     }
 
     /**
-	 * Returns email attachments.
-	 *
+     * Returns email attachments.
+     *
      * @return array
-	 */
-	public function get_attachments() {
+     */
+    public function get_attachments() {
         return apply_filters( 'getpaid_get_email_attachments', array(), $this->id, $this->object );
     }
 
     /**
-	 * Returns an array of merge tags.
-	 *
+     * Returns an array of merge tags.
+     *
      * @return array
-	 */
-	public function get_merge_tags() {
+     */
+    public function get_merge_tags() {
 
         $merge_tags = array(
             '{site_title}' => wpinv_get_blogname(),
@@ -144,13 +144,13 @@ 
     }
 
     /**
-	 * Adds merge tags to a text.
-	 *
+     * Adds merge tags to a text.
+     *
      * @param string string $text
      * @param array $merge_tags
      * @return string
-	 */
-	public function add_merge_tags( $text, $merge_tags = array() ) {
+     */
+    public function add_merge_tags( $text, $merge_tags = array() ) {
 
         foreach ( $merge_tags as $key => $value ) {
             $text = str_replace( $key, $value, $text );
@@ -160,13 +160,13 @@ 
     }
 
     /**
-	 * Returns the email content
-	 *
+     * Returns the email content
+     *
      * @param array $merge_tags
      * @param array $extra_args Extra template args
      * @return string
-	 */
-	public function get_content( $merge_tags = array(), $extra_args = array() ) {
+     */
+    public function get_content( $merge_tags = array(), $extra_args = array() ) {
 
         $content = wpinv_get_template_html(
             "emails/wpinv-email-{$this->id}.php",

Spacing +30 added lines, -30 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Represents a single email type.
@@ -32,7 +32,7 @@ 
      * @param string $id Email Type.
      * @param mixed $object Optional. Associated object.
 	 */
-	public function __construct( $id, $object = false ) {
+	public function __construct($id, $object = false) {
         $this->id     = $id;
         $this->object = $object;
     }
@@ -42,18 +42,18 @@ 
 	 *
      * @return mixed
 	 */
-	public function get_option( $key ) {
+	public function get_option($key) {
 
         $key   = "email_{$this->id}_$key";
-        $value = wpinv_get_option( $key, null );
-        if ( is_null( $value ) ) {
+        $value = wpinv_get_option($key, null);
+        if (is_null($value)) {
             $options = wpinv_get_emails();
 
-            if ( ! isset( $options[ $this->id ] ) || ! isset( $options[ $this->id ][ $key ] ) ) {
+            if (!isset($options[$this->id]) || !isset($options[$this->id][$key])) {
                 return '';
             }
 
-            $value = isset( $options[ $this->id ][ $key ]['std'] ) ? $options[ $this->id ][ $key ]['std'] : '';
+            $value = isset($options[$this->id][$key]['std']) ? $options[$this->id][$key]['std'] : '';
         }
 
         return $value;
@@ -65,8 +65,8 @@ 
      * @return string
 	 */
 	public function get_body() {
-        $body = $this->get_option( 'body' );
-        return apply_filters( 'getpaid_get_email_body', $body, $this->id, $this->object );
+        $body = $this->get_option('body');
+        return apply_filters('getpaid_get_email_body', $body, $this->id, $this->object);
     }
 
     /**
@@ -75,8 +75,8 @@ 
      * @return string
 	 */
 	public function get_subject() {
-        $subject = $this->get_option( 'subject' );
-        return apply_filters( 'getpaid_get_email_subject', $subject, $this->id, $this->object );
+        $subject = $this->get_option('subject');
+        return apply_filters('getpaid_get_email_subject', $subject, $this->id, $this->object);
     }
 
     /**
@@ -85,8 +85,8 @@ 
      * @return string
 	 */
 	public function get_heading() {
-        $heading = $this->get_option( 'heading' );
-        return apply_filters( 'getpaid_get_email_heading', $heading, $this->id, $this->object );
+        $heading = $this->get_option('heading');
+        return apply_filters('getpaid_get_email_heading', $heading, $this->id, $this->object);
     }
 
     /**
@@ -95,8 +95,8 @@ 
      * @return bool
 	 */
 	public function is_active() {
-        $is_active = ! empty( $this->get_option( 'active' ) );
-        return apply_filters( 'getpaid_email_type_is_active', $is_active, $this->id, $this->object );
+        $is_active = !empty($this->get_option('active'));
+        return apply_filters('getpaid_email_type_is_active', $is_active, $this->id, $this->object);
     }
 
     /**
@@ -105,8 +105,8 @@ 
      * @return bool
 	 */
 	public function include_admin_bcc() {
-        $include_admin_bcc = ! empty( $this->get_option( 'admin_bcc' ) );
-        return apply_filters( 'getpaid_email_type_include_admin_bcc', $include_admin_bcc, $this->id, $this->object );
+        $include_admin_bcc = !empty($this->get_option('admin_bcc'));
+        return apply_filters('getpaid_email_type_include_admin_bcc', $include_admin_bcc, $this->id, $this->object);
     }
 
     /**
@@ -115,8 +115,8 @@ 
      * @return bool
 	 */
 	public function is_admin_email() {
-        $is_admin_email = in_array( $this->id, array( 'new_invoice', 'failed_invoice' ) );
-        return apply_filters( 'getpaid_email_type_is_admin_email', $is_admin_email, $this->id, $this->object );
+        $is_admin_email = in_array($this->id, array('new_invoice', 'failed_invoice'));
+        return apply_filters('getpaid_email_type_is_admin_email', $is_admin_email, $this->id, $this->object);
     }
 
     /**
@@ -125,7 +125,7 @@ 
      * @return array
 	 */
 	public function get_attachments() {
-        return apply_filters( 'getpaid_get_email_attachments', array(), $this->id, $this->object );
+        return apply_filters('getpaid_get_email_attachments', array(), $this->id, $this->object);
     }
 
     /**
@@ -137,10 +137,10 @@ 
 
         $merge_tags = array(
             '{site_title}' => wpinv_get_blogname(),
-            '{date}'       => getpaid_format_date_value( current_time( 'mysql' ) ),
+            '{date}'       => getpaid_format_date_value(current_time('mysql')),
         );
 
-        return apply_filters( 'getpaid_get_email_merge_tags', $merge_tags, $this->object, $this->id );
+        return apply_filters('getpaid_get_email_merge_tags', $merge_tags, $this->object, $this->id);
     }
 
     /**
@@ -150,13 +150,13 @@ 
      * @param array $merge_tags
      * @return string
 	 */
-	public function add_merge_tags( $text, $merge_tags = array() ) {
+	public function add_merge_tags($text, $merge_tags = array()) {
 
-        foreach ( $merge_tags as $key => $value ) {
-            $text = str_replace( $key, $value, $text );
+        foreach ($merge_tags as $key => $value) {
+            $text = str_replace($key, $value, $text);
         }
 
-        return wptexturize( $text );
+        return wptexturize($text);
     }
 
     /**
@@ -166,7 +166,7 @@ 
      * @param array $extra_args Extra template args
      * @return string
 	 */
-	public function get_content( $merge_tags = array(), $extra_args = array() ) {
+	public function get_content($merge_tags = array(), $extra_args = array()) {
 
         $content = wpinv_get_template_html(
             "emails/wpinv-email-{$this->id}.php",
@@ -176,15 +176,15 @@ 
                     'invoice'       => $this->object, // Backwards compat.
                     'object'        => $this->object,
                     'email_type'    => $this->id,
-                    'email_heading' => $this->add_merge_tags( $this->get_heading(), $merge_tags ),
+                    'email_heading' => $this->add_merge_tags($this->get_heading(), $merge_tags),
                     'sent_to_admin' => $this->is_admin_email(),
                     'plain_text'    => false,
-                    'message_body'  => wpautop( $this->add_merge_tags( $this->get_body(), $merge_tags ) ),
+                    'message_body'  => wpautop($this->add_merge_tags($this->get_body(), $merge_tags)),
                 )
             )
         );
 
-        return wpinv_email_style_body( $content );
+        return wpinv_email_style_body($content);
     }
 
 }

includes/reports/class-getpaid-reports-helper.php

Indentation +276 added lines, -276 removed lines

@@ -12,294 +12,294 @@
  */
 class GetPaid_Reports_Helper {
 
-	/**
-	 * Get report totals such as invoice totals and discount amounts.
-	 *
-	 * Data example:
-	 *
-	 * 'subtotal' => array(
-	 *     'type'     => 'invoice_data',
-	 *     'function' => 'SUM',
-	 *     'name'     => 'subtotal'
-	 * )
-	 *
-	 * @param  array $args
-	 * @return mixed depending on query_type
-	 */
-	public static function get_invoice_report_data( $args = array() ) {
-		global $wpdb;
-
-		$default_args = array(
-			'data'                  => array(), // The data to retrieve.
-			'where'                 => array(), // An array of where queries.
-			'query_type'            => 'get_row', // wpdb query to run.
-			'group_by'              => '', // What to group results by.
-			'order_by'              => '', // What to order by.
-			'limit'                 => '', // Results limit.
-			'filter_range'          => array(), // An array of before and after dates to limit results by.
-			'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
-			'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
-			'parent_invoice_status' => false, // Optionally filter by parent invoice status.
-		);
-
-		$args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
-		$args         = wp_parse_args( $args, $default_args );
-
-		extract( $args );
-
-		if ( empty( $data ) ) {
-			return '';
-		}
-
-		$query           = array();
-		$query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
-		$query['from']   = "FROM {$wpdb->posts} AS posts";
-		$query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
-
-		$query['where']  = "
+    /**
+     * Get report totals such as invoice totals and discount amounts.
+     *
+     * Data example:
+     *
+     * 'subtotal' => array(
+     *     'type'     => 'invoice_data',
+     *     'function' => 'SUM',
+     *     'name'     => 'subtotal'
+     * )
+     *
+     * @param  array $args
+     * @return mixed depending on query_type
+     */
+    public static function get_invoice_report_data( $args = array() ) {
+        global $wpdb;
+
+        $default_args = array(
+            'data'                  => array(), // The data to retrieve.
+            'where'                 => array(), // An array of where queries.
+            'query_type'            => 'get_row', // wpdb query to run.
+            'group_by'              => '', // What to group results by.
+            'order_by'              => '', // What to order by.
+            'limit'                 => '', // Results limit.
+            'filter_range'          => array(), // An array of before and after dates to limit results by.
+            'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
+            'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
+            'parent_invoice_status' => false, // Optionally filter by parent invoice status.
+        );
+
+        $args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
+        $args         = wp_parse_args( $args, $default_args );
+
+        extract( $args );
+
+        if ( empty( $data ) ) {
+            return '';
+        }
+
+        $query           = array();
+        $query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
+        $query['from']   = "FROM {$wpdb->posts} AS posts";
+        $query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
+
+        $query['where']  = "
 			WHERE 	posts.post_type 	IN ( '" . implode( "','", $invoice_types ) . "' )
 			";
 
-		if ( ! empty( $invoice_status ) ) {
-			$query['where'] .= "
+        if ( ! empty( $invoice_status ) ) {
+            $query['where'] .= "
 				AND 	posts.post_status 	IN ( '" . implode( "','", $invoice_status ) . "' )
 			";
-		}
-
-		if ( ! empty( $parent_invoice_status ) ) {
-			if ( ! empty( $invoice_status ) ) {
-				$query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
-			} else {
-				$query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
-			}
-		}
-
-		if ( ! empty( $filter_range['before'] ) ) {
-			$query['where'] .= "
+        }
+
+        if ( ! empty( $parent_invoice_status ) ) {
+            if ( ! empty( $invoice_status ) ) {
+                $query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
+            } else {
+                $query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
+            }
+        }
+
+        if ( ! empty( $filter_range['before'] ) ) {
+            $query['where'] .= "
 				AND 	posts.post_date < '" . date( 'Y-m-d 23:59:59', strtotime( $filter_range['before'] ) ) . "'
 			";
-		}
+        }
 
-		if ( ! empty( $filter_range['after'] ) ) {
-			$query['where'] .= "
+        if ( ! empty( $filter_range['after'] ) ) {
+            $query['where'] .= "
 				AND 	posts.post_date > '" . date( 'Y-m-d H:i:s', strtotime( $filter_range['after'] ) ) . "'
 			";
-		}
+        }
 
-		if ( ! empty( $where ) ) {
+        if ( ! empty( $where ) ) {
 
-			foreach ( $where as $value ) {
+            foreach ( $where as $value ) {
 
-				if ( strtolower( $value['operator'] ) == 'in' || strtolower( $value['operator'] ) == 'not in' ) {
-
-					if ( is_array( $value['value'] ) ) {
-						$value['value'] = implode( "','", $value['value'] );
-					}
-
-					if ( ! empty( $value['value'] ) ) {
-						$where_value = "{$value['operator']} ('{$value['value']}')";
-					}
-				} else {
-					$where_value = "{$value['operator']} '{$value['value']}'";
-				}
-
-				if ( ! empty( $where_value ) ) {
-					$query['where'] .= " AND {$value['key']} {$where_value}";
-				}
-			}
-		}
-
-		if ( $group_by ) {
-			$query['group_by'] = "GROUP BY {$group_by}";
-		}
-
-		if ( $order_by ) {
-			$query['order_by'] = "ORDER BY {$order_by}";
-		}
-
-		if ( $limit ) {
-			$query['limit'] = "LIMIT {$limit}";
-		}
-
-		$query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
-		$query = implode( ' ', $query );
-
-		return self::execute( $query_type, $query );
-
-	}
-
-	/**
-	 * Prepares the data to select.
-	 *
-	 *
-	 * @param  array $data
-	 * @return array
-	 */
-	public static function prepare_invoice_data( $data ) {
-
-		$prepared = array();
-
-		foreach ( $data as $raw_key => $value ) {
-			$key      = sanitize_key( $raw_key );
-			$distinct = '';
-
-			if ( isset( $value['distinct'] ) ) {
-				$distinct = 'DISTINCT';
-			}
-
-			$get_key = self::get_invoice_table_key( $key, $value['type'] );
-
-			if ( false === $get_key ) {
-				// Skip to the next foreach iteration else the query will be invalid.
-				continue;
-			}
-
-			if ( ! empty( $value['function'] ) ) {
-				$get = "{$value['function']}({$distinct} {$get_key})";
-			} else {
-				$get = "{$distinct} {$get_key}";
-			}
-
-			$prepared[] = "{$get} as {$value['name']}";
-		}
-
-		return $prepared;
-
-	}
-
-	/**
-	 * Prepares the joins to use.
-	 *
-	 *
-	 * @param  array $data
-	 * @param  bool $with_parent
-	 * @return array
-	 */
-	public static function prepare_invoice_joins( $data, $with_parent ) {
-		global $wpdb;
-
-		$prepared = array();
-
-		foreach ( $data as $raw_key => $value ) {
-			$join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
-			$type      = isset( $value['type'] ) ? $value['type'] : false;
-			$key       = sanitize_key( $raw_key );
-
-			switch ( $type ) {
-				case 'meta':
-					$prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
-					break;
-				case 'parent_meta':
-					$prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
-					break;
-				case 'invoice_data':
-					$prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
-					break;
-				case 'invoice_item':
-					$prepared['invoice_items'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoice_items AS invoice_items ON posts.ID = invoice_items.post_id";
-					break;
-			}
-		}
-
-		if ( $with_parent ) {
-			$prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
-		}
-
-		return $prepared;
-
-	}
-
-	/**
-	 * Retrieves the appropriate table key to use.
-	 *
-	 *
-	 * @param  string $key
-	 * @param  string $table
-	 * @return string|false
-	 */
-	public static function get_invoice_table_key( $key, $table ) {
-
-		$keys = array(
-			'meta'         => "meta_{$key}.meta_value",
-			'parent_meta'  => "parent_meta_{$key}.meta_value",
-			'post_data'    => "posts.{$key}",
-			'invoice_data' => "invoices.{$key}",
-			'invoice_item' => "invoice_items.{$key}",
-		);
-
-		return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
-
-	}
-
-	/**
-	 * Executes a query and caches the result for a minute.
-	 *
-	 *
-	 * @param  string $query_type
-	 * @param  string $query
-	 * @return mixed depending on query_type
-	 */
-	public static function execute( $query_type, $query ) {
-		global $wpdb;
-
-		$query_hash = md5( $query_type . $query );
-		$result     = self::get_cached_query( $query_hash );
-		if ( $result === false ) {
-			self::enable_big_selects();
-
-			$result = $wpdb->$query_type( $query );
-			self::set_cached_query( $query_hash, $result );
-		}
-
-		return $result;
-
-	}
-
-	/**
-	 * Enables big mysql selects for reports, just once for this session.
-	 */
-	protected static function enable_big_selects() {
-		static $big_selects = false;
-
-		global $wpdb;
-
-		if ( ! $big_selects ) {
-			$wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
-			$big_selects = true;
-		}
-	}
-
-	/**
-	 * Get the cached query result or null if it's not in the cache.
-	 *
-	 * @param string $query_hash The query hash.
-	 *
-	 * @return mixed|false The cache contents on success, false on failure to retrieve contents.
-	 */
-	protected static function get_cached_query( $query_hash ) {
-
-		return wp_cache_get(
-			$query_hash,
-			strtolower( __CLASS__ )
-		);
-
-	}
-
-	/**
-	 * Set the cached query result.
-	 *
-	 * @param string $query_hash The query hash.
-	 * @param mixed  $data The data to cache.
-	 */
-	protected static function set_cached_query( $query_hash, $data ) {
-
-		wp_cache_set(
-			$query_hash,
-			$data,
-			strtolower( __CLASS__ ),
-			MINUTE_IN_SECONDS
-		);
-
-	}
+                if ( strtolower( $value['operator'] ) == 'in' || strtolower( $value['operator'] ) == 'not in' ) {
+
+                    if ( is_array( $value['value'] ) ) {
+                        $value['value'] = implode( "','", $value['value'] );
+                    }
+
+                    if ( ! empty( $value['value'] ) ) {
+                        $where_value = "{$value['operator']} ('{$value['value']}')";
+                    }
+                } else {
+                    $where_value = "{$value['operator']} '{$value['value']}'";
+                }
+
+                if ( ! empty( $where_value ) ) {
+                    $query['where'] .= " AND {$value['key']} {$where_value}";
+                }
+            }
+        }
+
+        if ( $group_by ) {
+            $query['group_by'] = "GROUP BY {$group_by}";
+        }
+
+        if ( $order_by ) {
+            $query['order_by'] = "ORDER BY {$order_by}";
+        }
+
+        if ( $limit ) {
+            $query['limit'] = "LIMIT {$limit}";
+        }
+
+        $query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
+        $query = implode( ' ', $query );
+
+        return self::execute( $query_type, $query );
+
+    }
+
+    /**
+     * Prepares the data to select.
+     *
+     *
+     * @param  array $data
+     * @return array
+     */
+    public static function prepare_invoice_data( $data ) {
+
+        $prepared = array();
+
+        foreach ( $data as $raw_key => $value ) {
+            $key      = sanitize_key( $raw_key );
+            $distinct = '';
+
+            if ( isset( $value['distinct'] ) ) {
+                $distinct = 'DISTINCT';
+            }
+
+            $get_key = self::get_invoice_table_key( $key, $value['type'] );
+
+            if ( false === $get_key ) {
+                // Skip to the next foreach iteration else the query will be invalid.
+                continue;
+            }
+
+            if ( ! empty( $value['function'] ) ) {
+                $get = "{$value['function']}({$distinct} {$get_key})";
+            } else {
+                $get = "{$distinct} {$get_key}";
+            }
+
+            $prepared[] = "{$get} as {$value['name']}";
+        }
+
+        return $prepared;
+
+    }
+
+    /**
+     * Prepares the joins to use.
+     *
+     *
+     * @param  array $data
+     * @param  bool $with_parent
+     * @return array
+     */
+    public static function prepare_invoice_joins( $data, $with_parent ) {
+        global $wpdb;
+
+        $prepared = array();
+
+        foreach ( $data as $raw_key => $value ) {
+            $join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
+            $type      = isset( $value['type'] ) ? $value['type'] : false;
+            $key       = sanitize_key( $raw_key );
+
+            switch ( $type ) {
+                case 'meta':
+                    $prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
+                    break;
+                case 'parent_meta':
+                    $prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
+                    break;
+                case 'invoice_data':
+                    $prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
+                    break;
+                case 'invoice_item':
+                    $prepared['invoice_items'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoice_items AS invoice_items ON posts.ID = invoice_items.post_id";
+                    break;
+            }
+        }
+
+        if ( $with_parent ) {
+            $prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
+        }
+
+        return $prepared;
+
+    }
+
+    /**
+     * Retrieves the appropriate table key to use.
+     *
+     *
+     * @param  string $key
+     * @param  string $table
+     * @return string|false
+     */
+    public static function get_invoice_table_key( $key, $table ) {
+
+        $keys = array(
+            'meta'         => "meta_{$key}.meta_value",
+            'parent_meta'  => "parent_meta_{$key}.meta_value",
+            'post_data'    => "posts.{$key}",
+            'invoice_data' => "invoices.{$key}",
+            'invoice_item' => "invoice_items.{$key}",
+        );
+
+        return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
+
+    }
+
+    /**
+     * Executes a query and caches the result for a minute.
+     *
+     *
+     * @param  string $query_type
+     * @param  string $query
+     * @return mixed depending on query_type
+     */
+    public static function execute( $query_type, $query ) {
+        global $wpdb;
+
+        $query_hash = md5( $query_type . $query );
+        $result     = self::get_cached_query( $query_hash );
+        if ( $result === false ) {
+            self::enable_big_selects();
+
+            $result = $wpdb->$query_type( $query );
+            self::set_cached_query( $query_hash, $result );
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Enables big mysql selects for reports, just once for this session.
+     */
+    protected static function enable_big_selects() {
+        static $big_selects = false;
+
+        global $wpdb;
+
+        if ( ! $big_selects ) {
+            $wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
+            $big_selects = true;
+        }
+    }
+
+    /**
+     * Get the cached query result or null if it's not in the cache.
+     *
+     * @param string $query_hash The query hash.
+     *
+     * @return mixed|false The cache contents on success, false on failure to retrieve contents.
+     */
+    protected static function get_cached_query( $query_hash ) {
+
+        return wp_cache_get(
+            $query_hash,
+            strtolower( __CLASS__ )
+        );
+
+    }
+
+    /**
+     * Set the cached query result.
+     *
+     * @param string $query_hash The query hash.
+     * @param mixed  $data The data to cache.
+     */
+    protected static function set_cached_query( $query_hash, $data ) {
+
+        wp_cache_set(
+            $query_hash,
+            $data,
+            strtolower( __CLASS__ ),
+            MINUTE_IN_SECONDS
+        );
+
+    }
 
 }

Spacing +64 added lines, -64 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Helper Class.
@@ -26,7 +26,7 @@ 
 	 * @param  array $args
 	 * @return mixed depending on query_type
 	 */
-	public static function get_invoice_report_data( $args = array() ) {
+	public static function get_invoice_report_data($args = array()) {
 		global $wpdb;
 
 		$default_args = array(
@@ -37,94 +37,94 @@ 
 			'order_by'              => '', // What to order by.
 			'limit'                 => '', // Results limit.
 			'filter_range'          => array(), // An array of before and after dates to limit results by.
-			'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
-			'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
+			'invoice_types'         => array('wpi_invoice'), // An array of post types to retrieve.
+			'invoice_status'        => array('publish', 'wpi-processing', 'wpi-onhold'),
 			'parent_invoice_status' => false, // Optionally filter by parent invoice status.
 		);
 
-		$args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
-		$args         = wp_parse_args( $args, $default_args );
+		$args         = apply_filters('getpaid_reports_get_invoice_report_data_args', $args);
+		$args         = wp_parse_args($args, $default_args);
 
-		extract( $args );
+		extract($args);
 
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			return '';
 		}
 
 		$query           = array();
-		$query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
+		$query['select'] = 'SELECT ' . implode(',', self::prepare_invoice_data($data));
 		$query['from']   = "FROM {$wpdb->posts} AS posts";
-		$query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
+		$query['join']   = implode(' ', self::prepare_invoice_joins($data + $where, !empty($parent_invoice_status)));
 
 		$query['where']  = "
-			WHERE 	posts.post_type 	IN ( '" . implode( "','", $invoice_types ) . "' )
+			WHERE 	posts.post_type 	IN ( '" . implode("','", $invoice_types) . "' )
 			";
 
-		if ( ! empty( $invoice_status ) ) {
+		if (!empty($invoice_status)) {
 			$query['where'] .= "
-				AND 	posts.post_status 	IN ( '" . implode( "','", $invoice_status ) . "' )
+				AND 	posts.post_status 	IN ( '" . implode("','", $invoice_status) . "' )
 			";
 		}
 
-		if ( ! empty( $parent_invoice_status ) ) {
-			if ( ! empty( $invoice_status ) ) {
-				$query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
+		if (!empty($parent_invoice_status)) {
+			if (!empty($invoice_status)) {
+				$query['where'] .= " AND ( parent.post_status IN ( '" . implode("','", $parent_invoice_status) . "' ) OR parent.ID IS NULL ) ";
 			} else {
-				$query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
+				$query['where'] .= " AND parent.post_status IN ( '" . implode("','", $parent_invoice_status) . "' ) ";
 			}
 		}
 
-		if ( ! empty( $filter_range['before'] ) ) {
+		if (!empty($filter_range['before'])) {
 			$query['where'] .= "
-				AND 	posts.post_date < '" . date( 'Y-m-d 23:59:59', strtotime( $filter_range['before'] ) ) . "'
+				AND 	posts.post_date < '" . date('Y-m-d 23:59:59', strtotime($filter_range['before'])) . "'
 			";
 		}
 
-		if ( ! empty( $filter_range['after'] ) ) {
+		if (!empty($filter_range['after'])) {
 			$query['where'] .= "
-				AND 	posts.post_date > '" . date( 'Y-m-d H:i:s', strtotime( $filter_range['after'] ) ) . "'
+				AND 	posts.post_date > '" . date('Y-m-d H:i:s', strtotime($filter_range['after'])) . "'
 			";
 		}
 
-		if ( ! empty( $where ) ) {
+		if (!empty($where)) {
 
-			foreach ( $where as $value ) {
+			foreach ($where as $value) {
 
-				if ( strtolower( $value['operator'] ) == 'in' || strtolower( $value['operator'] ) == 'not in' ) {
+				if (strtolower($value['operator']) == 'in' || strtolower($value['operator']) == 'not in') {
 
-					if ( is_array( $value['value'] ) ) {
-						$value['value'] = implode( "','", $value['value'] );
+					if (is_array($value['value'])) {
+						$value['value'] = implode("','", $value['value']);
 					}
 
-					if ( ! empty( $value['value'] ) ) {
+					if (!empty($value['value'])) {
 						$where_value = "{$value['operator']} ('{$value['value']}')";
 					}
 				} else {
 					$where_value = "{$value['operator']} '{$value['value']}'";
 				}
 
-				if ( ! empty( $where_value ) ) {
+				if (!empty($where_value)) {
 					$query['where'] .= " AND {$value['key']} {$where_value}";
 				}
 			}
 		}
 
-		if ( $group_by ) {
+		if ($group_by) {
 			$query['group_by'] = "GROUP BY {$group_by}";
 		}
 
-		if ( $order_by ) {
+		if ($order_by) {
 			$query['order_by'] = "ORDER BY {$order_by}";
 		}
 
-		if ( $limit ) {
+		if ($limit) {
 			$query['limit'] = "LIMIT {$limit}";
 		}
 
-		$query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
-		$query = implode( ' ', $query );
+		$query = apply_filters('getpaid_reports_get_invoice_report_query', $query, $data);
+		$query = implode(' ', $query);
 
-		return self::execute( $query_type, $query );
+		return self::execute($query_type, $query);
 
 	}
 
@@ -135,26 +135,26 @@ 
 	 * @param  array $data
 	 * @return array
 	 */
-	public static function prepare_invoice_data( $data ) {
+	public static function prepare_invoice_data($data) {
 
 		$prepared = array();
 
-		foreach ( $data as $raw_key => $value ) {
-			$key      = sanitize_key( $raw_key );
+		foreach ($data as $raw_key => $value) {
+			$key      = sanitize_key($raw_key);
 			$distinct = '';
 
-			if ( isset( $value['distinct'] ) ) {
+			if (isset($value['distinct'])) {
 				$distinct = 'DISTINCT';
 			}
 
-			$get_key = self::get_invoice_table_key( $key, $value['type'] );
+			$get_key = self::get_invoice_table_key($key, $value['type']);
 
-			if ( false === $get_key ) {
+			if (false === $get_key) {
 				// Skip to the next foreach iteration else the query will be invalid.
 				continue;
 			}
 
-			if ( ! empty( $value['function'] ) ) {
+			if (!empty($value['function'])) {
 				$get = "{$value['function']}({$distinct} {$get_key})";
 			} else {
 				$get = "{$distinct} {$get_key}";
@@ -175,22 +175,22 @@ 
 	 * @param  bool $with_parent
 	 * @return array
 	 */
-	public static function prepare_invoice_joins( $data, $with_parent ) {
+	public static function prepare_invoice_joins($data, $with_parent) {
 		global $wpdb;
 
 		$prepared = array();
 
-		foreach ( $data as $raw_key => $value ) {
-			$join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
-			$type      = isset( $value['type'] ) ? $value['type'] : false;
-			$key       = sanitize_key( $raw_key );
+		foreach ($data as $raw_key => $value) {
+			$join_type = isset($value['join_type']) ? $value['join_type'] : 'INNER';
+			$type      = isset($value['type']) ? $value['type'] : false;
+			$key       = sanitize_key($raw_key);
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'meta':
-					$prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
+					$prepared["meta_{$key}"] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
 					break;
 				case 'parent_meta':
-					$prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
+					$prepared["parent_meta_{$key}"] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
 					break;
 				case 'invoice_data':
 					$prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
@@ -201,7 +201,7 @@ 
 			}
 		}
 
-		if ( $with_parent ) {
+		if ($with_parent) {
 			$prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
 		}
 
@@ -217,7 +217,7 @@ 
 	 * @param  string $table
 	 * @return string|false
 	 */
-	public static function get_invoice_table_key( $key, $table ) {
+	public static function get_invoice_table_key($key, $table) {
 
 		$keys = array(
 			'meta'         => "meta_{$key}.meta_value",
@@ -227,7 +227,7 @@ 
 			'invoice_item' => "invoice_items.{$key}",
 		);
 
-		return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
+		return isset($keys[$table]) ? $keys[$table] : false;
 
 	}
 
@@ -239,16 +239,16 @@ 
 	 * @param  string $query
 	 * @return mixed depending on query_type
 	 */
-	public static function execute( $query_type, $query ) {
+	public static function execute($query_type, $query) {
 		global $wpdb;
 
-		$query_hash = md5( $query_type . $query );
-		$result     = self::get_cached_query( $query_hash );
-		if ( $result === false ) {
+		$query_hash = md5($query_type . $query);
+		$result     = self::get_cached_query($query_hash);
+		if ($result === false) {
 			self::enable_big_selects();
 
-			$result = $wpdb->$query_type( $query );
-			self::set_cached_query( $query_hash, $result );
+			$result = $wpdb->$query_type($query);
+			self::set_cached_query($query_hash, $result);
 		}
 
 		return $result;
@@ -263,8 +263,8 @@ 
 
 		global $wpdb;
 
-		if ( ! $big_selects ) {
-			$wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
+		if (!$big_selects) {
+			$wpdb->query('SET SESSION SQL_BIG_SELECTS=1');
 			$big_selects = true;
 		}
 	}
@@ -276,11 +276,11 @@ 
 	 *
 	 * @return mixed|false The cache contents on success, false on failure to retrieve contents.
 	 */
-	protected static function get_cached_query( $query_hash ) {
+	protected static function get_cached_query($query_hash) {
 
 		return wp_cache_get(
 			$query_hash,
-			strtolower( __CLASS__ )
+			strtolower(__CLASS__)
 		);
 
 	}
@@ -291,12 +291,12 @@ 
 	 * @param string $query_hash The query hash.
 	 * @param mixed  $data The data to cache.
 	 */
-	protected static function set_cached_query( $query_hash, $data ) {
+	protected static function set_cached_query($query_hash, $data) {
 
 		wp_cache_set(
 			$query_hash,
 			$data,
-			strtolower( __CLASS__ ),
+			strtolower(__CLASS__),
 			MINUTE_IN_SECONDS
 		);
 

templates/wpinv-invoice-print.php

Spacing +10 added lines, -10 removed lines

@@ -7,20 +7,20 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Fetch the invoice.
-if ( empty( $invoice ) ) {
-    $invoice = new WPInv_Invoice( $GLOBALS['post'] );
+if (empty($invoice)) {
+    $invoice = new WPInv_Invoice($GLOBALS['post']);
 }
 
 // Abort if it does not exist.
-if ( $invoice->get_id() == 0 ) {
+if ($invoice->get_id() == 0) {
     exit;
 }
 
 // Fires before printing an invoice.
-do_action( 'wpinv_invoice_print_before_display', $invoice );
+do_action('wpinv_invoice_print_before_display', $invoice);
 
 ?><!DOCTYPE html>
 
@@ -29,16 +29,16 @@ 
 
     <head>
 
-		<meta charset="<?php bloginfo( 'charset' ); ?>">
+		<meta charset="<?php bloginfo('charset'); ?>">
         <meta name="viewport" content="width=device-width, initial-scale=1.0" >
 
         <meta name="robots" content="noindex,nofollow">
 
 		<link rel="profile" href="https://gmpg.org/xfn/11">
 
-        <title>#<?php echo esc_html( $invoice->get_number() ); ?></title>
+        <title>#<?php echo esc_html($invoice->get_number()); ?></title>
 
-        <?php do_action( 'wpinv_invoice_print_head', $invoice ); ?>
+        <?php do_action('wpinv_invoice_print_head', $invoice); ?>
 
         <style type="text/css">
 			.body{ 
@@ -70,8 +70,8 @@ 
     <body class="body wpinv wpinv-print" style="font-weight: 400;">
 
         <div id="wpinv-print-inner">
-            <?php do_action( 'getpaid_invoice', $invoice ); ?>
-            <?php do_action( 'wpinv_invoice_print_body_end', $invoice ); ?>
+            <?php do_action('getpaid_invoice', $invoice); ?>
+            <?php do_action('wpinv_invoice_print_body_end', $invoice); ?>
         </div>
     </body>