AyeCode / invoicing

vendor/ayecode/wp-super-duper/sd-functions.php

Indentation +13 added lines, -13 removed lines

@@ -11,18 +11,18 @@ 
  * @return mixed|void
  */
 function sd_pagenow_exclude(){
-	return apply_filters( 'sd_pagenow_exclude', array(
-		'upload.php',
-		'edit-comments.php',
-		'edit-tags.php',
-		'index.php',
-		'media-new.php',
-		'options-discussion.php',
-		'options-writing.php',
-		'edit.php',
-		'themes.php',
-		'users.php',
-	) );
+    return apply_filters( 'sd_pagenow_exclude', array(
+        'upload.php',
+        'edit-comments.php',
+        'edit-tags.php',
+        'index.php',
+        'media-new.php',
+        'options-discussion.php',
+        'options-writing.php',
+        'edit.php',
+        'themes.php',
+        'users.php',
+    ) );
 }
 
 
@@ -34,5 +34,5 @@ 
  * @return mixed|void
  */
 function sd_widget_exclude(){
-	return apply_filters( 'sd_widget_exclude', array() );
+    return apply_filters( 'sd_widget_exclude', array() );
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -10,8 +10,8 @@ 
  *
  * @return mixed|void
  */
-function sd_pagenow_exclude(){
-	return apply_filters( 'sd_pagenow_exclude', array(
+function sd_pagenow_exclude() {
+	return apply_filters('sd_pagenow_exclude', array(
 		'upload.php',
 		'edit-comments.php',
 		'edit-tags.php',
@@ -22,7 +22,7 @@ 
 		'edit.php',
 		'themes.php',
 		'users.php',
-	) );
+	));
 }
 
 
@@ -33,6 +33,6 @@ 
  *
  * @return mixed|void
  */
-function sd_widget_exclude(){
-	return apply_filters( 'sd_widget_exclude', array() );
+function sd_widget_exclude() {
+	return apply_filters('sd_widget_exclude', array());
 }
\ No newline at end of file

vendor/ayecode/wp-super-duper/wp-super-duper.php

Braces +19 added lines, -20 removed lines

@@ -661,7 +661,7 @@ 
 				<?php
 				if(! empty( $insert_shortcode_function )){
 					echo $insert_shortcode_function;
-				}else{
+				} else{
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -1653,7 +1653,7 @@ 
 					var prev_attributes = [];
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
+					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";} else{echo "[]";} ?>;
 					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
 					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
 
@@ -1790,7 +1790,7 @@ 
 
 								// taxonomies
 								if( $value && 'post_type' in prev_attributes[props.id] && 'category' in prev_attributes[props.id] && run ){
-									wp.apiFetch({path: "<?php if(isset($this->arguments['post_type']['onchange_rest']['path'])){echo $this->arguments['post_type']['onchange_rest']['path'];}else{'/wp/v2/"+$value+"/categories/?per_page=100';} ?>"}).then(terms => {
+									wp.apiFetch({path: "<?php if(isset($this->arguments['post_type']['onchange_rest']['path'])){echo $this->arguments['post_type']['onchange_rest']['path'];} else{'/wp/v2/"+$value+"/categories/?per_page=100';} ?>"}).then(terms => {
 										while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
 										taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
 									}
@@ -1860,7 +1860,7 @@ 
 										'attributes': props.attributes,
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
 										echo $post->ID;
-									}else{echo '0';}?>,
+									} else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -1969,7 +1969,7 @@ 
 									$panel_count ++;
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings" ); ?>',
@@ -1995,7 +1995,7 @@ 
 								// If the user sets block-output array then build it
 								if ( ! empty( $this->options['block-output'] ) ) {
 								$this->block_element( $this->options['block-output'] );
-							}else{
+							} else{
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								?>
 								el('div', {
@@ -2065,7 +2065,7 @@ 
 							?>
 							return content;
 							<?php
-							}else{
+							} else{
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -2136,7 +2136,7 @@ 
 
 					<?php
 					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
+				} elseif(!empty($args['row']['close'])){
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -2145,7 +2145,7 @@ 
 							},
 					<?php
 					if(false){?></script><?php }
-				}else{
+				} else{
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -2262,8 +2262,7 @@ 
                             $key: value
                         });
                     },";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			} elseif ( $args['type'] == 'checkbox' ) {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
@@ -2274,9 +2273,9 @@ 
 
 				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
 					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
+				} elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
 					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
+				} else {
 
 					if ( ! empty( $args['options'] ) ) {
 						$options .= "options: [";
@@ -2291,7 +2290,7 @@ 
 				}
 			} elseif ( $args['type'] == 'alignment' ) {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			}elseif ( $args['type'] == 'margins' ) {
+			} elseif ( $args['type'] == 'margins' ) {
 
 			} else {
 				return;// if we have not implemented the control then don't break the JS.
@@ -2711,7 +2710,7 @@ 
 
 				if(empty($instance['widget_title_tag'])){
 					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
+				} else{
 					$title_tag = esc_attr( $instance['widget_title_tag'] );
 
 					// classes
@@ -2816,9 +2815,9 @@ 
 					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
+				} elseif(!empty($args['row']['close'])){
 					echo "<div class='col pl-0'>";
-				}else{
+				} else{
 					echo "<div class='col pl-0 pr-2'>";
 				}
 			}
@@ -3036,11 +3035,11 @@ 
 		public function get_widget_icon($icon = 'box-top', $title = ''){
 			if($icon=='box-top'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
+			} elseif($icon=='box-right'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
+			} elseif($icon=='box-bottom'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
+			} elseif($icon=='box-left'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
 			}
 		}

Indentation +2049 added lines, -2049 removed lines

@@ -1,268 +1,268 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
 
-	/**
-	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
-	 *
-	 * Should not be called direct but extended instead.
-	 *
-	 * Class WP_Super_Duper
-	 * @since 1.0.16 change log moved to file change-log.txt - CHANGED
-	 * @ver 1.0.19
-	 */
-	class WP_Super_Duper extends WP_Widget {
-
-		public $version = "1.0.29";
-		public $font_awesome_icon_version = "5.11.2";
-		public $block_code;
-		public $options;
-		public $base_id;
-		public $settings_hash;
-		public $arguments = array();
-		public $instance = array();
-		private $class_name;
-
-		/**
-		 * The relative url to the current folder.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Take the array options and use them to build.
-		 */
-		public function __construct( $options ) {
-			global $sd_widgets;
-
-			$sd_widgets[ $options['base_id'] ] = array(
-				'name'       => $options['name'],
-				'class_name' => $options['class_name']
-			);
-			$this->base_id                     = $options['base_id'];
-			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
-			$this->options = $options;
-
-			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
-
-			// init parent
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
-
-			if ( isset( $options['class_name'] ) ) {
-				// register widget
-				$this->class_name = $options['class_name'];
-
-				// register shortcode
-				$this->register_shortcode();
-
-				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
-				}
-
-				// register block
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-			}
-
-			// add the CSS and JS we need ONCE
-			global $sd_widget_scripts;
-
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
-
-				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
-
-				$sd_widget_scripts = true;
-
-				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
-				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
-				}
-				/* Load script on Divi theme builder page */
-				if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) {
-					add_thickbox();
-					add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
-				}
-
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
-					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
-						$this,
-						'shortcode_insert_button_script'
-					) ); // for elementor
-				}
-				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
-
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
-
-				// add generator text to admin head
-				add_action( 'admin_head', array( $this, 'generator' ) );
-			}
-
-			do_action( 'wp_super_duper_widget_init', $options, $this );
-		}
-
-		/**
-		 * Add our widget CSS to elementor editor.
-		 */
-		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
-		}
-
-		public function register_fusion_element() {
-
-			$options = $this->options;
-
-			if ( $this->base_id ) {
-
-				$params = $this->get_fusion_params();
-
-				$args = array(
-					'name'            => $options['name'],
-					'shortcode'       => $this->base_id,
-					'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
-					'allow_generator' => true,
-				);
-
-				if ( ! empty( $params ) ) {
-					$args['params'] = $params;
-				}
-
-				fusion_builder_map( $args );
-			}
-
-		}
-
-		public function get_fusion_params() {
-			$params    = array();
-			$arguments = $this->get_arguments();
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
-					$param = array();
-					// type
-					$param['type'] = str_replace(
-						array(
-							"text",
-							"number",
-							"email",
-							"color",
-							"checkbox"
-						),
-						array(
-							"textfield",
-							"textfield",
-							"textfield",
-							"colorpicker",
-							"select",
-
-						),
-						$val['type'] );
-
-					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
-						$param['type']     = 'multiple_select';
-						$param['multiple'] = true;
-					}
-
-					// heading
-					$param['heading'] = $val['title'];
-
-					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
-
-					// param_name
-					$param['param_name'] = $key;
-
-					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
-
-					// Group
-					if ( isset( $val['group'] ) ) {
-						$param['group'] = $val['group'];
-					}
-
-					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
-						}
-						$param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
-					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
-					}
-
-					// setup the param
-					$params[] = $param;
-
-				}
-			}
-
-
-			return $params;
-		}
-
-		/**
-		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
-		 */
-		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
-				self::shortcode_insert_button_script();
-			}
-		}
-
-		/**
-		 * A function to ge the shortcode builder picker html.
-		 *
-		 * @param string $editor_id
-		 *
-		 * @return string
-		 */
-		public static function get_picker( $editor_id = '' ) {
-
-			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = sanitize_text_field( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
-				$editor_id = 'main_content_content_vb_tiny_mce';
-			}
-
-			global $sd_widgets;
-			?>
+    /**
+     * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
+     *
+     * Should not be called direct but extended instead.
+     *
+     * Class WP_Super_Duper
+     * @since 1.0.16 change log moved to file change-log.txt - CHANGED
+     * @ver 1.0.19
+     */
+    class WP_Super_Duper extends WP_Widget {
+
+        public $version = "1.0.29";
+        public $font_awesome_icon_version = "5.11.2";
+        public $block_code;
+        public $options;
+        public $base_id;
+        public $settings_hash;
+        public $arguments = array();
+        public $instance = array();
+        private $class_name;
+
+        /**
+         * The relative url to the current folder.
+         *
+         * @var string
+         */
+        public $url = '';
+
+        /**
+         * Take the array options and use them to build.
+         */
+        public function __construct( $options ) {
+            global $sd_widgets;
+
+            $sd_widgets[ $options['base_id'] ] = array(
+                'name'       => $options['name'],
+                'class_name' => $options['class_name']
+            );
+            $this->base_id                     = $options['base_id'];
+            // lets filter the options before we do anything
+            $options       = apply_filters( "wp_super_duper_options", $options );
+            $options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
+            $options       = $this->add_name_from_key( $options );
+            $this->options = $options;
+
+            $this->base_id   = $options['base_id'];
+            $this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+
+            // init parent
+            parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+
+            if ( isset( $options['class_name'] ) ) {
+                // register widget
+                $this->class_name = $options['class_name'];
+
+                // register shortcode
+                $this->register_shortcode();
+
+                // Fusion Builder (avada) support
+                if ( function_exists( 'fusion_builder_map' ) ) {
+                    add_action( 'init', array( $this, 'register_fusion_element' ) );
+                }
+
+                // register block
+                add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+            }
+
+            // add the CSS and JS we need ONCE
+            global $sd_widget_scripts;
+
+            if ( ! $sd_widget_scripts ) {
+                wp_add_inline_script( 'admin-widgets', $this->widget_js() );
+                wp_add_inline_script( 'customize-controls', $this->widget_js() );
+                wp_add_inline_style( 'widgets', $this->widget_css() );
+
+                // maybe add elementor editor styles
+                add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+
+                $sd_widget_scripts = true;
+
+                // add shortcode insert button once
+                add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+                // generatepress theme sections compatibility
+                if ( function_exists( 'generate_sections_sections_metabox' ) ) {
+                    add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+                }
+                /* Load script on Divi theme builder page */
+                if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) {
+                    add_thickbox();
+                    add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
+                }
+
+                if ( $this->is_preview() ) {
+                    add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+                    // this makes the insert button work for elementor
+                    add_action( 'elementor/editor/after_enqueue_scripts', array(
+                        $this,
+                        'shortcode_insert_button_script'
+                    ) ); // for elementor
+                }
+                // this makes the insert button work for cornerstone
+                add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+
+                add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
+                add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+
+                // add generator text to admin head
+                add_action( 'admin_head', array( $this, 'generator' ) );
+            }
+
+            do_action( 'wp_super_duper_widget_init', $options, $this );
+        }
+
+        /**
+         * Add our widget CSS to elementor editor.
+         */
+        public function elementor_editor_styles() {
+            wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+        }
+
+        public function register_fusion_element() {
+
+            $options = $this->options;
+
+            if ( $this->base_id ) {
+
+                $params = $this->get_fusion_params();
+
+                $args = array(
+                    'name'            => $options['name'],
+                    'shortcode'       => $this->base_id,
+                    'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
+                    'allow_generator' => true,
+                );
+
+                if ( ! empty( $params ) ) {
+                    $args['params'] = $params;
+                }
+
+                fusion_builder_map( $args );
+            }
+
+        }
+
+        public function get_fusion_params() {
+            $params    = array();
+            $arguments = $this->get_arguments();
+
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $key => $val ) {
+                    $param = array();
+                    // type
+                    $param['type'] = str_replace(
+                        array(
+                            "text",
+                            "number",
+                            "email",
+                            "color",
+                            "checkbox"
+                        ),
+                        array(
+                            "textfield",
+                            "textfield",
+                            "textfield",
+                            "colorpicker",
+                            "select",
+
+                        ),
+                        $val['type'] );
+
+                    // multiselect
+                    if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+                        $param['type']     = 'multiple_select';
+                        $param['multiple'] = true;
+                    }
+
+                    // heading
+                    $param['heading'] = $val['title'];
+
+                    // description
+                    $param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+
+                    // param_name
+                    $param['param_name'] = $key;
+
+                    // Default
+                    $param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+
+                    // Group
+                    if ( isset( $val['group'] ) ) {
+                        $param['group'] = $val['group'];
+                    }
+
+                    // value
+                    if ( $val['type'] == 'checkbox' ) {
+                        if ( isset( $val['default'] ) && $val['default'] == '0' ) {
+                            unset( $param['default'] );
+                        }
+                        $param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
+                    } elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
+                        $param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+                    } else {
+                        $param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+                    }
+
+                    // setup the param
+                    $params[] = $param;
+
+                }
+            }
+
+
+            return $params;
+        }
+
+        /**
+         * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
+         */
+        public static function maybe_cornerstone_builder() {
+            if ( did_action( 'cornerstone_before_boot_app' ) ) {
+                self::shortcode_insert_button_script();
+            }
+        }
+
+        /**
+         * A function to ge the shortcode builder picker html.
+         *
+         * @param string $editor_id
+         *
+         * @return string
+         */
+        public static function get_picker( $editor_id = '' ) {
+
+            ob_start();
+            if ( isset( $_POST['editor_id'] ) ) {
+                $editor_id = sanitize_text_field( $_POST['editor_id'] );
+            } elseif ( isset( $_REQUEST['et_fb'] ) ) {
+                $editor_id = 'main_content_content_vb_tiny_mce';
+            }
+
+            global $sd_widgets;
+            ?>
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
-				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
-					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
-					}
-					echo "</select>";
-
-				}
-				?>
+                ksort( $sd_widgets );
+                //				print_r($sd_widgets);exit;
+                if ( ! empty( $sd_widgets ) ) {
+                    echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
+                    echo "<option>" . __( 'Select shortcode' ) . "</option>";
+                    foreach ( $sd_widgets as $shortcode => $class ) {
+                        echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+                    }
+                    echo "</select>";
+
+                }
+                ?>
 				<div class="sd-shortcode-settings"></div>
 
 			</div>
@@ -273,8 +273,8 @@ 
 					<?php if ( $editor_id != '' ) { ?>
 						<button class="button sd-insert-shortcode-button"
 						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
-							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+                                    echo "'" . $editor_id . "'";
+                                } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
 					<?php } ?>
 					<button class="button"
 					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
@@ -282,134 +282,134 @@ 
 			</div>
 			<?php
 
-			$html = ob_get_clean();
-
-			if ( wp_doing_ajax() ) {
-				echo $html;
-				$should_die = true;
-
-				// some builder get the editor via ajax so we should not die on those occasions
-				$dont_die = array(
-					'parent_tag',// WP Bakery
-					'avia_request' // enfold
-				);
-
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
-						$should_die = false;
-					}
-				}
-
-				if ( $should_die ) {
-					wp_die();
-				}
-
-			} else {
-				return $html;
-			}
-
-			return '';
-
-		}
-
-		/**
-		 * Output the version in the admin header.
-		 */
-		public function generator() {
-			echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
-		}
-
-		/**
-		 * Get widget settings.
-		 *
-		 * @since 1.0.0
-		 */
-		public static function get_widget_settings() {
-			global $sd_widgets;
-
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
-				wp_die();
-			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
-				wp_die();
-			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
-				wp_die();
-			}
-
-			// invoke an instance method
-			$widget = new $class_name;
-
-			ob_start();
-			$widget->form( array() );
-			$form = ob_get_clean();
-			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
-			echo "<style>" . $widget->widget_css() . "</style>";
-			echo "<script>" . $widget->widget_js() . "</script>";
-			?>
+            $html = ob_get_clean();
+
+            if ( wp_doing_ajax() ) {
+                echo $html;
+                $should_die = true;
+
+                // some builder get the editor via ajax so we should not die on those occasions
+                $dont_die = array(
+                    'parent_tag',// WP Bakery
+                    'avia_request' // enfold
+                );
+
+                foreach ( $dont_die as $request ) {
+                    if ( isset( $_REQUEST[ $request ] ) ) {
+                        $should_die = false;
+                    }
+                }
+
+                if ( $should_die ) {
+                    wp_die();
+                }
+
+            } else {
+                return $html;
+            }
+
+            return '';
+
+        }
+
+        /**
+         * Output the version in the admin header.
+         */
+        public function generator() {
+            echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
+        }
+
+        /**
+         * Get widget settings.
+         *
+         * @since 1.0.0
+         */
+        public static function get_widget_settings() {
+            global $sd_widgets;
+
+            $shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
+            if ( ! $shortcode ) {
+                wp_die();
+            }
+            $widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
+            if ( ! $widget_args ) {
+                wp_die();
+            }
+            $class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+            if ( ! $class_name ) {
+                wp_die();
+            }
+
+            // invoke an instance method
+            $widget = new $class_name;
+
+            ob_start();
+            $widget->form( array() );
+            $form = ob_get_clean();
+            echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
+            echo "<style>" . $widget->widget_css() . "</style>";
+            echo "<script>" . $widget->widget_js() . "</script>";
+            ?>
 			<?php
-			wp_die();
-		}
-
-		/**
-		 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $editor_id Optional. Shortcode editor id. Default null.
-		 * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
-		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
-			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
-				return;
-			}
-			add_thickbox();
-
-
-			/**
-			 * Cornerstone makes us play dirty tricks :/
-			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
-			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '<span id="insert-media-button">';
-			}
-
-			echo self::shortcode_button( 'this', 'true' );
-
-			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '</span>'; // end #insert-media-button
-			}
-
-			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
-			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
-			}
-
-			$shortcode_insert_button_once = true;
-		}
-
-		/**
-		 * Gets the shortcode insert button html.
-		 *
-		 * @param string $id
-		 * @param string $search_for_id
-		 *
-		 * @return mixed
-		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
-			ob_start();
-			?>
+            wp_die();
+        }
+
+        /**
+         * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
+         *
+         * @since 1.0.0
+         *
+         * @param string $editor_id Optional. Shortcode editor id. Default null.
+         * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
+         */
+        public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+            global $sd_widgets, $shortcode_insert_button_once;
+            if ( $shortcode_insert_button_once ) {
+                return;
+            }
+            add_thickbox();
+
+
+            /**
+             * Cornerstone makes us play dirty tricks :/
+             * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
+             */
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '<span id="insert-media-button">';
+            }
+
+            echo self::shortcode_button( 'this', 'true' );
+
+            // see opening note
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '</span>'; // end #insert-media-button
+            }
+
+            // Add separate script for generatepress theme sections
+            if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+            } else {
+                self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+            }
+
+            $shortcode_insert_button_once = true;
+        }
+
+        /**
+         * Gets the shortcode insert button html.
+         *
+         * @param string $id
+         * @param string $search_for_id
+         *
+         * @return mixed
+         */
+        public static function shortcode_button( $id = '', $search_for_id = '' ) {
+            ob_start();
+            ?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
-					echo "," . $search_for_id;
-				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
+                if ( $search_for_id ) {
+                    echo "," . $search_for_id;
+                } ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
 					<span style="vertical-align: middle;line-height: 18px;font-size: 20px;"
 					      class="dashicons dashicons-screenoptions"></span>
@@ -420,21 +420,21 @@ 
 			</span>
 
 			<?php
-			$html = ob_get_clean();
-
-			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
-		}
-
-		/**
-		 * Makes SD work with the siteOrigin page builder.
-		 *
-		 * @since 1.0.6
-		 * @return mixed
-		 */
-		public static function siteorigin_js() {
-			ob_start();
-			?>
+            $html = ob_get_clean();
+
+            // remove line breaks so we can use it in js
+            return preg_replace( "/\r|\n/", "", trim( $html ) );
+        }
+
+        /**
+         * Makes SD work with the siteOrigin page builder.
+         *
+         * @since 1.0.6
+         * @return mixed
+         */
+        public static function siteorigin_js() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * Check a form to see what items should be shown or hidden.
@@ -512,28 +512,28 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-		/**
-		 * Output the JS and CSS for the shortcode insert button.
-		 *
-		 * @since 1.0.6
-		 *
-		 * @param string $editor_id
-		 * @param string $insert_shortcode_function
-		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+        /**
+         * Output the JS and CSS for the shortcode insert button.
+         *
+         * @since 1.0.6
+         *
+         * @param string $editor_id
+         * @param string $insert_shortcode_function
+         */
+        public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+            ?>
 			<style>
 				.sd-shortcode-left-wrap {
 					float: left;
@@ -661,35 +661,35 @@ 
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				echo "<script>" . self::siteorigin_js() . "</script>";
-			}
-			?>
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                echo "<script>" . self::siteorigin_js() . "</script>";
+            }
+            ?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
-					echo $insert_shortcode_function;
-				}else{
-
-				/**
-				 * Function for super duper insert shortcode.
-				 *
-				 * @since 1.0.0
-				 */
-				?>
+                if(! empty( $insert_shortcode_function )){
+                    echo $insert_shortcode_function;
+                }else{
+
+                /**
+                 * Function for super duper insert shortcode.
+                 *
+                 * @since 1.0.0
+                 */
+                ?>
 				function sd_insert_shortcode($editor_id) {
 					$shortcode = jQuery('#TB_ajaxContent #sd-shortcode-output').val();
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
-								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
-								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
-							} else {
-								echo '$editor_id = "#wp-content-editor-container textarea";';
-							}
-							?>
+                            if ( isset( $_REQUEST['et_fb'] ) ) {
+                                echo '$editor_id = "#main_content_content_vb_tiny_mce";';
+                            } elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+                                echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
+                            } else {
+                                echo '$editor_id = "#wp-content-editor-container textarea";';
+                            }
+                            ?>
 						} else {
 							$editor_id = '#' + $editor_id;
 						}
@@ -1016,18 +1016,18 @@ 
 
 			</script>
 			<?php
-		}
-
-		/**
-		 * Gets some CSS for the widgets screen.
-		 *
-		 * @param bool $advanced If we should include advanced CSS.
-		 *
-		 * @return mixed
-		 */
-		public function widget_css( $advanced = true ) {
-			ob_start();
-			?>
+        }
+
+        /**
+         * Gets some CSS for the widgets screen.
+         *
+         * @param bool $advanced If we should include advanced CSS.
+         *
+         * @return mixed
+         */
+        public function widget_css( $advanced = true ) {
+            ob_start();
+            ?>
 			<style>
 				<?php if( $advanced ){ ?>
 				.sd-advanced-setting {
@@ -1065,26 +1065,26 @@ 
 				}
 			</style>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', $output );
-		}
-
-		/**
-		 * Gets some JS for the widgets screen.
-		 *
-		 * @return mixed
-		 */
-		public function widget_js() {
-			ob_start();
-			?>
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', $output );
+        }
+
+        /**
+         * Gets some JS for the widgets screen.
+         *
+         * @return mixed
+         */
+        public function widget_js() {
+            ob_start();
+            ?>
 			<script>
 
 				/**
@@ -1242,435 +1242,435 @@ 
 				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
-
-
-		/**
-		 * Set the name from the argument key.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
-				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
-		 * Register the parent shortcode.
-		 *
-		 * @since 1.0.0
-		 */
-		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
-		}
-
-		/**
-		 * Render the shortcode via ajax so we can return it to Gutenberg.
-		 *
-		 * @since 1.0.0
-		 */
-		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die();
-			}
-
-			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
-					global $post;
-					$post = $post_obj;
-				}
-			}
-
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
-				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
-				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
-						}
-
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
-
-							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
-							}
-						}
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . esc_attr( $value ) . "' ";
-					}
-				}
-
-				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
-
-				$content = do_shortcode( $shortcode );
-
-				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
-				}
-
-				echo $content;
-			}
-			wp_die();
-		}
-
-		/**
-		 * Output the shortcode.
-		 *
-		 * @param array $args
-		 * @param string $content
-		 *
-		 * @return string
-		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$_instance = $args;
-
-			$args = $this->argument_values( $args );
-
-			// add extra argument so we know its a output to gutenberg
-			//$args
-			$args = $this->string_to_bool( $args );
-
-			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
-				$args['html'] = $content;
-			}
-
-			if ( ! $this->is_preview() ) {
-				/**
-				 * Filters the settings for a particular widget args.
-				 *
-				 * @since 1.0.28
-				 *
-				 * @param array          $args      The current widget instance's settings.
-				 * @param WP_Super_Duper $widget    The current widget settings.
-				 * @param array          $_instance An array of default widget arguments.
-				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
-
-				if ( ! is_array( $args ) ) {
-					return $args;
-				}
-			}
-
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
-
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
-
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
-
-			$shortcode_args = array();
-			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
-				$no_wrap = true;
-			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
-				// wrap the shortcode in a div with the same class as the widget
-				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
-					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
-						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
-									$shortcode_args['before_title'] = $sidebar['before_title'];
-									$shortcode_args['after_title']  = $sidebar['after_title'];
-									break;
-								}
-							}
-						}
-					}
-					$output .= $this->output_title( $shortcode_args, $args );
-				}
-				$output .= $main_content;
-				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
-				$output .= $main_content;
-			}
-
-			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-			}
-
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
-		}
-
-		/**
-		 * Placeholder text to show if output is empty and we are on a preview/builder page.
-		 *
-		 * @param string $name
-		 *
-		 * @return string
-		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
-		}
-
-		/**
-		 * Sometimes booleans values can be turned to strings, so we fix that.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		public function string_to_bool( $options ) {
-			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
-				}
-			}
-
-			return $options;
-		}
-
-		/**
-		 * Get the argument values that are also filterable.
-		 *
-		 * @param $instance
-		 *
-		 * @since 1.0.12 Don't set checkbox default value if the value is empty.
-		 *
-		 * @return array
-		 */
-		public function argument_values( $instance ) {
-			$argument_values = array();
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->get_arguments();
-			}
-
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
-					// set the input name from the key
-					$args['name'] = $key;
-					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
-						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
-					}
-				}
-			}
-
-			return $argument_values;
-		}
-
-		/**
-		 * Set arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Set arguments.
-		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
-
-		/**
-		 * Get arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Get arguments.
-		 */
-		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->set_arguments();
-			}
-
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
-
-			return $this->arguments;
-		}
-
-		/**
-		 * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
-		 *
-		 * @param array $args
-		 * @param array $widget_args
-		 * @param string $content
-		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		}
-
-		/**
-		 * Add the dynamic block code inline when the wp-block in enqueued.
-		 */
-		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
-			}
-		}
-
-		/**
-		 * Check if we need to show advanced options.
-		 *
-		 * @return bool
-		 */
-		public function block_show_advanced() {
-
-			$show      = false;
-			$arguments = $this->get_arguments();
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+
+
+        /**
+         * Set the name from the argument key.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        private function add_name_from_key( $options, $arguments = false ) {
+            if ( ! empty( $options['arguments'] ) ) {
+                foreach ( $options['arguments'] as $key => $val ) {
+                    $options['arguments'][ $key ]['name'] = $key;
+                }
+            } elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
+                foreach ( $options as $key => $val ) {
+                    $options[ $key ]['name'] = $key;
+                }
+            }
+
+            return $options;
+        }
+
+        /**
+         * Register the parent shortcode.
+         *
+         * @since 1.0.0
+         */
+        public function register_shortcode() {
+            add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
+            add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+        }
+
+        /**
+         * Render the shortcode via ajax so we can return it to Gutenberg.
+         *
+         * @since 1.0.0
+         */
+        public function render_shortcode() {
+            check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die();
+            }
+
+            // we might need the $post value here so lets set it.
+            if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
+                $post_obj = get_post( absint( $_POST['post_id'] ) );
+                if ( ! empty( $post_obj ) && empty( $post ) ) {
+                    global $post;
+                    $post = $post_obj;
+                }
+            }
+
+            if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+                $is_preview = $this->is_preview();
+                $shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
+                $attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+                $attributes       = '';
+                if ( ! empty( $attributes_array ) ) {
+                    foreach ( $attributes_array as $key => $value ) {
+                        if ( is_array( $value ) ) {
+                            $value = implode( ",", $value );
+                        }
+
+                        if ( ! empty( $value ) ) {
+                            $value = wp_unslash( $value );
+
+                            // Encode [ and ].
+                            if ( $is_preview ) {
+                                $value = $this->encode_shortcodes( $value );
+                            }
+                        }
+                        $attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . esc_attr( $value ) . "' ";
+                    }
+                }
+
+                $shortcode = "[" . $shortcode_name . " " . $attributes . "]";
+
+                $content = do_shortcode( $shortcode );
+
+                // Decode [ and ].
+                if ( ! empty( $content ) && $is_preview ) {
+                    $content = $this->decode_shortcodes( $content );
+                }
+
+                echo $content;
+            }
+            wp_die();
+        }
+
+        /**
+         * Output the shortcode.
+         *
+         * @param array $args
+         * @param string $content
+         *
+         * @return string
+         */
+        public function shortcode_output( $args = array(), $content = '' ) {
+            $_instance = $args;
+
+            $args = $this->argument_values( $args );
+
+            // add extra argument so we know its a output to gutenberg
+            //$args
+            $args = $this->string_to_bool( $args );
+
+            // if we have a enclosed shortcode we add it to the special `html` argument
+            if ( ! empty( $content ) ) {
+                $args['html'] = $content;
+            }
+
+            if ( ! $this->is_preview() ) {
+                /**
+                 * Filters the settings for a particular widget args.
+                 *
+                 * @since 1.0.28
+                 *
+                 * @param array          $args      The current widget instance's settings.
+                 * @param WP_Super_Duper $widget    The current widget settings.
+                 * @param array          $_instance An array of default widget arguments.
+                 */
+                $args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+
+                if ( ! is_array( $args ) ) {
+                    return $args;
+                }
+            }
+
+            $class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+            $class .= " sdel-".$this->get_instance_hash();
+
+            $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+            $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+
+            $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+
+            $shortcode_args = array();
+            $output         = '';
+            $no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+            if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+                $no_wrap = true;
+            }
+            $main_content = $this->output( $args, $shortcode_args, $content );
+            if ( $main_content && ! $no_wrap ) {
+                // wrap the shortcode in a div with the same class as the widget
+                $output .= '<div class="' . $class . '" ' . $attrs . '>';
+                if ( ! empty( $args['title'] ) ) {
+                    // if its a shortcode and there is a title try to grab the title wrappers
+                    $shortcode_args = array( 'before_title' => '', 'after_title' => '' );
+                    if ( empty( $instance ) ) {
+                        global $wp_registered_sidebars;
+                        if ( ! empty( $wp_registered_sidebars ) ) {
+                            foreach ( $wp_registered_sidebars as $sidebar ) {
+                                if ( ! empty( $sidebar['before_title'] ) ) {
+                                    $shortcode_args['before_title'] = $sidebar['before_title'];
+                                    $shortcode_args['after_title']  = $sidebar['after_title'];
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    $output .= $this->output_title( $shortcode_args, $args );
+                }
+                $output .= $main_content;
+                $output .= '</div>';
+            } elseif ( $main_content && $no_wrap ) {
+                $output .= $main_content;
+            }
+
+            // if preview show a placeholder if empty
+            if ( $this->is_preview() && $output == '' ) {
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+            }
+
+            return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+        }
+
+        /**
+         * Placeholder text to show if output is empty and we are on a preview/builder page.
+         *
+         * @param string $name
+         *
+         * @return string
+         */
+        public function preview_placeholder_text( $name = '' ) {
+            return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+        }
+
+        /**
+         * Sometimes booleans values can be turned to strings, so we fix that.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        public function string_to_bool( $options ) {
+            // convert bool strings to booleans
+            foreach ( $options as $key => $val ) {
+                if ( $val == 'false' ) {
+                    $options[ $key ] = false;
+                } elseif ( $val == 'true' ) {
+                    $options[ $key ] = true;
+                }
+            }
+
+            return $options;
+        }
+
+        /**
+         * Get the argument values that are also filterable.
+         *
+         * @param $instance
+         *
+         * @since 1.0.12 Don't set checkbox default value if the value is empty.
+         *
+         * @return array
+         */
+        public function argument_values( $instance ) {
+            $argument_values = array();
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->get_arguments();
+            }
+
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $key => $args ) {
+                    // set the input name from the key
+                    $args['name'] = $key;
+                    //
+                    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
+                    if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+                        // don't set default for an empty checkbox
+                    } elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+                        $argument_values[ $key ] = $args['default'];
+                    }
+                }
+            }
+
+            return $argument_values;
+        }
+
+        /**
+         * Set arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Set arguments.
+         */
+        public function set_arguments() {
+            return $this->arguments;
+        }
+
+        /**
+         * Get arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Get arguments.
+         */
+        public function get_arguments() {
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->set_arguments();
+            }
+
+            $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
+            $this->arguments = $this->add_name_from_key( $this->arguments, true );
+
+            return $this->arguments;
+        }
+
+        /**
+         * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
+         *
+         * @param array $args
+         * @param array $widget_args
+         * @param string $content
+         */
+        public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        }
+
+        /**
+         * Add the dynamic block code inline when the wp-block in enqueued.
+         */
+        public function register_block() {
+            wp_add_inline_script( 'wp-blocks', $this->block() );
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+            }
+        }
+
+        /**
+         * Check if we need to show advanced options.
+         *
+         * @return bool
+         */
+        public function block_show_advanced() {
+
+            $show      = false;
+            $arguments = $this->get_arguments();
 			
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
-						$show = true;
-						break; // no need to continue if we know we have it
-					}
-				}
-			}
-
-			return $show;
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-
-			$url = $this->url;
-
-			if ( ! $url ) {
-				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
-
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
-
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
-					$this->url = $url;
-				}
-			}
-
-
-			return $url;
-		}
-
-		/**
-		 * Generate the block icon.
-		 *
-		 * Enables the use of Font Awesome icons.
-		 *
-		 * @note xlink:href is actually deprecated but href is not supported by all so we use both.
-		 *
-		 * @param $icon
-		 *
-		 * @since 1.1.0
-		 * @return string
-		 */
-		public function get_block_icon( $icon ) {
-
-			// check if we have a Font Awesome icon
-			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
-				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
-				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
-				$fa_type = 'brands';
-			} else {
-				$icon = "'" . $icon . "'";
-			}
-
-			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
-				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
-			}
-
-			return $icon;
-		}
-
-		public function group_arguments( $arguments ) {
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $argument ) {
+                    if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+                        $show = true;
+                        break; // no need to continue if we know we have it
+                    }
+                }
+            }
+
+            return $show;
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+
+            $url = $this->url;
+
+            if ( ! $url ) {
+                // check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+
+                $dir_parts = explode( "/wp-content/", $file_dir );
+                $url_parts = explode( "/wp-content/", plugins_url() );
+
+                if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
+                    $url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+                    $this->url = $url;
+                }
+            }
+
+
+            return $url;
+        }
+
+        /**
+         * Generate the block icon.
+         *
+         * Enables the use of Font Awesome icons.
+         *
+         * @note xlink:href is actually deprecated but href is not supported by all so we use both.
+         *
+         * @param $icon
+         *
+         * @since 1.1.0
+         * @return string
+         */
+        public function get_block_icon( $icon ) {
+
+            // check if we have a Font Awesome icon
+            $fa_type = '';
+            if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+                $fa_type = 'solid';
+            } elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+                $fa_type = 'regular';
+            } elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+                $fa_type = 'brands';
+            } else {
+                $icon = "'" . $icon . "'";
+            }
+
+            // set the icon if we found one
+            if ( $fa_type ) {
+                $fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+                $icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
+            }
+
+            return $icon;
+        }
+
+        public function group_arguments( $arguments ) {
 //			echo '###';print_r($arguments);
-			if ( ! empty( $arguments ) ) {
-				$temp_arguments = array();
-				$general        = __( "General" );
-				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
-						$add_sections                             = true;
-					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
-					}
-				}
-
-				// only add sections if more than one
-				if ( $add_sections ) {
-					$arguments = $temp_arguments;
-				}
-			}
+            if ( ! empty( $arguments ) ) {
+                $temp_arguments = array();
+                $general        = __( "General" );
+                $add_sections   = false;
+                foreach ( $arguments as $key => $args ) {
+                    if ( isset( $args['group'] ) ) {
+                        $temp_arguments[ $args['group'] ][ $key ] = $args;
+                        $add_sections                             = true;
+                    } else {
+                        $temp_arguments[ $general ][ $key ] = $args;
+                    }
+                }
+
+                // only add sections if more than one
+                if ( $add_sections ) {
+                    $arguments = $temp_arguments;
+                }
+            }
 
 //			echo '###';print_r($arguments);
-			return $arguments;
-		}
-
-
-		/**
-		 * Output the JS for building the dynamic Guntenberg block.
-		 *
-		 * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
-		 * @since 1.0.9 Save numbers as numbers and not strings.
-		 * @since 1.1.0 Font Awesome classes can be used for icons.
-		 * @return mixed
-		 */
-		public function block() {
-			ob_start();
-
-			$show_advanced = $this->block_show_advanced();
-			?>
+            return $arguments;
+        }
+
+
+        /**
+         * Output the JS for building the dynamic Guntenberg block.
+         *
+         * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
+         * @since 1.0.9 Save numbers as numbers and not strings.
+         * @since 1.1.0 Font Awesome classes can be used for icons.
+         * @return mixed
+         */
+        public function block() {
+            ob_start();
+
+            $show_advanced = $this->block_show_advanced();
+            ?>
 			<script>
 				/**
 				 * BLOCK: Basic
@@ -1714,97 +1714,97 @@ 
 						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
-							}
-							?>
+                            if ( isset( $this->options['block-supports'] ) ) {
+                                echo $this->array_to_attributes( $this->options['block-supports'] );
+                            }
+                            ?>
 						},
 						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
 						<?php if ( isset( $this->options['block-keywords'] ) ) {
-						echo "keywords : " . $this->options['block-keywords'] . ",";
-					}?>
+                        echo "keywords : " . $this->options['block-keywords'] . ",";
+                    }?>
 
 						<?php
 
-						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
-							$no_wrap = true;
-						}
-						if ( $no_wrap ) {
-							$this->options['block-wrap'] = '';
-						}
+                        // maybe set no_wrap
+                        $no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+                        if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+                            $no_wrap = true;
+                        }
+                        if ( $no_wrap ) {
+                            $this->options['block-wrap'] = '';
+                        }
 
 
 
-						$show_alignment = false;
-						// align feature
-						/*echo "supports: {";
+                        $show_alignment = false;
+                        // align feature
+                        /*echo "supports: {";
 						echo "	align: true,";
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
-							echo "attributes : {";
-
-							if ( $show_advanced ) {
-								echo "show_advanced: {";
-								echo "	type: 'boolean',";
-								echo "  default: false,";
-								echo "},";
-							}
-
-							// block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
-								echo "block_wrap: {";
-								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
-								echo "},";
-							}
-
-							foreach ( $this->arguments as $key => $args ) {
-
-								// set if we should show alignment
-								if ( $key == 'alignment' ) {
-									$show_alignment = true;
-								}
-
-								$extra = '';
-
-								if ( $args['type'] == 'checkbox' ) {
-									$type    = 'boolean';
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-								} elseif ( $args['type'] == 'number' ) {
-									$type    = 'number';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
-									$type = 'array';
-									if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-										$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
-									} else {
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									}
-								} elseif ( $args['type'] == 'multiselect' ) {
-									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} else {
-									$type    = 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								}
-								echo $key . " : {";
-								echo "type : '$type',";
-								echo "default : $default,";
-								echo "},";
-							}
-
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
-							echo "className: { type: 'string', default: '' },";
-
-							echo "},";
-
-						}
-
-						?>
+                        if ( ! empty( $this->arguments ) ) {
+                            echo "attributes : {";
+
+                            if ( $show_advanced ) {
+                                echo "show_advanced: {";
+                                echo "	type: 'boolean',";
+                                echo "  default: false,";
+                                echo "},";
+                            }
+
+                            // block wrap element
+                            if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+                                echo "block_wrap: {";
+                                echo "	type: 'string',";
+                                echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+                                echo "},";
+                            }
+
+                            foreach ( $this->arguments as $key => $args ) {
+
+                                // set if we should show alignment
+                                if ( $key == 'alignment' ) {
+                                    $show_alignment = true;
+                                }
+
+                                $extra = '';
+
+                                if ( $args['type'] == 'checkbox' ) {
+                                    $type    = 'boolean';
+                                    $default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
+                                } elseif ( $args['type'] == 'number' ) {
+                                    $type    = 'number';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                } elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+                                    $type = 'array';
+                                    if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
+                                        $default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+                                    } else {
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    }
+                                } elseif ( $args['type'] == 'multiselect' ) {
+                                    $type    = 'array';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                } else {
+                                    $type    = 'string';
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                }
+                                echo $key . " : {";
+                                echo "type : '$type',";
+                                echo "default : $default,";
+                                echo "},";
+                            }
+
+                            echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+                            echo "className: { type: 'string', default: '' },";
+
+                            echo "},";
+
+                        }
+
+                        ?>
 
 						// The "edit" property must be a valid function.
 						edit: function (props) {
@@ -1812,9 +1812,9 @@ 
 
 							var $value = '';
 							<?php
-							// if we have a post_type and a category then link them
-							if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
-							?>
+                            // if we have a post_type and a category then link them
+                            if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+                            ?>
 							if(typeof(prev_attributes[props.id]) != 'undefined' ){
 								$pt = props.attributes.post_type;
 								if(post_type_rest_slugs.length){
@@ -1898,8 +1898,8 @@ 
 										'shortcode': '<?php echo $this->options['base_id'];?>',
 										'attributes': props.attributes,
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
-										echo $post->ID;
-									}else{echo '0';}?>,
+                                        echo $post->ID;
+                                    }else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -1951,10 +1951,10 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+                                    if(! empty( $this->arguments )){
 
-									if ( $show_advanced ) {
-									?>
+                                    if ( $show_advanced ) {
+                                    ?>
 									el('div', {
 											style: {'padding-left': '16px','padding-right': '16px'}
 										},
@@ -1972,79 +1972,79 @@ 
 									,
 									<?php
 
-									}
+                                    }
 
-									$arguments = $this->group_arguments( $this->arguments );
+                                    $arguments = $this->group_arguments( $this->arguments );
 
-									// Do we have sections?
-									$has_sections = $arguments == $this->arguments ? false : true;
+                                    // Do we have sections?
+                                    $has_sections = $arguments == $this->arguments ? false : true;
 
 
-									if($has_sections){
-									$panel_count = 0;
-									foreach($arguments as $key => $args){
-									?>
+                                    if($has_sections){
+                                    $panel_count = 0;
+                                    foreach($arguments as $key => $args){
+                                    ?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( $key ); ?>',
 											initialOpen: <?php if ( $panel_count ) {
-											echo "false";
-										} else {
-											echo "true";
-										}?>
+                                            echo "false";
+                                        } else {
+                                            echo "true";
+                                        }?>
 										},
 										<?php
 
 
 
-										foreach ( $args as $k => $a ) {
+                                        foreach ( $args as $k => $a ) {
 
-											$this->block_row_start( $k, $a );
-											$this->build_block_arguments( $k, $a );
-											$this->block_row_end( $k, $a );
-										}
-										?>
+                                            $this->block_row_start( $k, $a );
+                                            $this->build_block_arguments( $k, $a );
+                                            $this->block_row_end( $k, $a );
+                                        }
+                                        ?>
 									),
 									<?php
-									$panel_count ++;
+                                    $panel_count ++;
 
-									}
-									}else {
-									?>
+                                    }
+                                    }else {
+                                    ?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings" ); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
-										}
-										?>
+                                        foreach ( $this->arguments as $key => $args ) {
+                                            $this->block_row_start( $key, $args );
+                                            $this->build_block_arguments( $key, $args );
+                                            $this->block_row_end( $key, $args );
+                                        }
+                                        ?>
 									),
 									<?php
-									}
+                                    }
 
-									}
-									?>
+                                    }
+                                    ?>
 
 								),
 
 								<?php
-								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}else{
-								// if no block-output is set then we try and get the shortcode html output via ajax.
-								?>
+                                // If the user sets block-output array then build it
+                                if ( ! empty( $this->options['block-output'] ) ) {
+                                $this->block_element( $this->options['block-output'] );
+                            }else{
+                                // if no block-output is set then we try and get the shortcode html output via ajax.
+                                ?>
 								el('div', {
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
 									className: props.className,
 									style: {'minHeight': '30px'}
 								})
 								<?php
-								}
-								?>
+                                }
+                                ?>
 							]; // end return
 						},
 
@@ -2062,10 +2062,10 @@ 
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+                            if(! empty( $this->arguments )){
 
-							foreach($this->arguments as $key => $args){
-							?>
+                            foreach($this->arguments as $key => $args){
+                            ?>
 							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 								if ('<?php echo esc_attr( $key );?>' == 'html') {
 									$html = attr.<?php echo esc_attr( $key );?>;
@@ -2074,10 +2074,10 @@ 
 								}
 							}
 							<?php
-							}
-							}
+                            }
+                            }
 
-							?>
+                            ?>
 							content += "]";
 
 							// if has html element
@@ -2100,20 +2100,20 @@ 
 							}
 
 							<?php
-							if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
-							?>
+                            if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+                            ?>
 							return content;
 							<?php
-							}else{
-							?>
+                            }else{
+                            ?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
 								block_wrap = attr.block_wrap;
 							}
 							return el(block_wrap, {dangerouslySetInnerHTML: {__html: content}, className: align});
 							<?php
-							}
-							?>
+                            }
+                            ?>
 
 
 						}
@@ -2121,30 +2121,30 @@ 
 				})();
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
-		public function block_row_start($key, $args){
+        public function block_row_start($key, $args){
 
-			// check for row
-			if(!empty($args['row'])){
+            // check for row
+            if(!empty($args['row'])){
 
-				if(!empty($args['row']['open'])){
+                if(!empty($args['row']['open'])){
 
-				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-				echo $element_require;
+                // element require
+                $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+                echo $element_require;
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
@@ -2174,87 +2174,87 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+                    if(false){?></script><?php }
+                }elseif(!empty($args['row']['close'])){
+                    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+                    if(false){?></script><?php }
+                }else{
+                    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 pr-2',
 							},
 					<?php
-					if(false){?></script><?php }
-				}
-
-			}
-
-		}
-
-		public function block_row_end($key, $args){
-
-			if(!empty($args['row'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "))";
-				}
-
-				echo "),";
-			}
-		}
-
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
-			$options           = '';
-			$extra             = '';
-			$require           = '';
-
-			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
-				return;
-			}
-
-
-			// icon
-			$icon = '';
-			if( !empty( $args['icon'] ) ){
-				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
-									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
-								$icon .= "}),";
-
-				// blank title as its added to the icon.
-				$args['title'] = '';
-			}
-
-			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
-
-			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-
-
-			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
-			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
-			if ( in_array( $args['type'], $text_type ) ) {
-				$type = 'TextControl';
-				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
-					$onchange = "props.setAttributes({ $key: Number($key) } )";
-				}
-			}
-			/*
+                    if(false){?></script><?php }
+                }
+
+            }
+
+        }
+
+        public function block_row_end($key, $args){
+
+            if(!empty($args['row'])){
+                // maybe close
+                if(!empty($args['row']['close'])){
+                    echo "))";
+                }
+
+                echo "),";
+            }
+        }
+
+        public function build_block_arguments( $key, $args ) {
+            $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+            $options           = '';
+            $extra             = '';
+            $require           = '';
+
+            // `content` is a protected and special argument
+            if ( $key == 'content' ) {
+                return;
+            }
+
+
+            // icon
+            $icon = '';
+            if( !empty( $args['icon'] ) ){
+                $icon .= "el('div', {";
+                                    $icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+                                    $icon .= "className: 'text-center',";
+                                    $icon .= "title: '".addslashes( $args['title'] )."',";
+                                $icon .= "}),";
+
+                // blank title as its added to the icon.
+                $args['title'] = '';
+            }
+
+            // require advanced
+            $require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+
+            // element require
+            $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+
+
+            $onchange  = "props.setAttributes({ $key: $key } )";
+            $onchangecomplete  = "";
+            $value     = "props.attributes.$key";
+            $text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
+            if ( in_array( $args['type'], $text_type ) ) {
+                $type = 'TextControl';
+                // Save numbers as numbers and not strings
+                if ( $args['type'] == 'number' ) {
+                    $onchange = "props.setAttributes({ $key: Number($key) } )";
+                }
+            }
+            /*
 			 * https://www.wptricks.com/question/set-current-tab-on-a-gutenberg-tabpanel-component-from-outside-that-component/ es5 layout
 						elseif($args['type']=='tabs'){
 							?>
@@ -2288,85 +2288,85 @@ 
 							return;
 						}
 			*/
-			elseif ( $args['type'] == 'color' ) {
-				$type = 'ColorPicker';
-				$onchange = "";
-				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
-					$extra .= "disableAlpha: true,";
-				}
-				$onchangecomplete = "onChangeComplete: function($key) {
+            elseif ( $args['type'] == 'color' ) {
+                $type = 'ColorPicker';
+                $onchange = "";
+                $extra = "color: $value,";
+                if(!empty($args['disable_alpha'])){
+                    $extra .= "disableAlpha: true,";
+                }
+                $onchangecomplete = "onChangeComplete: function($key) {
 				value =  $key.rgb.a && $key.rgb.a < 1 ? \"rgba(\"+$key.rgb.r+\",\"+$key.rgb.g+\",\"+$key.rgb.b+\",\"+$key.rgb.a+\")\" : $key.hex;
                         props.setAttributes({
                             $key: value
                         });
                     },";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
-				$type = 'CheckboxControl';
-				$extra .= "checked: props.attributes.$key,";
-				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
-				$type = 'TextareaControl';
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
-				$type = 'SelectControl';
-
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
-
-					if ( ! empty( $args['options'] ) ) {
-						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
-						}
-						$options .= "],";
-					}
-				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
-					$extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px"}, ';
-				}
-			} elseif ( $args['type'] == 'alignment' ) {
-				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			}elseif ( $args['type'] == 'margins' ) {
-
-			} else {
-				return;// if we have not implemented the control then don't break the JS.
-			}
-
-
-
-			// color input does not show the labels so we add them
-			if($args['type']=='color'){
-				// add show only if advanced
-				echo $require_advanced;
-				// add setting require if defined
-				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
-			}
-
-			// add show only if advanced
-			echo $require_advanced;
-			// add setting require if defined
-			echo $element_require;
-
-			// icon
-			echo $icon;
-			?>
+            }
+            elseif ( $args['type'] == 'checkbox' ) {
+                $type = 'CheckboxControl';
+                $extra .= "checked: props.attributes.$key,";
+                $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
+            } elseif ( $args['type'] == 'textarea' ) {
+                $type = 'TextareaControl';
+            } elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+                $type = 'SelectControl';
+
+                if($args['name'] == 'category' && !empty($args['post_type_linked'])){
+                    $options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
+                }elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
+                    $options .= "options: sort_by_".str_replace("-","_", $this->id).",";
+                }else {
+
+                    if ( ! empty( $args['options'] ) ) {
+                        $options .= "options: [";
+                        foreach ( $args['options'] as $option_val => $option_label ) {
+                            $options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
+                        }
+                        $options .= "],";
+                    }
+                }
+                if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+                    $extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px"}, ';
+                }
+            } elseif ( $args['type'] == 'alignment' ) {
+                $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
+            }elseif ( $args['type'] == 'margins' ) {
+
+            } else {
+                return;// if we have not implemented the control then don't break the JS.
+            }
+
+
+
+            // color input does not show the labels so we add them
+            if($args['type']=='color'){
+                // add show only if advanced
+                echo $require_advanced;
+                // add setting require if defined
+                echo $element_require;
+                echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+            }
+
+            // add show only if advanced
+            echo $require_advanced;
+            // add setting require if defined
+            echo $element_require;
+
+            // icon
+            echo $icon;
+            ?>
 			el( wp.components.<?php echo $type; ?>, {
 			label: '<?php echo addslashes( $args['title'] ); ?>',
 			help: '<?php if ( isset( $args['desc'] ) ) {
-				echo addslashes( $args['desc'] );
-			} ?>',
+                echo addslashes( $args['desc'] );
+            } ?>',
 			value: <?php echo $value; ?>,
 			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
-			} ?>
+                echo "type: '" . addslashes( $args['type'] ) . "',";
+            } ?>
 			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
-			} ?>
+                echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
+            } ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
@@ -2378,608 +2378,608 @@ 
 			<?php
 
 
-		}
-
-		/**
-		 * Convert an array of attributes to block string.
-		 *
-		 * @todo there is prob a faster way to do this, also we could add some validation here.
-		 *
-		 * @param $custom_attributes
-		 *
-		 * @return string
-		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
-			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
-
-				if ( $html ) {
-					foreach ( $custom_attributes as $key => $val ) {
-						$attributes .= " $key='$val' ";
-					}
-				} else {
-					foreach ( $custom_attributes as $key => $val ) {
-						$attributes .= "'$key': '$val',";
-					}
-				}
-			}
-
-			return $attributes;
-		}
-
-		/**
-		 * A self looping function to create the output for JS block elements.
-		 *
-		 * This is what is output in the WP Editor visual view.
-		 *
-		 * @param $args
-		 */
-		public function block_element( $args ) {
-
-
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
-
-					if ( is_array( $new_args ) ) { // its an element
-
-
-						if ( isset( $new_args['element'] ) ) {
-
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
-
-							echo "\n el( '" . $new_args['element'] . "', {";
-
-							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
-
-
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
-									// do nothing
-								} else {
-									echo $this->block_element( array( $new_key => $new_value ) );
-								}
-							}
-
-							echo "},";// end attributes
-
-							// get the content
-							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
-
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}
-
-									if ( is_array( $new_value ) ) {
-
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
-													"'+",
-													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
-										}
-
-										if ( isset( $new_value['element_repeat'] ) ) {
-											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ) );
-												$x ++;
-											}
-										} else {
-											$this->block_element( array( '' => $new_value ) );
-										}
-									}
-									$first_item ++;
-								}
-							}
-
-							echo ")";// end content
-
-							echo ", \n";
-
-						}
-					} else {
-
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
-						}
-
-					}
-				}
-			}
-		}
-
-		/**
-		 * Replace block attributes placeholders with the proper naming.
-		 *
-		 * @param $string
-		 *
-		 * @return mixed
-		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
-			} else {
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
-			}
-
-			return $string;
-		}
-
-		/**
-		 * Outputs the content of the widget
-		 *
-		 * @param array $args
-		 * @param array $instance
-		 */
-		public function widget( $args, $instance ) {
-
-			// get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
-
-			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
-				$no_wrap = true;
-			}
-
-			ob_start();
-			if ( $output && ! $no_wrap ) {
-
-				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
-
-				// Before widget
-				$before_widget = $args['before_widget'];
-				$before_widget = str_replace($class_original,$class,$before_widget);
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
-
-				// After widget
-				$after_widget = $args['after_widget'];
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
-
-				echo $before_widget;
-				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					// Filter class & attrs for elementor widget output.
-					$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-					$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
-
-					$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-					$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
-
-					echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
-				}
-				echo $this->output_title( $args, $instance );
-				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo "</span>";
-				}
-				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-				echo $output;
-			} elseif ( $output && $no_wrap ) {
-				echo $output;
-			}
-			$output = ob_get_clean();
-
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
-
-			echo $output;
-		}
-
-		/**
-		 * Tests if the current output is inside a elementor container.
-		 *
-		 * @since 1.0.4
-		 * @return bool
-		 */
-		public function is_elementor_widget_output() {
-			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a elementor preview.
-		 *
-		 * @since 1.0.4
-		 * @return bool
-		 */
-		public function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Divi preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Beaver builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a siteorigin builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a cornerstone builder preview.
-		 *
-		 * @since 1.0.8
-		 * @return bool
-		 */
-		public function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a fusion builder preview.
-		 *
-		 * @since 1.1.0
-		 * @return bool
-		 */
-		public function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Oxygen builder preview.
-		 *
-		 * @since 1.0.18
-		 * @return bool
-		 */
-		public function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_preview() {
-			$preview = false;
-			if ( $this->is_divi_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
-				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
-				$preview = true;
-			}
-
-			return $preview;
-		}
-
-		/**
-		 * Output the super title.
-		 *
-		 * @param $args
-		 * @param array $instance
-		 *
-		 * @return string
-		 */
-		public function output_title( $args, $instance = array() ) {
-			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
-				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-
-				if(empty($instance['widget_title_tag'])){
-					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
-					$title_tag = esc_attr( $instance['widget_title_tag'] );
-
-					// classes
-					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
-					$output = "<$title_tag class='$class' >$title</$title_tag>";
-				}
-
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Outputs the options form inputs for the widget.
-		 *
-		 * @param array $instance The widget options.
-		 */
-		public function form( $instance ) {
-
-			// set widget instance
-			$this->instance = $instance;
-
-			// set it as a SD widget
-			echo $this->widget_advanced_toggle();
-
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
-			$arguments_raw = $this->get_arguments();
-
-			if ( is_array( $arguments_raw ) ) {
-
-				$arguments = $this->group_arguments( $arguments_raw );
-
-				// Do we have sections?
-				$has_sections = $arguments == $arguments_raw ? false : true;
-
-
-				if ( $has_sections ) {
-					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
-
-						?>
+        }
+
+        /**
+         * Convert an array of attributes to block string.
+         *
+         * @todo there is prob a faster way to do this, also we could add some validation here.
+         *
+         * @param $custom_attributes
+         *
+         * @return string
+         */
+        public function array_to_attributes( $custom_attributes, $html = false ) {
+            $attributes = '';
+            if ( ! empty( $custom_attributes ) ) {
+
+                if ( $html ) {
+                    foreach ( $custom_attributes as $key => $val ) {
+                        $attributes .= " $key='$val' ";
+                    }
+                } else {
+                    foreach ( $custom_attributes as $key => $val ) {
+                        $attributes .= "'$key': '$val',";
+                    }
+                }
+            }
+
+            return $attributes;
+        }
+
+        /**
+         * A self looping function to create the output for JS block elements.
+         *
+         * This is what is output in the WP Editor visual view.
+         *
+         * @param $args
+         */
+        public function block_element( $args ) {
+
+
+            if ( ! empty( $args ) ) {
+                foreach ( $args as $element => $new_args ) {
+
+                    if ( is_array( $new_args ) ) { // its an element
+
+
+                        if ( isset( $new_args['element'] ) ) {
+
+                            if ( isset( $new_args['element_require'] ) ) {
+                                echo str_replace( array(
+                                        "'+",
+                                        "+'"
+                                    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+                                unset( $new_args['element_require'] );
+                            }
+
+                            echo "\n el( '" . $new_args['element'] . "', {";
+
+                            // get the attributes
+                            foreach ( $new_args as $new_key => $new_value ) {
+
+
+                                if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+                                    // do nothing
+                                } else {
+                                    echo $this->block_element( array( $new_key => $new_value ) );
+                                }
+                            }
+
+                            echo "},";// end attributes
+
+                            // get the content
+                            $first_item = 0;
+                            foreach ( $new_args as $new_key => $new_value ) {
+                                if ( $new_key === 'content' || is_array( $new_value ) ) {
+
+                                    if ( $new_key === 'content' ) {
+                                        echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+                                    }
+
+                                    if ( is_array( $new_value ) ) {
+
+                                        if ( isset( $new_value['element_require'] ) ) {
+                                            echo str_replace( array(
+                                                    "'+",
+                                                    "+'"
+                                                ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
+                                            unset( $new_value['element_require'] );
+                                        }
+
+                                        if ( isset( $new_value['element_repeat'] ) ) {
+                                            $x = 1;
+                                            while ( $x <= absint( $new_value['element_repeat'] ) ) {
+                                                $this->block_element( array( '' => $new_value ) );
+                                                $x ++;
+                                            }
+                                        } else {
+                                            $this->block_element( array( '' => $new_value ) );
+                                        }
+                                    }
+                                    $first_item ++;
+                                }
+                            }
+
+                            echo ")";// end content
+
+                            echo ", \n";
+
+                        }
+                    } else {
+
+                        if ( substr( $element, 0, 3 ) === "if_" ) {
+                            echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
+                        } elseif ( $element == 'style' ) {
+                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+                        } else {
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+                        }
+
+                    }
+                }
+            }
+        }
+
+        /**
+         * Replace block attributes placeholders with the proper naming.
+         *
+         * @param $string
+         *
+         * @return mixed
+         */
+        public function block_props_replace( $string, $no_wrap = false ) {
+
+            if ( $no_wrap ) {
+                $string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+            } else {
+                $string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+            }
+
+            return $string;
+        }
+
+        /**
+         * Outputs the content of the widget
+         *
+         * @param array $args
+         * @param array $instance
+         */
+        public function widget( $args, $instance ) {
+
+            // get the filtered values
+            $argument_values = $this->argument_values( $instance );
+            $argument_values = $this->string_to_bool( $argument_values );
+            $output          = $this->output( $argument_values, $args );
+
+            $no_wrap = false;
+            if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+                $no_wrap = true;
+            }
+
+            ob_start();
+            if ( $output && ! $no_wrap ) {
+
+                $class_original = $this->options['widget_ops']['classname'];
+                $class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+
+                // Before widget
+                $before_widget = $args['before_widget'];
+                $before_widget = str_replace($class_original,$class,$before_widget);
+                $before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
+                $before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+
+                // After widget
+                $after_widget = $args['after_widget'];
+                $after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
+                $after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+
+                echo $before_widget;
+                // elementor strips the widget wrapping div so we check for and add it back if needed
+                if ( $this->is_elementor_widget_output() ) {
+                    // Filter class & attrs for elementor widget output.
+                    $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+                    $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+
+                    $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+                    $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+
+                    echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
+                }
+                echo $this->output_title( $args, $instance );
+                echo $output;
+                if ( $this->is_elementor_widget_output() ) {
+                    echo "</span>";
+                }
+                echo $after_widget;
+            } elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+                echo $output;
+            } elseif ( $output && $no_wrap ) {
+                echo $output;
+            }
+            $output = ob_get_clean();
+
+            $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+
+            echo $output;
+        }
+
+        /**
+         * Tests if the current output is inside a elementor container.
+         *
+         * @since 1.0.4
+         * @return bool
+         */
+        public function is_elementor_widget_output() {
+            $result = false;
+            if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a elementor preview.
+         *
+         * @since 1.0.4
+         * @return bool
+         */
+        public function is_elementor_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Divi preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_divi_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Beaver builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_beaver_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['fl_builder'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a siteorigin builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_siteorigin_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a cornerstone builder preview.
+         *
+         * @since 1.0.8
+         * @return bool
+         */
+        public function is_cornerstone_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a fusion builder preview.
+         *
+         * @since 1.1.0
+         * @return bool
+         */
+        public function is_fusion_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Oxygen builder preview.
+         *
+         * @since 1.0.18
+         * @return bool
+         */
+        public function is_oxygen_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_preview() {
+            $preview = false;
+            if ( $this->is_divi_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_elementor_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_beaver_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_siteorigin_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_cornerstone_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_fusion_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_oxygen_preview() ) {
+                $preview = true;
+            } elseif( $this->is_block_content_call() ) {
+                $preview = true;
+            }
+
+            return $preview;
+        }
+
+        /**
+         * Output the super title.
+         *
+         * @param $args
+         * @param array $instance
+         *
+         * @return string
+         */
+        public function output_title( $args, $instance = array() ) {
+            $output = '';
+            if ( ! empty( $instance['title'] ) ) {
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+
+                if(empty($instance['widget_title_tag'])){
+                    $output = $args['before_title'] . $title . $args['after_title'];
+                }else{
+                    $title_tag = esc_attr( $instance['widget_title_tag'] );
+
+                    // classes
+                    $title_classes = array();
+                    $title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
+
+                    $class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+                    $output = "<$title_tag class='$class' >$title</$title_tag>";
+                }
+
+            }
+
+            return $output;
+        }
+
+        /**
+         * Outputs the options form inputs for the widget.
+         *
+         * @param array $instance The widget options.
+         */
+        public function form( $instance ) {
+
+            // set widget instance
+            $this->instance = $instance;
+
+            // set it as a SD widget
+            echo $this->widget_advanced_toggle();
+
+            echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+            $arguments_raw = $this->get_arguments();
+
+            if ( is_array( $arguments_raw ) ) {
+
+                $arguments = $this->group_arguments( $arguments_raw );
+
+                // Do we have sections?
+                $has_sections = $arguments == $arguments_raw ? false : true;
+
+
+                if ( $has_sections ) {
+                    $panel_count = 0;
+                    foreach ( $arguments as $key => $args ) {
+
+                        ?>
 						<script>
 							//							jQuery(this).find("i").toggleClass("fas fa-chevron-up fas fa-chevron-down");jQuery(this).next().toggle();
 						</script>
 						<?php
 
-						$hide       = $panel_count ? ' style="display:none;" ' : '';
-						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+                        $hide       = $panel_count ? ' style="display:none;" ' : '';
+                        $icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
+                        echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+                        echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
 
-						foreach ( $args as $k => $a ) {
+                        foreach ( $args as $k => $a ) {
 
-							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
-							$this->widget_inputs_row_end($k, $a);
+                            $this->widget_inputs_row_start($k, $a);
+                            $this->widget_inputs( $a, $instance );
+                            $this->widget_inputs_row_end($k, $a);
 
-						}
+                        }
 
-						echo "</div>";
+                        echo "</div>";
 
-						$panel_count ++;
+                        $panel_count ++;
 
-					}
-				} else {
-					foreach ( $arguments as $key => $args ) {
-						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
-						$this->widget_inputs_row_end($key, $args);
-					}
-				}
+                    }
+                } else {
+                    foreach ( $arguments as $key => $args ) {
+                        $this->widget_inputs_row_start($key, $args);
+                        $this->widget_inputs( $args, $instance );
+                        $this->widget_inputs_row_end($key, $args);
+                    }
+                }
 
-			}
-		}
+            }
+        }
 
-		public function widget_inputs_row_start($key, $args){
-			if(!empty($args['row'])){
-				// maybe open
-				if(!empty($args['row']['open'])){
-					?>
+        public function widget_inputs_row_start($key, $args){
+            if(!empty($args['row'])){
+                // maybe open
+                if(!empty($args['row']['open'])){
+                    ?>
 					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php if ( !empty($args['row']['element_require'])) {
-						echo $this->convert_element_require( $args['row']['element_require'] );
-					} ?>'>
+                        echo $this->convert_element_require( $args['row']['element_require'] );
+                    } ?>'>
 					<?php if(!empty($args['row']['title'])){ ?>
 					<label class="mb-0 "><?php echo esc_attr( $args['row']['title'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
 					<?php }?>
 					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
-					echo "<div class='col pl-0'>";
-				}else{
-					echo "<div class='col pl-0 pr-2'>";
-				}
-			}
-		}
-
-		public function widget_inputs_row_end($key, $args){
-
-			if(!empty($args['row'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "</div></div>";
-				}
-
-				echo "</div>";
-			}
-		}
-
-		/**
-		 * Get the hidden input that when added makes the advanced button show on widget settings.
-		 *
-		 * @return string
-		 */
-		public function widget_advanced_toggle() {
-
-			$output = '';
-			if ( $this->block_show_advanced() ) {
-				$val = 1;
-			} else {
-				$val = 0;
-			}
-
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
-
-			return $output;
-		}
-
-		/**
-		 * Convert require element.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $input Input element.
-		 *
-		 * @return string $output
-		 */
-		public function convert_element_require( $input ) {
-
-			$input = str_replace( "'", '"', $input );// we only want double quotes
-
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()"
-			), $input ) );
-
-			return $output;
-		}
-
-		/**
-		 * Builds the inputs for the widget options.
-		 *
-		 * @param $args
-		 * @param $instance
-		 */
-		public function widget_inputs( $args, $instance ) {
-
-			$class             = "";
-			$element_require   = "";
-			$custom_attributes = "";
-
-			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
-			} else {
-				$value = '';
-			}
-
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
-
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
-
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
-
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
-
-
-			// before wrapper
-			?>
+                }elseif(!empty($args['row']['close'])){
+                    echo "<div class='col pl-0'>";
+                }else{
+                    echo "<div class='col pl-0 pr-2'>";
+                }
+            }
+        }
+
+        public function widget_inputs_row_end($key, $args){
+
+            if(!empty($args['row'])){
+                // maybe close
+                if(!empty($args['row']['close'])){
+                    echo "</div></div>";
+                }
+
+                echo "</div>";
+            }
+        }
+
+        /**
+         * Get the hidden input that when added makes the advanced button show on widget settings.
+         *
+         * @return string
+         */
+        public function widget_advanced_toggle() {
+
+            $output = '';
+            if ( $this->block_show_advanced() ) {
+                $val = 1;
+            } else {
+                $val = 0;
+            }
+
+            $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
+
+            return $output;
+        }
+
+        /**
+         * Convert require element.
+         *
+         * @since 1.0.0
+         *
+         * @param string $input Input element.
+         *
+         * @return string $output
+         */
+        public function convert_element_require( $input ) {
+
+            $input = str_replace( "'", '"', $input );// we only want double quotes
+
+            $output = esc_attr( str_replace( array( "[%", "%]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select,textarea').val()"
+            ), $input ) );
+
+            return $output;
+        }
+
+        /**
+         * Builds the inputs for the widget options.
+         *
+         * @param $args
+         * @param $instance
+         */
+        public function widget_inputs( $args, $instance ) {
+
+            $class             = "";
+            $element_require   = "";
+            $custom_attributes = "";
+
+            // get value
+            if ( isset( $instance[ $args['name'] ] ) ) {
+                $value = $instance[ $args['name'] ];
+            } elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
+                $value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+            } else {
+                $value = '';
+            }
+
+            // get placeholder
+            if ( ! empty( $args['placeholder'] ) ) {
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+            } else {
+                $placeholder = '';
+            }
+
+            // get if advanced
+            if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+                $class .= " sd-advanced-setting ";
+            }
+
+            // element_require
+            if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+                $element_require = $args['element_require'];
+            }
+
+            // custom_attributes
+            if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
+                $custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+            }
+
+
+            // before wrapper
+            ?>
 			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
 			data-argument='<?php echo esc_attr( $args['name'] ); ?>'
 			data-element_require='<?php if ( $element_require ) {
-				echo $this->convert_element_require( $element_require );
-			} ?>'
+                echo $this->convert_element_require( $element_require );
+            } ?>'
 			>
 			<?php
 
 
-			switch ( $args['type'] ) {
-				//array('text','password','number','email','tel','url','color')
-				case "text":
-				case "password":
-				case "number":
-				case "email":
-				case "tel":
-				case "url":
-				case "color":
-					?>
+            switch ( $args['type'] ) {
+                //array('text','password','number','email','tel','url','color')
+                case "text":
+                case "password":
+                case "number":
+                case "email":
+                case "tel":
+                case "url":
+                case "color":
+                    ?>
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat"
@@ -2990,47 +2990,47 @@ 
 						                               value="<?php echo esc_attr( $value ); ?>">
 					<?php
 
-					break;
-				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
-							$value = array();
-						}
-					}
-					?>
+                    break;
+                case "select":
+                    $multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
+                    if ( $multiple ) {
+                        if ( empty( $value ) ) {
+                            $value = array();
+                        }
+                    }
+                    ?>
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
 						                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 						                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-						                                if ( $multiple ) {
-							                                echo "[]";
-						                                } ?>"
+                                                        if ( $multiple ) {
+                                                            echo "[]";
+                                                        } ?>"
 						<?php if ( $multiple ) {
-							echo "multiple";
-						} //@todo not implemented yet due to gutenberg not supporting it
-						?>
+                            echo "multiple";
+                        } //@todo not implemented yet due to gutenberg not supporting it
+                        ?>
 					>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
-								} else {
-									$selected = selected( $value, $val, false );
-								}
-								echo "<option value='$val' " . $selected . ">$label</option>";
-							}
-						}
-						?>
+                        if ( ! empty( $args['options'] ) ) {
+                            foreach ( $args['options'] as $val => $label ) {
+                                if ( $multiple ) {
+                                    $selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+                                } else {
+                                    $selected = selected( $value, $val, false );
+                                }
+                                echo "<option value='$val' " . $selected . ">$label</option>";
+                            }
+                        }
+                        ?>
 					</select>
 					<?php
-					break;
-				case "checkbox":
-					?>
+                    break;
+                case "checkbox":
+                    ?>
 					<input <?php echo $placeholder; ?>
 						<?php checked( 1, $value, true ) ?>
 						<?php echo $custom_attributes; ?>
@@ -3040,9 +3040,9 @@ 
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<?php
-					break;
-				case "textarea":
-					?>
+                    break;
+                case "textarea":
+                    ?>
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat"
@@ -3052,280 +3052,280 @@ 
 					><?php echo esc_attr( $value ); ?></textarea>
 					<?php
 
-					break;
-				case "hidden":
-					?>
+                    break;
+                case "hidden":
+                    ?>
 					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 					       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
 					       value="<?php echo esc_attr( $value ); ?>">
 					<?php
-					break;
-				default:
-					echo "No input type found!"; // @todo we need to add more input types.
-			}
+                    break;
+                default:
+                    echo "No input type found!"; // @todo we need to add more input types.
+            }
 
-			// after wrapper
-			?>
+            // after wrapper
+            ?>
 			</p>
 			<?php
 
 
-		}
-
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
-			}
-		}
-
-		/**
-		 * Get the widget input description html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 * @todo, need to make its own tooltip script
-		 */
-		public function widget_field_desc( $args ) {
-
-			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
-				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
-				}
-			}
-
-			return $description;
-		}
-
-		/**
-		 * Get the widget input title html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 */
-		public function widget_field_title( $args ) {
-
-			$title = '';
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
-				} else {
-					$title = esc_attr($args['title']);
-				}
-			}
-
-			return $title;
-		}
-
-		/**
-		 * Get the tool tip html.
-		 *
-		 * @param $tip
-		 * @param bool $allow_html
-		 *
-		 * @return string
-		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
-			} else {
-				$tip = esc_attr( $tip );
-			}
-
-			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
-		}
-
-		/**
-		 * Sanitize a string destined to be a tooltip.
-		 *
-		 * @param string $var
-		 *
-		 * @return string
-		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
-				'br'     => array(),
-				'em'     => array(),
-				'strong' => array(),
-				'small'  => array(),
-				'span'   => array(),
-				'ul'     => array(),
-				'li'     => array(),
-				'ol'     => array(),
-				'p'      => array(),
-			) ) );
-		}
-
-		/**
-		 * Processing widget options on save
-		 *
-		 * @param array $new_instance The new options
-		 * @param array $old_instance The previous options
-		 *
-		 * @return array
-		 * @todo we should add some sanitation here.
-		 */
-		public function update( $new_instance, $old_instance ) {
-
-			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->get_arguments();
-			}
-
-			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
-					}
-				}
-			}
-
-			return $instance;
-		}
-
-		/**
-		 * Checks if the current call is a ajax call to get the block content.
-		 *
-		 * This can be used in your widget to return different content as the block content.
-		 *
-		 * @since 1.0.3
-		 * @return bool
-		 */
-		public function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Get an instance hash that will be unique to the type and settings.
-		 *
-		 * @since 1.0.20
-		 * @return string
-		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
-		}
-
-		/**
-		 * Generate and return inline styles from CSS rules that will match the unique class of the instance.
-		 *
-		 * @param array $rules
-		 *
-		 * @since 1.0.20
-		 * @return string
-		 */
-		public function get_instance_style($rules = array()){
-			$css = '';
-
-			if(!empty($rules)){
-				$rules = array_unique($rules);
-				$instance_hash = $this->get_instance_hash();
-				$css .= "<style>";
-				foreach($rules as $rule){
-					$css .= ".sdel-$instance_hash $rule";
-				}
-				$css .= "</style>";
-			}
-
-			return $css;
-		}
-
-		/**
-		 * Encode shortcodes tags.
-		 *
-		 * @since 1.0.28
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 * @return string Content with shortcode tags removed.
-		 */
-		public function encode_shortcodes( $content ) {
-			// Avoids existing encoded tags.
-			$trans   = array(
-				'&#91;' => '&#091;',
-				'&#93;' => '&#093;',
-				'&amp;#91;' => '&#091;',
-				'&amp;#93;' => '&#093;',
-				'&lt;' => '&0lt;',
-				'&gt;' => '&0gt;',
-				'&amp;lt;' => '&0lt;',
-				'&amp;gt;' => '&0gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'[' => '&#91;',
-				']' => '&#93;',
-				'<' => '&lt;',
-				'>' => '&gt;',
-				'"' => '&quot;',
-				"'" => '&apos;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
-
-		/**
-		 * Remove encoded shortcod tags.
-		 *
-		 * @since 1.0.28
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 * @return string Content with decoded shortcode tags.
-		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
-				'&#91;' => '[',
-				'&#93;' => ']',
-				'&amp;#91;' => '[',
-				'&amp;#93;' => ']',
-				'&lt;' => '<',
-				'&gt;' => '>',
-				'&amp;lt;' => '<',
-				'&amp;gt;' => '>',
-				'&quot;' => '"',
-				'&apos;' => "'",
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'&#091;' => '&#91;',
-				'&#093;' => '&#93;',
-				'&amp;#091;' => '&#91;',
-				'&amp;#093;' => '&#93;',
-				'&0lt;' => '&lt;',
-				'&0gt;' => '&gt;',
-				'&amp;0lt;' => '&lt;',
-				'&amp;0gt;' => '&gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
-	}
+        }
+
+        public function get_widget_icon($icon = 'box-top', $title = ''){
+            if($icon=='box-top'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+            }elseif($icon=='box-right'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+            }elseif($icon=='box-bottom'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+            }elseif($icon=='box-left'){
+                return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+            }
+        }
+
+        /**
+         * Get the widget input description html.
+         *
+         * @param $args
+         *
+         * @return string
+         * @todo, need to make its own tooltip script
+         */
+        public function widget_field_desc( $args ) {
+
+            $description = '';
+            if ( isset( $args['desc'] ) && $args['desc'] ) {
+                if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
+                    $description = $this->desc_tip( $args['desc'] );
+                } else {
+                    $description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+                }
+            }
+
+            return $description;
+        }
+
+        /**
+         * Get the widget input title html.
+         *
+         * @param $args
+         *
+         * @return string
+         */
+        public function widget_field_title( $args ) {
+
+            $title = '';
+            if ( isset( $args['title'] ) && $args['title'] ) {
+                if ( isset( $args['icon'] ) && $args['icon'] ) {
+                    $title = self::get_widget_icon( $args['icon'], $args['title']  );
+                } else {
+                    $title = esc_attr($args['title']);
+                }
+            }
+
+            return $title;
+        }
+
+        /**
+         * Get the tool tip html.
+         *
+         * @param $tip
+         * @param bool $allow_html
+         *
+         * @return string
+         */
+        function desc_tip( $tip, $allow_html = false ) {
+            if ( $allow_html ) {
+                $tip = $this->sanitize_tooltip( $tip );
+            } else {
+                $tip = esc_attr( $tip );
+            }
+
+            return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
+        }
+
+        /**
+         * Sanitize a string destined to be a tooltip.
+         *
+         * @param string $var
+         *
+         * @return string
+         */
+        public function sanitize_tooltip( $var ) {
+            return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+                'br'     => array(),
+                'em'     => array(),
+                'strong' => array(),
+                'small'  => array(),
+                'span'   => array(),
+                'ul'     => array(),
+                'li'     => array(),
+                'ol'     => array(),
+                'p'      => array(),
+            ) ) );
+        }
+
+        /**
+         * Processing widget options on save
+         *
+         * @param array $new_instance The new options
+         * @param array $old_instance The previous options
+         *
+         * @return array
+         * @todo we should add some sanitation here.
+         */
+        public function update( $new_instance, $old_instance ) {
+
+            //save the widget
+            $instance = array_merge( (array) $old_instance, (array) $new_instance );
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->get_arguments();
+            }
+
+            // check for checkboxes
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $argument ) {
+                    if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
+                        $instance[ $argument['name'] ] = '0';
+                    }
+                }
+            }
+
+            return $instance;
+        }
+
+        /**
+         * Checks if the current call is a ajax call to get the block content.
+         *
+         * This can be used in your widget to return different content as the block content.
+         *
+         * @since 1.0.3
+         * @return bool
+         */
+        public function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Get an instance hash that will be unique to the type and settings.
+         *
+         * @since 1.0.20
+         * @return string
+         */
+        public function get_instance_hash(){
+            $instance_string = $this->base_id.serialize($this->instance);
+            return hash('crc32b',$instance_string);
+        }
+
+        /**
+         * Generate and return inline styles from CSS rules that will match the unique class of the instance.
+         *
+         * @param array $rules
+         *
+         * @since 1.0.20
+         * @return string
+         */
+        public function get_instance_style($rules = array()){
+            $css = '';
+
+            if(!empty($rules)){
+                $rules = array_unique($rules);
+                $instance_hash = $this->get_instance_hash();
+                $css .= "<style>";
+                foreach($rules as $rule){
+                    $css .= ".sdel-$instance_hash $rule";
+                }
+                $css .= "</style>";
+            }
+
+            return $css;
+        }
+
+        /**
+         * Encode shortcodes tags.
+         *
+         * @since 1.0.28
+         *
+         * @param string $content Content to search for shortcode tags.
+         * @return string Content with shortcode tags removed.
+         */
+        public function encode_shortcodes( $content ) {
+            // Avoids existing encoded tags.
+            $trans   = array(
+                '&#91;' => '&#091;',
+                '&#93;' => '&#093;',
+                '&amp;#91;' => '&#091;',
+                '&amp;#93;' => '&#093;',
+                '&lt;' => '&0lt;',
+                '&gt;' => '&0gt;',
+                '&amp;lt;' => '&0lt;',
+                '&amp;gt;' => '&0gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '[' => '&#91;',
+                ']' => '&#93;',
+                '<' => '&lt;',
+                '>' => '&gt;',
+                '"' => '&quot;',
+                "'" => '&apos;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
+
+        /**
+         * Remove encoded shortcod tags.
+         *
+         * @since 1.0.28
+         *
+         * @param string $content Content to search for shortcode tags.
+         * @return string Content with decoded shortcode tags.
+         */
+        public function decode_shortcodes( $content ) {
+            $trans   = array(
+                '&#91;' => '[',
+                '&#93;' => ']',
+                '&amp;#91;' => '[',
+                '&amp;#93;' => ']',
+                '&lt;' => '<',
+                '&gt;' => '>',
+                '&amp;lt;' => '<',
+                '&amp;gt;' => '>',
+                '&quot;' => '"',
+                '&apos;' => "'",
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '&#091;' => '&#91;',
+                '&#093;' => '&#93;',
+                '&amp;#091;' => '&#91;',
+                '&amp;#093;' => '&#93;',
+                '&0lt;' => '&lt;',
+                '&0gt;' => '&gt;',
+                '&amp;0lt;' => '&lt;',
+                '&amp;0gt;' => '&gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
+    }
 }

Spacing +581 added lines, -581 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 
 
 	/**
@@ -37,27 +37,27 @@ 
 		/**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
+		public function __construct($options) {
 			global $sd_widgets;
 
-			$sd_widgets[ $options['base_id'] ] = array(
+			$sd_widgets[$options['base_id']] = array(
 				'name'       => $options['name'],
 				'class_name' => $options['class_name']
 			);
-			$this->base_id                     = $options['base_id'];
+			$this->base_id = $options['base_id'];
 			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
+			$options       = apply_filters("wp_super_duper_options", $options);
+			$options       = apply_filters("wp_super_duper_options_{$this->base_id}", $options);
+			$options       = $this->add_name_from_key($options);
 			$this->options = $options;
 
 			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+			$this->arguments = isset($options['arguments']) ? $options['arguments'] : array();
 
 			// init parent
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			parent::__construct($options['base_id'], $options['name'], $options['widget_ops']);
 
-			if ( isset( $options['class_name'] ) ) {
+			if (isset($options['class_name'])) {
 				// register widget
 				$this->class_name = $options['class_name'];
 
@@ -65,72 +65,72 @@ 
 				$this->register_shortcode();
 
 				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
+				if (function_exists('fusion_builder_map')) {
+					add_action('init', array($this, 'register_fusion_element'));
 				}
 
 				// register block
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				add_action('admin_enqueue_scripts', array($this, 'register_block'));
 			}
 
 			// add the CSS and JS we need ONCE
 			global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+			if (!$sd_widget_scripts) {
+				wp_add_inline_script('admin-widgets', $this->widget_js());
+				wp_add_inline_script('customize-controls', $this->widget_js());
+				wp_add_inline_style('widgets', $this->widget_css());
 
 				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+				add_action('elementor/editor/after_enqueue_styles', array($this, 'elementor_editor_styles'));
 
 				$sd_widget_scripts = true;
 
 				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+				add_action('media_buttons', array($this, 'shortcode_insert_button'));
 				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+				if (function_exists('generate_sections_sections_metabox')) {
+					add_action('generate_sections_metabox', array($this, 'shortcode_insert_button_script'));
 				}
 				/* Load script on Divi theme builder page */
-				if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) {
+				if (function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) {
 					add_thickbox();
-					add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
+					add_action('admin_footer', array($this, 'shortcode_insert_button_script'));
 				}
 
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+				if ($this->is_preview()) {
+					add_action('wp_footer', array($this, 'shortcode_insert_button_script'));
 					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
+					add_action('elementor/editor/after_enqueue_scripts', array(
 						$this,
 						'shortcode_insert_button_script'
-					) ); // for elementor
+					)); // for elementor
 				}
 				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'maybe_cornerstone_builder'));
 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+				add_action('wp_ajax_super_duper_get_widget_settings', array(__CLASS__, 'get_widget_settings'));
+				add_action('wp_ajax_super_duper_get_picker', array(__CLASS__, 'get_picker'));
 
 				// add generator text to admin head
-				add_action( 'admin_head', array( $this, 'generator' ) );
+				add_action('admin_head', array($this, 'generator'));
 			}
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 		}
 
 		/**
 		 * Add our widget CSS to elementor editor.
 		 */
 		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+			wp_add_inline_style('elementor-editor', $this->widget_css(false));
 		}
 
 		public function register_fusion_element() {
 
 			$options = $this->options;
 
-			if ( $this->base_id ) {
+			if ($this->base_id) {
 
 				$params = $this->get_fusion_params();
 
@@ -141,11 +141,11 @@ 
 					'allow_generator' => true,
 				);
 
-				if ( ! empty( $params ) ) {
+				if (!empty($params)) {
 					$args['params'] = $params;
 				}
 
-				fusion_builder_map( $args );
+				fusion_builder_map($args);
 			}
 
 		}
@@ -154,8 +154,8 @@ 
 			$params    = array();
 			$arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $key => $val) {
 					$param = array();
 					// type
 					$param['type'] = str_replace(
@@ -177,7 +177,7 @@ 
 						$val['type'] );
 
 					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+					if ($val['type'] == 'multiselect' || (($param['type'] == 'select' || $val['type'] == 'select') && !empty($val['multiple']))) {
 						$param['type']     = 'multiple_select';
 						$param['multiple'] = true;
 					}
@@ -186,29 +186,29 @@ 
 					$param['heading'] = $val['title'];
 
 					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+					$param['description'] = isset($val['desc']) ? $val['desc'] : '';
 
 					// param_name
 					$param['param_name'] = $key;
 
 					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+					$param['default'] = isset($val['default']) ? $val['default'] : '';
 
 					// Group
-					if ( isset( $val['group'] ) ) {
+					if (isset($val['group'])) {
 						$param['group'] = $val['group'];
 					}
 
 					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
+					if ($val['type'] == 'checkbox') {
+						if (isset($val['default']) && $val['default'] == '0') {
+							unset($param['default']);
 						}
-						$param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+						$param['value'] = array('' => __("No"), '1' => __("Yes"));
+					} elseif ($param['type'] == 'select' || $param['type'] == 'multiple_select') {
+						$param['value'] = isset($val['options']) ? $val['options'] : array();
 					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+						$param['value'] = isset($val['default']) ? $val['default'] : '';
 					}
 
 					// setup the param
@@ -225,7 +225,7 @@ 
 		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
 		 */
 		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
+			if (did_action('cornerstone_before_boot_app')) {
 				self::shortcode_insert_button_script();
 			}
 		}
@@ -237,12 +237,12 @@ 
 		 *
 		 * @return string
 		 */
-		public static function get_picker( $editor_id = '' ) {
+		public static function get_picker($editor_id = '') {
 
 			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = sanitize_text_field( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
+			if (isset($_POST['editor_id'])) {
+				$editor_id = sanitize_text_field($_POST['editor_id']);
+			} elseif (isset($_REQUEST['et_fb'])) {
 				$editor_id = 'main_content_content_vb_tiny_mce';
 			}
 
@@ -251,13 +251,13 @@ 
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
+				ksort($sd_widgets);
 				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
+				if (!empty($sd_widgets)) {
 					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 
@@ -270,37 +270,37 @@ 
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
-					<?php if ( $editor_id != '' ) { ?>
+					<?php if ($editor_id != '') { ?>
 						<button class="button sd-insert-shortcode-button"
-						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
+						        onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) {
 							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+						        } ?>)"><?php _e('Insert shortcode'); ?></button>
 					<?php } ?>
 					<button class="button"
-					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
+					        onclick="sd_copy_to_clipboard()"><?php _e('Copy shortcode'); ?></button>
 				</div>
 			</div>
 			<?php
 
 			$html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
+			if (wp_doing_ajax()) {
 				echo $html;
 				$should_die = true;
 
 				// some builder get the editor via ajax so we should not die on those occasions
 				$dont_die = array(
-					'parent_tag',// WP Bakery
+					'parent_tag', // WP Bakery
 					'avia_request' // enfold
 				);
 
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
+				foreach ($dont_die as $request) {
+					if (isset($_REQUEST[$request])) {
 						$should_die = false;
 					}
 				}
 
-				if ( $should_die ) {
+				if ($should_die) {
 					wp_die();
 				}
 
@@ -327,16 +327,16 @@ 
 		public static function get_widget_settings() {
 			global $sd_widgets;
 
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
+			$shortcode = isset($_REQUEST['shortcode']) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes($_REQUEST['shortcode']) : '';
+			if (!$shortcode) {
 				wp_die();
 			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
+			$widget_args = isset($sd_widgets[$shortcode]) ? $sd_widgets[$shortcode] : '';
+			if (!$widget_args) {
 				wp_die();
 			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
+			$class_name = isset($widget_args['class_name']) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+			if (!$class_name) {
 				wp_die();
 			}
 
@@ -344,7 +344,7 @@ 
 			$widget = new $class_name;
 
 			ob_start();
-			$widget->form( array() );
+			$widget->form(array());
 			$form = ob_get_clean();
 			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
 			echo "<style>" . $widget->widget_css() . "</style>";
@@ -362,9 +362,9 @@ 
 		 * @param string $editor_id Optional. Shortcode editor id. Default null.
 		 * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
 			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
+			if ($shortcode_insert_button_once) {
 				return;
 			}
 			add_thickbox();
@@ -374,21 +374,21 @@ 
 			 * Cornerstone makes us play dirty tricks :/
 			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
 			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '<span id="insert-media-button">';
 			}
 
-			echo self::shortcode_button( 'this', 'true' );
+			echo self::shortcode_button('this', 'true');
 
 			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '</span>'; // end #insert-media-button
 			}
 
 			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+			if (function_exists('generate_sections_sections_metabox') && did_action('generate_sections_metabox')) {
 			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+				self::shortcode_insert_button_script($editor_id, $insert_shortcode_function);
 			}
 
 			$shortcode_insert_button_once = true;
@@ -402,12 +402,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
+		public static function shortcode_button($id = '', $search_for_id = '') {
 			ob_start();
 			?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
+				if ($search_for_id) {
 					echo "," . $search_for_id;
 				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
@@ -423,7 +423,7 @@ 
 			$html = ob_get_clean();
 
 			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
+			return preg_replace("/\r|\n/", "", trim($html));
 		}
 
 		/**
@@ -481,7 +481,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -518,10 +518,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -532,7 +532,7 @@ 
 		 * @param string $editor_id
 		 * @param string $insert_shortcode_function
 		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
 			?>
 			<style>
 				.sd-shortcode-left-wrap {
@@ -651,25 +651,25 @@ 
 					width: 100%;
 				}
 
-				<?php if ( function_exists( 'generate_sections_sections_metabox' ) ) { ?>
+				<?php if (function_exists('generate_sections_sections_metabox')) { ?>
 				.generate-sections-modal #custom-media-buttons > .sd-lable-shortcode-inserter {
 					display: inline;
 				}
 				<?php } ?>
-				<?php if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) { ?>
+				<?php if (function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) { ?>
 				body.divi_page_et_theme_builder div#TB_window.gd-tb-window{z-index:9999999}
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
+			if (class_exists('SiteOrigin_Panels')) {
 				echo "<script>" . self::siteorigin_js() . "</script>";
 			}
 			?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
+				if (!empty($insert_shortcode_function)) {
 					echo $insert_shortcode_function;
-				}else{
+				} else {
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -682,9 +682,9 @@ 
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
+							if (isset($_REQUEST['et_fb'])) {
 								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+							} elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') {
 								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
 							} else {
 								echo '$editor_id = "#wp-content-editor-container textarea";';
@@ -769,11 +769,11 @@ 
 							'shortcode': $short_code,
 							'attributes': 123,
 							'post_id': 321,
-							'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+							'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 						};
 
 						if (typeof ajaxurl === 'undefined') {
-							var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' );?>";
+							var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 						}
 
 						jQuery.post(ajaxurl, data, function (response) {
@@ -982,11 +982,11 @@ 
 					var data = {
 						'action': 'super_duper_get_picker',
 						'editor_id': $id,
-						'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_picker' );?>'
+						'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_picker'); ?>'
 					};
 
 					if (!ajaxurl) {
-						var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' ); ?>";
+						var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 					}
 
 					jQuery.post(ajaxurl, data, function (response) {
@@ -1008,9 +1008,9 @@ 
 				 */
 				function sd_shortcode_button($id) {
 					if ($id) {
-						return '<?php echo self::shortcode_button( "\\''+\$id+'\\'" );?>';
+						return '<?php echo self::shortcode_button("\\''+\$id+'\\'"); ?>';
 					} else {
-						return '<?php echo self::shortcode_button();?>';
+						return '<?php echo self::shortcode_button(); ?>';
 					}
 				}
 
@@ -1025,11 +1025,11 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function widget_css( $advanced = true ) {
+		public function widget_css($advanced = true) {
 			ob_start();
 			?>
 			<style>
-				<?php if( $advanced ){ ?>
+				<?php if ($advanced) { ?>
 				.sd-advanced-setting {
 					display: none;
 				}
@@ -1071,10 +1071,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -1144,7 +1144,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -1239,7 +1239,7 @@ 
 					});
 
 				}
-				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
+				<?php do_action('wp_super_duper_widget_js', $this); ?>
 			</script>
 			<?php
 			$output = ob_get_clean();
@@ -1248,10 +1248,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 
@@ -1262,14 +1262,14 @@ 
 		 *
 		 * @return mixed
 		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
+		private function add_name_from_key($options, $arguments = false) {
+			if (!empty($options['arguments'])) {
+				foreach ($options['arguments'] as $key => $val) {
+					$options['arguments'][$key]['name'] = $key;
 				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
+			} elseif ($arguments && is_array($options) && !empty($options)) {
+				foreach ($options as $key => $val) {
+					$options[$key]['name'] = $key;
 				}
 			}
 
@@ -1282,8 +1282,8 @@ 
 		 * @since 1.0.0
 		 */
 		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+			add_shortcode($this->base_id, array($this, 'shortcode_output'));
+			add_action('wp_ajax_super_duper_output_shortcode', array($this, 'render_shortcode'));
 		}
 
 		/**
@@ -1292,50 +1292,50 @@ 
 		 * @since 1.0.0
 		 */
 		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
+			check_ajax_referer('super_duper_output_shortcode', '_ajax_nonce', true);
+			if (!current_user_can('manage_options')) {
 				wp_die();
 			}
 
 			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
+			if (isset($_POST['post_id']) && $_POST['post_id']) {
+				$post_obj = get_post(absint($_POST['post_id']));
+				if (!empty($post_obj) && empty($post)) {
 					global $post;
 					$post = $post_obj;
 				}
 			}
 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+			if (isset($_POST['shortcode']) && $_POST['shortcode']) {
 				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+				$shortcode_name   = sanitize_title_with_dashes($_POST['shortcode']);
+				$attributes_array = isset($_POST['attributes']) && $_POST['attributes'] ? $_POST['attributes'] : array();
 				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
+				if (!empty($attributes_array)) {
+					foreach ($attributes_array as $key => $value) {
+						if (is_array($value)) {
+							$value = implode(",", $value);
 						}
 
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
+						if (!empty($value)) {
+							$value = wp_unslash($value);
 
 							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
+							if ($is_preview) {
+								$value = $this->encode_shortcodes($value);
 							}
 						}
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . esc_attr( $value ) . "' ";
+						$attributes .= " " . sanitize_title_with_dashes($key) . "='" . esc_attr($value) . "' ";
 					}
 				}
 
 				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
 
-				$content = do_shortcode( $shortcode );
+				$content = do_shortcode($shortcode);
 
 				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
+				if (!empty($content) && $is_preview) {
+					$content = $this->decode_shortcodes($content);
 				}
 
 				echo $content;
@@ -1351,21 +1351,21 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
+		public function shortcode_output($args = array(), $content = '') {
 			$_instance = $args;
 
-			$args = $this->argument_values( $args );
+			$args = $this->argument_values($args);
 
 			// add extra argument so we know its a output to gutenberg
 			//$args
-			$args = $this->string_to_bool( $args );
+			$args = $this->string_to_bool($args);
 
 			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
+			if (!empty($content)) {
 				$args['html'] = $content;
 			}
 
-			if ( ! $this->is_preview() ) {
+			if (!$this->is_preview()) {
 				/**
 				 * Filters the settings for a particular widget args.
 				 *
@@ -1375,40 +1375,40 @@ 
 				 * @param WP_Super_Duper $widget    The current widget settings.
 				 * @param array          $_instance An array of default widget arguments.
 				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+				$args = apply_filters('wp_super_duper_widget_display_callback', $args, $this, $_instance);
 
-				if ( ! is_array( $args ) ) {
+				if (!is_array($args)) {
 					return $args;
 				}
 			}
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
+			$class = isset($this->options['widget_ops']['classname']) ? esc_attr($this->options['widget_ops']['classname']) : '';
+			$class .= " sdel-" . $this->get_instance_hash();
 
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+			$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+			$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+			$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+			$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
 
 			$shortcode_args = array();
 			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+			$no_wrap        = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+			if (isset($args['no_wrap']) && $args['no_wrap']) {
 				$no_wrap = true;
 			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
+			$main_content = $this->output($args, $shortcode_args, $content);
+			if ($main_content && !$no_wrap) {
 				// wrap the shortcode in a div with the same class as the widget
 				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
+				if (!empty($args['title'])) {
 					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
+					$shortcode_args = array('before_title' => '', 'after_title' => '');
+					if (empty($instance)) {
 						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
+						if (!empty($wp_registered_sidebars)) {
+							foreach ($wp_registered_sidebars as $sidebar) {
+								if (!empty($sidebar['before_title'])) {
 									$shortcode_args['before_title'] = $sidebar['before_title'];
 									$shortcode_args['after_title']  = $sidebar['after_title'];
 									break;
@@ -1416,20 +1416,20 @@ 
 							}
 						}
 					}
-					$output .= $this->output_title( $shortcode_args, $args );
+					$output .= $this->output_title($shortcode_args, $args);
 				}
 				$output .= $main_content;
 				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
+			} elseif ($main_content && $no_wrap) {
 				$output .= $main_content;
 			}
 
 			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			if ($this->is_preview() && $output == '') {
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 			}
 
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+			return apply_filters('wp_super_duper_widget_output', $output, $args, $shortcode_args, $this);
 		}
 
 		/**
@@ -1439,8 +1439,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf(__('Placeholder for: %s'), $name) . "</div>";
 		}
 
 		/**
@@ -1450,13 +1450,13 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function string_to_bool( $options ) {
+		public function string_to_bool($options) {
 			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
+			foreach ($options as $key => $val) {
+				if ($val == 'false') {
+					$options[$key] = false;
+				} elseif ($val == 'true') {
+					$options[$key] = true;
 				}
 			}
 
@@ -1472,26 +1472,26 @@ 
 		 *
 		 * @return array
 		 */
-		public function argument_values( $instance ) {
+		public function argument_values($instance) {
 			$argument_values = array();
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $key => $args) {
 					// set the input name from the key
 					$args['name'] = $key;
 					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
+					if ($args['type'] == 'checkbox' && $argument_values[$key] == '') {
 						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
+					} elseif ($argument_values[$key] == '' && isset($args['default'])) {
+						$argument_values[$key] = $args['default'];
 					}
 				}
 			}
@@ -1518,12 +1518,12 @@ 
 		 * @return array Get arguments.
 		 */
 		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->set_arguments();
 			}
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
 
 			return $this->arguments;
 		}
@@ -1535,7 +1535,7 @@ 
 		 * @param array $widget_args
 		 * @param string $content
 		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
+		public function output($args = array(), $widget_args = array(), $content = '') {
 
 		}
 
@@ -1543,9 +1543,9 @@ 
 		 * Add the dynamic block code inline when the wp-block in enqueued.
 		 */
 		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+			wp_add_inline_script('wp-blocks', $this->block());
+			if (class_exists('SiteOrigin_Panels')) {
+				wp_add_inline_script('wp-blocks', $this->siteorigin_js());
 			}
 		}
 
@@ -1559,9 +1559,9 @@ 
 			$show      = false;
 			$arguments = $this->get_arguments();
 			
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $argument) {
+					if (isset($argument['advanced']) && $argument['advanced']) {
 						$show = true;
 						break; // no need to continue if we know we have it
 					}
@@ -1580,15 +1580,15 @@ 
 
 			$url = $this->url;
 
-			if ( ! $url ) {
+			if (!$url) {
 				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+				$file_dir = str_replace("/includes", "", dirname(__FILE__));
 
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
+				$dir_parts = explode("/wp-content/", $file_dir);
+				$url_parts = explode("/wp-content/", plugins_url());
 
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+				if (!empty($url_parts[0]) && !empty($dir_parts[1])) {
+					$url       = trailingslashit($url_parts[0] . "/wp-content/" . $dir_parts[1]);
 					$this->url = $url;
 				}
 			}
@@ -1609,46 +1609,46 @@ 
 		 * @since 1.1.0
 		 * @return string
 		 */
-		public function get_block_icon( $icon ) {
+		public function get_block_icon($icon) {
 
 			// check if we have a Font Awesome icon
 			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+			if (substr($icon, 0, 7) === "fas fa-") {
 				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+			} elseif (substr($icon, 0, 7) === "far fa-") {
 				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+			} elseif (substr($icon, 0, 7) === "fab fa-") {
 				$fa_type = 'brands';
 			} else {
 				$icon = "'" . $icon . "'";
 			}
 
 			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+			if ($fa_type) {
+				$fa_icon = str_replace(array("fas fa-", "far fa-", "fab fa-"), "", $icon);
 				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
 			}
 
 			return $icon;
 		}
 
-		public function group_arguments( $arguments ) {
+		public function group_arguments($arguments) {
 //			echo '###';print_r($arguments);
-			if ( ! empty( $arguments ) ) {
+			if (!empty($arguments)) {
 				$temp_arguments = array();
-				$general        = __( "General" );
+				$general        = __("General");
 				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
+				foreach ($arguments as $key => $args) {
+					if (isset($args['group'])) {
+						$temp_arguments[$args['group']][$key] = $args;
 						$add_sections                             = true;
 					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
+						$temp_arguments[$general][$key] = $args;
 					}
 				}
 
 				// only add sections if more than one
-				if ( $add_sections ) {
+				if ($add_sections) {
 					$arguments = $temp_arguments;
 				}
 			}
@@ -1692,9 +1692,9 @@ 
 					var prev_attributes = [];
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
-					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
-					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
+					var post_type_rest_slugs = <?php if (!empty($this->arguments) && isset($this->arguments['post_type']['onchange_rest']['values'])) {echo "[" . json_encode($this->arguments['post_type']['onchange_rest']['values']) . "]"; } else {echo "[]"; } ?>;
+					const taxonomies_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
+					const sort_by_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
 
 					/**
 					 * Register Basic Block.
@@ -1708,30 +1708,30 @@ 
 					 * @return {?WPBlock}          The block, if it has been successfully
 					 *                             registered; otherwise `undefined`.
 					 */
-					registerBlockType('<?php echo str_replace( "_", "-", sanitize_title_with_dashes( $this->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->options['class_name'] ) );  ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
-						title: '<?php echo addslashes( $this->options['name'] ); ?>', // Block title.
-						description: '<?php echo addslashes( $this->options['widget_ops']['description'] )?>', // Block title.
-						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
+					registerBlockType('<?php echo str_replace("_", "-", sanitize_title_with_dashes($this->options['textdomain']) . '/' . sanitize_title_with_dashes($this->options['class_name'])); ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
+						title: '<?php echo addslashes($this->options['name']); ?>', // Block title.
+						description: '<?php echo addslashes($this->options['widget_ops']['description'])?>', // Block title.
+						icon: <?php echo $this->get_block_icon($this->options['block-icon']); ?>,//'<?php echo isset($this->options['block-icon']) ? esc_attr($this->options['block-icon']) : 'shield-alt'; ?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
+							if (isset($this->options['block-supports'])) {
+								echo $this->array_to_attributes($this->options['block-supports']);
 							}
 							?>
 						},
-						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
-						<?php if ( isset( $this->options['block-keywords'] ) ) {
+						category: '<?php echo isset($this->options['block-category']) ? esc_attr($this->options['block-category']) : 'common'; ?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+						<?php if (isset($this->options['block-keywords'])) {
 						echo "keywords : " . $this->options['block-keywords'] . ",";
 					}?>
 
 						<?php
 
 						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+						$no_wrap = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+						if (isset($this->arguments['no_wrap']) && $this->arguments['no_wrap']) {
 							$no_wrap = true;
 						}
-						if ( $no_wrap ) {
+						if ($no_wrap) {
 							$this->options['block-wrap'] = '';
 						}
 
@@ -1744,10 +1744,10 @@ 
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
+						if (!empty($this->arguments)) {
 							echo "attributes : {";
 
-							if ( $show_advanced ) {
+							if ($show_advanced) {
 								echo "show_advanced: {";
 								echo "	type: 'boolean',";
 								echo "  default: false,";
@@ -1755,41 +1755,41 @@ 
 							}
 
 							// block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+							if (!empty($this->options['block-wrap'])) { //@todo we should validate this?
 								echo "block_wrap: {";
 								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+								echo "  default: '" . esc_attr($this->options['block-wrap']) . "',";
 								echo "},";
 							}
 
-							foreach ( $this->arguments as $key => $args ) {
+							foreach ($this->arguments as $key => $args) {
 
 								// set if we should show alignment
-								if ( $key == 'alignment' ) {
+								if ($key == 'alignment') {
 									$show_alignment = true;
 								}
 
 								$extra = '';
 
-								if ( $args['type'] == 'checkbox' ) {
+								if ($args['type'] == 'checkbox') {
 									$type    = 'boolean';
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-								} elseif ( $args['type'] == 'number' ) {
+									$default = isset($args['default']) && $args['default'] ? 'true' : 'false';
+								} elseif ($args['type'] == 'number') {
 									$type    = 'number';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+								} elseif ($args['type'] == 'select' && !empty($args['multiple'])) {
 									$type = 'array';
-									if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-										$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+									if (isset($args['default']) && is_array($args['default'])) {
+										$default = !empty($args['default']) ? "['" . implode("','", $args['default']) . "']" : "[]";
 									} else {
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 									}
-								} elseif ( $args['type'] == 'multiselect' ) {
+								} elseif ($args['type'] == 'multiselect') {
 									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 								} else {
 									$type    = 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 								}
 								echo $key . " : {";
 								echo "type : '$type',";
@@ -1813,7 +1813,7 @@ 
 							var $value = '';
 							<?php
 							// if we have a post_type and a category then link them
-							if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+							if (isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked'])) {
 							?>
 							if(typeof(prev_attributes[props.id]) != 'undefined' ){
 								$pt = props.attributes.post_type;
@@ -1829,13 +1829,13 @@ 
 
 								// taxonomies
 								if( $value && 'post_type' in prev_attributes[props.id] && 'category' in prev_attributes[props.id] && run ){
-									wp.apiFetch({path: "<?php if(isset($this->arguments['post_type']['onchange_rest']['path'])){echo $this->arguments['post_type']['onchange_rest']['path'];}else{'/wp/v2/"+$value+"/categories/?per_page=100';} ?>"}).then(terms => {
-										while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-										taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+									wp.apiFetch({path: "<?php if (isset($this->arguments['post_type']['onchange_rest']['path'])) {echo $this->arguments['post_type']['onchange_rest']['path']; } else {'/wp/v2/"+$value+"/categories/?per_page=100'; } ?>"}).then(terms => {
+										while (taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+										taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 									}
-									taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: "All", value: 0});
+									taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: "All", value: 0});
 									jQuery.each( terms, function( key, val ) {
-										taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: val.name, value: val.id});
+										taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val.name, value: val.id});
 									});
 
 									// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -1843,7 +1843,7 @@ 
 									props.setAttributes({category: [0] });
 									props.setAttributes({category: $old_cat_value });
 
-									return taxonomies_<?php echo str_replace("-","_", $this->id);?>;
+									return taxonomies_<?php echo str_replace("-", "_", $this->id); ?>;
 								});
 								}
 
@@ -1855,12 +1855,12 @@ 
 									};
 									jQuery.post(ajaxurl, data, function(response) {
 										response = JSON.parse(response);
-										while (sort_by_<?php echo str_replace("-","_", $this->id);?>.length) {
-											sort_by_<?php echo str_replace("-","_", $this->id);?>.pop();
+										while (sort_by_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+											sort_by_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 										}
 
 										jQuery.each( response, function( key, val ) {
-											sort_by_<?php echo str_replace("-","_", $this->id);?>.push({label: val, value: key});
+											sort_by_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val, value: key});
 										});
 
 										// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -1868,7 +1868,7 @@ 
 										props.setAttributes({sort_by: [0] });
 										props.setAttributes({sort_by: $old_sort_by_value });
 
-										return sort_by_<?php echo str_replace("-","_", $this->id);?>;
+										return sort_by_<?php echo str_replace("-", "_", $this->id); ?>;
 									});
 
 								}
@@ -1895,12 +1895,12 @@ 
 									is_fetching = true;
 									var data = {
 										'action': 'super_duper_output_shortcode',
-										'shortcode': '<?php echo $this->options['base_id'];?>',
+										'shortcode': '<?php echo $this->options['base_id']; ?>',
 										'attributes': props.attributes,
-										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
+										'post_id': <?php global $post; if (isset($post->ID)) {
 										echo $post->ID;
-									}else{echo '0';}?>,
-										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+									} else {echo '0'; }?>,
+										'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 									};
 
 									jQuery.post(ajaxurl, data, function (response) {
@@ -1909,7 +1909,7 @@ 
 
 										// if the content is empty then we place some placeholder text
 										if (env == '') {
-											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e( 'Placeholder for: ' );?>" + props.name + "</div>";
+											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for: '); ?>" + props.name + "</div>";
 										}
 
 										props.setAttributes({content: env});
@@ -1933,7 +1933,7 @@ 
 
 								el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-									<?php if($show_alignment){?>
+									<?php if ($show_alignment) {?>
 									el(
 										wp.blockEditor.AlignmentToolbar,
 										{
@@ -1951,9 +1951,9 @@ 
 
 									<?php
 
-									if(! empty( $this->arguments )){
+									if (!empty($this->arguments)) {
 
-									if ( $show_advanced ) {
+									if ($show_advanced) {
 									?>
 									el('div', {
 											style: {'padding-left': '16px','padding-right': '16px'}
@@ -1974,19 +1974,19 @@ 
 
 									}
 
-									$arguments = $this->group_arguments( $this->arguments );
+									$arguments = $this->group_arguments($this->arguments);
 
 									// Do we have sections?
 									$has_sections = $arguments == $this->arguments ? false : true;
 
 
-									if($has_sections){
+									if ($has_sections) {
 									$panel_count = 0;
-									foreach($arguments as $key => $args){
+									foreach ($arguments as $key => $args) {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( $key ); ?>',
-											initialOpen: <?php if ( $panel_count ) {
+											title: '<?php esc_attr_e($key); ?>',
+											initialOpen: <?php if ($panel_count) {
 											echo "false";
 										} else {
 											echo "true";
@@ -1996,29 +1996,29 @@ 
 
 
 
-										foreach ( $args as $k => $a ) {
+										foreach ($args as $k => $a) {
 
-											$this->block_row_start( $k, $a );
-											$this->build_block_arguments( $k, $a );
-											$this->block_row_end( $k, $a );
+											$this->block_row_start($k, $a);
+											$this->build_block_arguments($k, $a);
+											$this->block_row_end($k, $a);
 										}
 										?>
 									),
 									<?php
-									$panel_count ++;
+									$panel_count++;
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( "Settings" ); ?>',
+											title: '<?php esc_attr_e("Settings"); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
+										foreach ($this->arguments as $key => $args) {
+											$this->block_row_start($key, $args);
+											$this->build_block_arguments($key, $args);
+											$this->block_row_end($key, $args);
 										}
 										?>
 									),
@@ -2032,9 +2032,9 @@ 
 
 								<?php
 								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}else{
+								if (!empty($this->options['block-output'])) {
+								$this->block_element($this->options['block-output']);
+							} else {
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								?>
 								el('div', {
@@ -2058,19 +2058,19 @@ 
 							var align = '';
 
 							// build the shortcode.
-							var content = "[<?php echo $this->options['base_id'];?>";
+							var content = "[<?php echo $this->options['base_id']; ?>";
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+							if (!empty($this->arguments)) {
 
-							foreach($this->arguments as $key => $args){
+							foreach ($this->arguments as $key => $args) {
 							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-								if ('<?php echo esc_attr( $key );?>' == 'html') {
-									$html = attr.<?php echo esc_attr( $key );?>;
+							if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+								if ('<?php echo esc_attr($key); ?>' == 'html') {
+									$html = attr.<?php echo esc_attr($key); ?>;
 								} else {
-									content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>+ "' ";
+									content += " <?php echo esc_attr($key); ?>='" + attr.<?php echo esc_attr($key); ?>+ "' ";
 								}
 							}
 							<?php
@@ -2082,7 +2082,7 @@ 
 
 							// if has html element
 							if ($html) {
-								content += $html + "[/<?php echo $this->options['base_id'];?>]";
+								content += $html + "[/<?php echo $this->options['base_id']; ?>]";
 							}
 
 
@@ -2100,11 +2100,11 @@ 
 							}
 
 							<?php
-							if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							if (isset($this->options['block-wrap']) && $this->options['block-wrap'] == '') {
 							?>
 							return content;
 							<?php
-							}else{
+							} else {
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -2127,45 +2127,45 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
-		public function block_row_start($key, $args){
+		public function block_row_start($key, $args) {
 
 			// check for row
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 
 				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+				$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 				echo $element_require;
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
-							<?php if(!empty($args['row']['title'])){ ?>
+							<?php if (!empty($args['row']['title'])) { ?>
 							el('label', {
 									className: 'components-base-control__label',
 								},
-								'<?php echo addslashes( $args['row']['title'] ); ?>'
+								'<?php echo addslashes($args['row']['title']); ?>'
 							),
 							<?php }?>
-							<?php if(!empty($args['row']['desc'])){ ?>
+							<?php if (!empty($args['row']['desc'])) { ?>
 							el('p', {
 									className: 'components-base-control__help mb-0',
 								},
-								'<?php echo addslashes( $args['row']['desc'] ); ?>'
+								'<?php echo addslashes($args['row']['desc']); ?>'
 							),
 							<?php }?>
 							el(
 								'div',
 								{
-									className: 'row mb-n2 <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>',
+									className: 'row mb-n2 <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>',
 								},
 								el(
 									'div',
@@ -2174,36 +2174,36 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				}elseif (!empty($args['row']['close'])) {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				} else {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 pr-2',
 							},
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_row_end($key, $args){
+		public function block_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "))";
 				}
 
@@ -2211,25 +2211,25 @@ 
 			}
 		}
 
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+		public function build_block_arguments($key, $args) {
+			$custom_attributes = !empty($args['custom_attributes']) ? $this->array_to_attributes($args['custom_attributes']) : '';
 			$options           = '';
 			$extra             = '';
 			$require           = '';
 
 			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
+			if ($key == 'content') {
 				return;
 			}
 
 
 			// icon
 			$icon = '';
-			if( !empty( $args['icon'] ) ){
+			if (!empty($args['icon'])) {
 				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+									$icon .= "dangerouslySetInnerHTML: {__html: '" . self::get_widget_icon(esc_attr($args['icon'])) . "'},";
 									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
+									$icon .= "title: '" . addslashes($args['title']) . "',";
 								$icon .= "}),";
 
 				// blank title as its added to the icon.
@@ -2237,20 +2237,20 @@ 
 			}
 
 			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+			$require_advanced = !empty($args['advanced']) ? "props.attributes.show_advanced && " : "";
 
 			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+			$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 
 
 			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
+			$onchangecomplete = "";
 			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
-			if ( in_array( $args['type'], $text_type ) ) {
+			$text_type = array('text', 'password', 'number', 'email', 'tel', 'url', 'colorx');
+			if (in_array($args['type'], $text_type)) {
 				$type = 'TextControl';
 				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
+				if ($args['type'] == 'number') {
 					$onchange = "props.setAttributes({ $key: Number($key) } )";
 				}
 			}
@@ -2288,11 +2288,11 @@ 
 							return;
 						}
 			*/
-			elseif ( $args['type'] == 'color' ) {
+			elseif ($args['type'] == 'color') {
 				$type = 'ColorPicker';
 				$onchange = "";
 				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
+				if (!empty($args['disable_alpha'])) {
 					$extra .= "disableAlpha: true,";
 				}
 				$onchangecomplete = "onChangeComplete: function($key) {
@@ -2302,49 +2302,49 @@ 
                         });
                     },";
 			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			elseif ($args['type'] == 'checkbox') {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
+			} elseif ($args['type'] == 'textarea') {
 				$type = 'TextareaControl';
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+			} elseif ($args['type'] == 'select' || $args['type'] == 'multiselect') {
 				$type = 'SelectControl';
 
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
+				if ($args['name'] == 'category' && !empty($args['post_type_linked'])) {
+					$options .= "options: taxonomies_" . str_replace("-", "_", $this->id) . ",";
+				}elseif ($args['name'] == 'sort_by' && !empty($args['post_type_linked'])) {
+					$options .= "options: sort_by_" . str_replace("-", "_", $this->id) . ",";
+				} else {
 
-					if ( ! empty( $args['options'] ) ) {
+					if (!empty($args['options'])) {
 						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
+						foreach ($args['options'] as $option_val => $option_label) {
+							$options .= "{ value: '" . esc_attr($option_val) . "', label: '" . addslashes($option_label) . "' },";
 						}
 						$options .= "],";
 					}
 				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+				if (isset($args['multiple']) && $args['multiple']) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
 					$extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px"}, ';
 				}
-			} elseif ( $args['type'] == 'alignment' ) {
+			} elseif ($args['type'] == 'alignment') {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			}elseif ( $args['type'] == 'margins' ) {
+			}elseif ($args['type'] == 'margins') {
 
 			} else {
-				return;// if we have not implemented the control then don't break the JS.
+				return; // if we have not implemented the control then don't break the JS.
 			}
 
 
 
 			// color input does not show the labels so we add them
-			if($args['type']=='color'){
+			if ($args['type'] == 'color') {
 				// add show only if advanced
 				echo $require_advanced;
 				// add setting require if defined
 				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+				echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes($args['title']) . "'),";
 			}
 
 			// add show only if advanced
@@ -2356,21 +2356,21 @@ 
 			echo $icon;
 			?>
 			el( wp.components.<?php echo $type; ?>, {
-			label: '<?php echo addslashes( $args['title'] ); ?>',
-			help: '<?php if ( isset( $args['desc'] ) ) {
-				echo addslashes( $args['desc'] );
+			label: '<?php echo addslashes($args['title']); ?>',
+			help: '<?php if (isset($args['desc'])) {
+				echo addslashes($args['desc']);
 			} ?>',
 			value: <?php echo $value; ?>,
-			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
+			<?php if ($type == 'TextControl' && $args['type'] != 'text') {
+				echo "type: '" . addslashes($args['type']) . "',";
 			} ?>
-			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
+			<?php if (!empty($args['placeholder'])) {
+				echo "placeholder: '" . addslashes($args['placeholder']) . "',";
 			} ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
-			<?php echo $onchangecomplete;?>
+			<?php echo $onchangecomplete; ?>
 			onChange: function ( <?php echo $key; ?> ) {
 			<?php echo $onchange; ?>
 			}
@@ -2389,16 +2389,16 @@ 
 		 *
 		 * @return string
 		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
+		public function array_to_attributes($custom_attributes, $html = false) {
 			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
+			if (!empty($custom_attributes)) {
 
-				if ( $html ) {
-					foreach ( $custom_attributes as $key => $val ) {
+				if ($html) {
+					foreach ($custom_attributes as $key => $val) {
 						$attributes .= " $key='$val' ";
 					}
 				} else {
-					foreach ( $custom_attributes as $key => $val ) {
+					foreach ($custom_attributes as $key => $val) {
 						$attributes .= "'$key': '$val',";
 					}
 				}
@@ -2414,86 +2414,86 @@ 
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args ) {
+		public function block_element($args) {
 
 
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+			if (!empty($args)) {
+				foreach ($args as $element => $new_args) {
 
-					if ( is_array( $new_args ) ) { // its an element
+					if (is_array($new_args)) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+						if (isset($new_args['element'])) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
+							if (isset($new_args['element_require'])) {
+								echo str_replace(array(
 										"'+",
 										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
+									), '', $this->block_props_replace($new_args['element_require'])) . " &&  ";
+								unset($new_args['element_require']);
 							}
 
 							echo "\n el( '" . $new_args['element'] . "', {";
 
 							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
+							foreach ($new_args as $new_key => $new_value) {
 
 
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+								if ($new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array($new_value)) {
 									// do nothing
 								} else {
-									echo $this->block_element( array( $new_key => $new_value ) );
+									echo $this->block_element(array($new_key => $new_value));
 								}
 							}
 
-							echo "},";// end attributes
+							echo "},"; // end attributes
 
 							// get the content
 							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
+							foreach ($new_args as $new_key => $new_value) {
+								if ($new_key === 'content' || is_array($new_value)) {
 
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+									if ($new_key === 'content') {
+										echo "'" . $this->block_props_replace(wp_slash($new_value)) . "'";
 									}
 
-									if ( is_array( $new_value ) ) {
+									if (is_array($new_value)) {
 
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
+										if (isset($new_value['element_require'])) {
+											echo str_replace(array(
 													"'+",
 													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
+												), '', $this->block_props_replace($new_value['element_require'])) . " &&  ";
+											unset($new_value['element_require']);
 										}
 
-										if ( isset( $new_value['element_repeat'] ) ) {
+										if (isset($new_value['element_repeat'])) {
 											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ) );
-												$x ++;
+											while ($x <= absint($new_value['element_repeat'])) {
+												$this->block_element(array('' => $new_value));
+												$x++;
 											}
 										} else {
-											$this->block_element( array( '' => $new_value ) );
+											$this->block_element(array('' => $new_value));
 										}
 									}
-									$first_item ++;
+									$first_item++;
 								}
 							}
 
-							echo ")";// end content
+							echo ")"; // end content
 
 							echo ", \n";
 
 						}
 					} else {
 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+						if (substr($element, 0, 3) === "if_") {
+							echo str_replace("if_", "", $element) . ": " . $this->block_props_replace($new_args, true) . ",";
+						} elseif ($element == 'style') {
+							echo $element . ": " . $this->block_props_replace($new_args) . ",";
 						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+							echo $element . ": '" . $this->block_props_replace($new_args) . "',";
 						}
 
 					}
@@ -2508,12 +2508,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
+		public function block_props_replace($string, $no_wrap = false) {
 
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+			if ($no_wrap) {
+				$string = str_replace(array("[%", "%]"), array("props.attributes.", ""), $string);
 			} else {
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+				$string = str_replace(array("[%", "%]"), array("'+props.attributes.", "+'"), $string);
 			}
 
 			return $string;
@@ -2525,62 +2525,62 @@ 
 		 * @param array $args
 		 * @param array $instance
 		 */
-		public function widget( $args, $instance ) {
+		public function widget($args, $instance) {
 
 			// get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
+			$argument_values = $this->argument_values($instance);
+			$argument_values = $this->string_to_bool($argument_values);
+			$output          = $this->output($argument_values, $args);
 
 			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+			if (isset($argument_values['no_wrap']) && $argument_values['no_wrap']) {
 				$no_wrap = true;
 			}
 
 			ob_start();
-			if ( $output && ! $no_wrap ) {
+			if ($output && !$no_wrap) {
 
 				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+				$class = $this->options['widget_ops']['classname'] . " sdel-" . $this->get_instance_hash();
 
 				// Before widget
 				$before_widget = $args['before_widget'];
-				$before_widget = str_replace($class_original,$class,$before_widget);
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+				$before_widget = str_replace($class_original, $class, $before_widget);
+				$before_widget = apply_filters('wp_super_duper_before_widget', $before_widget, $args, $instance, $this);
+				$before_widget = apply_filters('wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this);
 
 				// After widget
 				$after_widget = $args['after_widget'];
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+				$after_widget = apply_filters('wp_super_duper_after_widget', $after_widget, $args, $instance, $this);
+				$after_widget = apply_filters('wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this);
 
 				echo $before_widget;
 				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
+				if ($this->is_elementor_widget_output()) {
 					// Filter class & attrs for elementor widget output.
-					$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-					$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+					$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+					$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-					$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-					$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+					$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+					$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
 
-					echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
+					echo "<span class='" . esc_attr($class) . "' " . $attrs . ">";
 				}
-				echo $this->output_title( $args, $instance );
+				echo $this->output_title($args, $instance);
 				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
+				if ($this->is_elementor_widget_output()) {
 					echo "</span>";
 				}
 				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			} elseif ($this->is_preview() && $output == '') {// if preview show a placeholder if empty
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 				echo $output;
-			} elseif ( $output && $no_wrap ) {
+			} elseif ($output && $no_wrap) {
 				echo $output;
 			}
 			$output = ob_get_clean();
 
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+			$output = apply_filters('wp_super_duper_widget_output', $output, $instance, $args, $this);
 
 			echo $output;
 		}
@@ -2593,7 +2593,7 @@ 
 		 */
 		public function is_elementor_widget_output() {
 			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+			if (defined('ELEMENTOR_VERSION') && isset($this->number) && $this->number == 'REPLACE_TO_ID') {
 				$result = true;
 			}
 
@@ -2608,7 +2608,7 @@ 
 		 */
 		public function is_elementor_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+			if (isset($_REQUEST['elementor-preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') || (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor_ajax')) {
 				$result = true;
 			}
 
@@ -2623,7 +2623,7 @@ 
 		 */
 		public function is_divi_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+			if (isset($_REQUEST['et_fb']) || isset($_REQUEST['et_pb_preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor')) {
 				$result = true;
 			}
 
@@ -2638,7 +2638,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 
@@ -2653,7 +2653,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 
@@ -2668,7 +2668,7 @@ 
 		 */
 		public function is_cornerstone_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+			if (!empty($_REQUEST['cornerstone_preview']) || basename($_SERVER['REQUEST_URI']) == 'cornerstone-endpoint') {
 				$result = true;
 			}
 
@@ -2683,7 +2683,7 @@ 
 		 */
 		public function is_fusion_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+			if (!empty($_REQUEST['fb-edit']) || !empty($_REQUEST['fusion_load_nonce'])) {
 				$result = true;
 			}
 
@@ -2698,7 +2698,7 @@ 
 		 */
 		public function is_oxygen_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+			if (!empty($_REQUEST['ct_builder']) || (!empty($_REQUEST['action']) && (substr($_REQUEST['action'], 0, 11) === "oxy_render_" || substr($_REQUEST['action'], 0, 10) === "ct_render_"))) {
 				$result = true;
 			}
 
@@ -2713,21 +2713,21 @@ 
 		 */
 		public function is_preview() {
 			$preview = false;
-			if ( $this->is_divi_preview() ) {
+			if ($this->is_divi_preview()) {
 				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
+			} elseif ($this->is_elementor_preview()) {
 				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
+			} elseif ($this->is_beaver_preview()) {
 				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
+			} elseif ($this->is_siteorigin_preview()) {
 				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
+			} elseif ($this->is_cornerstone_preview()) {
 				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
+			} elseif ($this->is_fusion_preview()) {
 				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
+			} elseif ($this->is_oxygen_preview()) {
 				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
+			} elseif ($this->is_block_content_call()) {
 				$preview = true;
 			}
 
@@ -2742,34 +2742,34 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
+		public function output_title($args, $instance = array()) {
 			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
+			if (!empty($instance['title'])) {
 				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+				$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
 
-				if(empty($instance['widget_title_tag'])){
+				if (empty($instance['widget_title_tag'])) {
 					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
-					$title_tag = esc_attr( $instance['widget_title_tag'] );
+				} else {
+					$title_tag = esc_attr($instance['widget_title_tag']);
 
 					// classes
 					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+					$title_classes[] = !empty($instance['widget_title_size_class']) ? sanitize_html_class($instance['widget_title_size_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_align_class']) ? sanitize_html_class($instance['widget_title_align_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_color_class']) ? "text-" . sanitize_html_class($instance['widget_title_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_class']) ? sanitize_html_class($instance['widget_title_border_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_color_class']) ? "border-" . sanitize_html_class($instance['widget_title_border_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mt_class']) ? "mt-" . absint($instance['widget_title_mt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mr_class']) ? "mr-" . absint($instance['widget_title_mr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mb_class']) ? "mb-" . absint($instance['widget_title_mb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_ml_class']) ? "ml-" . absint($instance['widget_title_ml_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pt_class']) ? "pt-" . absint($instance['widget_title_pt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pr_class']) ? "pr-" . absint($instance['widget_title_pr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pb_class']) ? "pb-" . absint($instance['widget_title_pb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pl_class']) ? "pl-" . absint($instance['widget_title_pl_class']) : '';
+
+					$class = !empty($title_classes) ? implode(" ", $title_classes) : '';
 					$output = "<$title_tag class='$class' >$title</$title_tag>";
 				}
 
@@ -2783,7 +2783,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 
 			// set widget instance
 			$this->instance = $instance;
@@ -2791,20 +2791,20 @@ 
 			// set it as a SD widget
 			echo $this->widget_advanced_toggle();
 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
+			echo "<p>" . esc_attr($this->options['widget_ops']['description']) . "</p>";
 			$arguments_raw = $this->get_arguments();
 
-			if ( is_array( $arguments_raw ) ) {
+			if (is_array($arguments_raw)) {
 
-				$arguments = $this->group_arguments( $arguments_raw );
+				$arguments = $this->group_arguments($arguments_raw);
 
 				// Do we have sections?
 				$has_sections = $arguments == $arguments_raw ? false : true;
 
 
-				if ( $has_sections ) {
+				if ($has_sections) {
 					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
+					foreach ($arguments as $key => $args) {
 
 						?>
 						<script>
@@ -2814,26 +2814,26 @@ 
 
 						$hide       = $panel_count ? ' style="display:none;" ' : '';
 						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes($key) . "'>" . esc_attr($key) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes($key) . "' $hide>";
 
-						foreach ( $args as $k => $a ) {
+						foreach ($args as $k => $a) {
 
 							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
+							$this->widget_inputs($a, $instance);
 							$this->widget_inputs_row_end($k, $a);
 
 						}
 
 						echo "</div>";
 
-						$panel_count ++;
+						$panel_count++;
 
 					}
 				} else {
-					foreach ( $arguments as $key => $args ) {
+					foreach ($arguments as $key => $args) {
 						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
+						$this->widget_inputs($args, $instance);
 						$this->widget_inputs_row_end($key, $args);
 					}
 				}
@@ -2841,33 +2841,33 @@ 
 			}
 		}
 
-		public function widget_inputs_row_start($key, $args){
-			if(!empty($args['row'])){
+		public function widget_inputs_row_start($key, $args) {
+			if (!empty($args['row'])) {
 				// maybe open
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 					?>
-					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php if ( !empty($args['row']['element_require'])) {
-						echo $this->convert_element_require( $args['row']['element_require'] );
+					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr($args['row']['key']); ?>' data-element_require='<?php if (!empty($args['row']['element_require'])) {
+						echo $this->convert_element_require($args['row']['element_require']);
 					} ?>'>
-					<?php if(!empty($args['row']['title'])){ ?>
-					<label class="mb-0 "><?php echo esc_attr( $args['row']['title'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+					<?php if (!empty($args['row']['title'])) { ?>
+					<label class="mb-0 "><?php echo esc_attr($args['row']['title']); ?><?php echo $this->widget_field_desc($args['row']); ?></label>
 					<?php }?>
-					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
+					<div class='row <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
+				}elseif (!empty($args['row']['close'])) {
 					echo "<div class='col pl-0'>";
-				}else{
+				} else {
 					echo "<div class='col pl-0 pr-2'>";
 				}
 			}
 		}
 
-		public function widget_inputs_row_end($key, $args){
+		public function widget_inputs_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "</div></div>";
 				}
 
@@ -2883,7 +2883,7 @@ 
 		public function widget_advanced_toggle() {
 
 			$output = '';
-			if ( $this->block_show_advanced() ) {
+			if ($this->block_show_advanced()) {
 				$val = 1;
 			} else {
 				$val = 0;
@@ -2903,14 +2903,14 @@ 
 		 *
 		 * @return string $output
 		 */
-		public function convert_element_require( $input ) {
+		public function convert_element_require($input) {
 
-			$input = str_replace( "'", '"', $input );// we only want double quotes
+			$input = str_replace("'", '"', $input); // we only want double quotes
 
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
+			$output = esc_attr(str_replace(array("[%", "%]"), array(
 				"jQuery(form).find('[data-argument=\"",
 				"\"]').find('input,select,textarea').val()"
-			), $input ) );
+			), $input));
 
 			return $output;
 		}
@@ -2921,56 +2921,56 @@ 
 		 * @param $args
 		 * @param $instance
 		 */
-		public function widget_inputs( $args, $instance ) {
+		public function widget_inputs($args, $instance) {
 
 			$class             = "";
 			$element_require   = "";
 			$custom_attributes = "";
 
 			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+			if (isset($instance[$args['name']])) {
+				$value = $instance[$args['name']];
+			} elseif (!isset($instance[$args['name']]) && !empty($args['default'])) {
+				$value = is_array($args['default']) ? array_map("esc_html", $args['default']) : esc_html($args['default']);
 			} else {
 				$value = '';
 			}
 
 			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			if (!empty($args['placeholder'])) {
+				$placeholder = "placeholder='" . esc_html($args['placeholder']) . "'";
 			} else {
 				$placeholder = '';
 			}
 
 			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+			if (isset($args['advanced']) && $args['advanced']) {
 				$class .= " sd-advanced-setting ";
 			}
 
 			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+			if (isset($args['element_require']) && $args['element_require']) {
 				$element_require = $args['element_require'];
 			}
 
 			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+			if (isset($args['custom_attributes']) && $args['custom_attributes']) {
+				$custom_attributes = $this->array_to_attributes($args['custom_attributes'], true);
 			}
 
 
 			// before wrapper
 			?>
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
-			data-argument='<?php echo esc_attr( $args['name'] ); ?>'
-			data-element_require='<?php if ( $element_require ) {
-				echo $this->convert_element_require( $element_require );
+			<p class="sd-argument <?php echo esc_attr($class); ?>"
+			data-argument='<?php echo esc_attr($args['name']); ?>'
+			data-element_require='<?php if ($element_require) {
+				echo $this->convert_element_require($element_require);
 			} ?>'
 			>
 			<?php
 
 
-			switch ( $args['type'] ) {
+			switch ($args['type']) {
 				//array('text','password','number','email','tel','url','color')
 				case "text":
 				case "password":
@@ -2981,46 +2981,46 @@ 
 				case "color":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                               id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                               name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-						                               type="<?php echo esc_attr( $args['type'] ); ?>"
-						                               value="<?php echo esc_attr( $value ); ?>">
+						                               id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                               name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+						                               type="<?php echo esc_attr($args['type']); ?>"
+						                               value="<?php echo esc_attr($value); ?>">
 					<?php
 
 					break;
 				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
+					$multiple = isset($args['multiple']) && $args['multiple'] ? true : false;
+					if ($multiple) {
+						if (empty($value)) {
 							$value = array();
 						}
 					}
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-						                                if ( $multiple ) {
+						                                id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                                name="<?php echo esc_attr($this->get_field_name($args['name']));
+						                                if ($multiple) {
 							                                echo "[]";
 						                                } ?>"
-						<?php if ( $multiple ) {
+						<?php if ($multiple) {
 							echo "multiple";
 						} //@todo not implemented yet due to gutenberg not supporting it
 						?>
 					>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+						if (!empty($args['options'])) {
+							foreach ($args['options'] as $val => $label) {
+								if ($multiple) {
+									$selected = in_array($val, $value) ? 'selected="selected"' : '';
 								} else {
-									$selected = selected( $value, $val, false );
+									$selected = selected($value, $val, false);
 								}
 								echo "<option value='$val' " . $selected . ">$label</option>";
 							}
@@ -3032,32 +3032,32 @@ 
 				case "checkbox":
 					?>
 					<input <?php echo $placeholder; ?>
-						<?php checked( 1, $value, true ) ?>
+						<?php checked(1, $value, true) ?>
 						<?php echo $custom_attributes; ?>
-						class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox"
+						class="widefat" id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="checkbox"
 						value="1">
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<?php
 					break;
 				case "textarea":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                                  id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                                  name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-					><?php echo esc_attr( $value ); ?></textarea>
+						                                  id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                                  name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+					><?php echo esc_attr($value); ?></textarea>
 					<?php
 
 					break;
 				case "hidden":
 					?>
-					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-					       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
-					       value="<?php echo esc_attr( $value ); ?>">
+					<input id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+					       name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="hidden"
+					       value="<?php echo esc_attr($value); ?>">
 					<?php
 					break;
 				default:
@@ -3072,15 +3072,15 @@ 
 
 		}
 
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+		public function get_widget_icon($icon = 'box-top', $title = '') {
+			if ($icon == 'box-top') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-right') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-bottom') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+			}elseif ($icon == 'box-left') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
 			}
 		}
 
@@ -3092,14 +3092,14 @@ 
 		 * @return string
 		 * @todo, need to make its own tooltip script
 		 */
-		public function widget_field_desc( $args ) {
+		public function widget_field_desc($args) {
 
 			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
+			if (isset($args['desc']) && $args['desc']) {
+				if (isset($args['desc_tip']) && $args['desc_tip']) {
+					$description = $this->desc_tip($args['desc']);
 				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+					$description = '<span class="description">' . wp_kses_post($args['desc']) . '</span>';
 				}
 			}
 
@@ -3113,12 +3113,12 @@ 
 		 *
 		 * @return string
 		 */
-		public function widget_field_title( $args ) {
+		public function widget_field_title($args) {
 
 			$title = '';
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
+			if (isset($args['title']) && $args['title']) {
+				if (isset($args['icon']) && $args['icon']) {
+					$title = self::get_widget_icon($args['icon'], $args['title']);
 				} else {
 					$title = esc_attr($args['title']);
 				}
@@ -3135,11 +3135,11 @@ 
 		 *
 		 * @return string
 		 */
-		function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
+		function desc_tip($tip, $allow_html = false) {
+			if ($allow_html) {
+				$tip = $this->sanitize_tooltip($tip);
 			} else {
-				$tip = esc_attr( $tip );
+				$tip = esc_attr($tip);
 			}
 
 			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
@@ -3152,8 +3152,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+		public function sanitize_tooltip($var) {
+			return htmlspecialchars(wp_kses(html_entity_decode($var), array(
 				'br'     => array(),
 				'em'     => array(),
 				'strong' => array(),
@@ -3163,7 +3163,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 
 		/**
@@ -3175,23 +3175,23 @@ 
 		 * @return array
 		 * @todo we should add some sanitation here.
 		 */
-		public function update( $new_instance, $old_instance ) {
+		public function update($new_instance, $old_instance) {
 
 			//save the widget
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
+			$instance = array_merge((array) $old_instance, (array) $new_instance);
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->get_arguments();
 			}
 
 			// check for checkboxes
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $argument ) {
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-						$instance[ $argument['name'] ] = '0';
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $argument) {
+					if (isset($argument['type']) && $argument['type'] == 'checkbox' && !isset($new_instance[$argument['name']])) {
+						$instance[$argument['name']] = '0';
 					}
 				}
 			}
@@ -3209,7 +3209,7 @@ 
 		 */
 		public function is_block_content_call() {
 			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+			if (wp_doing_ajax() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'super_duper_output_shortcode') {
 				$result = true;
 			}
 
@@ -3222,9 +3222,9 @@ 
 		 * @since 1.0.20
 		 * @return string
 		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
+		public function get_instance_hash() {
+			$instance_string = $this->base_id . serialize($this->instance);
+			return hash('crc32b', $instance_string);
 		}
 
 		/**
@@ -3235,14 +3235,14 @@ 
 		 * @since 1.0.20
 		 * @return string
 		 */
-		public function get_instance_style($rules = array()){
+		public function get_instance_style($rules = array()) {
 			$css = '';
 
-			if(!empty($rules)){
+			if (!empty($rules)) {
 				$rules = array_unique($rules);
 				$instance_hash = $this->get_instance_hash();
 				$css .= "<style>";
-				foreach($rules as $rule){
+				foreach ($rules as $rule) {
 					$css .= ".sdel-$instance_hash $rule";
 				}
 				$css .= "</style>";
@@ -3259,9 +3259,9 @@ 
 		 * @param string $content Content to search for shortcode tags.
 		 * @return string Content with shortcode tags removed.
 		 */
-		public function encode_shortcodes( $content ) {
+		public function encode_shortcodes($content) {
 			// Avoids existing encoded tags.
-			$trans   = array(
+			$trans = array(
 				'&#91;' => '&#091;',
 				'&#93;' => '&#093;',
 				'&amp;#91;' => '&#091;',
@@ -3272,7 +3272,7 @@ 
 				'&amp;gt;' => '&0gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'[' => '&#91;',
@@ -3283,7 +3283,7 @@ 
 				"'" => '&apos;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}
@@ -3296,8 +3296,8 @@ 
 		 * @param string $content Content to search for shortcode tags.
 		 * @return string Content with decoded shortcode tags.
 		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
+		public function decode_shortcodes($content) {
+			$trans = array(
 				'&#91;' => '[',
 				'&#93;' => ']',
 				'&amp;#91;' => '[',
@@ -3310,7 +3310,7 @@ 
 				'&apos;' => "'",
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'&#091;' => '&#91;',
@@ -3323,7 +3323,7 @@ 
 				'&amp;0gt;' => '&gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}

templates/payment-forms/elements/total_payable.php

Spacing +4 added lines, -4 removed lines

@@ -7,13 +7,13 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( empty( $text ) ) {
-    $text = __( 'Total to pay:', 'invoicing' );
+if (empty($text)) {
+    $text = __('Total to pay:', 'invoicing');
 }
 ?>
 <div class="form-group mt-4">
-    <strong><?php echo esc_html( $text ); ?></strong>
+    <strong><?php echo esc_html($text); ?></strong>
     <span class="getpaid-checkout-total-payable"></span>
 </div>

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

Spacing +2 added lines, -2 removed lines

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

vendor/composer/autoload_static.php

Spacing +9 added lines, -9 removed lines

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

vendor/composer/InstalledVersions.php

Spacing +3 added lines, -3 removed lines

@@ -312,9 +312,9 @@
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
-                } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                } elseif (is_file($vendorDir . '/composer/installed.php')) {
+                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir . '/composer/installed.php';
+                    if (null === self::$installed && strtr($vendorDir . '/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                         self::$installed = $installed[count($installed) - 1];
                     }
                 }

vendor/composer/platform_check.php

Spacing +2 added lines, -2 removed lines

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

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

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

Braces +80 added lines, -33 removed lines

@@ -156,7 +156,9 @@ 
 
 		function parse($data) {
 			
-			if ( ! $this->is_active_addon($data['import']->options['custom_type'])) return false;
+			if ( ! $this->is_active_addon($data['import']->options['custom_type'])) {
+			    return false;
+			}
 
 			$parsedData = $this->helper_parse($data, $this->options_array());
 			return $parsedData;
@@ -177,8 +179,7 @@ 
 						if ($field['type'] == 'accordion')
 						{
 							$this->fields[$value['slug']]['is_sub_field'] = true;
-						}
-						else
+						} else
 						{
 							foreach ($value as $n => $param) {							
 								if (is_array($param) and ! empty($this->fields[$param['slug']])){
@@ -242,7 +243,9 @@ 
             if ( ! empty( $this->fields ) ) {
 
                 foreach ($this->fields as $field_slug => $field_params) {
-                    if (in_array($field_params['type'], array('title', 'plain_text', 'acf'))) continue;
+                    if (in_array($field_params['type'], array('title', 'plain_text', 'acf'))) {
+                        continue;
+                    }
                     $default_value = '';
                     if (!empty($field_params['enum_values'])){
                         foreach ($field_params['enum_values'] as $key => $value) {						
@@ -310,8 +313,9 @@ 
 
 		function post_saved( $importData ){
 
-			if (is_callable($this->post_saved_function))
-				call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
+			if (is_callable($this->post_saved_function)) {
+							call_user_func($this->post_saved_function, $importData['pid'], $importData['import'], $importData['logger']);
+			}
 			
 		}
 
@@ -336,7 +340,9 @@ 
 				$data = array();
 				if (!empty($this->fields)){
 					foreach ($this->fields as $field_slug => $field_params) {
-						if (in_array($field_params['type'], array('title', 'plain_text'))) continue;
+						if (in_array($field_params['type'], array('title', 'plain_text'))) {
+						    continue;
+						}
 						switch ($field_params['type']) {
 
 							case 'image':
@@ -421,7 +427,9 @@ 
 			$visible_fields = 0;
 
 			foreach ($this->fields as $field_slug => $field_params) {
-				if ($field_params['is_sub_field']) continue;
+				if ($field_params['is_sub_field']) {
+				    continue;
+				}
 				$visible_fields++;
 			}
 
@@ -430,7 +438,9 @@ 
 			foreach ($this->fields as $field_slug => $field_params) {				
 
 				// do not render sub fields
-				if ($field_params['is_sub_field']) continue;		
+				if ($field_params['is_sub_field']) {
+				    continue;
+				}
 
 				$counter++;		
 
@@ -561,7 +571,9 @@ 
 				$fieldData['id']    = $field_params['field_obj']->ID;
 				$fieldData['label'] = $field_params['field_obj']->post_title;
 				$fieldData['key']   = $field_params['field_obj']->post_name;
-				if (empty($fieldData['name'])) $fieldData['name'] = $field_params['field_obj']->post_excerpt;
+				if (empty($fieldData['name'])) {
+				    $fieldData['name'] = $field_params['field_obj']->post_excerpt;
+				}
 				if (function_exists('pmai_render_field')) {
 					echo pmai_render_field($fieldData, ( ! empty($current_values) ) ? $current_values : array() );
 				}
@@ -573,9 +585,12 @@ 
 			} else if($field_params['type'] == 'plain_text'){
 				if ($field_params['is_html']):					
 					echo $field_params['name'];				
-				else:
+				else {
+				    :
 					?>
-					<p style="margin: 0 0 12px 0;"><?php echo $field_params['name'];?></p>
+					<p style="margin: 0 0 12px 0;"><?php echo $field_params['name'];
+				}
+				?></p>
 					<?php
 				endif;
 			}
@@ -595,8 +610,7 @@ 
 					if (is_array($value)){
 						if ($field_params['type'] == 'accordion'){								
 							$sub_fields[$key][] = $this->convert_field($value, $current_values);
-						}
-						else
+						} else
 						{
 							foreach ($value as $k => $sub_field) {								
 								if (is_array($sub_field) and ! empty($this->fields[$sub_field['slug']]))
@@ -758,7 +772,9 @@ 
 
 		function add_title($title = '', $tooltip = ''){
 
-			if (empty($title)) return;
+			if (empty($title)) {
+			    return;
+			}
 
 			return $this->add_field(sanitize_key($title) . time(), $title, 'title', null, $tooltip);			
 
@@ -766,7 +782,9 @@ 
 
 		function add_text($text = '', $is_html = false){
 
-			if (empty($text)) return;
+			if (empty($text)) {
+			    return;
+			}
 
 			$count = is_array($this->fields) ? count($this->fields) : 0;
 
@@ -902,7 +920,9 @@ 
 		*/
 		function import_images( $slug, $title, $type = 'images', $callback = NULL ){
 			
-			if ( empty($title) or empty($slug) ) return;
+			if ( empty($title) or empty($slug) ) {
+			    return;
+			}
 
 			if (is_array($slug)) {
                 $section_slug = 'pmxi_' . md5(serialize($slug));
@@ -1005,8 +1025,7 @@ 
 								$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug]['xpaths'][$option_name], $file)->parse();
 								$tmp_files[] = $file;						
 							}
-						} 
-						else {							
+						} else {							
 							$data[$option_name] = XmlImportParser::factory($xml, $cxpath, (string) $import->options[$this->slug][$option_name], $file)->parse();
 							$tmp_files[] = $file;
 						}
@@ -1036,13 +1055,23 @@ 
 			
 			$import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+			if ($import_options['update_all_data'] == 'yes') {
+			    return true;
+			}
 
-			if ( ! $import_options['is_update_custom_fields'] ) return false;			
+			if ( ! $import_options['is_update_custom_fields'] ) {
+			    return false;
+			}
 
-			if ($import_options['update_custom_fields_logic'] == "full_update") return true;
-			if ($import_options['update_custom_fields_logic'] == "only" and ! empty($import_options['custom_fields_list']) and is_array($import_options['custom_fields_list']) and in_array($meta_key, $import_options['custom_fields_list']) ) return true;
-			if ($import_options['update_custom_fields_logic'] == "all_except" and ( empty($import_options['custom_fields_list']) or ! in_array($meta_key, $import_options['custom_fields_list']) )) return true;
+			if ($import_options['update_custom_fields_logic'] == "full_update") {
+			    return true;
+			}
+			if ($import_options['update_custom_fields_logic'] == "only" and ! empty($import_options['custom_fields_list']) and is_array($import_options['custom_fields_list']) and in_array($meta_key, $import_options['custom_fields_list']) ) {
+			    return true;
+			}
+			if ($import_options['update_custom_fields_logic'] == "all_except" and ( empty($import_options['custom_fields_list']) or ! in_array($meta_key, $import_options['custom_fields_list']) )) {
+			    return true;
+			}
 
 			return false;
 
@@ -1056,13 +1085,23 @@ 
 			
 			$import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+			if ($import_options['update_all_data'] == 'yes') {
+			    return true;
+			}
 
-			if ( ! $import_options['is_update_categories'] ) return false;			
+			if ( ! $import_options['is_update_categories'] ) {
+			    return false;
+			}
 
-			if ($import_options['update_categories_logic'] == "full_update") return true;
-			if ($import_options['update_categories_logic'] == "only" and ! empty($import_options['taxonomies_list']) and is_array($import_options['taxonomies_list']) and in_array($tax_name, $import_options['taxonomies_list']) ) return true;
-			if ($import_options['update_categories_logic'] == "all_except" and ( empty($import_options['taxonomies_list']) or ! in_array($tax_name, $import_options['taxonomies_list']) )) return true;
+			if ($import_options['update_categories_logic'] == "full_update") {
+			    return true;
+			}
+			if ($import_options['update_categories_logic'] == "only" and ! empty($import_options['taxonomies_list']) and is_array($import_options['taxonomies_list']) and in_array($tax_name, $import_options['taxonomies_list']) ) {
+			    return true;
+			}
+			if ($import_options['update_categories_logic'] == "all_except" and ( empty($import_options['taxonomies_list']) or ! in_array($tax_name, $import_options['taxonomies_list']) )) {
+			    return true;
+			}
 
 			return false;
 
@@ -1072,11 +1111,17 @@ 
 
 			$import_options = $import_options['options'];
 
-			if ($import_options['update_all_data'] == 'yes') return true;
+			if ($import_options['update_all_data'] == 'yes') {
+			    return true;
+			}
 
-			if (!$import_options['is_update_images']) return false;			
+			if (!$import_options['is_update_images']) {
+			    return false;
+			}
 
-			if ($import_options['is_update_images']) return true;			
+			if ($import_options['is_update_images']) {
+			    return true;
+			}
 
 			return false;
 		}
@@ -1153,7 +1198,9 @@ 
 
 				$requires_counter = 0;
 				foreach ($conditions['plugins'] as $plugin) {
-					if ( is_plugin_active($plugin) ) $requires_counter++;
+					if ( is_plugin_active($plugin) ) {
+					    $requires_counter++;
+					}
 				}
 
 				if ($requires_counter != count($conditions['plugins'])){ 					

Spacing +153 added lines, -153 removed lines

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

Indentation +802 added lines, -802 removed lines

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