AyeCode / invoicing

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

Indentation +4 added lines, -4 removed lines

@@ -15,12 +15,12 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
-	// include the class if needed
-	include_once( dirname( __FILE__ ) . "/wp-super-duper.php" );
+    // include the class if needed
+    include_once( dirname( __FILE__ ) . "/wp-super-duper.php" );
 }
 
 /*
@@ -35,5 +35,5 @@ 
 
 
 if ( ! function_exists( 'sd_get_class_build_keys' ) ) {
-	include_once( dirname( __FILE__ ) . "/sd-functions.php" );
+    include_once( dirname( __FILE__ ) . "/sd-functions.php" );
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -14,26 +14,26 @@
  * Tested up to: 5.3
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 	// include the class if needed
-	include_once( dirname( __FILE__ ) . "/wp-super-duper.php" );
+	include_once(dirname(__FILE__) . "/wp-super-duper.php");
 }
 
 /*
  * Hello world example.
  */
-include_once( dirname( __FILE__ ) . "/hello-world.php" );
+include_once(dirname(__FILE__) . "/hello-world.php");
 
 /*
  * Map example.
  */
-include_once( dirname( __FILE__ ) . "/map.php" );
+include_once(dirname(__FILE__) . "/map.php");
 
 
-if ( ! function_exists( 'sd_get_class_build_keys' ) ) {
-	include_once( dirname( __FILE__ ) . "/sd-functions.php" );
+if (!function_exists('sd_get_class_build_keys')) {
+	include_once(dirname(__FILE__) . "/sd-functions.php");
 }
\ No newline at end of file

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

Indentation +106 added lines, -106 removed lines

@@ -3,114 +3,114 @@ 
 class SD_Hello_World extends WP_Super_Duper {
 
 
-	public $arguments;
-
-	/**
-	 * Sets up the widgets name etc
-	 */
-	public function __construct() {
-
-		$options = array(
-			'textdomain'     => 'super-duper',
-			// textdomain of the plugin/theme (used to prefix the Gutenberg block)
-			'block-icon'     => 'fas fa-globe-americas',
-			// Dash icon name for the block: https://developer.wordpress.org/resource/dashicons/#arrow-right
-			// OR font-awesome 5 class name: fas fa-globe-americas
-			'block-category' => 'widgets',
-			// the category for the block, 'common', 'formatting', 'layout', 'widgets', 'embed'.
-			'block-keywords' => "['hello','world']",
-			// used in the block search, MAX 3
-			'block-output'   => array( // the block visual output elements as an array
+    public $arguments;
+
+    /**
+     * Sets up the widgets name etc
+     */
+    public function __construct() {
+
+        $options = array(
+            'textdomain'     => 'super-duper',
+            // textdomain of the plugin/theme (used to prefix the Gutenberg block)
+            'block-icon'     => 'fas fa-globe-americas',
+            // Dash icon name for the block: https://developer.wordpress.org/resource/dashicons/#arrow-right
+            // OR font-awesome 5 class name: fas fa-globe-americas
+            'block-category' => 'widgets',
+            // the category for the block, 'common', 'formatting', 'layout', 'widgets', 'embed'.
+            'block-keywords' => "['hello','world']",
+            // used in the block search, MAX 3
+            'block-output'   => array( // the block visual output elements as an array
 //				array(
 //					'element' => 'p',
 //					'title'   => __( 'Placeholder', 'ayecode-connect' ),
 //					'class'   => '[%className%]',
 //					'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
 //				)
-				array(
-					'element'       => 'BlocksProps',
-					'inner_element' => 'p',
-					'blockProps'    => array(
-						'className'               => '[%WrapClass%]',
+                array(
+                    'element'       => 'BlocksProps',
+                    'inner_element' => 'p',
+                    'blockProps'    => array(
+                        'className'               => '[%WrapClass%]',
 //						'content' => 'Hello: [%after_text%]'
 //						'if_dangerouslySetInnerHTML' => '{__html: blockstrap_build_shape(props.attributes) }',
-					),
-					'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
-
-
-				),
-			),
-			'block-wrap'    => '', // You can specify the type of element to wrap the block `div` or `span` etc.. Or blank for no wrap at all.
-			'class_name'     => __CLASS__,
-			// The calling class name
-			'base_id'        => 'hello_world',
-			// this is used as the widget id and the shortcode id.
-			'name'           => __( 'Hello World', 'ayecode-connect' ),
-			// the name of the widget/block
-			'widget_ops'     => array(
-				'classname'   => 'hello-world-class',
-				// widget class
-				'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'ayecode-connect' ),
-				// widget description
-			),
-			'no_wrap'       => true, // This will prevent the widget being wrapped in the containing widget class div.
-			'arguments'      => array( // these are the arguments that will be used in the widget, shortcode and block settings.
-				'after_text' => array( // this is the input name=''
-					'title'       => __( 'Text after hello:', 'ayecode-connect' ),
-					// input title
-					'desc'        => __( 'This is the text that will appear after `Hello:`.', 'ayecode-connect' ),
-					// input description
-					'type'        => 'text',
-					// the type of input, test, select, checkbox etc.
-					'placeholder' => 'World',
-					// the input placeholder text.
-					'desc_tip'    => true,
-					// if the input should show the widget description text as a tooltip.
-					'default'     => 'World',
-					// the input default value.
-					'advanced'    => false
-					// not yet implemented
-				),
-			)
-		);
-
-		parent::__construct( $options );
-	}
-
-
-	/**
-	 * This is the output function for the widget, shortcode and block (front end).
-	 *
-	 * @param array $args The arguments values.
-	 * @param array $widget_args The widget arguments when used.
-	 * @param string $content The shortcode content argument
-	 *
-	 * @return string
-	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		/**
-		 * @var string $after_text
-		 * @var string $another_input This is added by filter below.
-		 */
-		extract( $args, EXTR_SKIP );
-
-		/*
+                    ),
+                    'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
+
+
+                ),
+            ),
+            'block-wrap'    => '', // You can specify the type of element to wrap the block `div` or `span` etc.. Or blank for no wrap at all.
+            'class_name'     => __CLASS__,
+            // The calling class name
+            'base_id'        => 'hello_world',
+            // this is used as the widget id and the shortcode id.
+            'name'           => __( 'Hello World', 'ayecode-connect' ),
+            // the name of the widget/block
+            'widget_ops'     => array(
+                'classname'   => 'hello-world-class',
+                // widget class
+                'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'ayecode-connect' ),
+                // widget description
+            ),
+            'no_wrap'       => true, // This will prevent the widget being wrapped in the containing widget class div.
+            'arguments'      => array( // these are the arguments that will be used in the widget, shortcode and block settings.
+                'after_text' => array( // this is the input name=''
+                    'title'       => __( 'Text after hello:', 'ayecode-connect' ),
+                    // input title
+                    'desc'        => __( 'This is the text that will appear after `Hello:`.', 'ayecode-connect' ),
+                    // input description
+                    'type'        => 'text',
+                    // the type of input, test, select, checkbox etc.
+                    'placeholder' => 'World',
+                    // the input placeholder text.
+                    'desc_tip'    => true,
+                    // if the input should show the widget description text as a tooltip.
+                    'default'     => 'World',
+                    // the input default value.
+                    'advanced'    => false
+                    // not yet implemented
+                ),
+            )
+        );
+
+        parent::__construct( $options );
+    }
+
+
+    /**
+     * This is the output function for the widget, shortcode and block (front end).
+     *
+     * @param array $args The arguments values.
+     * @param array $widget_args The widget arguments when used.
+     * @param string $content The shortcode content argument
+     *
+     * @return string
+     */
+    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        /**
+         * @var string $after_text
+         * @var string $another_input This is added by filter below.
+         */
+        extract( $args, EXTR_SKIP );
+
+        /*
 		 * This value is added by filter so might not exist if filter is removed so we check.
 		 */
-		if ( ! isset( $another_input ) ) {
-			$another_input = '';
-		}
+        if ( ! isset( $another_input ) ) {
+            $another_input = '';
+        }
 
-		return "Helllo: " . $after_text . "" . $another_input;
+        return "Helllo: " . $after_text . "" . $another_input;
 
-	}
+    }
 
 }
 
 // register it.
 add_action( 'widgets_init', function () {
-	register_widget( 'SD_Hello_World' );
+    register_widget( 'SD_Hello_World' );
 } );
 
 
@@ -123,26 +123,26 @@ 
  */
 function _my_extra_arguments( $options ) {
 
-	/*
+    /*
 	 * Add a new input option.
 	 */
-	$options['arguments']['another_input'] = array(
-		'name'        => 'another_input', // this is the input name=''
-		'title'       => __( 'Another input:', 'ayecode-connect' ), // input title
-		'desc'        => __( 'This is an input added via filter.', 'ayecode-connect' ), // input description
-		'type'        => 'text', // the type of input, test, select, checkbox etc.
-		'placeholder' => 'Placeholder text', // the input placeholder text.
-		'desc_tip'    => true, // if the input should show the widget description text as a tooltip.
-		'default'     => '', // the input default value.
-		'advanced'    => false // not yet implemented
-	);
-
-	/*
+    $options['arguments']['another_input'] = array(
+        'name'        => 'another_input', // this is the input name=''
+        'title'       => __( 'Another input:', 'ayecode-connect' ), // input title
+        'desc'        => __( 'This is an input added via filter.', 'ayecode-connect' ), // input description
+        'type'        => 'text', // the type of input, test, select, checkbox etc.
+        'placeholder' => 'Placeholder text', // the input placeholder text.
+        'desc_tip'    => true, // if the input should show the widget description text as a tooltip.
+        'default'     => '', // the input default value.
+        'advanced'    => false // not yet implemented
+    );
+
+    /*
 	 * Output the new option in the block output also.
 	 */
-	$options['block-output']['element::p']['content'] = $options['block-output']['element::p']['content'] . " [%another_input%]";;
+    $options['block-output']['element::p']['content'] = $options['block-output']['element::p']['content'] . " [%another_input%]";;
 
-	return $options;
+    return $options;
 }
 
 //add_filter( 'wp_super_duper_options_hello_world', '_my_extra_arguments' );
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -45,20 +45,20 @@ 
 			// The calling class name
 			'base_id'        => 'hello_world',
 			// this is used as the widget id and the shortcode id.
-			'name'           => __( 'Hello World', 'ayecode-connect' ),
+			'name'           => __('Hello World', 'ayecode-connect'),
 			// the name of the widget/block
 			'widget_ops'     => array(
 				'classname'   => 'hello-world-class',
 				// widget class
-				'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'ayecode-connect' ),
+				'description' => esc_html__('This is an example that will take a text parameter and output it after `Hello:`.', 'ayecode-connect'),
 				// widget description
 			),
 			'no_wrap'       => true, // This will prevent the widget being wrapped in the containing widget class div.
 			'arguments'      => array( // these are the arguments that will be used in the widget, shortcode and block settings.
 				'after_text' => array( // this is the input name=''
-					'title'       => __( 'Text after hello:', 'ayecode-connect' ),
+					'title'       => __('Text after hello:', 'ayecode-connect'),
 					// input title
-					'desc'        => __( 'This is the text that will appear after `Hello:`.', 'ayecode-connect' ),
+					'desc'        => __('This is the text that will appear after `Hello:`.', 'ayecode-connect'),
 					// input description
 					'type'        => 'text',
 					// the type of input, test, select, checkbox etc.
@@ -74,7 +74,7 @@ 
 			)
 		);
 
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 
@@ -87,18 +87,18 @@ 
 	 *
 	 * @return string
 	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
+	public function output($args = array(), $widget_args = array(), $content = '') {
 
 		/**
 		 * @var string $after_text
 		 * @var string $another_input This is added by filter below.
 		 */
-		extract( $args, EXTR_SKIP );
+		extract($args, EXTR_SKIP);
 
 		/*
 		 * This value is added by filter so might not exist if filter is removed so we check.
 		 */
-		if ( ! isset( $another_input ) ) {
+		if (!isset($another_input)) {
 			$another_input = '';
 		}
 
@@ -109,8 +109,8 @@ 
 }
 
 // register it.
-add_action( 'widgets_init', function () {
-	register_widget( 'SD_Hello_World' );
+add_action('widgets_init', function() {
+	register_widget('SD_Hello_World');
 } );
 
 
@@ -121,15 +121,15 @@ 
  *
  * @return mixed
  */
-function _my_extra_arguments( $options ) {
+function _my_extra_arguments($options) {
 
 	/*
 	 * Add a new input option.
 	 */
 	$options['arguments']['another_input'] = array(
 		'name'        => 'another_input', // this is the input name=''
-		'title'       => __( 'Another input:', 'ayecode-connect' ), // input title
-		'desc'        => __( 'This is an input added via filter.', 'ayecode-connect' ), // input description
+		'title'       => __('Another input:', 'ayecode-connect'), // input title
+		'desc'        => __('This is an input added via filter.', 'ayecode-connect'), // input description
 		'type'        => 'text', // the type of input, test, select, checkbox etc.
 		'placeholder' => 'Placeholder text', // the input placeholder text.
 		'desc_tip'    => true, // if the input should show the widget description text as a tooltip.
@@ -140,7 +140,7 @@ 
 	/*
 	 * Output the new option in the block output also.
 	 */
-	$options['block-output']['element::p']['content'] = $options['block-output']['element::p']['content'] . " [%another_input%]";;
+	$options['block-output']['element::p']['content'] = $options['block-output']['element::p']['content'] . " [%another_input%]"; ;
 
 	return $options;
 }

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

Braces +42 added lines, -44 removed lines

@@ -60,7 +60,7 @@ 
 			if(!empty($this->options['nested-block'])){
 				if(empty($this->options['output_types'])){
 					$this->options['output_types'] = array('shortcode','block');
-				}elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
+				} elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
 					unset($this->options['output_types'][$key]);
 				}
 			}
@@ -715,7 +715,7 @@ 
 				<?php
 				if(! empty( $insert_shortcode_function )){
 					echo $insert_shortcode_function;
-				}else{
+				} else{
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -2231,7 +2231,7 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
+				} else{
 						?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
@@ -2459,7 +2459,7 @@ 
 					var InnerBlocks = blockEditor.InnerBlocks;
 
 					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}];
 					const MediaUpload = wp.blockEditor.MediaUpload;
@@ -2516,9 +2516,9 @@ 
 						$example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
 						if( isset( $this->options['example'] ) && $this->options['example'] === false ){
 							// no preview if set to false
-						}elseif( !empty( $example_args ) ){
+						} elseif( !empty( $example_args ) ){
 							echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-						}elseif( !empty( $this->options['example'] ) ){
+						} elseif( !empty( $this->options['example'] ) ){
 							unset($this->options['example']['viewportWidth']);
 							unset($this->options['example']['innerBlocks']);
 							$example_atts = $this->array_to_attributes( $this->options['example'] );
@@ -2535,7 +2535,7 @@ 
 							if(!empty($example_parts)){
 								echo "example : {".implode(',', $example_parts)."},";
 							}
-						}else{
+						} else{
 							echo 'example : {viewportWidth: 500},';
 						}
 
@@ -2606,8 +2606,7 @@ 
 
 									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
 										continue;
-									}
-									elseif ( $args['type'] == 'checkbox' ) {
+									} elseif ( $args['type'] == 'checkbox' ) {
 										$type    = 'boolean';
 										$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
 									} elseif ( $args['type'] == 'number' ) {
@@ -2742,7 +2741,7 @@ 
 							<?php
 							if(!empty($this->options['block-edit-raw'])) {
 								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
+							} else{
 							?>
 
 function hasSelectedInnerBlock(props) {
@@ -2877,7 +2876,7 @@ 
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
 if(!empty($current_screen->base) && $current_screen->base==='widgets'){
 	echo 'const { deviceType } = "";';
-}else{
+} else{
 ?>
 /** Get device type const. */
 const { deviceType } = wp.data.useSelect != 'undefined' ?  wp.data.useSelect(select => {
@@ -2912,7 +2911,7 @@ 
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
 										'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' );?>'
 									};
 
@@ -2932,7 +2931,7 @@ 
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 											 <?php
-										}else{
+										} else{
 										?>
 										props.setAttributes({content: env});
 										is_fetching = false;
@@ -3139,7 +3138,7 @@ 
 //
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
@@ -3165,9 +3164,9 @@ 
 								// If the user sets block-output array then build it
 								if ( ! empty( $this->options['block-output'] ) ) {
 								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
+							} elseif(!empty($this->options['block-edit-return'])){
 								   echo $this->options['block-edit-return'];
-							}else{
+							} else{
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
 								?>
@@ -3279,9 +3278,9 @@ 
 							   );
 								<?php
 
-							}elseif(!empty($this->options['block-save-return'])){
+							} elseif(!empty($this->options['block-save-return'])){
 								   echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
+							} elseif(!empty($this->options['nested-block'])){
 								?>
 							  return el(
 								   '',
@@ -3291,13 +3290,13 @@ 
 								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
 							   );
 								<?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
+							} elseif(!empty( $this->options['block-save-return'] ) ){
 								echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							} elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
 							?>
 							return content;
 							<?php
-							}else{
+							} else{
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -3348,9 +3347,9 @@ 
 				$device_type_icon = '';
 				if($device_type=='Desktop'){
 					$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Tablet'){
+				} elseif($device_type=='Tablet'){
 					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Mobile'){
+				} elseif($device_type=='Mobile'){
 					$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 				}
 				echo $element_require;
@@ -3395,7 +3394,7 @@ 
 
 					<?php
 					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
+				} elseif(!empty($args['row']['close'])){
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -3404,7 +3403,7 @@ 
 							},
 					<?php
 					if(false){?></script><?php }
-				}else{
+				} else{
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -3509,9 +3508,9 @@ 
 			$device_type_icon = '';
 			if($device_type=='Desktop'){
 				$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Tablet'){
+			} elseif($device_type=='Tablet'){
 				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Mobile'){
+			} elseif($device_type=='Mobile'){
 				$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 			}
 
@@ -3574,7 +3573,7 @@ 
 				$args['type'] == 'text';
 				// Save numbers as numbers and not strings
 				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
+			} else if ( $args['type'] == 'notice' ) {
 
 				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
 				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
@@ -3649,7 +3648,7 @@ 
 							$key: value
 						});
 					},";
-			}elseif ( $args['type'] == 'gradient' ) {
+			} elseif ( $args['type'] == 'gradient' ) {
 				$type = 'GradientPicker';
 				$extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
@@ -3688,7 +3687,7 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
+			} elseif ( $args['type'] == 'image' ) {
 //                print_r($args);
 
 				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
@@ -3825,8 +3824,7 @@ 
 				$onchange = "";
 
 				//$inside_elements = ",el('div',{},'file upload')";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			} elseif ( $args['type'] == 'checkbox' ) {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
@@ -3838,9 +3836,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: [";
@@ -4004,7 +4002,7 @@ 
 				foreach ( $custom_attributes as $key => $val ) {
 					if(is_array($val)){
 						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
+					} else{
 						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
 					}
 				}
@@ -4045,7 +4043,7 @@ 
 
 							if($new_args['element']=='InnerBlocks'){
 								echo "\n el( InnerBlocks, {";
-							}elseif($new_args['element']=='innerBlocksProps'){
+							} elseif($new_args['element']=='innerBlocksProps'){
 								$element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
 							  //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
@@ -4058,11 +4056,11 @@ 
 							//    echo '###';
 
 							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
+							} elseif($new_args['element']=='BlocksProps'){
 
 								if ( isset($new_args['if_inner_element']) ) {
 									$element = $new_args['if_inner_element'];
-								}else {
+								} else {
 									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
 								}
 
@@ -4073,7 +4071,7 @@ 
 
 							   // echo "} ),";
 
-							}else{
+							} else{
 								echo "\n el( '" . $new_args['element'] . "', {";
 							}
 
@@ -4098,7 +4096,7 @@ 
 
 									if ( $new_key === 'content' ) {
 										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
+									} else if ( $new_key === 'if_content' ) {
 										echo  $this->block_props_replace(  $new_value  );
 									}
 
@@ -4128,7 +4126,7 @@ 
 
 							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
 								echo "))";// end content
-							}else{
+							} else{
 								echo ")";// end content
 							}
 
@@ -4752,11 +4750,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 +2872 added lines, -2872 removed lines

@@ -1,299 +1,299 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
-	define( 'SUPER_DUPER_VER', '1.2.6' );
-
-	/**
-	 * 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.1.1
-	 */
-	class WP_Super_Duper extends WP_Widget {
-
-		public $version = SUPER_DUPER_VER;
-		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'],
-				'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
-			);
-			$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();
-
-			// nested blocks can't work as a widget
-			if(!empty($this->options['nested-block'])){
-				if(empty($this->options['output_types'])){
-					$this->options['output_types'] = array('shortcode','block');
-				}elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
-					unset($this->options['output_types'][$key]);
-				}
-			}
-
-			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				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 needs to be done even for blocks and widgets
-				$this->register_shortcode();
-
-
-				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
-				}
-
-				// register block
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-					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 head
-				add_action( 'admin_head', array( $this, 'generator' ), 99 );
-				add_action( 'wp_head', array( $this, 'generator' ), 99 );
-			}
-
-			do_action( 'wp_super_duper_widget_init', $options, $this );
-		}
-
-		/**
-		 * The register widget function
-		 * @return void
-		 */
-		public function _register() {
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::_register();
-			}
-		}
-
-		/**
-		 * 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'] = isset( $val['title'] ) ? $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( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
-					} 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 = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
-				$editor_id = 'main_content_content_vb_tiny_mce';
-			}
-
-			global $sd_widgets;
+    define( 'SUPER_DUPER_VER', '1.2.6' );
+
+    /**
+     * 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.1.1
+     */
+    class WP_Super_Duper extends WP_Widget {
+
+        public $version = SUPER_DUPER_VER;
+        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'],
+                'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
+            );
+            $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();
+
+            // nested blocks can't work as a widget
+            if(!empty($this->options['nested-block'])){
+                if(empty($this->options['output_types'])){
+                    $this->options['output_types'] = array('shortcode','block');
+                }elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
+                    unset($this->options['output_types'][$key]);
+                }
+            }
+
+            // init parent
+            if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+                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 needs to be done even for blocks and widgets
+                $this->register_shortcode();
+
+
+                // Fusion Builder (avada) support
+                if ( function_exists( 'fusion_builder_map' ) ) {
+                    add_action( 'init', array( $this, 'register_fusion_element' ) );
+                }
+
+                // register block
+                if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
+                    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 head
+                add_action( 'admin_head', array( $this, 'generator' ), 99 );
+                add_action( 'wp_head', array( $this, 'generator' ), 99 );
+            }
+
+            do_action( 'wp_super_duper_widget_init', $options, $this );
+        }
+
+        /**
+         * The register widget function
+         * @return void
+         */
+        public function _register() {
+            if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+                parent::_register();
+            }
+        }
+
+        /**
+         * 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'] = isset( $val['title'] ) ? $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( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
+                    } 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 = esc_attr( $_POST['editor_id'] );
+            } elseif ( isset( $_REQUEST['et_fb'] ) ) {
+                $editor_id = 'main_content_content_vb_tiny_mce';
+            }
+
+            global $sd_widgets;
 
 //			print_r($sd_widgets);exit;
-			?>
+            ?>
 
 			<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', 'ayecode-connect' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						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', 'ayecode-connect' ) . "</option>";
+                    foreach ( $sd_widgets as $shortcode => $class ) {
+                        if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
+                        echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+                    }
+                    echo "</select>";
+
+                }
+                ?>
 				<div class="sd-shortcode-settings"></div>
 
 			</div>
@@ -304,8 +304,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', 'ayecode-connect' ); ?></button>
+                                    echo "'" . $editor_id . "'";
+                                } ?>)"><?php _e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
 					<?php } ?>
 					<button class="button"
 							onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
@@ -313,150 +313,150 @@ 
 			</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 header.
-		 */
-		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-			// Find source plugin/theme of SD
-			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-				}
-			}
-
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
-		}
-
-		/**
-		 * 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 header.
+         */
+        public function generator() {
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme of SD
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
+
+            echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+        }
+
+        /**
+         * 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).
-		 *
-		 * @param string $editor_id Optional. Shortcode editor id. Default null.
-		 * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
-		 *
-		 *@since 1.0.0
-		 *
-		 */
-		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).
+         *
+         * @param string $editor_id Optional. Shortcode editor id. Default null.
+         * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
+         *
+         *@since 1.0.0
+         *
+         */
+        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>
@@ -467,21 +467,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.
-		 *
-		 * @return mixed
-		 *@since 1.0.6
-		 */
-		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.
+         *
+         * @return mixed
+         *@since 1.0.6
+         */
+        public static function siteorigin_js() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * Check a form to see what items should be shown or hidden.
@@ -557,29 +557,29 @@ 
 				});
 			</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.
-		 *
-		 * @param string $editor_id
-		 * @param string $insert_shortcode_function
-		 *
-		 *@since 1.0.6
-		 *
-		 */
-		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.
+         *
+         * @param string $editor_id
+         * @param string $insert_shortcode_function
+         *
+         *@since 1.0.6
+         *
+         */
+        public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+            ?>
 			<style>
 				.sd-shortcode-left-wrap {
 					float: left;
@@ -707,35 +707,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;
 						}
@@ -1049,18 +1049,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 {
@@ -1100,26 +1100,26 @@ 
 				.elementor-control .sd-argument select[multiple] option{padding:3px}
 			</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>
 
 				/**
@@ -1270,595 +1270,595 @@ 
 				<?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 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 .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+                    }
+                }
+
+                $shortcode = "[" . esc_attr( $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.
+                 *
+                 * @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.
+                 *
+                 *@since 1.0.28
+                 *
+                 */
+                $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;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $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
+         *
+         * @return array
+         *@since 1.0.12 Don't set checkbox default value if the value is empty.
+         *
+         */
+        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.
+         *
+         * @return array Set arguments.
+         *@since 1.0.0
+         *
+         */
+        public function set_arguments() {
+            return $this->arguments;
+        }
+
+        /**
+         * Get arguments in super duper.
+         *
+         * @return array Get arguments.
+         *@since 1.0.0
+         *
+         */
+        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 ) {
+                $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+                $content_url = untrailingslashit( WP_CONTENT_URL );
+
+                // Replace http:// to https://.
+                if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                    $content_url = str_replace( 'http://', 'https://', $content_url );
+                }
+
+                // Check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+                $url = str_replace( $content_dir, $content_url, $file_dir );
+                $url = trailingslashit( $url );
+                $this->url = $url;
+            }
+
+            return $url;
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url_old() {
+
+            $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
+         *
+         * @return string
+         *@since 1.1.0
+         */
+        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 ) ) {
+                $temp_arguments = array();
+                $general        = __( "General", 'ayecode-connect' );
+                $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;
+                }
+            }
+
+            return $arguments;
+        }
+
+        /**
+         * Parse used group tabs.
+         *
+         * @since 1.1.17
+         */
+        public function group_block_tabs( $tabs, $arguments ) {
+            if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+                $has_sections = false;
+
+                foreach ( $this->arguments as $key => $args ) {
+                    if ( isset( $args['group'] ) ) {
+                        $has_sections = true;
+                        break;
+                    }
+                }
+
+                if ( ! $has_sections ) {
+                    return $tabs;
+                }
+
+                $new_tabs = array();
+
+                foreach ( $tabs as $tab_key => $tab ) {
+                    $new_groups = array();
+
+                    if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
+                        foreach ( $tab['groups'] as $group ) {
+                            if ( isset( $arguments[ $group ] ) ) {
+                                $new_groups[] = $group;
+                            }
+                        }
+                    }
+
+                    if ( ! empty( $new_groups ) ) {
+                        $tab['groups'] = $new_groups;
+
+                        $new_tabs[ $tab_key ] = $tab;
+                    }
+                }
+
+                $tabs = $new_tabs;
+            }
+
+            return $tabs;
+        }
+
+        /**
+         * Output the JS for building the dynamic Guntenberg block.
+         *
+         * @return mixed
+         *@since 1.0.9 Save numbers as numbers and not strings.
+         * @since 1.1.0 Font Awesome classes can be used for icons.
+         * @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.
+         */
+        public function block() {
+            global $sd_is_js_functions_loaded, $aui_bs5;
+
+            $show_advanced = $this->block_show_advanced();
+
+            ob_start();
+            ?>
+			<script>
+			<?php
+            if ( ! $sd_is_js_functions_loaded ) {
+                $sd_is_js_functions_loaded = true;
+            ?>
+function sd_show_view_options($this){
+	if(jQuery($this).html().length){
+		jQuery($this).html('');
+	}else{
+		jQuery($this).html('<div class="position-absolute d-flex flex-column bg-white p-1 rounded border shadow-lg " style="top:-80px;left:-5px;"><div class="dashicons dashicons-desktop mb-1" onclick="sd_set_view_type(\'Desktop\');"></div><div class="dashicons dashicons-tablet mb-1" onclick="sd_set_view_type(\'Tablet\');"></div><div class="dashicons dashicons-smartphone" onclick="sd_set_view_type(\'Mobile\');"></div></div>');
+	}
+}
 
-			return $options;
-		}
+function sd_set_view_type($device){
+	wp.data.dispatch('core/edit-site') ? wp.data.dispatch('core/edit-site').__experimentalSetPreviewDeviceType($device) : wp.data.dispatch('core/edit-post').__experimentalSetPreviewDeviceType($device);
+}
 
-		/**
-		 * 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' ) );
+jQuery(function(){
+	sd_block_visibility_init();
+});
+function sd_block_visibility_init() {
+	jQuery(document).off('change', '.bs-vc-modal-form').on('change', '.bs-vc-modal-form', function() {
+		try {
+			aui_conditional_fields('.bs-vc-modal-form');
+		} catch(err) {
+			console.log(err.message);
 		}
+	});
 
-		/**
-		 * 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 .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+	jQuery(document).off('click', '.bs-vc-save').on('click', '.bs-vc-save', function() {
+		var $bsvcModal = jQuery(this).closest('.bs-vc-modal'), $bsvcForm = $bsvcModal.find('.bs-vc-modal-form'), vOutput = jQuery('#bsvc_output', $bsvcForm).val(), rawValue = '', oVal = {}, oOut = {}, iRule = 0;
+		jQuery(this).addClass('disabled');
+		jQuery('.bs-vc-modal-form .bs-vc-rule-sets .bs-vc-rule').each(function(){
+			vRule = jQuery(this).find('.bsvc_rule').val(), oRule = {};
+			if (vRule == 'logged_in' || vRule == 'logged_out' || vRule == 'post_author') {
+				oRule.type = vRule;
+			} else if (vRule == 'user_roles') {
+				oRule.type = vRule;
+				if (jQuery(this).find('.bsvc_user_roles:checked').length) {
+					var user_roles = jQuery(this).find('.bsvc_user_roles:checked').map(function() {
+						return jQuery(this).val();
+					}).get();
+					if (user_roles && user_roles.length) {
+						oRule.user_roles = user_roles.join(",");
 					}
 				}
-
-				$shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
-
-				$content = do_shortcode( $shortcode );
-
-				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
+			} else if (vRule == 'gd_field') {
+				if (jQuery(this).find('.bsvc_gd_field ').val() && jQuery(this).find('.bsvc_gd_field_condition').val()) {
+					oRule.type = vRule;
+					oRule.field = jQuery(this).find('.bsvc_gd_field ').val();
+					oRule.condition = jQuery(this).find('.bsvc_gd_field_condition').val();
+					if (oRule.condition != 'is_empty' && oRule.condition != 'is_not_empty') {
+						oRule.search = jQuery(this).find('.bsvc_gd_field_search').val();
+					}
 				}
-
-				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 (Object.keys(oRule).length > 0) {
+				iRule++;
+				oVal['rule'+iRule] = oRule;
 			}
-
-			if ( ! $this->is_preview() ) {
-				/**
-				 * Filters the settings for a particular widget args.
-				 *
-				 * @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.
-				 *
-				 *@since 1.0.28
-				 *
-				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
-
-				if ( ! is_array( $args ) ) {
-					return $args;
+		});
+		if (vOutput == 'hide') {
+			oOut.type = vOutput;
+		} else if (vOutput == 'message') {
+			if (jQuery('#bsvc_message', $bsvcForm).val()) {
+				oOut.type = vOutput;
+				oOut.message = jQuery('#bsvc_message', $bsvcForm).val();
+				if (jQuery('#bsvc_message_type', $bsvcForm).val()) {
+					oOut.message_type = jQuery('#bsvc_message_type', $bsvcForm).val();
 				}
 			}
-
-			$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;
+		} else if (vOutput == 'page') {
+			if (jQuery('#bsvc_page', $bsvcForm).val()) {
+				oOut.type = vOutput;
+				oOut.page = jQuery('#bsvc_page', $bsvcForm).val();
 			}
-
-			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+		} else if (vOutput == 'template_part') {
+			if (jQuery('#bsvc_tmpl_part', $bsvcForm).val()) {
+				oOut.type = vOutput;
+				oOut.template_part = jQuery('#bsvc_tmpl_part', $bsvcForm).val();
 			}
-
-			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;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
+		if (Object.keys(oOut).length > 0) {
+			oVal.output = oOut;
 		}
-
-		/**
-		 * 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
-		 *
-		 * @return array
-		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
-		 *
-		 */
-		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.
-		 *
-		 * @return array Set arguments.
-		 *@since 1.0.0
-		 *
-		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
-
-		/**
-		 * Get arguments in super duper.
-		 *
-		 * @return array Get arguments.
-		 *@since 1.0.0
-		 *
-		 */
-		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 ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
-
-				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
-				}
-
-				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
-				$this->url = $url;
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url_old() {
-
-			$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
-		 *
-		 * @return string
-		 *@since 1.1.0
-		 */
-		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 ) ) {
-				$temp_arguments = array();
-				$general        = __( "General", 'ayecode-connect' );
-				$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;
-				}
-			}
-
-			return $arguments;
-		}
-
-		/**
-		 * Parse used group tabs.
-		 *
-		 * @since 1.1.17
-		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
-				$has_sections = false;
-
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$has_sections = true;
-						break;
-					}
-				}
-
-				if ( ! $has_sections ) {
-					return $tabs;
-				}
-
-				$new_tabs = array();
-
-				foreach ( $tabs as $tab_key => $tab ) {
-					$new_groups = array();
-
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
-								$new_groups[] = $group;
-							}
-						}
-					}
-
-					if ( ! empty( $new_groups ) ) {
-						$tab['groups'] = $new_groups;
-
-						$new_tabs[ $tab_key ] = $tab;
-					}
-				}
-
-				$tabs = $new_tabs;
-			}
-
-			return $tabs;
-		}
-
-		/**
-		 * Output the JS for building the dynamic Guntenberg block.
-		 *
-		 * @return mixed
-		 *@since 1.0.9 Save numbers as numbers and not strings.
-		 * @since 1.1.0 Font Awesome classes can be used for icons.
-		 * @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.
-		 */
-		public function block() {
-			global $sd_is_js_functions_loaded, $aui_bs5;
-
-			$show_advanced = $this->block_show_advanced();
-
-			ob_start();
-			?>
-			<script>
-			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
-				$sd_is_js_functions_loaded = true;
-			?>
-function sd_show_view_options($this){
-	if(jQuery($this).html().length){
-		jQuery($this).html('');
-	}else{
-		jQuery($this).html('<div class="position-absolute d-flex flex-column bg-white p-1 rounded border shadow-lg " style="top:-80px;left:-5px;"><div class="dashicons dashicons-desktop mb-1" onclick="sd_set_view_type(\'Desktop\');"></div><div class="dashicons dashicons-tablet mb-1" onclick="sd_set_view_type(\'Tablet\');"></div><div class="dashicons dashicons-smartphone" onclick="sd_set_view_type(\'Mobile\');"></div></div>');
-	}
-}
-
-function sd_set_view_type($device){
-	wp.data.dispatch('core/edit-site') ? wp.data.dispatch('core/edit-site').__experimentalSetPreviewDeviceType($device) : wp.data.dispatch('core/edit-post').__experimentalSetPreviewDeviceType($device);
-}
-
-jQuery(function(){
-	sd_block_visibility_init();
-});
-function sd_block_visibility_init() {
-	jQuery(document).off('change', '.bs-vc-modal-form').on('change', '.bs-vc-modal-form', function() {
-		try {
-			aui_conditional_fields('.bs-vc-modal-form');
-		} catch(err) {
-			console.log(err.message);
-		}
-	});
-
-	jQuery(document).off('click', '.bs-vc-save').on('click', '.bs-vc-save', function() {
-		var $bsvcModal = jQuery(this).closest('.bs-vc-modal'), $bsvcForm = $bsvcModal.find('.bs-vc-modal-form'), vOutput = jQuery('#bsvc_output', $bsvcForm).val(), rawValue = '', oVal = {}, oOut = {}, iRule = 0;
-		jQuery(this).addClass('disabled');
-		jQuery('.bs-vc-modal-form .bs-vc-rule-sets .bs-vc-rule').each(function(){
-			vRule = jQuery(this).find('.bsvc_rule').val(), oRule = {};
-			if (vRule == 'logged_in' || vRule == 'logged_out' || vRule == 'post_author') {
-				oRule.type = vRule;
-			} else if (vRule == 'user_roles') {
-				oRule.type = vRule;
-				if (jQuery(this).find('.bsvc_user_roles:checked').length) {
-					var user_roles = jQuery(this).find('.bsvc_user_roles:checked').map(function() {
-						return jQuery(this).val();
-					}).get();
-					if (user_roles && user_roles.length) {
-						oRule.user_roles = user_roles.join(",");
-					}
-				}
-			} else if (vRule == 'gd_field') {
-				if (jQuery(this).find('.bsvc_gd_field ').val() && jQuery(this).find('.bsvc_gd_field_condition').val()) {
-					oRule.type = vRule;
-					oRule.field = jQuery(this).find('.bsvc_gd_field ').val();
-					oRule.condition = jQuery(this).find('.bsvc_gd_field_condition').val();
-					if (oRule.condition != 'is_empty' && oRule.condition != 'is_not_empty') {
-						oRule.search = jQuery(this).find('.bsvc_gd_field_search').val();
-					}
-				}
-			}
-			if (Object.keys(oRule).length > 0) {
-				iRule++;
-				oVal['rule'+iRule] = oRule;
-			}
-		});
-		if (vOutput == 'hide') {
-			oOut.type = vOutput;
-		} else if (vOutput == 'message') {
-			if (jQuery('#bsvc_message', $bsvcForm).val()) {
-				oOut.type = vOutput;
-				oOut.message = jQuery('#bsvc_message', $bsvcForm).val();
-				if (jQuery('#bsvc_message_type', $bsvcForm).val()) {
-					oOut.message_type = jQuery('#bsvc_message_type', $bsvcForm).val();
-				}
-			}
-		} else if (vOutput == 'page') {
-			if (jQuery('#bsvc_page', $bsvcForm).val()) {
-				oOut.type = vOutput;
-				oOut.page = jQuery('#bsvc_page', $bsvcForm).val();
-			}
-		} else if (vOutput == 'template_part') {
-			if (jQuery('#bsvc_tmpl_part', $bsvcForm).val()) {
-				oOut.type = vOutput;
-				oOut.template_part = jQuery('#bsvc_tmpl_part', $bsvcForm).val();
-			}
-		}
-		if (Object.keys(oOut).length > 0) {
-			oVal.output = oOut;
-		}
-		if (Object.keys(oVal).length > 0) {
-			rawValue = JSON.stringify(oVal);
+		if (Object.keys(oVal).length > 0) {
+			rawValue = JSON.stringify(oVal);
 		}
 		$bsvcModal.find('[name="bsvc_raw_value"]').val(rawValue).trigger('change');
 		$bsvcModal.find('.bs-vc-close').trigger('click');
@@ -2222,8 +2222,8 @@ 
 				$classes = [];
 
 				<?php
-				if($aui_bs5){
-					?>
+                if($aui_bs5){
+                    ?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
 				$p_mr = 'me-';
@@ -2231,8 +2231,8 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
-						?>
+                }else{
+                        ?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
 				$p_mr = 'mr-';
@@ -2240,8 +2240,8 @@ 
 				$p_pl = 'pl-';
 				$p_pr = 'pr-';
 					<?php
-				}
-				?>
+                }
+                ?>
 
 				// margins
 				if ( $args['mt'] !== undefined && $args['mt'] !== '' ) { $classes.push( "mt-" + $args['mt'] );  $mt = $args['mt']; }else{$mt = null;}
@@ -2425,12 +2425,12 @@ 
 			<?php
 
 
-			}
+            }
 
-			if(method_exists($this,'block_global_js')){
-					echo $this->block_global_js();
-			}
-			?>
+            if(method_exists($this,'block_global_js')){
+                    echo $this->block_global_js();
+            }
+            ?>
 
 jQuery(function() {
 
@@ -2483,13 +2483,13 @@ 
 						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']['renaming'])){
-								$this->options['block-supports']['renaming'] = false;
-							}
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
-							}
-							?>
+                            if(!isset($this->options['block-supports']['renaming'])){
+                                $this->options['block-supports']['renaming'] = false;
+                            }
+                            if ( isset( $this->options['block-supports'] ) ) {
+                                echo $this->array_to_attributes( $this->options['block-supports'] );
+                            }
+                            ?>
 						},
 						__experimentalLabel( attributes, { context } ) {
 							var visibility_html = attributes && attributes.visibility_conditions ? ' &#128065;' : '';
@@ -2499,174 +2499,174 @@ 
 						},
 						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'] . ",";
-						}
-
-
-						// block hover preview.
-						$example_args = array();
-						if(!empty($this->arguments)){
-							foreach($this->arguments as $key => $a_args){
-								if(isset($a_args['example'])){
-									$example_args[$key] = $a_args['example'];
-								}
-							}
-						}
-						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
-						$example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
-						if( isset( $this->options['example'] ) && $this->options['example'] === false ){
-							// no preview if set to false
-						}elseif( !empty( $example_args ) ){
-							echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-						}elseif( !empty( $this->options['example'] ) ){
-							unset($this->options['example']['viewportWidth']);
-							unset($this->options['example']['innerBlocks']);
-							$example_atts = $this->array_to_attributes( $this->options['example'] );
-							$example_parts = array();
-							if($example_atts){
-								$example_parts[] = rtrim($example_atts,",");
-							}
-							if($viewport_width){
-								$example_parts[] = $viewport_width;
-							}
-							if($example_inner_blocks){
-								$example_parts[] = $example_inner_blocks;
-							}
-							if(!empty($example_parts)){
-								echo "example : {".implode(',', $example_parts)."},";
-							}
-						}else{
-							echo 'example : {viewportWidth: 500},';
-						}
-
-
-
-						// limit to parent
-						if( !empty( $this->options['parent'] ) ){
-							echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
-						}
-
-						// limit allowed blocks
-						if( !empty( $this->options['allowed-blocks'] ) ){
-							echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
-						}
-
-						// 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 load the drag/drop functions.
-						$img_drag_drop = false;
-
-						$show_alignment = false;
-						// align feature
-						/*echo "supports: {";
+                        echo "keywords : " . $this->options['block-keywords'] . ",";
+                        }
+
+
+                        // block hover preview.
+                        $example_args = array();
+                        if(!empty($this->arguments)){
+                            foreach($this->arguments as $key => $a_args){
+                                if(isset($a_args['example'])){
+                                    $example_args[$key] = $a_args['example'];
+                                }
+                            }
+                        }
+                        $viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
+                        $example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
+                        if( isset( $this->options['example'] ) && $this->options['example'] === false ){
+                            // no preview if set to false
+                        }elseif( !empty( $example_args ) ){
+                            echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
+                        }elseif( !empty( $this->options['example'] ) ){
+                            unset($this->options['example']['viewportWidth']);
+                            unset($this->options['example']['innerBlocks']);
+                            $example_atts = $this->array_to_attributes( $this->options['example'] );
+                            $example_parts = array();
+                            if($example_atts){
+                                $example_parts[] = rtrim($example_atts,",");
+                            }
+                            if($viewport_width){
+                                $example_parts[] = $viewport_width;
+                            }
+                            if($example_inner_blocks){
+                                $example_parts[] = $example_inner_blocks;
+                            }
+                            if(!empty($example_parts)){
+                                echo "example : {".implode(',', $example_parts)."},";
+                            }
+                        }else{
+                            echo 'example : {viewportWidth: 500},';
+                        }
+
+
+
+                        // limit to parent
+                        if( !empty( $this->options['parent'] ) ){
+                            echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
+                        }
+
+                        // limit allowed blocks
+                        if( !empty( $this->options['allowed-blocks'] ) ){
+                            echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
+                        }
+
+                        // 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 load the drag/drop functions.
+                        $img_drag_drop = false;
+
+                        $show_alignment = false;
+                        // align feature
+                        /*echo "supports: {";
 						echo "	align: true,";
 						echo "  html: false";
 						echo "},";*/
 
 
-							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 "},";
-							}
-
-
-							if ( ! empty( $this->arguments ) ) {
-
-								foreach ( $this->arguments as $key => $args ) {
-
-									if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
-										$img_drag_drop = true;
-									}
-
-									// set if we should show alignment
-									if ( $key == 'alignment' ) {
-										$show_alignment = true;
-									}
-
-									$extra = '';
-
-									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
-										continue;
-									}
-									elseif ( $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'] == 'tagselect' ) {
-										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'multiselect' ) {
-										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image_xy' ) {
-										$type    = 'object';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image' ) {
-										$type    = 'string';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-
-										// add a field for ID
-	//                                    echo $key . "_id : {";
-	//                                    echo "type : 'number',";
-	//                                    echo "},";
-	//                                    echo $key . "_xy : {";
-	//                                    echo "type : 'object',";
-	//                                    echo "},";
-
-									} else {
-										$type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_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 "sd_shortcode : {type : 'string',default: ''},";
-
-							if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-								echo "sd_shortcode_close : {type : 'string',default: ''},";
-							}
-
-							echo "className: { type: 'string', default: '' },";
-
-							echo "},";
-
-
-
-						?>
+                            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 "},";
+                            }
+
+
+                            if ( ! empty( $this->arguments ) ) {
+
+                                foreach ( $this->arguments as $key => $args ) {
+
+                                    if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
+                                        $img_drag_drop = true;
+                                    }
+
+                                    // set if we should show alignment
+                                    if ( $key == 'alignment' ) {
+                                        $show_alignment = true;
+                                    }
+
+                                    $extra = '';
+
+                                    if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+                                        continue;
+                                    }
+                                    elseif ( $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'] == 'tagselect' ) {
+                                        $type    = 'array';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    } elseif ( $args['type'] == 'multiselect' ) {
+                                        $type    = 'array';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    } elseif ( $args['type'] == 'image_xy' ) {
+                                        $type    = 'object';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    } elseif ( $args['type'] == 'image' ) {
+                                        $type    = 'string';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+
+                                        // add a field for ID
+    //                                    echo $key . "_id : {";
+    //                                    echo "type : 'number',";
+    //                                    echo "},";
+    //                                    echo $key . "_xy : {";
+    //                                    echo "type : 'object',";
+    //                                    echo "},";
+
+                                    } else {
+                                        $type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_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 "sd_shortcode : {type : 'string',default: ''},";
+
+                            if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+                                echo "sd_shortcode_close : {type : 'string',default: ''},";
+                            }
+
+                            echo "className: { type: 'string', default: '' },";
+
+                            echo "},";
+
+
+
+                        ?>
 
 						// The "edit" property must be a valid function.
 						edit: function (props) {
@@ -2740,10 +2740,10 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-raw'])) {
-								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
-							?>
+                            if(!empty($this->options['block-edit-raw'])) {
+                                echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
+                            }else{
+                            ?>
 
 function hasSelectedInnerBlock(props) {
 	const select = wp.data.select('core/editor');
@@ -2765,9 +2765,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.clientId]) != 'undefined'){
 		$pt = props.attributes.post_type;
 		if(post_type_rest_slugs.length){
@@ -2780,11 +2780,11 @@ 
 			term_query_type = $pt;
 		}
 <?php
-	$cat_path = '';
-	if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
-		$cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
-		$cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
-	}
+    $cat_path = '';
+    if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
+        $cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
+        $cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
+    }
 ?>
 		/* taxonomies */
 		if($value && 'post_type' in prev_attributes[props.clientId] && 'category' in prev_attributes[props.clientId] && run){
@@ -2876,7 +2876,7 @@ 
 <?php
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
 if(!empty($current_screen->base) && $current_screen->base==='widgets'){
-	echo 'const { deviceType } = "";';
+    echo 'const { deviceType } = "";';
 }else{
 ?>
 /** Get device type const. */
@@ -2911,8 +2911,8 @@ 
 										'attributes': props.attributes,
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
 										'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' );?>'
 									};
 
@@ -2926,20 +2926,20 @@ 
 										}
 
 										 <?php
-										if(!empty($this->options['nested-block'])){
-											?>
+                                        if(!empty($this->options['nested-block'])){
+                                            ?>
 											// props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 											 <?php
-										}else{
-										?>
+                                        }else{
+                                        ?>
 										props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 										<?php
-										}
-										?>
+                                        }
+                                        ?>
 
 
 										// if AUI is active call the js init function
@@ -2958,31 +2958,31 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-js'])) {
-								echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
-							}
+                            if(!empty($this->options['block-edit-js'])) {
+                                echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
+                            }
 
 
 
 
-							if(empty($this->options['block-save-return'])){
-							?>
+                            if(empty($this->options['block-save-return'])){
+                            ?>
 								///////////////////////////////////////////////////////////////////////
 
 									 // build the shortcode.
 								shortcode = "[<?php echo $this->options['base_id'];?>";
 								<?php
 
-								if(! empty( $this->arguments )){
+                                if(! empty( $this->arguments )){
 
-								foreach($this->arguments as $key => $args){
-								   // if($args['type']=='tabs'){continue;}
+                                foreach($this->arguments as $key => $args){
+                                    // if($args['type']=='tabs'){continue;}
 
-								   // don't add metadata arguments
-								   if (substr($key, 0, 9 ) === 'metadata_') {
-									   continue;
-								   }
-								?>
+                                    // don't add metadata arguments
+                                    if (substr($key, 0, 9 ) === 'metadata_') {
+                                        continue;
+                                    }
+                                ?>
 								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 									if ('<?php echo esc_attr( $key );?>' == 'html') {
 									} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
@@ -2993,10 +2993,10 @@ 
 									}
 								}
 								<?php
-								}
-								}
+                                }
+                                }
 
-								?>
+                                ?>
 								shortcode += "]";
 
 								if(shortcode){
@@ -3004,17 +3004,17 @@ 
 									props.setAttributes({sd_shortcode: shortcode});
 
 									<?php
-									if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-										echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
-									}
-									?>
+                                    if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+                                        echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
+                                    }
+                                    ?>
 								}
 
 
 							///////////////////////////////////////////////////////////////////////
 							<?php
-							} // end nested block check
-							?>
+                            } // end nested block check
+                            ?>
 
 							return [
 
@@ -3038,10 +3038,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'}
 										},
@@ -3058,119 +3058,119 @@ 
 									)
 									,
 									<?php
-									}
-
-									$arguments = $this->group_arguments( $this->arguments );
-									$block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
-
-									// Do we have sections?
-									$has_sections = $arguments == $this->arguments ? false : true;
-
-									if($has_sections){
-									$panel_count = 0;
-									$open_tab = '';
-
-									$open_tab_groups = array();
-									$used_tabs = array();
-
-									foreach ( $arguments as $key => $args ) {
-										$close_tab = false;
-										$close_tabs = false;
-
-										 if ( ! empty( $block_group_tabs ) ) {
-											foreach ( $block_group_tabs as $tab_name => $tab_args ) {
-												if ( in_array( $key, $tab_args['groups'] ) ) {
-													$open_tab_groups[] = $key;
-
-													if ( $open_tab != $tab_name ) {
-														$tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
-														$tab_args['tab']['open'] = true;
-
-														$this->block_tab_start( '', $tab_args );
-														$open_tab = $tab_name;
-														$used_tabs[] = $tab_name;
-													}
-
-													if ( $open_tab_groups == $tab_args['groups'] ) {
-														$close_tab = true;
-														$open_tab_groups = array();
-
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
-															$close_tabs = true;
-														}
-													}
-												}
-											}
-										}
-										?>
+                                    }
+
+                                    $arguments = $this->group_arguments( $this->arguments );
+                                    $block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
+
+                                    // Do we have sections?
+                                    $has_sections = $arguments == $this->arguments ? false : true;
+
+                                    if($has_sections){
+                                    $panel_count = 0;
+                                    $open_tab = '';
+
+                                    $open_tab_groups = array();
+                                    $used_tabs = array();
+
+                                    foreach ( $arguments as $key => $args ) {
+                                        $close_tab = false;
+                                        $close_tabs = false;
+
+                                            if ( ! empty( $block_group_tabs ) ) {
+                                            foreach ( $block_group_tabs as $tab_name => $tab_args ) {
+                                                if ( in_array( $key, $tab_args['groups'] ) ) {
+                                                    $open_tab_groups[] = $key;
+
+                                                    if ( $open_tab != $tab_name ) {
+                                                        $tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
+                                                        $tab_args['tab']['open'] = true;
+
+                                                        $this->block_tab_start( '', $tab_args );
+                                                        $open_tab = $tab_name;
+                                                        $used_tabs[] = $tab_name;
+                                                    }
+
+                                                    if ( $open_tab_groups == $tab_args['groups'] ) {
+                                                        $close_tab = true;
+                                                        $open_tab_groups = array();
+
+                                                        if ( $used_tabs == array_keys( $block_group_tabs ) ) {
+                                                            $close_tabs = true;
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        ?>
 										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 ) {
-												$this->block_tab_start( $k, $a );
-												$this->block_row_start( $k, $a );
-												$this->build_block_arguments( $k, $a );
-												$this->block_row_end( $k, $a );
-												$this->block_tab_end( $k, $a );
-											}
-											?>
+                                            foreach ( $args as $k => $a ) {
+                                                $this->block_tab_start( $k, $a );
+                                                $this->block_row_start( $k, $a );
+                                                $this->build_block_arguments( $k, $a );
+                                                $this->block_row_end( $k, $a );
+                                                $this->block_tab_end( $k, $a );
+                                            }
+                                            ?>
 										),
 										<?php
-										$panel_count ++;
+                                        $panel_count ++;
 
-										if($close_tab || $close_tabs){
-											$tab_args = array(
-												'tab'	=> array(
-													'tabs_close' => $close_tabs,
-												'close' => true,
-												)
+                                        if($close_tab || $close_tabs){
+                                            $tab_args = array(
+                                                'tab'	=> array(
+                                                    'tabs_close' => $close_tabs,
+                                                'close' => true,
+                                                )
 
-											);
-											$this->block_tab_end( '', $tab_args );
+                                            );
+                                            $this->block_tab_end( '', $tab_args );
 //											echo '###close'; print_r($tab_args);
-											$panel_count = 0;
-										}
+                                            $panel_count = 0;
+                                        }
 //
 
-									}
-									}else {
-									?>
+                                    }
+                                    }else {
+                                    ?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
 											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'] );
-							}elseif(!empty($this->options['block-edit-return'])){
-								   echo $this->options['block-edit-return'];
-							}else{
-								// if no block-output is set then we try and get the shortcode html output via ajax.
-								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
-								?>
+                                // If the user sets block-output array then build it
+                                if ( ! empty( $this->options['block-output'] ) ) {
+                                $this->block_element( $this->options['block-output'] );
+                            }elseif(!empty($this->options['block-edit-return'])){
+                                    echo $this->options['block-edit-return'];
+                            }else{
+                                // if no block-output is set then we try and get the shortcode html output via ajax.
+                                $block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
+                                ?>
 								el('<?php echo esc_attr($block_edit_wrap_tag); ?>', wp.blockEditor.useBlockProps({
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
 									className: props.className,
@@ -3178,13 +3178,13 @@ 
 									style: {'minHeight': '30px'}
 								}))
 								<?php
-								}
-								?>
+                                }
+                                ?>
 							]; // end return
 
 							<?php
-							} // end block-edit-raw else
-							?>
+                            } // end block-edit-raw else
+                            ?>
 						},
 
 						// The "save" property must be specified and must be a valid function.
@@ -3198,16 +3198,16 @@ 
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+                            if(! empty( $this->arguments )){
 
-							foreach($this->arguments as $key => $args){
-							   // if($args['type']=='tabs'){continue;}
+                            foreach($this->arguments as $key => $args){
+                                // if($args['type']=='tabs'){continue;}
 
-							   // don't add metadata arguments
-							   if (substr($key, 0, 9 ) === 'metadata_') {
-								   continue;
-							   }
-							?>
+                                // don't add metadata arguments
+                                if (substr($key, 0, 9 ) === 'metadata_') {
+                                    continue;
+                                }
+                            ?>
 							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 								if ('<?php echo esc_attr( $key );?>' == 'html') {
 									$html = attr.<?php echo esc_attr( $key );?>;
@@ -3218,10 +3218,10 @@ 
 								}
 							}
 							<?php
-							}
-							}
+                            }
+                            }
 
-							?>
+                            ?>
 							content += "]";
 							 content = '';
 
@@ -3231,7 +3231,7 @@ 
 //                                $html = 'el( InnerBlocks.Content )';
 //                                <?php
 //                            }
-							?>
+                            ?>
 							// if has html element
 							if ($html) {
 								//content += $html + "[/<?php echo $this->options['base_id'];?>]";
@@ -3264,12 +3264,12 @@ 
 //                                <x?php
 //							}else
 
-							if(!empty($this->options['block-output'])){
+                            if(!empty($this->options['block-output'])){
 //                               echo "return";
 //                               $this->block_element( $this->options['block-output'], true );
 //                               echo ";";
 
-							   ?>
+                                ?>
 							  return el(
 								   '',
 								   {},
@@ -3279,10 +3279,10 @@ 
 							   );
 								<?php
 
-							}elseif(!empty($this->options['block-save-return'])){
-								   echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
-								?>
+                            }elseif(!empty($this->options['block-save-return'])){
+                                    echo 'return ' . $this->options['block-save-return'];
+                            }elseif(!empty($this->options['nested-block'])){
+                                ?>
 							  return el(
 								   '',
 								   {},
@@ -3291,22 +3291,22 @@ 
 								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
 							   );
 								<?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
-								echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
-							?>
+                            }elseif(!empty( $this->options['block-save-return'] ) ){
+                                echo "return ". $this->options['block-edit-return'].";";
+                            }elseif(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, wp.blockEditor.useBlockProps.save( {dangerouslySetInnerHTML: {__html: content}, className: align} ));
 							<?php
-							}
-							?>
+                            }
+                            ?>
 
 
 						}
@@ -3320,43 +3320,43 @@ 
 				});
 			</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 ) . " && " : "";
-				$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-				$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
-				$device_type_icon = '';
-				if($device_type=='Desktop'){
-					$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Tablet'){
-					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Mobile'){
-					$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}
-				echo $element_require;
-				echo $device_type_require;
+                // element require
+                $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+                $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
+                $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+                $device_type_icon = '';
+                if($device_type=='Desktop'){
+                    $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+                }elseif($device_type=='Tablet'){
+                    $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+                }elseif($device_type=='Mobile'){
+                    $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+                }
+                echo $element_require;
+                echo $device_type_require;
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
@@ -3369,8 +3369,8 @@ 
 								<?php if($device_type_icon){ ?>
 									deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
 								<?php
-								}
-								?>
+                                }
+                                ?>
 
 
 							),
@@ -3394,51 +3394,51 @@ 
 									},
 
 					<?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 ps-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 ps-0 pr-2 pe-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'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "))";
-				}
+            if(!empty($args['row'])){
+                // maybe close
+                if(!empty($args['row']['close'])){
+                    echo "))";
+                }
 
-				echo "),";
-			}
-		}
+                echo "),";
+            }
+        }
 
-		public function block_tab_start($key, $args){
+        public function block_tab_start($key, $args){
 
-			// check for row
-			if(!empty($args['tab'])){
+            // check for row
+            if(!empty($args['tab'])){
 
-				if(!empty($args['tab']['tabs_open'])){
+                if(!empty($args['tab']['tabs_open'])){
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 
 el('div',{className: 'bsui'},
 
@@ -3451,12 +3451,12 @@ 
 										tabs: [
 
 					<?php
-					if(false){?></script><?php }
-				}
+                    if(false){?></script><?php }
+                }
 
-				if(!empty($args['tab']['open'])){
+                if(!empty($args['tab']['open'])){
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 							{
 												name: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
 												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes( esc_attr( $args['tab']['title']) ); ?>'}}),
@@ -3465,93 +3465,93 @@ 
 									className: 'components-base-control__help mb-0',
 									dangerouslySetInnerHTML: {__html:'<?php echo addslashes( $args['tab']['desc'] ); ?>'}
 								}),<?php }
-					if(false){?></script><?php }
-				}
+                    if(false){?></script><?php }
+                }
 
-			}
+            }
 
-		}
+        }
 
-		public function block_tab_end($key, $args){
+        public function block_tab_end($key, $args){
 
-			if(!empty($args['tab'])){
-				// maybe close
-				if(!empty($args['tab']['close'])){
-					echo ")}, /* tab close */";
-				}
+            if(!empty($args['tab'])){
+                // maybe close
+                if(!empty($args['tab']['close'])){
+                    echo ")}, /* tab close */";
+                }
 
-				if(!empty($args['tab']['tabs_close'])){
-					if(false){?><script><?php }?>
+                if(!empty($args['tab']['tabs_close'])){
+                    if(false){?><script><?php }?>
 						]}, ( tab ) => {
 								return tab.content;
 							}
 						)), /* tabs close */
 					<?php if(false){ ?></script><?php }
-				}
-			}
-		}
-
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
-			$options           = '';
-			$extra             = '';
-			$require           = '';
-			$inside_elements   = '';
-			$after_elements	   = '';
-
-			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
-				return;
-			}
-
-			$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-			$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
-			$device_type_icon = '';
-			if($device_type=='Desktop'){
-				$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Tablet'){
-				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Mobile'){
-				$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}
-
-			// 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','range' );
-			if ( in_array( $args['type'], $text_type ) ) {
-				$type = 'TextControl';
-				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
-					$onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
-				}
-
-				if (substr($key, 0, 9 ) === 'metadata_') {
-					$real_key = str_replace('metadata_','', $key );
-					$onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
-					$value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
-				}
-			}
+                }
+            }
+        }
+
+        public function build_block_arguments( $key, $args ) {
+            $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+            $options           = '';
+            $extra             = '';
+            $require           = '';
+            $inside_elements   = '';
+            $after_elements	   = '';
+
+            // `content` is a protected and special argument
+            if ( $key == 'content' ) {
+                return;
+            }
+
+            $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
+            $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+            $device_type_icon = '';
+            if($device_type=='Desktop'){
+                $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+            }elseif($device_type=='Tablet'){
+                $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+            }elseif($device_type=='Mobile'){
+                $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+            }
+
+            // 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','range' );
+            if ( in_array( $args['type'], $text_type ) ) {
+                $type = 'TextControl';
+                // Save numbers as numbers and not strings
+                if ( $args['type'] == 'number' ) {
+                    $onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
+                }
+
+                if (substr($key, 0, 9 ) === 'metadata_') {
+                    $real_key = str_replace('metadata_','', $key );
+                    $onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
+                    $value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
+                }
+            }
 //			else if ( $args['type'] == 'popup' ) {
 //				$type = 'TextControl';
 //				$args['type'] == 'text';
@@ -3569,21 +3569,21 @@ 
 //
 //				$value     = "props.attributes.$key ? props.attributes.$key : ''";
 //			}
-			else if ( $args['type'] == 'styleid' ) {
-				$type = 'TextControl';
-				$args['type'] == 'text';
-				// Save numbers as numbers and not strings
-				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
-
-				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
-				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
-
-				$notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
-				echo $notice_message ? $element_require . $notice : '';
-				return;
-			}
-			/*
+            else if ( $args['type'] == 'styleid' ) {
+                $type = 'TextControl';
+                $args['type'] == 'text';
+                // Save numbers as numbers and not strings
+                $value     = "props.attributes.$key ? props.attributes.$key : ''";
+            }else if ( $args['type'] == 'notice' ) {
+
+                $notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
+                $notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
+
+                $notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
+                echo $notice_message ? $element_require . $notice : '';
+                return;
+            }
+            /*
 			 * https://www.wptricks.com/question/set-current-tab-on-a-gutenberg-tabpanel-component-from-outside-that-component/ es5 layout
 						elseif($args['type']=='tabs'){
 							?>
@@ -3636,22 +3636,22 @@ 
 							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'] == 'gradient' ) {
-				$type = 'GradientPicker';
-				$extra .= "gradients: [{
+            }elseif ( $args['type'] == 'gradient' ) {
+                $type = 'GradientPicker';
+                $extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
 			gradient:
 				'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
@@ -3688,10 +3688,10 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
+            }elseif ( $args['type'] == 'image' ) {
 //                print_r($args);
 
-				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
+                $img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
 							url:  props.attributes.{$key}_use_featured === true ? 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxzdmcgYmFzZVByb2ZpbGU9InRpbnkiIGhlaWdodD0iNDAwIiB2ZXJzaW9uPSIxLjIiIHdpZHRoPSI0MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6ZXY9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEveG1sLWV2ZW50cyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzIC8+PHJlY3QgZmlsbD0iI2QzZDNkMyIgaGVpZ2h0PSI0MDAiIHdpZHRoPSI0MDAiIHg9IjAiIHk9IjAiIC8+PGxpbmUgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLXdpZHRoPSIxMCIgeDE9IjAiIHgyPSI0MDAiIHkxPSIwIiB5Mj0iNDAwIiAvPjxsaW5lIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMTAiIHgxPSIwIiB4Mj0iNDAwIiB5MT0iNDAwIiB5Mj0iMCIgLz48cmVjdCBmaWxsPSIjZDNkM2QzIiBoZWlnaHQ9IjUwIiB3aWR0aD0iMjE4LjAiIHg9IjkxLjAiIHk9IjE3NS4wIiAvPjx0ZXh0IGZpbGw9IndoaXRlIiBmb250LXNpemU9IjMwIiBmb250LXdlaWdodD0iYm9sZCIgdGV4dC1hbmNob3I9Im1pZGRsZSIgeD0iMjAwLjAiIHk9IjIwNy41Ij5QTEFDRUhPTERFUjwvdGV4dD48L3N2Zz4='  : props.attributes.$key,
 							value: props.attributes.{$key}_xy.x !== undefined && props.attributes.{$key}_xy.x >= 0 ? props.attributes.{$key}_xy  : {x: 0.5,y: 0.5,},
 //                            value: props.attributes.{$key}_xy,
@@ -3712,16 +3712,16 @@ 
 						}), ";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+                $value = '""';
+                $type = 'MediaUpload';
+                $extra .= "onSelect: function(media){
 					  return props.setAttributes({
 						  $key: media.url,
 						  {$key}_id: media.id
 						});
 					  },";
-				   $extra .= "type: 'image',";
-				   $extra .= "render: function (obj) {
+                    $extra .= "type: 'image',";
+                    $extra .= "render: function (obj) {
 						return el( 'div',{},
 						( !props.attributes.$key && !props.attributes.{$key}_use_featured ) && el( wp.components.Button, {
 						  className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
@@ -3747,11 +3747,11 @@ 
 
 
 					  }";
-				$onchange = "";
+                $onchange = "";
 
-				//$inside_elements = ",el('div',{},'file upload')";
-			} else if ( $args['type'] == 'images' ) {
-				$img_preview = "props.attributes.$key && (function() {
+                //$inside_elements = ",el('div',{},'file upload')";
+            } else if ( $args['type'] == 'images' ) {
+                $img_preview = "props.attributes.$key && (function() {
 	let uploads = JSON.parse('['+props.attributes.$key+']');
 	let images = [];
 	uploads.map((upload, index) => (
@@ -3778,9 +3778,9 @@ 
 })(),";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+                $value = '""';
+                $type = 'MediaUpload';
+                $extra .= "onSelect: function(media){
 	let slim_images = props.attributes.$key ? JSON.parse('['+props.attributes.$key+']') : [];
 	if(media.length){
 		for (var i=0; i < media.length; i++) {
@@ -3793,9 +3793,9 @@ 
 	}
 	return props.setAttributes({ $key: slimImagesV});
 },";
-				$extra .= "type: 'image',";
-				$extra .= "multiple: true,";
-				$extra .= "render: function (obj) {
+                $extra .= "type: 'image',";
+                $extra .= "multiple: true,";
+                $extra .= "render: function (obj) {
 	/* Init the sort */
 	enableDragSort('sd-sortable');
 	return el( 'div',{},
@@ -3822,40 +3822,40 @@ 
 		)
 	)
 }";
-				$onchange = "";
-
-				//$inside_elements = ",el('div',{},'file upload')";
-			}
-			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: '" . esc_js( 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","overflow-y":"auto"}, ';
-				}
-
-				if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
-					$after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
+                $onchange = "";
+
+                //$inside_elements = ",el('div',{},'file upload')";
+            }
+            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: '" . esc_js( 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","overflow-y":"auto"}, ';
+                }
+
+                if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
+                    $after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
 									  className: 'components-button components-circular-option-picker__clear is-secondary is-small',
 									  style: {margin:'-8px 0 8px 0',display: 'block'},
 									  onClick: function(){
@@ -3866,8 +3866,8 @@ 
 									},
 									'Clear'
 							),";
-				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+                }
+            } elseif ( $args['type'] == 'tagselect' ) {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3902,20 +3902,20 @@ 
 //				$value     = "[]";
 //				$extra .= ' __experimentalExpandOnFocus: true,';
 
-			} else if ( $args['type'] == 'alignment' ) {
-				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			} else if ( $args['type'] == 'margins' ) {
-
-			} else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
-				$type = 'TextControl';
-				$value = "(props.attributes.$key ? props.attributes.$key : '')";
-				$args['type'] = 'text';
-				$options .= 'disabled:true,';
-				$bsvc_title = esc_attr( addslashes( $args['title'] ) );
-				$bsvc_body = $this->block_visibility_fields( $args );
-				// @TODO reset button
-				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
-				$after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
+            } else if ( $args['type'] == 'alignment' ) {
+                $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
+            } else if ( $args['type'] == 'margins' ) {
+
+            } else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
+                $type = 'TextControl';
+                $value = "(props.attributes.$key ? props.attributes.$key : '')";
+                $args['type'] = 'text';
+                $options .= 'disabled:true,';
+                $bsvc_title = esc_attr( addslashes( $args['title'] ) );
+                $bsvc_body = $this->block_visibility_fields( $args );
+                // @TODO reset button
+                $bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
+                $after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
 						className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
 						onClick: function() {
 							var sValue = props.attributes." . $key . ";
@@ -3941,39 +3941,39 @@ 
 					},
 					'" . addslashes( ! empty( $args['button_title'] ) ? $args['button_title'] : $args['title'] ) . "'
 				) ),";
-			} 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;
-			echo $device_type_require;
-
-			// icon
-			echo $icon;
-			?>
+            } 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;
+            echo $device_type_require;
+
+            // icon
+            echo $icon;
+            ?>
 			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
 			label: <?php if ( empty( $args['title'] ) ) { echo "''"; } else if ( empty( $args['row'] ) && ! empty( $args['device_type'] ) ) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['title'] ) ?>'}}),<?php if ( $device_type_icon ) { ?>deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
-			} else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
+            } else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
 			help: <?php echo ( isset( $args['desc'] ) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim( wp_kses_post( 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: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
-			} ?>
+                echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
+            } ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
@@ -3985,1250 +3985,1250 @@ 
 			<?php } ?>
 		} <?php echo $inside_elements; ?> ),
 			<?php
-			echo $after_elements;
-		}
-
-		/**
-		 * Convert an array of attributes to block string.
-		 *
-		 * @param $custom_attributes
-		 *
-		 * @return string
-		 *@todo there is prob a faster way to do this, also we could add some validation here.
-		 *
-		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
-			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
-
-				foreach ( $custom_attributes as $key => $val ) {
-					if(is_array($val)){
-						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
-						$attributes .= $html ?  " $key='$val' " : "'$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, $save = false ) {
+            echo $after_elements;
+        }
+
+        /**
+         * Convert an array of attributes to block string.
+         *
+         * @param $custom_attributes
+         *
+         * @return string
+         *@todo there is prob a faster way to do this, also we could add some validation here.
+         *
+         */
+        public function array_to_attributes( $custom_attributes, $html = false ) {
+            $attributes = '';
+            if ( ! empty( $custom_attributes ) ) {
+
+                foreach ( $custom_attributes as $key => $val ) {
+                    if(is_array($val)){
+                        $attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
+                    }else{
+                        $attributes .= $html ?  " $key='$val' " : "'$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, $save = false ) {
 
 //            print_r($args);echo '###';exit;
 
-			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(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
+                            if ( isset( $new_args['element_require'] ) ) {
+                                echo str_replace( array(
+                                        "'+",
+                                        "+'"
+                                    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+                                unset( $new_args['element_require'] );
+                            }
 
-							if($new_args['element']=='InnerBlocks'){
-								echo "\n el( InnerBlocks, {";
-							}elseif($new_args['element']=='innerBlocksProps'){
-								$element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
-							  //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
+                            if($new_args['element']=='InnerBlocks'){
+                                echo "\n el( InnerBlocks, {";
+                            }elseif($new_args['element']=='innerBlocksProps'){
+                                $element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
+                                //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
-								echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
-								echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
-
-								echo "} ), {";
-								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
-							//    echo '###';
-
-							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
-
-								if ( isset($new_args['if_inner_element']) ) {
-									$element = $new_args['if_inner_element'];
-								}else {
-									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
-								}
-
-								unset($new_args['inner_element']);
-								echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
-
-
-							   // echo "} ),";
-
-							}else{
-								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 == 'if_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 ),$save );
-								}
-							}
-
-							echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
-
-							// get the content
-							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
-
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
-										echo  $this->block_props_replace(  $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 ),$save );
-												$x ++;
-											}
-										} else {
-											$this->block_element( array( '' => $new_value ),$save );
-										}
-									}
-									$first_item ++;
-								}
-							}
-
-							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
-								echo "))";// end content
-							}else{
-								echo ")";// end content
-							}
-
-
-							echo ", \n";
-
-						}
-					} else {
-
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							$extra = '';
-							if( strpos($new_args, '[%WrapClass%]') !== false ){
-								$new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
-								$new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
-							}
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
-							$new_args = str_replace('[%WrapStyle%]','',$new_args);
-							echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
+                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
+                                echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
+                                echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+
+                                echo "} ), {";
+                                echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
+                            //    echo '###';
+
+                                //  echo '###';
+                            }elseif($new_args['element']=='BlocksProps'){
+
+                                if ( isset($new_args['if_inner_element']) ) {
+                                    $element = $new_args['if_inner_element'];
+                                }else {
+                                    $element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
+                                }
+
+                                unset($new_args['inner_element']);
+                                echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
+                                echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+
+
+                                // echo "} ),";
+
+                            }else{
+                                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 == 'if_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 ),$save );
+                                }
+                            }
+
+                            echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
+
+                            // get the content
+                            $first_item = 0;
+                            foreach ( $new_args as $new_key => $new_value ) {
+                                if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
+
+                                    if ( $new_key === 'content' ) {
+                                        echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+                                    }else if ( $new_key === 'if_content' ) {
+                                        echo  $this->block_props_replace(  $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 ),$save );
+                                                $x ++;
+                                            }
+                                        } else {
+                                            $this->block_element( array( '' => $new_value ),$save );
+                                        }
+                                    }
+                                    $first_item ++;
+                                }
+                            }
+
+                            if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
+                                echo "))";// end content
+                            }else{
+                                echo ")";// end content
+                            }
+
+
+                            echo ", \n";
+
+                        }
+                    } else {
+
+                        if ( substr( $element, 0, 3 ) === "if_" ) {
+                            $extra = '';
+                            if( strpos($new_args, '[%WrapClass%]') !== false ){
+                                $new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
+                                $new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
+                            }
+                            echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
+                        } elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
+                            $new_args = str_replace('[%WrapStyle%]','',$new_args);
+                            echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
 //                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
-							$new_args = str_replace('[%WrapClass%]','',$new_args);
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
-						} elseif ( $element == 'template' && $new_args ) {
-							echo $element . ": $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( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
-			} else {
-				$string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
-			}
-
-			return $string;
-		}
-
-		/**
-		 * Outputs the content of the widget
-		 *
-		 * @param array $args
-		 * @param array $instance
-		 */
-		public function widget( $args, $instance ) {
-			if ( ! is_array( $args ) ) {
-				$args = array();
-			}
-
-			// 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 = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
-				$before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $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 = ! empty( $args['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.
-		 *
-		 * @return bool
-		 *@since 1.0.4
-		 */
-		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.
-		 *
-		 * @return bool
-		 *@since 1.0.4
-		 */
-		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.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		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.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		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.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		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.
-		 *
-		 * @return bool
-		 *@since 1.0.8
-		 */
-		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.
-		 *
-		 * @return bool
-		 *@since 1.1.0
-		 */
-		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.
-		 *
-		 * @return bool
-		 *@since 1.0.18
-		 */
-		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;
-		}
-
-		/**
-		 * Check for Kallyas theme Zion builder preview.
-		 *
-		 * @since 1.1.22
-		 *
-		 * @return bool True when preview page otherwise false.
-		 */
-		public function is_kallyas_zion_preview() {
-			$result = false;
-
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Check for Bricks theme builder preview.
-		 *
-		 * @since 1.1.31
-		 *
-		 * @return bool True when preview page otherwise false.
-		 */
-		public function is_bricks_preview() {
-			$result = false;
-
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		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_kallyas_zion_preview() ) {
-				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
-				$preview = true;
-			} elseif( $this->is_bricks_preview() ) {
-				$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'] ) ) {
-					if ( ! isset( $args['before_title'] ) ) {
-						$args['before_title'] = '';
-					}
-
-					if ( ! isset( $args['after_title'] ) ) {
-						$args['after_title'] = '';
-					}
-
-					$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 ) {
-
-						?>
+                        } elseif ( $element == 'style' ) {
+                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+                        } elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
+                            $new_args = str_replace('[%WrapClass%]','',$new_args);
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
+                        } elseif ( $element == 'template' && $new_args ) {
+                            echo $element . ": $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( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
+            } else {
+                $string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
+            }
+
+            return $string;
+        }
+
+        /**
+         * Outputs the content of the widget
+         *
+         * @param array $args
+         * @param array $instance
+         */
+        public function widget( $args, $instance ) {
+            if ( ! is_array( $args ) ) {
+                $args = array();
+            }
+
+            // 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 = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
+                $before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $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 = ! empty( $args['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.
+         *
+         * @return bool
+         *@since 1.0.4
+         */
+        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.
+         *
+         * @return bool
+         *@since 1.0.4
+         */
+        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.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        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.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        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.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        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.
+         *
+         * @return bool
+         *@since 1.0.8
+         */
+        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.
+         *
+         * @return bool
+         *@since 1.1.0
+         */
+        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.
+         *
+         * @return bool
+         *@since 1.0.18
+         */
+        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;
+        }
+
+        /**
+         * Check for Kallyas theme Zion builder preview.
+         *
+         * @since 1.1.22
+         *
+         * @return bool True when preview page otherwise false.
+         */
+        public function is_kallyas_zion_preview() {
+            $result = false;
+
+            if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Check for Bricks theme builder preview.
+         *
+         * @since 1.1.31
+         *
+         * @return bool True when preview page otherwise false.
+         */
+        public function is_bricks_preview() {
+            $result = false;
+
+            if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        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_kallyas_zion_preview() ) {
+                $preview = true;
+            } elseif( $this->is_block_content_call() ) {
+                $preview = true;
+            } elseif( $this->is_bricks_preview() ) {
+                $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'] ) ) {
+                    if ( ! isset( $args['before_title'] ) ) {
+                        $args['before_title'] = '';
+                    }
+
+                    if ( ! isset( $args['after_title'] ) ) {
+                        $args['after_title'] = '';
+                    }
+
+                    $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 echo ( ! empty( $args['row']['element_require'] ) ? $this->convert_element_require( $args['row']['element_require'] ) : '' ); ?>'>
 					<?php if ( ! empty( $args['row']['title'] ) ) { ?>
 					<?php
-						if ( isset( $args['row']['icon'] ) ) {
-							$args['row']['icon'] = '';
-						}
-
-						if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
-							$args['row']['device_type'] = $args['device_type'];
-						}
-					?>
+                        if ( isset( $args['row']['icon'] ) ) {
+                            $args['row']['icon'] = '';
+                        }
+
+                        if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
+                            $args['row']['device_type'] = $args['device_type'];
+                        }
+                    ?>
 					<label class="mb-0"><?php echo $this->widget_field_title( $args['row'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
 					<?php } ?>
 					<div class='row<?php echo ( ! empty( $args['row']['class'] ) ? ' ' . esc_attr( $args['row']['class'] ) : '' ); ?>'>
 					<div class='col pr-2'>
 					<?php
-				} else if ( ! empty( $args['row']['close'] ) ) {
-					echo "<div class='col pl-0 ps-0'>";
-				} else {
-					echo "<div class='col pl-0 ps-0 pr-2 pe-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.
-		 *
-		 * @param string $input Input element.
-		 *
-		 * @return string $output
-		 *@since 1.0.0
-		 *
-		 */
-		public function convert_element_require( $input ) {
-			$input = str_replace( "'", '"', $input );// we only want double quotes
-
-			$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()",
-				"\"]').find('input:checked').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
-			?>
+                } else if ( ! empty( $args['row']['close'] ) ) {
+                    echo "<div class='col pl-0 ps-0'>";
+                } else {
+                    echo "<div class='col pl-0 ps-0 pr-2 pe-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.
+         *
+         * @param string $input Input element.
+         *
+         * @return string $output
+         *@since 1.0.0
+         *
+         */
+        public function convert_element_require( $input ) {
+            $input = str_replace( "'", '"', $input );// we only want double quotes
+
+            $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select,textarea').val()",
+                "\"]').find('input:checked').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 );} ?>'>
 			<?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" <?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 ); ?>">
 					<?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 "[]"; } ?>"
 						<?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; ?> 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>
 					<?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" <?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>
 					<?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.
-			}
-			// 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 ( ! empty( $args['device_type'] ) ) {
-					$args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to 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.
-		 *
-		 * @return bool
-		 *@since 1.0.3
-		 */
-		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.
-		 *
-		 * @return string
-		 *@since 1.0.20
-		 */
-		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
-		 *
-		 * @return string
-		 *@since 1.0.20
-		 */
-		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.
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 *
+                    break;
+                default:
+                    echo "No input type found!"; // @todo we need to add more input types.
+            }
+            // 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 ( ! empty( $args['device_type'] ) ) {
+                    $args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to 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.
+         *
+         * @return bool
+         *@since 1.0.3
+         */
+        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.
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        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
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        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.
+         *
+         * @param string $content Content to search for shortcode tags.
+         *
 *@return string Content with shortcode tags removed.
-		 *@since 1.0.28
-		 *
-		 */
-		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;',
-				"'" => '&#39;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
-
-		/**
-		 * Remove encoded shortcod tags.
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 *
+         *@since 1.0.28
+         *
+         */
+        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;',
+                "'" => '&#39;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
+
+        /**
+         * Remove encoded shortcod tags.
+         *
+         * @param string $content Content to search for shortcode tags.
+         *
 *@return string Content with decoded shortcode tags.
-		 *@since 1.0.28
-		 *
-		 */
-		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 block_visibility_fields( $args ) {
-			$value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
-			$content = '<div class="bs-vc-rule-template d-none">';
-				$content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
-					$content .= '<div class="row">';
-						$content .= '<div class="col-sm-12">';
-							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
-							$content .= aui()->select(
-								array(
-									'id'          => 'bsvc_rule_BSVCINDEX',
-									'name'        => 'bsvc_rule_BSVCINDEX',
-									'label'       => __( 'Rule', 'ayecode-connect' ),
-									'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
-									'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
-									'options'     => sd_visibility_rules_options(),
-									'default'     => '',
-									'value'       => '',
-									'label_type'  => '',
-									'select2'     => false,
-									'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
-									'extra_attributes' => array(
-										'data-minimum-results-for-search' => '-1'
-									)
-								)
-							);
-
-						$content .= '</div>';
-
-						if ( class_exists( 'GeoDirectory' ) ) {
-							$content .= '<div class="col-md-7 col-sm-12">';
-
-								$content .= aui()->select(
-									array(
-										'id'          => 'bsvc_gd_field_BSVCINDEX',
-										'name'        => 'bsvc_gd_field_BSVCINDEX',
-										'label'       => __( 'FIELD', 'ayecode-connect' ),
-										'placeholder' => __( 'FIELD', 'ayecode-connect' ),
-										'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
-										'options'     => sd_visibility_gd_field_options(),
-										'default'     => '',
-										'value'       => '',
-										'label_type'  => '',
-										'select2'     => false,
-										'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
-										'extra_attributes' => array(
-											'data-minimum-results-for-search' => '-1'
-										)
-									)
-								);
-
-							$content .= '</div>';
-							$content .= '<div class="col-md-5 col-sm-12">';
-
-								$content .= aui()->select(
-									array(
-										'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
-										'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
-										'label'       => __( 'CONDITION', 'ayecode-connect' ),
-										'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
-										'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
-										'options'     => sd_visibility_field_condition_options(),
-										'default'     => '',
-										'value'       => '',
-										'label_type'  => '',
-										'select2'     => false,
-										'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
-										'extra_attributes' => array(
-											'data-minimum-results-for-search' => '-1'
-										)
-									)
-								);
-
-							$content .= '</div>';
-							$content .= '<div class="col-sm-12">';
-
-								$content .= aui()->input(
-									array(
-										'type'            => 'text',
-										'id'              => 'bsvc_gd_field_search_BSVCINDEX',
-										'name'            => 'bsvc_gd_field_search_BSVCINDEX',
-										'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
-										'class'           => 'bsvc_gd_field_search form-control-sm',
-										'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
-										'label_type'      => '',
-										'value'           => '',
-										'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
-									)
-								);
-
-							$content .= '</div>';
-						}
-
-					$content .= '</div>';
-
-					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
-						$role_options = sd_user_roles_options();
-
-						$role_option_i = 0;
-						foreach ( $role_options as $role_option_key => $role_option_name ) {
-							$role_option_i++;
-
-							$content .= '<div class="col-sm-6">';
-							$content .= aui()->input(
-								array(
-									'id'               => 'bsvc_user_roles_BSVCINDEX_' . $role_option_i,
-									'name'             => 'bsvc_user_roles_BSVCINDEX[]',
-									'type'             => 'checkbox',
-									'label'            => $role_option_name,
-									'label_type'       => 'hidden',
-									'class'            => 'bsvc_user_roles',
-									'value'            => $role_option_key,
-									'switch'           => 'md',
-									'no_wrap'          => true
-								)
-							);
-							$content .= '</div>';
-						}
-					$content .= '</div>';
-				$content .= '</div>';
-			$content .= '</div>';
-			$content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
-			$content .= '<div class="bs-vc-rule-sets"></div>';
-			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
-			$content .= '<div class="row"><div class="col-md-6 col-sm-12">';
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_output',
-					'name'        => 'bsvc_output',
-					'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Default Output', 'ayecode-connect' ),
-					'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
-					'options'     => sd_visibility_output_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-md-6 col-sm-12">';
-
-			$content .= aui()->select(
-				array(
-					'id'              => 'bsvc_page',
-					'name'            => 'bsvc_page',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
-					'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
-					'options'         => sd_template_page_options(),
-					'default'         => '',
-					'value'           => '',
-					'label_type'      => 'top',
-					'select2'         => false,
-					'element_require' => '[%bsvc_output%]=="page"'
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_tmpl_part',
-					'name'        => 'bsvc_tmpl_part',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
-					'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
-					'options'     => sd_template_part_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'element_require'  => '[%bsvc_output%]=="template_part"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'               => 'bsvc_message_type',
-					'name'             => 'bsvc_message_type',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
-					'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
-					'options'          => sd_aui_colors(),
-					'default'          => '',
-					'value'            => '',
-					'label_type'       => 'top',
-					'select2'          => false,
-					'element_require'  => '[%bsvc_output%]=="message"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-sm-12">';
-
-			$content .= aui()->input(
-				array(
-					'type'            => 'text',
-					'id'              => 'bsvc_message',
-					'name'            => 'bsvc_message',
-					'label'           => '',
-					'class'           => 'bsvc_message form-control-sm',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
-					'label_type'      => '',
-					'value'           => '',
-					'form_group_class' => ' ',
-					'element_require' => '[%bsvc_output%]=="message"',
-				)
-			);
-
-			$content .= '</div></div></form><input type="hidden" id="bsvc_raw_value" name="bsvc_raw_value" value="' . $value . '">';
-
-			return $content;
-		}
-	}
+         *@since 1.0.28
+         *
+         */
+        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 block_visibility_fields( $args ) {
+            $value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
+            $content = '<div class="bs-vc-rule-template d-none">';
+                $content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
+                    $content .= '<div class="row">';
+                        $content .= '<div class="col-sm-12">';
+                            $content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
+                            $content .= aui()->select(
+                                array(
+                                    'id'          => 'bsvc_rule_BSVCINDEX',
+                                    'name'        => 'bsvc_rule_BSVCINDEX',
+                                    'label'       => __( 'Rule', 'ayecode-connect' ),
+                                    'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
+                                    'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
+                                    'options'     => sd_visibility_rules_options(),
+                                    'default'     => '',
+                                    'value'       => '',
+                                    'label_type'  => '',
+                                    'select2'     => false,
+                                    'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
+                                    'extra_attributes' => array(
+                                        'data-minimum-results-for-search' => '-1'
+                                    )
+                                )
+                            );
+
+                        $content .= '</div>';
+
+                        if ( class_exists( 'GeoDirectory' ) ) {
+                            $content .= '<div class="col-md-7 col-sm-12">';
+
+                                $content .= aui()->select(
+                                    array(
+                                        'id'          => 'bsvc_gd_field_BSVCINDEX',
+                                        'name'        => 'bsvc_gd_field_BSVCINDEX',
+                                        'label'       => __( 'FIELD', 'ayecode-connect' ),
+                                        'placeholder' => __( 'FIELD', 'ayecode-connect' ),
+                                        'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
+                                        'options'     => sd_visibility_gd_field_options(),
+                                        'default'     => '',
+                                        'value'       => '',
+                                        'label_type'  => '',
+                                        'select2'     => false,
+                                        'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
+                                        'extra_attributes' => array(
+                                            'data-minimum-results-for-search' => '-1'
+                                        )
+                                    )
+                                );
+
+                            $content .= '</div>';
+                            $content .= '<div class="col-md-5 col-sm-12">';
+
+                                $content .= aui()->select(
+                                    array(
+                                        'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
+                                        'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
+                                        'label'       => __( 'CONDITION', 'ayecode-connect' ),
+                                        'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
+                                        'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
+                                        'options'     => sd_visibility_field_condition_options(),
+                                        'default'     => '',
+                                        'value'       => '',
+                                        'label_type'  => '',
+                                        'select2'     => false,
+                                        'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
+                                        'extra_attributes' => array(
+                                            'data-minimum-results-for-search' => '-1'
+                                        )
+                                    )
+                                );
+
+                            $content .= '</div>';
+                            $content .= '<div class="col-sm-12">';
+
+                                $content .= aui()->input(
+                                    array(
+                                        'type'            => 'text',
+                                        'id'              => 'bsvc_gd_field_search_BSVCINDEX',
+                                        'name'            => 'bsvc_gd_field_search_BSVCINDEX',
+                                        'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'class'           => 'bsvc_gd_field_search form-control-sm',
+                                        'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'label_type'      => '',
+                                        'value'           => '',
+                                        'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
+                                    )
+                                );
+
+                            $content .= '</div>';
+                        }
+
+                    $content .= '</div>';
+
+                    $content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
+                        $role_options = sd_user_roles_options();
+
+                        $role_option_i = 0;
+                        foreach ( $role_options as $role_option_key => $role_option_name ) {
+                            $role_option_i++;
+
+                            $content .= '<div class="col-sm-6">';
+                            $content .= aui()->input(
+                                array(
+                                    'id'               => 'bsvc_user_roles_BSVCINDEX_' . $role_option_i,
+                                    'name'             => 'bsvc_user_roles_BSVCINDEX[]',
+                                    'type'             => 'checkbox',
+                                    'label'            => $role_option_name,
+                                    'label_type'       => 'hidden',
+                                    'class'            => 'bsvc_user_roles',
+                                    'value'            => $role_option_key,
+                                    'switch'           => 'md',
+                                    'no_wrap'          => true
+                                )
+                            );
+                            $content .= '</div>';
+                        }
+                    $content .= '</div>';
+                $content .= '</div>';
+            $content .= '</div>';
+            $content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
+            $content .= '<div class="bs-vc-rule-sets"></div>';
+            $content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
+            $content .= '<div class="row"><div class="col-md-6 col-sm-12">';
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_output',
+                    'name'        => 'bsvc_output',
+                    'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
+                    'placeholder' => __( 'Default Output', 'ayecode-connect' ),
+                    'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
+                    'options'     => sd_visibility_output_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-md-6 col-sm-12">';
+
+            $content .= aui()->select(
+                array(
+                    'id'              => 'bsvc_page',
+                    'name'            => 'bsvc_page',
+                    'label'           => __( 'Page Content', 'ayecode-connect' ),
+                    'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+                    'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
+                    'options'         => sd_template_page_options(),
+                    'default'         => '',
+                    'value'           => '',
+                    'label_type'      => 'top',
+                    'select2'         => false,
+                    'element_require' => '[%bsvc_output%]=="page"'
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_tmpl_part',
+                    'name'        => 'bsvc_tmpl_part',
+                    'label'       => __( 'Template Part', 'ayecode-connect' ),
+                    'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+                    'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
+                    'options'     => sd_template_part_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'element_require'  => '[%bsvc_output%]=="template_part"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'               => 'bsvc_message_type',
+                    'name'             => 'bsvc_message_type',
+                    'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
+                    'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+                    'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
+                    'options'          => sd_aui_colors(),
+                    'default'          => '',
+                    'value'            => '',
+                    'label_type'       => 'top',
+                    'select2'          => false,
+                    'element_require'  => '[%bsvc_output%]=="message"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-sm-12">';
+
+            $content .= aui()->input(
+                array(
+                    'type'            => 'text',
+                    'id'              => 'bsvc_message',
+                    'name'            => 'bsvc_message',
+                    'label'           => '',
+                    'class'           => 'bsvc_message form-control-sm',
+                    'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+                    'label_type'      => '',
+                    'value'           => '',
+                    'form_group_class' => ' ',
+                    'element_require' => '[%bsvc_output%]=="message"',
+                )
+            );
+
+            $content .= '</div></div></form><input type="hidden" id="bsvc_raw_value" name="bsvc_raw_value" value="' . $value . '">';
+
+            return $content;
+        }
+    }
 }

Spacing +814 added lines, -814 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 
-	define( 'SUPER_DUPER_VER', '1.2.6' );
+	define('SUPER_DUPER_VER', '1.2.6');
 
 	/**
 	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
@@ -38,40 +38,40 @@ 
 		/**
 		 * 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'],
 				'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
 			);
-			$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();
 
 			// nested blocks can't work as a widget
-			if(!empty($this->options['nested-block'])){
-				if(empty($this->options['output_types'])){
-					$this->options['output_types'] = array('shortcode','block');
+			if (!empty($this->options['nested-block'])) {
+				if (empty($this->options['output_types'])) {
+					$this->options['output_types'] = array('shortcode', 'block');
 				}elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
 					unset($this->options['output_types'][$key]);
 				}
 			}
 
 			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
+				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'];
 
@@ -80,61 +80,61 @@ 
 
 
 				// 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
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-					add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				if (empty($this->options['output_types']) || in_array('block', $this->options['output_types'])) {
+					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 head
-				add_action( 'admin_head', array( $this, 'generator' ), 99 );
-				add_action( 'wp_head', array( $this, 'generator' ), 99 );
+				add_action('admin_head', array($this, 'generator'), 99);
+				add_action('wp_head', array($this, 'generator'), 99);
 			}
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 		}
 
 		/**
@@ -142,7 +142,7 @@ 
 		 * @return void
 		 */
 		public function _register() {
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+			if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
 				parent::_register();
 			}
 		}
@@ -151,14 +151,14 @@ 
 		 * 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();
 
@@ -169,11 +169,11 @@ 
 					'allow_generator' => true,
 				);
 
-				if ( ! empty( $params ) ) {
+				if (!empty($params)) {
 					$args['params'] = $params;
 				}
 
-				fusion_builder_map( $args );
+				fusion_builder_map($args);
 			}
 
 		}
@@ -182,8 +182,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(
@@ -205,38 +205,38 @@ 
 						$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;
 					}
 
 					// heading
-					$param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+					$param['heading'] = isset($val['title']) ? $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( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+						$param['value'] = array('0' => __("No", 'ayecode-connect'), '1' => __("Yes", 'ayecode-connect'));
+					} 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
@@ -253,7 +253,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();
 			}
 		}
@@ -265,12 +265,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 = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
+			if (isset($_POST['editor_id'])) {
+				$editor_id = esc_attr($_POST['editor_id']);
+			} elseif (isset($_REQUEST['et_fb'])) {
 				$editor_id = 'main_content_content_vb_tiny_mce';
 			}
 
@@ -281,14 +281,14 @@ 
 
 			<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', 'ayecode-connect' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode', 'ayecode-connect') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						if (!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])) { continue; }
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 
@@ -301,37 +301,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', 'ayecode-connect' ); ?></button>
+								} ?>)"><?php _e('Insert shortcode', 'ayecode-connect'); ?></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();
 				}
 
@@ -347,22 +347,22 @@ 
 		 * Output the version in the header.
 		 */
 		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+			$file = str_replace(array("/", "\\"), "/", realpath(__FILE__));
+			$plugins_dir = str_replace(array("/", "\\"), "/", realpath(WP_PLUGIN_DIR));
 
 			// Find source plugin/theme of SD
 			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+			if (strpos($file, $plugins_dir) !== false) {
+				$source = explode("/", plugin_basename($file));
+			} else if (function_exists('get_theme_root')) {
+				$themes_dir = str_replace(array("/", "\\"), "/", realpath(get_theme_root()));
 
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+				if (strpos($file, $themes_dir) !== false) {
+					$source = explode("/", ltrim(str_replace($themes_dir, "", $file), "/"));
 				}
 			}
 
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+			echo '<meta name="generator" content="WP Super Duper v' . esc_attr($this->version) . '"' . (!empty($source[0]) ? ' data-sd-source="' . esc_attr($source[0]) . '"' : '') . ' />';
 		}
 
 		/**
@@ -373,16 +373,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();
 			}
 
@@ -390,7 +390,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>";
@@ -409,9 +409,9 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		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();
@@ -421,21 +421,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;
@@ -449,12 +449,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">
@@ -470,7 +470,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));
 		}
 
 		/**
@@ -528,7 +528,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings', 'ayecode-connect' );?>" 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', 'ayecode-connect'); ?>" 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) {
@@ -563,10 +563,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);
 		}
 
 		/**
@@ -578,7 +578,7 @@ 
 		 *@since 1.0.6
 		 *
 		 */
-		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 {
@@ -697,25 +697,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.
@@ -728,9 +728,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";';
@@ -813,11 +813,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) {
@@ -1016,11 +1016,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) {
@@ -1042,9 +1042,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(); ?>';
 					}
 				}
 			</script>
@@ -1058,11 +1058,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;
 				}
@@ -1106,10 +1106,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);
 		}
 
 		/**
@@ -1176,7 +1176,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings', 'ayecode-connect' );?>" 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', 'ayecode-connect'); ?>" 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 = $form ? $form : jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -1267,7 +1267,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();
@@ -1276,10 +1276,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);
 		}
 
 
@@ -1290,14 +1290,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;
 				}
 			}
 
@@ -1310,8 +1310,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'));
 		}
 
 		/**
@@ -1320,50 +1320,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 .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+						$attributes .= " " . esc_attr(sanitize_title_with_dashes($key)) . "='" . esc_attr($value) . "' ";
 					}
 				}
 
-				$shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
+				$shortcode = "[" . esc_attr($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;
@@ -1379,21 +1379,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.
 				 *
@@ -1404,40 +1404,40 @@ 
 				 *@since 1.0.28
 				 *
 				 */
-				$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;
@@ -1445,20 +1445,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);
 		}
 
 		/**
@@ -1468,8 +1468,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf(__('Placeholder for: %s', 'ayecode-connect'), $name) . "</div>";
 		}
 
 		/**
@@ -1479,13 +1479,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;
 				}
 			}
 
@@ -1501,26 +1501,26 @@ 
 		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
 		 *
 		 */
-		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'];
 					}
 				}
 			}
@@ -1547,12 +1547,12 @@ 
 		 *
 		 */
 		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;
 		}
@@ -1564,7 +1564,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 = '') {
 
 		}
 
@@ -1572,9 +1572,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());
 			}
 		}
 
@@ -1588,9 +1588,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
 					}
@@ -1608,19 +1608,19 @@ 
 		public function get_url() {
 			$url = $this->url;
 
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
+			if (!$url) {
+				$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+				$content_url = untrailingslashit(WP_CONTENT_URL);
 
 				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
+				if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+					$content_url = str_replace('http://', 'https://', $content_url);
 				}
 
 				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
+				$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+				$url = str_replace($content_dir, $content_url, $file_dir);
+				$url = trailingslashit($url);
 				$this->url = $url;
 			}
 
@@ -1636,15 +1636,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;
 				}
 			}
@@ -1665,45 +1665,45 @@ 
 		 * @return string
 		 *@since 1.1.0
 		 */
-		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 ) {
-			if ( ! empty( $arguments ) ) {
+		public function group_arguments($arguments) {
+			if (!empty($arguments)) {
 				$temp_arguments = array();
-				$general        = __( "General", 'ayecode-connect' );
+				$general        = __("General", 'ayecode-connect');
 				$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;
 				}
 			}
@@ -1716,38 +1716,38 @@ 
 		 *
 		 * @since 1.1.17
 		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+		public function group_block_tabs($tabs, $arguments) {
+			if (!empty($tabs) && !empty($arguments)) {
 				$has_sections = false;
 
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
+				foreach ($this->arguments as $key => $args) {
+					if (isset($args['group'])) {
 						$has_sections = true;
 						break;
 					}
 				}
 
-				if ( ! $has_sections ) {
+				if (!$has_sections) {
 					return $tabs;
 				}
 
 				$new_tabs = array();
 
-				foreach ( $tabs as $tab_key => $tab ) {
+				foreach ($tabs as $tab_key => $tab) {
 					$new_groups = array();
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
+					if (!empty($tab['groups']) && is_array($tab['groups'])) {
+						foreach ($tab['groups'] as $group) {
+							if (isset($arguments[$group])) {
 								$new_groups[] = $group;
 							}
 						}
 					}
 
-					if ( ! empty( $new_groups ) ) {
+					if (!empty($new_groups)) {
 						$tab['groups'] = $new_groups;
 
-						$new_tabs[ $tab_key ] = $tab;
+						$new_tabs[$tab_key] = $tab;
 					}
 				}
 
@@ -1774,7 +1774,7 @@ 
 			?>
 			<script>
 			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
+			if (!$sd_is_js_functions_loaded) {
 				$sd_is_js_functions_loaded = true;
 			?>
 function sd_show_view_options($this){
@@ -2043,7 +2043,7 @@ 
 	}
 }
 
-<?php if( !isset( $_REQUEST['sd-block-recover-debug'] ) ){ ?>
+<?php if (!isset($_REQUEST['sd-block-recover-debug'])) { ?>
 // Wait will window is loaded before calling.
 window.onload = function() {
 	sd_auto_recover_blocks();
@@ -2222,7 +2222,7 @@ 
 				$classes = [];
 
 				<?php
-				if($aui_bs5){
+				if ($aui_bs5) {
 					?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
@@ -2231,7 +2231,7 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
+				} else {
 						?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
@@ -2419,7 +2419,7 @@ 
 			}
 
 			function sd_get_class_build_keys(){
-				return <?php echo json_encode(sd_get_class_build_keys());?>;
+				return <?php echo json_encode(sd_get_class_build_keys()); ?>;
 			}
 
 			<?php
@@ -2427,7 +2427,7 @@ 
 
 			}
 
-			if(method_exists($this,'block_global_js')){
+			if (method_exists($this, 'block_global_js')) {
 					echo $this->block_global_js();
 			}
 			?>
@@ -2459,9 +2459,9 @@ 
 					var InnerBlocks = blockEditor.InnerBlocks;
 
 					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}];
 					const MediaUpload = wp.blockEditor.MediaUpload;
 
 					/**
@@ -2476,87 +2476,87 @@ 
 					 * @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.
-						apiVersion: <?php echo isset($this->options['block-api-version']) ? absint($this->options['block-api-version']) : 2 ; ?>,
-						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.
+						apiVersion: <?php echo isset($this->options['block-api-version']) ? absint($this->options['block-api-version']) : 2; ?>,
+						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']['renaming'])){
+							if (!isset($this->options['block-supports']['renaming'])) {
 								$this->options['block-supports']['renaming'] = false;
 							}
-							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']);
 							}
 							?>
 						},
 						__experimentalLabel( attributes, { context } ) {
 							var visibility_html = attributes && attributes.visibility_conditions ? ' &#128065;' : '';
 							var metadata_name = attributes && attributes.metadata && attributes.metadata.name ? attributes.metadata.name : '';
-							var label_name = <?php echo !empty($this->options['block-label']) ? $this->options['block-label'] : "'" . esc_attr( addslashes( $this->options['name'] ) ) . "'"; ?>;
+							var label_name = <?php echo !empty($this->options['block-label']) ? $this->options['block-label'] : "'" . esc_attr(addslashes($this->options['name'])) . "'"; ?>;
 							return metadata_name ? metadata_name + visibility_html  : label_name + visibility_html;
 						},
-						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'] . ",";
 						}
 
 
 						// block hover preview.
 						$example_args = array();
-						if(!empty($this->arguments)){
-							foreach($this->arguments as $key => $a_args){
-								if(isset($a_args['example'])){
+						if (!empty($this->arguments)) {
+							foreach ($this->arguments as $key => $a_args) {
+								if (isset($a_args['example'])) {
 									$example_args[$key] = $a_args['example'];
 								}
 							}
 						}
-						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
+						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: ' . absint($this->options['example']['viewportWidth']) : '';
 						$example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
-						if( isset( $this->options['example'] ) && $this->options['example'] === false ){
+						if (isset($this->options['example']) && $this->options['example'] === false) {
 							// no preview if set to false
-						}elseif( !empty( $example_args ) ){
-							echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-						}elseif( !empty( $this->options['example'] ) ){
+						}elseif (!empty($example_args)) {
+							echo "example : {attributes:{" . $this->array_to_attributes($example_args) . "},$viewport_width},";
+						}elseif (!empty($this->options['example'])) {
 							unset($this->options['example']['viewportWidth']);
 							unset($this->options['example']['innerBlocks']);
-							$example_atts = $this->array_to_attributes( $this->options['example'] );
+							$example_atts = $this->array_to_attributes($this->options['example']);
 							$example_parts = array();
-							if($example_atts){
-								$example_parts[] = rtrim($example_atts,",");
+							if ($example_atts) {
+								$example_parts[] = rtrim($example_atts, ",");
 							}
-							if($viewport_width){
+							if ($viewport_width) {
 								$example_parts[] = $viewport_width;
 							}
-							if($example_inner_blocks){
+							if ($example_inner_blocks) {
 								$example_parts[] = $example_inner_blocks;
 							}
-							if(!empty($example_parts)){
-								echo "example : {".implode(',', $example_parts)."},";
+							if (!empty($example_parts)) {
+								echo "example : {" . implode(',', $example_parts) . "},";
 							}
-						}else{
+						} else {
 							echo 'example : {viewportWidth: 500},';
 						}
 
 
 
 						// limit to parent
-						if( !empty( $this->options['parent'] ) ){
-							echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
+						if (!empty($this->options['parent'])) {
+							echo "parent : " . wp_json_encode($this->options['parent']) . ",";
 						}
 
 						// limit allowed blocks
-						if( !empty( $this->options['allowed-blocks'] ) ){
-							echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
+						if (!empty($this->options['allowed-blocks'])) {
+							echo "allowedBlocks : " . wp_json_encode($this->options['allowed-blocks']) . ",";
 						}
 
 						// 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'] = '';
 						}
 
@@ -2573,7 +2573,7 @@ 
 
 							echo "attributes : {";
 
-							if ( $show_advanced ) {
+							if ($show_advanced) {
 								echo "show_advanced: {";
 								echo "	type: 'boolean',";
 								echo "  default: false,";
@@ -2581,57 +2581,57 @@ 
 							}
 
 							// 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 "},";
 							}
 
 
-							if ( ! empty( $this->arguments ) ) {
+							if (!empty($this->arguments)) {
 
-								foreach ( $this->arguments as $key => $args ) {
+								foreach ($this->arguments as $key => $args) {
 
-									if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
+									if ($args['type'] == 'image' || $args['type'] == 'images') {
 										$img_drag_drop = true;
 									}
 
 									// set if we should show alignment
-									if ( $key == 'alignment' ) {
+									if ($key == 'alignment') {
 										$show_alignment = true;
 									}
 
 									$extra = '';
 
-									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+									if ($args['type'] == 'notice' || $args['type'] == 'tab') {
 										continue;
 									}
-									elseif ( $args['type'] == 'checkbox' ) {
+									elseif ($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'] == 'tagselect' ) {
+									} elseif ($args['type'] == 'tagselect') {
 										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'multiselect' ) {
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+									} elseif ($args['type'] == 'multiselect') {
 										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image_xy' ) {
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+									} elseif ($args['type'] == 'image_xy') {
 										$type    = 'object';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image' ) {
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+									} elseif ($args['type'] == 'image') {
 										$type    = 'string';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 
 										// add a field for ID
 	//                                    echo $key . "_id : {";
@@ -2643,7 +2643,7 @@ 
 
 									} else {
 										$type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_type']) : 'string';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 
 									}
 									echo $key . " : {";
@@ -2656,7 +2656,7 @@ 
 							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
 							echo "sd_shortcode : {type : 'string',default: ''},";
 
-							if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+							if (!empty($this->options['nested-block']) || !empty($this->arguments['html'])) {
 								echo "sd_shortcode_close : {type : 'string',default: ''},";
 							}
 
@@ -2674,7 +2674,7 @@ 
 
 <?php
 // only include the drag/drop functions if required.
-if( $img_drag_drop ){
+if ($img_drag_drop) {
 
 ?>
 
@@ -2740,9 +2740,9 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-raw'])) {
+							if (!empty($this->options['block-edit-raw'])) {
 								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
+							} else {
 							?>
 
 function hasSelectedInnerBlock(props) {
@@ -2766,7 +2766,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.clientId]) != 'undefined'){
 		$pt = props.attributes.post_type;
@@ -2781,9 +2781,9 @@ 
 		}
 <?php
 	$cat_path = '';
-	if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
-		$cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
-		$cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
+	if (!empty($this->arguments['post_type']['onchange_rest']['path'])) {
+		$cat_path = esc_js(strip_tags($this->arguments['post_type']['onchange_rest']['path']));
+		$cat_path = str_replace(array('&quot;', '&#039;'), array('"', "'"), $cat_path);
 	}
 ?>
 		/* taxonomies */
@@ -2791,15 +2791,15 @@ 
 			if (!window.gdCPTCats) {
 				window.gdCPTCats = [];
 			}
-			var gdCatPath = "<?php echo ( ! empty( $cat_path ) ? $cat_path : "/wp/v2/" + $value + "/categories/?per_page=100" ); ?>";
+			var gdCatPath = "<?php echo (!empty($cat_path) ? $cat_path : "/wp/v2/" +$value + "/categories/?per_page=100"); ?>";
 			if (window.gdCPTCats[gdCatPath]) {
 				terms = window.gdCPTCats[gdCatPath];
-				while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+				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. */
@@ -2809,12 +2809,12 @@ 
 			} else {
 				wp.apiFetch({path: gdCatPath}).then(terms => {
 					window.gdCPTCats[gdCatPath] = terms;
-					while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-						taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+					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. */
@@ -2822,7 +2822,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); ?>;
 				});
 			}
 		}
@@ -2834,12 +2834,12 @@ 
 			}
 			if (window.gdCPTSort[$pt]) {
 				response = window.gdCPTSort[$pt];
-				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.
@@ -2854,12 +2854,12 @@ 
 				jQuery.post(ajaxurl, data, function(response) {
 					response = JSON.parse(response);
 					window.gdCPTSort[$pt] = 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.
@@ -2867,7 +2867,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); ?>;
 				});
 			}
 		}
@@ -2875,9 +2875,9 @@ 
 	<?php } ?>
 <?php
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
-if(!empty($current_screen->base) && $current_screen->base==='widgets'){
+if (!empty($current_screen->base) && $current_screen->base === 'widgets') {
 	echo 'const { deviceType } = "";';
-}else{
+} else {
 ?>
 /** Get device type const. */
 const { deviceType } = wp.data.useSelect != 'undefined' ?  wp.data.useSelect(select => {
@@ -2907,13 +2907,13 @@ 
 
 									var data = {
 										'action': 'super_duper_output_shortcode',
-										'shortcode': '<?php echo $this->options['base_id'];?>',
+										'shortcode': '<?php echo $this->options['base_id']; ?>',
 										'attributes': props.attributes,
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
-										'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) {
@@ -2922,17 +2922,17 @@ 
 
 										// 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:', 'ayecode-connect' );?> " + props.name + "</div>";
+											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for:', 'ayecode-connect'); ?> " + props.name + "</div>";
 										}
 
 										 <?php
-										if(!empty($this->options['nested-block'])){
+										if (!empty($this->options['nested-block'])) {
 											?>
 											// props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 											 <?php
-										}else{
+										} else {
 										?>
 										props.setAttributes({content: env});
 										is_fetching = false;
@@ -2958,38 +2958,38 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-js'])) {
-								echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
+							if (!empty($this->options['block-edit-js'])) {
+								echo  $this->options['block-edit-js']; // strings have to be in single quotes, may cause issues
 							}
 
 
 
 
-							if(empty($this->options['block-save-return'])){
+							if (empty($this->options['block-save-return'])) {
 							?>
 								///////////////////////////////////////////////////////////////////////
 
 									 // build the shortcode.
-								shortcode = "[<?php echo $this->options['base_id'];?>";
+								shortcode = "[<?php echo $this->options['base_id']; ?>";
 								<?php
 
-								if(! empty( $this->arguments )){
+								if (!empty($this->arguments)) {
 
-								foreach($this->arguments as $key => $args){
+								foreach ($this->arguments as $key => $args) {
 								   // if($args['type']=='tabs'){continue;}
 
 								   // don't add metadata arguments
-								   if (substr($key, 0, 9 ) === 'metadata_') {
+								   if (substr($key, 0, 9) === 'metadata_') {
 									   continue;
 								   }
 								?>
-								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-									if ('<?php echo esc_attr( $key );?>' == 'html') {
-									} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
-										shortcode += props.attributes.<?php echo esc_attr( $key );?>.length && ( props.attributes.<?php echo esc_attr( $key );?>.x.length || props.attributes.<?php echo esc_attr( $key );?>.y.length ) ? " <?php echo esc_attr( $key );?>='{x:" + props.attributes.<?php echo esc_attr( $key );?>.x + ",y:"+props.attributes.<?php echo esc_attr( $key );?>.y +"}' " : "";
+								if (props.attributes.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+									if ('<?php echo esc_attr($key); ?>' == 'html') {
+									} else if ('<?php echo esc_attr($args['type']); ?>' == 'image_xy') {
+										shortcode += props.attributes.<?php echo esc_attr($key); ?>.length && ( props.attributes.<?php echo esc_attr($key); ?>.x.length || props.attributes.<?php echo esc_attr($key); ?>.y.length ) ? " <?php echo esc_attr($key); ?>='{x:" + props.attributes.<?php echo esc_attr($key); ?>.x + ",y:"+props.attributes.<?php echo esc_attr($key); ?>.y +"}' " : "";
 									} else {
-										//shortcode += props.attributes.<?php echo esc_attr( $key );?>.length ? " <?php echo esc_attr( $key );?>='" + props.attributes.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' " : "";
-										shortcode +=  " <?php echo esc_attr( $key );?>='" + props.attributes.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' ";
+										//shortcode += props.attributes.<?php echo esc_attr($key); ?>.length ? " <?php echo esc_attr($key); ?>='" + props.attributes.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' " : "";
+										shortcode +=  " <?php echo esc_attr($key); ?>='" + props.attributes.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' ";
 									}
 								}
 								<?php
@@ -3004,8 +3004,8 @@ 
 									props.setAttributes({sd_shortcode: shortcode});
 
 									<?php
-									if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-										echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
+									if (!empty($this->options['nested-block']) || !empty($this->arguments['html'])) {
+										echo "props.setAttributes({sd_shortcode_close: '[/" . esc_attr($this->options['base_id']) . "]'});";
 									}
 									?>
 								}
@@ -3020,7 +3020,7 @@ 
 
 								el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-									<?php if($show_alignment){?>
+									<?php if ($show_alignment) {?>
 									el(
 										wp.blockEditor.AlignmentToolbar,
 										{
@@ -3038,9 +3038,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'}
@@ -3060,42 +3060,42 @@ 
 									<?php
 									}
 
-									$arguments = $this->group_arguments( $this->arguments );
-									$block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
+									$arguments = $this->group_arguments($this->arguments);
+									$block_group_tabs = !empty($this->options['block_group_tabs']) ? $this->group_block_tabs($this->options['block_group_tabs'], $arguments) : array();
 
 									// Do we have sections?
 									$has_sections = $arguments == $this->arguments ? false : true;
 
-									if($has_sections){
+									if ($has_sections) {
 									$panel_count = 0;
 									$open_tab = '';
 
 									$open_tab_groups = array();
 									$used_tabs = array();
 
-									foreach ( $arguments as $key => $args ) {
+									foreach ($arguments as $key => $args) {
 										$close_tab = false;
 										$close_tabs = false;
 
-										 if ( ! empty( $block_group_tabs ) ) {
-											foreach ( $block_group_tabs as $tab_name => $tab_args ) {
-												if ( in_array( $key, $tab_args['groups'] ) ) {
+										 if (!empty($block_group_tabs)) {
+											foreach ($block_group_tabs as $tab_name => $tab_args) {
+												if (in_array($key, $tab_args['groups'])) {
 													$open_tab_groups[] = $key;
 
-													if ( $open_tab != $tab_name ) {
+													if ($open_tab != $tab_name) {
 														$tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
 														$tab_args['tab']['open'] = true;
 
-														$this->block_tab_start( '', $tab_args );
+														$this->block_tab_start('', $tab_args);
 														$open_tab = $tab_name;
 														$used_tabs[] = $tab_name;
 													}
 
-													if ( $open_tab_groups == $tab_args['groups'] ) {
+													if ($open_tab_groups == $tab_args['groups']) {
 														$close_tab = true;
 														$open_tab_groups = array();
 
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
+														if ($used_tabs == array_keys($block_group_tabs)) {
 															$close_tabs = true;
 														}
 													}
@@ -3104,27 +3104,27 @@ 
 										}
 										?>
 										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";
 											}?>
 											},
 											<?php
-											foreach ( $args as $k => $a ) {
-												$this->block_tab_start( $k, $a );
-												$this->block_row_start( $k, $a );
-												$this->build_block_arguments( $k, $a );
-												$this->block_row_end( $k, $a );
-												$this->block_tab_end( $k, $a );
+											foreach ($args as $k => $a) {
+												$this->block_tab_start($k, $a);
+												$this->block_row_start($k, $a);
+												$this->build_block_arguments($k, $a);
+												$this->block_row_end($k, $a);
+												$this->block_tab_end($k, $a);
 											}
 											?>
 										),
 										<?php
-										$panel_count ++;
+										$panel_count++;
 
-										if($close_tab || $close_tabs){
+										if ($close_tab || $close_tabs) {
 											$tab_args = array(
 												'tab'	=> array(
 													'tabs_close' => $close_tabs,
@@ -3132,24 +3132,24 @@ 
 												)
 
 											);
-											$this->block_tab_end( '', $tab_args );
+											$this->block_tab_end('', $tab_args);
 //											echo '###close'; print_r($tab_args);
 											$panel_count = 0;
 										}
 //
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
+											title: '<?php esc_attr_e("Settings", 'ayecode-connect'); ?>',
 											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);
 										}
 										?>
 									),
@@ -3163,11 +3163,11 @@ 
 
 								<?php
 								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
+								if (!empty($this->options['block-output'])) {
+								$this->block_element($this->options['block-output']);
+							}elseif (!empty($this->options['block-edit-return'])) {
 								   echo $this->options['block-edit-return'];
-							}else{
+							} else {
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
 								?>
@@ -3194,27 +3194,27 @@ 
 							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($args['type']=='tabs'){continue;}
 
 							   // don't add metadata arguments
-							   if (substr($key, 0, 9 ) === 'metadata_') {
+							   if (substr($key, 0, 9) === 'metadata_') {
 								   continue;
 							   }
 							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-								if ('<?php echo esc_attr( $key );?>' == 'html') {
-									$html = attr.<?php echo esc_attr( $key );?>;
-								} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
-									content += " <?php echo esc_attr( $key );?>='{x:" + attr.<?php echo esc_attr( $key );?>.x + ",y:"+attr.<?php echo esc_attr( $key );?>.y +"}' ";
+							if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+								if ('<?php echo esc_attr($key); ?>' == 'html') {
+									$html = attr.<?php echo esc_attr($key); ?>;
+								} else if ('<?php echo esc_attr($args['type']); ?>' == 'image_xy') {
+									content += " <?php echo esc_attr($key); ?>='{x:" + attr.<?php echo esc_attr($key); ?>.x + ",y:"+attr.<?php echo esc_attr($key); ?>.y +"}' ";
 								} else {
-									content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' ";
+									content += " <?php echo esc_attr($key); ?>='" + attr.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' ";
 								}
 							}
 							<?php
@@ -3234,7 +3234,7 @@ 
 							?>
 							// if has html element
 							if ($html) {
-								//content += $html + "[/<?php echo $this->options['base_id'];?>]";
+								//content += $html + "[/<?php echo $this->options['base_id']; ?>]";
 							}
 
 							// @todo should we add inline style here or just css classes?
@@ -3264,7 +3264,7 @@ 
 //                                <x?php
 //							}else
 
-							if(!empty($this->options['block-output'])){
+							if (!empty($this->options['block-output'])) {
 //                               echo "return";
 //                               $this->block_element( $this->options['block-output'], true );
 //                               echo ";";
@@ -3274,30 +3274,30 @@ 
 								   '',
 								   {},
 								  // el('', {dangerouslySetInnerHTML: {__html: content}}),
-								   <?php $this->block_element( $this->options['block-output'], true ); ?>
-								  // el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
+								   <?php $this->block_element($this->options['block-output'], true); ?>
+								  // el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id']; ?>]"}})
 							   );
 								<?php
 
-							}elseif(!empty($this->options['block-save-return'])){
+							}elseif (!empty($this->options['block-save-return'])) {
 								   echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
+							}elseif (!empty($this->options['nested-block'])) {
 								?>
 							  return el(
 								   '',
 								   {},
 								   el('', {dangerouslySetInnerHTML: {__html: content+"\n"}}),
 								   InnerBlocks.Content ? el( InnerBlocks.Content ) : '', // @todo i think we need a comma here
-								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
+								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id']; ?>]"}})
 							   );
 								<?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
-								echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							}elseif (!empty($this->options['block-save-return'])) {
+								echo "return " . $this->options['block-edit-return'] . ";";
+							}elseif (isset($this->options['block-wrap']) && $this->options['block-wrap'] == '') {
 							?>
 							return content;
 							<?php
-							}else{
+							} else {
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -3326,48 +3326,48 @@ 
 			 * 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 ) . " && " : "";
-				$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-				$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+				$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
+				$device_type = !empty($args['device_type']) ? esc_attr($args['device_type']) : '';
+				$device_type_require = !empty($args['device_type']) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
 				$device_type_icon = '';
-				if($device_type=='Desktop'){
+				if ($device_type == 'Desktop') {
 					$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Tablet'){
+				}elseif ($device_type == 'Tablet') {
 					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Mobile'){
+				}elseif ($device_type == 'Mobile') {
 					$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 				}
 				echo $element_require;
 				echo $device_type_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 position-relative',
 									style: {width:"100%"}
 								},
-								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['row']['title'] ) ?>'}}),
-								<?php if($device_type_icon){ ?>
-									deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
+								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes($args['row']['title']) ?>'}}),
+								<?php if ($device_type_icon) { ?>
+									deviceType == '<?php echo $device_type; ?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
 								<?php
 								}
 								?>
@@ -3375,17 +3375,17 @@ 
 
 							),
 							<?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',
@@ -3394,36 +3394,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 ps-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 ps-0 pr-2 pe-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 "))";
 				}
 
@@ -3431,14 +3431,14 @@ 
 			}
 		}
 
-		public function block_tab_start($key, $args){
+		public function block_tab_start($key, $args) {
 
 			// check for row
-			if(!empty($args['tab'])){
+			if (!empty($args['tab'])) {
 
-				if(!empty($args['tab']['tabs_open'])){
+				if (!empty($args['tab']['tabs_open'])) {
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 
 el('div',{className: 'bsui'},
 
@@ -3447,52 +3447,52 @@ 
 									{
 										activeClass: 'is-active',
 										className: 'btn-groupx',
-										initialTabName: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
+										initialTabName: '<?php echo addslashes(esc_attr($args['tab']['key'])); ?>',
 										tabs: [
 
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
-				if(!empty($args['tab']['open'])){
+				if (!empty($args['tab']['open'])) {
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 							{
-												name: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
-												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes( esc_attr( $args['tab']['title']) ); ?>'}}),
-												className: '<?php echo addslashes( esc_attr( $args['tab']['class']) ); ?>',
-												content: el('div',{}, <?php if(!empty($args['tab']['desc'])){ ?>el('p', {
+												name: '<?php echo addslashes(esc_attr($args['tab']['key'])); ?>',
+												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes(esc_attr($args['tab']['title'])); ?>'}}),
+												className: '<?php echo addslashes(esc_attr($args['tab']['class'])); ?>',
+												content: el('div',{}, <?php if (!empty($args['tab']['desc'])) { ?>el('p', {
 									className: 'components-base-control__help mb-0',
-									dangerouslySetInnerHTML: {__html:'<?php echo addslashes( $args['tab']['desc'] ); ?>'}
+									dangerouslySetInnerHTML: {__html:'<?php echo addslashes($args['tab']['desc']); ?>'}
 								}),<?php }
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_tab_end($key, $args){
+		public function block_tab_end($key, $args) {
 
-			if(!empty($args['tab'])){
+			if (!empty($args['tab'])) {
 				// maybe close
-				if(!empty($args['tab']['close'])){
+				if (!empty($args['tab']['close'])) {
 					echo ")}, /* tab close */";
 				}
 
-				if(!empty($args['tab']['tabs_close'])){
-					if(false){?><script><?php }?>
+				if (!empty($args['tab']['tabs_close'])) {
+					if (false) {?><script><?php }?>
 						]}, ( tab ) => {
 								return tab.content;
 							}
 						)), /* tabs close */
-					<?php if(false){ ?></script><?php }
+					<?php if (false) { ?></script><?php }
 				}
 			}
 		}
 
-		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           = '';
@@ -3500,28 +3500,28 @@ 
 			$after_elements	   = '';
 
 			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
+			if ($key == 'content') {
 				return;
 			}
 
-			$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-			$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+			$device_type = !empty($args['device_type']) ? esc_attr($args['device_type']) : '';
+			$device_type_require = !empty($args['device_type']) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
 			$device_type_icon = '';
-			if($device_type=='Desktop'){
+			if ($device_type == 'Desktop') {
 				$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Tablet'){
+			}elseif ($device_type == 'Tablet') {
 				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Mobile'){
+			}elseif ($device_type == 'Mobile') {
 				$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 			}
 
 			// 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.
@@ -3529,27 +3529,27 @@ 
 			}
 
 			// 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','range' );
-			if ( in_array( $args['type'], $text_type ) ) {
+			$text_type = array('text', 'password', 'number', 'email', 'tel', 'url', 'colorx', 'range');
+			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: $key ? Number($key) : '' } )";
 				}
 
-				if (substr($key, 0, 9 ) === 'metadata_') {
-					$real_key = str_replace('metadata_','', $key );
+				if (substr($key, 0, 9) === 'metadata_') {
+					$real_key = str_replace('metadata_', '', $key);
 					$onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
-					$value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
+					$value = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
 				}
 			}
 //			else if ( $args['type'] == 'popup' ) {
@@ -3569,12 +3569,12 @@ 
 //
 //				$value     = "props.attributes.$key ? props.attributes.$key : ''";
 //			}
-			else if ( $args['type'] == 'styleid' ) {
+			else if ($args['type'] == 'styleid') {
 				$type = 'TextControl';
 				$args['type'] == 'text';
 				// Save numbers as numbers and not strings
-				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
+				$value = "props.attributes.$key ? props.attributes.$key : ''";
+			} else if ($args['type'] == 'notice') {
 
 				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
 				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
@@ -3636,11 +3636,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) {
@@ -3649,7 +3649,7 @@ 
 							$key: value
 						});
 					},";
-			}elseif ( $args['type'] == 'gradient' ) {
+			}elseif ($args['type'] == 'gradient') {
 				$type = 'GradientPicker';
 				$extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
@@ -3688,7 +3688,7 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
+			}elseif ($args['type'] == 'image') {
 //                print_r($args);
 
 				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
@@ -3750,7 +3750,7 @@ 
 				$onchange = "";
 
 				//$inside_elements = ",el('div',{},'file upload')";
-			} else if ( $args['type'] == 'images' ) {
+			} else if ($args['type'] == 'images') {
 				$img_preview = "props.attributes.$key && (function() {
 	let uploads = JSON.parse('['+props.attributes.$key+']');
 	let images = [];
@@ -3763,7 +3763,7 @@ 
 			el('i',{
 				className: 'fas fa-times-circle text-danger position-absolute  ml-n2 mt-n1 bg-white rounded-circle c-pointer',
 				onClick: function() {
-					aui_confirm('".esc_attr__('Are you sure?')."', '".esc_attr__('Delete')."', '".esc_attr__('Cancel')."', true).then(function(confirmed) {
+					aui_confirm('" . esc_attr__('Are you sure?') . "', '" . esc_attr__('Delete') . "', '" . esc_attr__('Cancel') . "', true).then(function(confirmed) {
 						if (confirmed) {
 							let new_uploads = JSON.parse('['+props.attributes.$key+']');
 							new_uploads.splice(index, 1);
@@ -3826,36 +3826,36 @@ 
 
 				//$inside_elements = ",el('div',{},'file upload')";
 			}
-			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: '" . esc_js( addslashes( $option_label ) ) . "' },";
+						foreach ($args['options'] as $option_val => $option_label) {
+							$options .= "{ value: '" . esc_attr($option_val) . "', label: '" . esc_js(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","overflow-y":"auto"}, ';
 				}
 
-				if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
-					$after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
+				if ($args['type'] == 'multiselect' || (isset($args['multiple']) && $args['multiple'])) {
+					$after_elements .= "props.attributes.$key && el( wp.components.Button, {
 									  className: 'components-button components-circular-option-picker__clear is-secondary is-small',
 									  style: {margin:'-8px 0 8px 0',display: 'block'},
 									  onClick: function(){
@@ -3867,7 +3867,7 @@ 
 									'Clear'
 							),";
 				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+			} elseif ($args['type'] == 'tagselect') {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3902,19 +3902,19 @@ 
 //				$value     = "[]";
 //				$extra .= ' __experimentalExpandOnFocus: true,';
 
-			} else if ( $args['type'] == 'alignment' ) {
+			} else if ($args['type'] == 'alignment') {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			} else if ( $args['type'] == 'margins' ) {
+			} else if ($args['type'] == 'margins') {
 
-			} else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
+			} else if ($args['type'] == 'visibility_conditions' && (function_exists('wp_is_block_theme') && wp_is_block_theme())) {
 				$type = 'TextControl';
 				$value = "(props.attributes.$key ? props.attributes.$key : '')";
 				$args['type'] = 'text';
 				$options .= 'disabled:true,';
-				$bsvc_title = esc_attr( addslashes( $args['title'] ) );
-				$bsvc_body = $this->block_visibility_fields( $args );
+				$bsvc_title = esc_attr(addslashes($args['title']));
+				$bsvc_body = $this->block_visibility_fields($args);
 				// @TODO reset button
-				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
+				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __('Reset', 'ayecode-connect') . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __('Close', 'ayecode-connect') . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __('Save Rules', 'ayecode-connect') . '</button>';
 				$after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
 						className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
 						onClick: function() {
@@ -3933,25 +3933,25 @@ 
 									jQuery('.bs-vc-modal-form').trigger('change');
 								}
 							});
-							aui_modal('" . $bsvc_title . "', '" . addslashes( $bsvc_body ) . "', '" . $bsvc_footer . "', true, 'bs-vc-modal', 'modal-lg', '');
+							aui_modal('" . $bsvc_title . "', '" . addslashes($bsvc_body) . "', '" . $bsvc_footer . "', true, 'bs-vc-modal', 'modal-lg', '');
 							jQuery(document).off('change', '#bsvc_raw_value').on('change', '#bsvc_raw_value', function(e) {
 								props.setAttributes({" . $key . ": e.target.value});
 							});
 						}
 					},
-					'" . addslashes( ! empty( $args['button_title'] ) ? $args['button_title'] : $args['title'] ) . "'
+					'" . addslashes(!empty($args['button_title']) ? $args['button_title'] : $args['title']) . "'
 				) ),";
 			} 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
@@ -3963,22 +3963,22 @@ 
 			// icon
 			echo $icon;
 			?>
-			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
-			label: <?php if ( empty( $args['title'] ) ) { echo "''"; } else if ( empty( $args['row'] ) && ! empty( $args['device_type'] ) ) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['title'] ) ?>'}}),<?php if ( $device_type_icon ) { ?>deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
-			} else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
-			help: <?php echo ( isset( $args['desc'] ) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim( wp_kses_post( addslashes( $args['desc'] ) ) ) . "'}})" : "''" ); ?>,
+			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type : "wp.components." . $type; ?>, {
+			label: <?php if (empty($args['title'])) { echo "''"; } else if (empty($args['row']) && !empty($args['device_type'])) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes($args['title']) ?>'}}),<?php if ($device_type_icon) { ?>deviceType == '<?php echo $device_type; ?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
+			} else { ?>'<?php echo addslashes(trim(esc_html($args['title']))); ?>'<?php } ?>,
+			help: <?php echo (isset($args['desc']) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim(wp_kses_post(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: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
+			<?php if (!empty($args['placeholder'])) {
+				echo "placeholder: '" . esc_js(addslashes(trim(esc_html($args['placeholder'])))) . "',";
 			} ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
 			<?php echo $onchangecomplete; ?>
-			<?php if ( $onchange ) { ?>
+			<?php if ($onchange) { ?>
 			onChange: function ( <?php echo $key; ?> ) {
 				<?php echo $onchange; ?>
 			}
@@ -3997,15 +3997,15 @@ 
 		 *@todo there is prob a faster way to do this, also we could add some validation here.
 		 *
 		 */
-		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)) {
 
-				foreach ( $custom_attributes as $key => $val ) {
-					if(is_array($val)){
-						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
-						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
+				foreach ($custom_attributes as $key => $val) {
+					if (is_array($val)) {
+						$attributes .= $key . ': {' . $this->array_to_attributes($val, $html) . '},';
+					} else {
+						$attributes .= $html ? " $key='$val' " : "'$key': '$val',";
 					}
 				}
 
@@ -4023,113 +4023,113 @@ 
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args, $save = false ) {
+		public function block_element($args, $save = false) {
 
 //            print_r($args);echo '###';exit;
 
-			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']);
 							}
 
-							if($new_args['element']=='InnerBlocks'){
+							if ($new_args['element'] == 'InnerBlocks') {
 								echo "\n el( InnerBlocks, {";
-							}elseif($new_args['element']=='innerBlocksProps'){
+							}elseif ($new_args['element'] == 'innerBlocksProps') {
 								$element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
 							  //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
 								echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
 								echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+								echo !empty($new_args['blockProps']) ? $this->block_element($new_args['blockProps'], $save) : '';
 
 								echo "} ), {";
-								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
+								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element($new_args['innerBlocksProps'], $save) : '';
 							//    echo '###';
 
 							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
+							}elseif ($new_args['element'] == 'BlocksProps') {
 
-								if ( isset($new_args['if_inner_element']) ) {
+								if (isset($new_args['if_inner_element'])) {
 									$element = $new_args['if_inner_element'];
-								}else {
-									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
+								} else {
+									$element = isset($new_args['inner_element']) ? "'" . esc_attr($new_args['inner_element']) . "'" : "'div'";
 								}
 
 								unset($new_args['inner_element']);
 								echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+								echo !empty($new_args['blockProps']) ? $this->block_element($new_args['blockProps'], $save) : '';
 
 
 							   // echo "} ),";
 
-							}else{
+							} else {
 								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 == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+								if ($new_key == 'element' || $new_key == 'content' || $new_key == 'if_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 ),$save );
+									echo $this->block_element(array($new_key => $new_value), $save);
 								}
 							}
 
-							echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
+							echo $new_args['element'] == 'BlocksProps' ? '} ),' : "},"; // end attributes
 
 							// get the content
 							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
+							foreach ($new_args as $new_key => $new_value) {
+								if ($new_key === 'content' || $new_key === 'if_content' || is_array($new_value)) {
 
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
-										echo  $this->block_props_replace(  $new_value  );
+									if ($new_key === 'content') {
+										echo "'" . $this->block_props_replace(wp_slash($new_value)) . "'";
+									} else if ($new_key === 'if_content') {
+										echo  $this->block_props_replace($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 ),$save );
-												$x ++;
+											while ($x <= absint($new_value['element_repeat'])) {
+												$this->block_element(array('' => $new_value), $save);
+												$x++;
 											}
 										} else {
-											$this->block_element( array( '' => $new_value ),$save );
+											$this->block_element(array('' => $new_value), $save);
 										}
 									}
-									$first_item ++;
+									$first_item++;
 								}
 							}
 
-							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
-								echo "))";// end content
-							}else{
-								echo ")";// end content
+							if ($new_args['element'] == 'innerBlocksProps' || $new_args['element'] == 'xBlocksProps') {
+								echo "))"; // end content
+							} else {
+								echo ")"; // end content
 							}
 
 
@@ -4138,26 +4138,26 @@ 
 						}
 					} else {
 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
+						if (substr($element, 0, 3) === "if_") {
 							$extra = '';
-							if( strpos($new_args, '[%WrapClass%]') !== false ){
-								$new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
-								$new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
+							if (strpos($new_args, '[%WrapClass%]') !== false) {
+								$new_args = str_replace('[%WrapClass%]"', '" + sd_build_aui_class(props.attributes)', $new_args);
+								$new_args = str_replace('[%WrapClass%]', '+ sd_build_aui_class(props.attributes)', $new_args);
 							}
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
-							$new_args = str_replace('[%WrapStyle%]','',$new_args);
-							echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
+							echo str_replace("if_", "", $element) . ": " . $this->block_props_replace($new_args, true) . ",";
+						} elseif ($element == 'style' && strpos($new_args, '[%WrapStyle%]') !== false) {
+							$new_args = str_replace('[%WrapStyle%]', '', $new_args);
+							echo $element . ": {..." . $this->block_props_replace($new_args) . " , ...sd_build_aui_styles(props.attributes) },";
 //                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
-							$new_args = str_replace('[%WrapClass%]','',$new_args);
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
-						} elseif ( $element == 'template' && $new_args ) {
+						} elseif ($element == 'style') {
+							echo $element . ": " . $this->block_props_replace($new_args) . ",";
+						} elseif (($element == 'class' || $element == 'className') && strpos($new_args, '[%WrapClass%]') !== false) {
+							$new_args = str_replace('[%WrapClass%]', '', $new_args);
+							echo $element . ": '" . $this->block_props_replace($new_args) . "' + sd_build_aui_class(props.attributes),";
+						} elseif ($element == 'template' && $new_args) {
 							echo $element . ": $new_args,";
 						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+							echo $element . ": '" . $this->block_props_replace($new_args) . "',";
 						}
 
 					}
@@ -4172,11 +4172,11 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
+		public function block_props_replace($string, $no_wrap = false) {
+			if ($no_wrap) {
+				$string = str_replace(array("[%", "%]", "%:checked]"), array("props.attributes.", "", ""), $string);
 			} else {
-				$string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
+				$string = str_replace(array("![%", "[%", "%]", "%:checked]"), array("'+!props.attributes.", "'+props.attributes.", "+'", "+'"), $string);
 			}
 
 			return $string;
@@ -4188,65 +4188,65 @@ 
 		 * @param array $args
 		 * @param array $instance
 		 */
-		public function widget( $args, $instance ) {
-			if ( ! is_array( $args ) ) {
+		public function widget($args, $instance) {
+			if (!is_array($args)) {
 				$args = array();
 			}
 
 			// 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 = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
-				$before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $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 = !empty($args['before_widget']) ? $args['before_widget'] : '';
+				$before_widget = $before_widget ? str_replace($class_original, $class, $before_widget) : $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 = ! empty( $args['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 = !empty($args['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() ) {
+				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;
 		}
@@ -4259,7 +4259,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;
 			}
 
@@ -4274,7 +4274,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;
 			}
 
@@ -4289,7 +4289,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;
 			}
 
@@ -4304,7 +4304,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 
@@ -4319,7 +4319,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 
@@ -4334,7 +4334,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;
 			}
 
@@ -4349,7 +4349,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;
 			}
 
@@ -4364,7 +4364,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;
 			}
 
@@ -4381,7 +4381,7 @@ 
 		public function is_kallyas_zion_preview() {
 			$result = false;
 
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+			if (function_exists('znhg_kallyas_theme_config') && !empty($_REQUEST['zn_pb_edit'])) {
 				$result = true;
 			}
 
@@ -4398,7 +4398,7 @@ 
 		public function is_bricks_preview() {
 			$result = false;
 
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+			if (function_exists('bricks_is_builder') && (bricks_is_builder() || bricks_is_builder_call())) {
 				$result = true;
 			}
 
@@ -4413,25 +4413,25 @@ 
 		 */
 		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_kallyas_zion_preview() ) {
+			} elseif ($this->is_kallyas_zion_preview()) {
 				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
+			} elseif ($this->is_block_content_call()) {
 				$preview = true;
-			} elseif( $this->is_bricks_preview() ) {
+			} elseif ($this->is_bricks_preview()) {
 				$preview = true;
 			}
 
@@ -4446,42 +4446,42 @@ 
 		 *
 		 * @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 ( ! isset( $args['before_title'] ) ) {
+				if (empty($instance['widget_title_tag'])) {
+					if (!isset($args['before_title'])) {
 						$args['before_title'] = '';
 					}
 
-					if ( ! isset( $args['after_title'] ) ) {
+					if (!isset($args['after_title'])) {
 						$args['after_title'] = '';
 					}
 
 					$output = $args['before_title'] . $title . $args['after_title'];
 				} else {
-					$title_tag = esc_attr( $instance['widget_title_tag'] );
+					$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>";
 				}
 
@@ -4495,7 +4495,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 
 			// set widget instance
 			$this->instance = $instance;
@@ -4503,20 +4503,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>
@@ -4526,26 +4526,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);
 					}
 				}
@@ -4553,28 +4553,28 @@ 
 			}
 		}
 
-		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 echo ( ! empty( $args['row']['element_require'] ) ? $this->convert_element_require( $args['row']['element_require'] ) : '' ); ?>'>
-					<?php if ( ! empty( $args['row']['title'] ) ) { ?>
+					<div class='bsui sd-argument' data-argument='<?php echo esc_attr($args['row']['key']); ?>' data-element_require='<?php echo (!empty($args['row']['element_require']) ? $this->convert_element_require($args['row']['element_require']) : ''); ?>'>
+					<?php if (!empty($args['row']['title'])) { ?>
 					<?php
-						if ( isset( $args['row']['icon'] ) ) {
+						if (isset($args['row']['icon'])) {
 							$args['row']['icon'] = '';
 						}
 
-						if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
+						if (!isset($args['row']['device_type']) && isset($args['device_type'])) {
 							$args['row']['device_type'] = $args['device_type'];
 						}
 					?>
-					<label class="mb-0"><?php echo $this->widget_field_title( $args['row'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+					<label class="mb-0"><?php echo $this->widget_field_title($args['row']); ?><?php echo $this->widget_field_desc($args['row']); ?></label>
 					<?php } ?>
-					<div class='row<?php echo ( ! empty( $args['row']['class'] ) ? ' ' . esc_attr( $args['row']['class'] ) : '' ); ?>'>
+					<div class='row<?php echo (!empty($args['row']['class']) ? ' ' . esc_attr($args['row']['class']) : ''); ?>'>
 					<div class='col pr-2'>
 					<?php
-				} else if ( ! empty( $args['row']['close'] ) ) {
+				} else if (!empty($args['row']['close'])) {
 					echo "<div class='col pl-0 ps-0'>";
 				} else {
 					echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
@@ -4582,10 +4582,10 @@ 
 			}
 		}
 
-		public function widget_inputs_row_end( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
+		public function widget_inputs_row_end($key, $args) {
+			if (!empty($args['row'])) {
 				// Maybe close
-				if ( ! empty( $args['row']['close'] ) ) {
+				if (!empty($args['row']['close'])) {
 					echo "</div></div>";
 				}
 				echo "</div>";
@@ -4600,7 +4600,7 @@ 
 		public function widget_advanced_toggle() {
 
 			$output = '';
-			if ( $this->block_show_advanced() ) {
+			if ($this->block_show_advanced()) {
 				$val = 1;
 			} else {
 				$val = 0;
@@ -4620,14 +4620,14 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public function convert_element_require( $input ) {
-			$input = str_replace( "'", '"', $input );// we only want double quotes
+		public function convert_element_require($input) {
+			$input = str_replace("'", '"', $input); // we only want double quotes
 
-			$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+			$output = esc_attr(str_replace(array("[%", "%]", "%:checked]"), array(
 				"jQuery(form).find('[data-argument=\"",
 				"\"]').find('input,select,textarea').val()",
 				"\"]').find('input:checked').val()"
-			), $input ) );
+			), $input));
 
 			return $output;
 		}
@@ -4638,48 +4638,48 @@ 
 		 * @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":
@@ -4689,33 +4689,33 @@ 
 				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" <?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 ); ?>">
+					<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); ?>">
 					<?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>
-					<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 "[]"; } ?>"
-						<?php if ( $multiple ) {
+					<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 "[]"; } ?>"
+						<?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>";
 							}
@@ -4726,20 +4726,20 @@ 
 					break;
 				case "checkbox":
 					?>
-					<input <?php echo $placeholder; ?> <?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" 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>
+					<input <?php echo $placeholder; ?> <?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" 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>
 					<?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>
-					<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>
+					<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>
 					<?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:
@@ -4749,15 +4749,15 @@ 
 			?></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>';
+		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>';
 			}
 		}
 
@@ -4769,14 +4769,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>';
 				}
 			}
 
@@ -4790,18 +4790,18 @@ 
 		 *
 		 * @return string
 		 */
-		public function widget_field_title( $args ) {
+		public function widget_field_title($args) {
 			$title = '';
 
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( ! empty( $args['device_type'] ) ) {
+			if (isset($args['title']) && $args['title']) {
+				if (!empty($args['device_type'])) {
 					$args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
 				}
 
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
+				if (isset($args['icon']) && $args['icon']) {
+					$title = self::get_widget_icon($args['icon'], $args['title']);
 				} else {
-					$title = esc_attr( $args['title'] );
+					$title = esc_attr($args['title']);
 				}
 			}
 
@@ -4816,11 +4816,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>';
@@ -4833,8 +4833,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(),
@@ -4844,7 +4844,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 
 		/**
@@ -4856,23 +4856,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';
 					}
 				}
 			}
@@ -4890,7 +4890,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;
 			}
 
@@ -4903,9 +4903,9 @@ 
 		 * @return string
 		 *@since 1.0.20
 		 */
-		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);
 		}
 
 		/**
@@ -4916,14 +4916,14 @@ 
 		 * @return string
 		 *@since 1.0.20
 		 */
-		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>";
@@ -4941,9 +4941,9 @@ 
 		 *@since 1.0.28
 		 *
 		 */
-		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;',
@@ -4954,7 +4954,7 @@ 
 				'&amp;gt;' => '&0gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'[' => '&#91;',
@@ -4965,7 +4965,7 @@ 
 				"'" => '&#39;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}
@@ -4979,8 +4979,8 @@ 
 		 *@since 1.0.28
 		 *
 		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
+		public function decode_shortcodes($content) {
+			$trans = array(
 				'&#91;' => '[',
 				'&#93;' => ']',
 				'&amp;#91;' => '[',
@@ -4993,7 +4993,7 @@ 
 				'&apos;' => "'",
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'&#091;' => '&#91;',
@@ -5006,31 +5006,31 @@ 
 				'&amp;0gt;' => '&gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}
 
-		public function block_visibility_fields( $args ) {
-			$value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
+		public function block_visibility_fields($args) {
+			$value = !empty($args['value']) ? esc_attr($args['value']) : '';
 			$content = '<div class="bs-vc-rule-template d-none">';
 				$content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
 					$content .= '<div class="row">';
 						$content .= '<div class="col-sm-12">';
-							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
+							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__('Remove Rule', 'ayecode-connect') . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
 							$content .= aui()->select(
 								array(
 									'id'          => 'bsvc_rule_BSVCINDEX',
 									'name'        => 'bsvc_rule_BSVCINDEX',
-									'label'       => __( 'Rule', 'ayecode-connect' ),
-									'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
+									'label'       => __('Rule', 'ayecode-connect'),
+									'placeholder' => __('Select Rule...', 'ayecode-connect'),
 									'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
 									'options'     => sd_visibility_rules_options(),
 									'default'     => '',
 									'value'       => '',
 									'label_type'  => '',
 									'select2'     => false,
-									'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
+									'input_group_left' => __('Rule:', 'ayecode-connect'),
 									'extra_attributes' => array(
 										'data-minimum-results-for-search' => '-1'
 									)
@@ -5039,15 +5039,15 @@ 
 
 						$content .= '</div>';
 
-						if ( class_exists( 'GeoDirectory' ) ) {
+						if (class_exists('GeoDirectory')) {
 							$content .= '<div class="col-md-7 col-sm-12">';
 
 								$content .= aui()->select(
 									array(
 										'id'          => 'bsvc_gd_field_BSVCINDEX',
 										'name'        => 'bsvc_gd_field_BSVCINDEX',
-										'label'       => __( 'FIELD', 'ayecode-connect' ),
-										'placeholder' => __( 'FIELD', 'ayecode-connect' ),
+										'label'       => __('FIELD', 'ayecode-connect'),
+										'placeholder' => __('FIELD', 'ayecode-connect'),
 										'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
 										'options'     => sd_visibility_gd_field_options(),
 										'default'     => '',
@@ -5068,8 +5068,8 @@ 
 									array(
 										'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
 										'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
-										'label'       => __( 'CONDITION', 'ayecode-connect' ),
-										'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
+										'label'       => __('CONDITION', 'ayecode-connect'),
+										'placeholder' => __('CONDITION', 'ayecode-connect'),
 										'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
 										'options'     => sd_visibility_field_condition_options(),
 										'default'     => '',
@@ -5091,9 +5091,9 @@ 
 										'type'            => 'text',
 										'id'              => 'bsvc_gd_field_search_BSVCINDEX',
 										'name'            => 'bsvc_gd_field_search_BSVCINDEX',
-										'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+										'label'           => __('VALUE TO MATCH', 'ayecode-connect'),
 										'class'           => 'bsvc_gd_field_search form-control-sm',
-										'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+										'placeholder'     => __('VALUE TO MATCH', 'ayecode-connect'),
 										'label_type'      => '',
 										'value'           => '',
 										'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
@@ -5105,11 +5105,11 @@ 
 
 					$content .= '</div>';
 
-					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
+					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __('Select User Roles:', 'ayecode-connect') . '</label>';
 						$role_options = sd_user_roles_options();
 
 						$role_option_i = 0;
-						foreach ( $role_options as $role_option_key => $role_option_name ) {
+						foreach ($role_options as $role_option_key => $role_option_name) {
 							$role_option_i++;
 
 							$content .= '<div class="col-sm-6">';
@@ -5133,14 +5133,14 @@ 
 			$content .= '</div>';
 			$content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
 			$content .= '<div class="bs-vc-rule-sets"></div>';
-			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
+			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __('Add Rule', 'ayecode-connect') . '</button></div></div>';
 			$content .= '<div class="row"><div class="col-md-6 col-sm-12">';
 			$content .= aui()->select(
 				array(
 					'id'          => 'bsvc_output',
 					'name'        => 'bsvc_output',
-					'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Default Output', 'ayecode-connect' ),
+					'label'       => __('What should happen if rules met.', 'ayecode-connect'),
+					'placeholder' => __('Default Output', 'ayecode-connect'),
 					'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
 					'options'     => sd_visibility_output_options(),
 					'default'     => '',
@@ -5159,8 +5159,8 @@ 
 				array(
 					'id'              => 'bsvc_page',
 					'name'            => 'bsvc_page',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+					'label'           => __('Page Content', 'ayecode-connect'),
+					'placeholder'     => __('Select Page ID...', 'ayecode-connect'),
 					'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
 					'options'         => sd_template_page_options(),
 					'default'         => '',
@@ -5175,8 +5175,8 @@ 
 				array(
 					'id'          => 'bsvc_tmpl_part',
 					'name'        => 'bsvc_tmpl_part',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+					'label'       => __('Template Part', 'ayecode-connect'),
+					'placeholder' => __('Select Template Part...', 'ayecode-connect'),
 					'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
 					'options'     => sd_template_part_options(),
 					'default'     => '',
@@ -5194,8 +5194,8 @@ 
 				array(
 					'id'               => 'bsvc_message_type',
 					'name'             => 'bsvc_message_type',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+					'label'            => __('Custom Message Type', 'ayecode-connect'),
+					'placeholder'      => __('Default (none)', 'ayecode-connect'),
 					'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
 					'options'          => sd_aui_colors(),
 					'default'          => '',
@@ -5218,7 +5218,7 @@ 
 					'name'            => 'bsvc_message',
 					'label'           => '',
 					'class'           => 'bsvc_message form-control-sm',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+					'placeholder'     => __('CUSTOM MESSAGE TO SHOW', 'ayecode-connect'),
 					'label_type'      => '',
 					'value'           => '',
 					'form_group_class' => ' ',

includes/class-wpinv.php

Indentation +616 added lines, -616 removed lines

@@ -14,620 +14,620 @@
  */
 class WPInv_Plugin {
 
-	/**
-	 * GetPaid version.
-	 *
-	 * @var string
-	 */
-	public $version;
-
-	/**
-	 * Data container.
-	 *
-	 * @var array
-	 */
-	protected $data = array();
-
-	/**
-	 * Form elements instance.
-	 *
-	 * @var WPInv_Payment_Form_Elements
-	 */
-	public $form_elements;
-
-	/**
-	 * @var array An array of payment gateways.
-	 */
-	public $gateways;
-
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-		$this->define_constants();
-		$this->includes();
-		$this->init_hooks();
-		$this->set_properties();
-	}
-
-	/**
-	 * Sets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @param mixed $value The value to retrieve.
-	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
-	}
-
-	/**
-	 * Gets a custom data property.
-	 *
-	 * @param string $prop The prop to set.
-	 * @return mixed The value.
-	 */
-	public function get( $prop ) {
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Define class properties.
-	 */
-	public function set_properties() {
-		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
-		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
-
-		// Init other objects.
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
-	}
-
-	 /**
-	 * Define plugin constants.
-	 */
-	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
-		$this->version = WPINV_VERSION;
-	}
-
-	/**
-	 * Hook into actions and filters.
-	 *
-	 * @since 1.0.19
-	 */
-	protected function init_hooks() {
-		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
-
-		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( $this, 'wp_footer' ) );
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'the_seo_framework_sitemap_supported_post_types', array( $this, 'exclude_invoicing_post_types' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
-		add_action( 'init', array( $this, 'add_rewrite_rule' ), 10, 0 );
-		add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
-
-		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
-	}
-
-	public function plugins_loaded() {
-		/* Internationalize the text strings used. */
-		$this->load_textdomain();
-
-		do_action( 'wpinv_loaded' );
-
-		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
-			wpinv_oxygen_fix_conflict();
-		}
-	}
-
-	/**
-	 * Load Localisation files.
-	 *
-	 * Note: the first-loaded translation file overrides any following ones if the same translation is present.
-	 *
-	 * Locales found in:
-	 *      - WP_LANG_DIR/plugins/invoicing-LOCALE.mo
-	 *      - WP_PLUGIN_DIR/invoicing/languages/invoicing-LOCALE.mo
-	 *
-	 * @since 1.0.0
-	 */
-	public function load_textdomain() {
-		// Determines the current locale.
-		if ( function_exists( 'determine_locale' ) ) {
-			$locale = determine_locale();
-		} else if ( function_exists( 'get_user_locale' ) ) {
-			$locale = get_user_locale();
-		} else {
-			$locale = get_locale();
-		}
-
-		/**
-		 * Filter the locale to use for translations.
-		 */
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
-
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/' );
-	}
-
-	/**
-	 * Include required core files used in admin and on the frontend.
-	 */
-	public function includes() {
-		// Start with the settings.
-		require_once WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php';
-
-		// Packages/libraries.
-		require_once WPINV_PLUGIN_DIR . 'vendor/autoload.php';
-		require_once WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php';
-
-		// Load functions.
-		require_once WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/invoice-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/subscription-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/user-functions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/error-functions.php';
-
-		// Register autoloader.
-		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
-		}
-
-		require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/checkout.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice-history.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/subscriptions.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/buy-item.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/getpaid.php';
-		require_once WPINV_PLUGIN_DIR . 'widgets/invoice.php';
-		require_once WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php';
-
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
-			GetPaid_Post_Types_Admin::init();
-
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php';
-			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php';
-			// load the user class only on the users.php page
-			global $pagenow;
-			if ( $pagenow == 'users.php' ) {
-				new WPInv_Admin_Users();
-			}
-		}
-
-		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php';
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
-		}
-	}
-
-	/**
-	 * Class autoloader
-	 *
-	 * @param       string $class_name The name of the class to load.
-	 * @access      public
-	 * @since       1.0.19
-	 * @return      void
-	 */
-	public function autoload( $class_name ) {
-		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
-
-		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
-			return;
-		}
-
-		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
-
-		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
-
-		// And an array of possible locations in order of importance.
-		$locations = array(
-			"$plugin_path/includes",
-			"$plugin_path/includes/data-stores",
-			"$plugin_path/includes/gateways",
-			"$plugin_path/includes/payments",
-			"$plugin_path/includes/geolocation",
-			"$plugin_path/includes/reports",
-			"$plugin_path/includes/api",
-			"$plugin_path/includes/admin",
-			"$plugin_path/includes/admin/meta-boxes",
-		);
-
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
-				break;
-			}
-		}
-	}
-
-	/**
-	 * Inits hooks etc.
-	 */
-	public function init() {
-		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
-
-		// Maybe upgrade.
-		$this->maybe_upgrade_database();
-
-		// Load default gateways.
-		$gateways = apply_filters(
-			'getpaid_default_gateways',
-			array(
-				'manual'        => 'GetPaid_Manual_Gateway',
-				'paypal'        => 'GetPaid_Paypal_Gateway',
-				'worldpay'      => 'GetPaid_Worldpay_Gateway',
-				'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
-				'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
-			)
-		);
-
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
-		}
-
-		if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
-			GetPaid_Installer::rename_gateways_label();
-			update_option( 'wpinv_renamed_gateways', 'yes' );
-		}
-
-		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
-	}
-
-	/**
-	 * Checks if this is an IPN request and processes it.
-	 */
-	public function maybe_process_ipn() {
-		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
-			return;
-		}
-
-		$gateway = sanitize_text_field( $_GET['wpi-gateway'] );
-
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
-		exit;
-	}
-
-	public function enqueue_scripts() {
-		// Fires before adding scripts.
-		do_action( 'getpaid_enqueue_scripts' );
-
-		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-		$localize['thousands']            = wpinv_thousands_separator();
-		$localize['decimals']             = wpinv_decimal_separator();
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
-		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['loading']              = __( 'Loading...', 'invoicing' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
-		$localize['recaptchaSettings']    = getpaid_get_recaptcha_settings();
-
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
-
-		// reCaptcha.
-		if ( getpaid_is_recaptcha_enabled() && ( $recaptcha_js = getpaid_recaptcha_api_url() ) ) {
-			wp_enqueue_script( 'recaptcha', $recaptcha_js, array(), null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
-		}
-
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ), $version, true );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
-	}
-
-	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
-		}
-
-		if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
-			include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
-		}
-	}
-
-	/**
-	 * Fires an action after verifying that a user can fire them.
-	 *
-	 * Note: If the action is on an invoice, subscription etc, esure that the
-	 * current user owns the invoice/subscription.
-	 */
-	public function maybe_do_authenticated_action() {
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
-
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
-			}
-
-			do_action( "getpaid_unauthenticated_action_$key", $data );
-		}
-	}
-
-	public function pre_get_posts( $wp_query ) {
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
-		}
-
-		return $wp_query;
-	}
-
-	/**
-	 * Register widgets
-	 *
-	 */
-	public function register_widgets() {
-		global $pagenow;
-
-		// Currently, UX Builder does not work particulaly well with SuperDuper.
-		// So we disable our widgets when editing a page with UX Builder.
-		if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
-			return;
-		}
-
-		$block_widget_init_screens = function_exists( 'sd_pagenow_exclude' ) ? sd_pagenow_exclude() : array();
-
-		if ( is_admin() && $pagenow && in_array( $pagenow, $block_widget_init_screens ) ) {
-			// don't initiate in these conditions.
-		} else {
-			// Only load allowed widgets.
-			$exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
-			$widgets = apply_filters(
-				'getpaid_widget_classes',
-				array(
-					'WPInv_Checkout_Widget',
-					'WPInv_History_Widget',
-					'WPInv_Receipt_Widget',
-					'WPInv_Subscriptions_Widget',
-					'WPInv_Buy_Item_Widget',
-					'WPInv_Messages_Widget',
-					'WPInv_GetPaid_Widget',
-					'WPInv_Invoice_Widget',
-				)
-			);
-
-			// For each widget...
-			foreach ( $widgets as $widget ) {
-				// Abort early if it is excluded for this page.
-				if ( in_array( $widget, $exclude ) ) {
-					continue;
-				}
-
-				// SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
-				if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
-					register_widget( $widget );
-				} else {
-					new $widget();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Upgrades the database.
-	 *
-	 * @since 2.0.2
-	 */
-	public function maybe_upgrade_database() {
-		// Ensure the database tables are up to date.
-		GetPaid_Installer::maybe_create_db_tables();
-
-		$wpi_version = get_option( 'wpinv_version', 0 );
-
-		if ( $wpi_version == WPINV_VERSION ) {
-			return;
-		}
-
-		$installer = new GetPaid_Installer();
-
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
-		}
-
-		$upgrades  = array(
-			'0.0.5' => '004',
-			'1.0.3' => '102',
-			'2.0.0' => '118',
-			'2.8.0' => '279',
-		);
-
-		foreach ( $upgrades as $key => $method ) {
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
-			}
-		}
-	}
-
-	/**
-	 * Flushes the permalinks if needed.
-	 *
-	 * @since 2.0.8
-	 */
-	public function maybe_flush_permalinks() {
-		$flush = get_option( 'wpinv_flush_permalinks', 0 );
-
-		if ( ! empty( $flush ) ) {
-			flush_rewrite_rules();
-			delete_option( 'wpinv_flush_permalinks' );
-		}
-	}
-
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param int[] $excluded_posts_ids
-	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ) {
-		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
-			$excluded_posts_ids = array();
-		}
-
-		// Prepare our pages.
-		$our_pages = array();
-
-		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
-
-		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
-
-		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
-
-		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
-
-		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
-
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
-
-		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
-
-		return array_unique( $excluded_posts_ids );
-	}
-
-	/**
-	 * Remove our pages from yoast sitemaps.
-	 *
-	 * @since 1.0.19
-	 * @param string[] $post_types
-	 */
-	public function exclude_invoicing_post_types( $post_types ) {
-		// Ensure that we have an array.
-		if ( ! is_array( $post_types ) ) {
-			$post_types = array();
-		}
-
-		// Remove our post types.
-		return array_diff( $post_types, array_keys( getpaid_get_invoice_post_types() ) );
-	}
-
-	/**
-	 * Displays additional footer code.
-	 *
-	 * @since 2.0.0
-	 */
-	public function wp_footer() {
-		wpinv_get_template( 'frontend-footer.php' );
-	}
-
-	/**
-	 * Displays additional header code.
-	 *
-	 * @since 2.0.0
-	 */
-	public function wp_head() {
-		wpinv_get_template( 'frontend-head.php' );
-	}
-
-	/**
-	 * Custom query vars.
-	 *
-	 */
-	public function custom_query_vars( $vars ) {
-		$vars[] = 'getpaid-ipn';
-		return $vars;
-	}
-
-	/**
-	 * Add rewrite tags and rules.
-	 *
-	 */
-	public function add_rewrite_rule() {
-		$tag = 'getpaid-ipn';
-		add_rewrite_tag( "%$tag%", '([^&]+)' );
-		add_rewrite_rule( "^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top' );
-	}
-
-	/**
-	 * Processes non-query string ipns.
-	 *
-	 */
-	public function maybe_process_new_ipn( $query ) {
-		if ( is_admin() || ! $query->is_main_query() ) {
-			return;
-		}
-
-		$gateway = get_query_var( 'getpaid-ipn' );
-
-		if ( ! empty( $gateway ) ) {
-			$gateway = sanitize_text_field( $gateway );
-			nocache_headers();
-			do_action( 'wpinv_verify_payment_ipn', $gateway );
-			do_action( "wpinv_verify_{$gateway}_ipn" );
-			exit;
-		}
-	}
+    /**
+     * GetPaid version.
+     *
+     * @var string
+     */
+    public $version;
+
+    /**
+     * Data container.
+     *
+     * @var array
+     */
+    protected $data = array();
+
+    /**
+     * Form elements instance.
+     *
+     * @var WPInv_Payment_Form_Elements
+     */
+    public $form_elements;
+
+    /**
+     * @var array An array of payment gateways.
+     */
+    public $gateways;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+        $this->define_constants();
+        $this->includes();
+        $this->init_hooks();
+        $this->set_properties();
+    }
+
+    /**
+     * Sets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @param mixed $value The value to retrieve.
+     */
+    public function set( $prop, $value ) {
+        $this->data[ $prop ] = $value;
+    }
+
+    /**
+     * Gets a custom data property.
+     *
+     * @param string $prop The prop to set.
+     * @return mixed The value.
+     */
+    public function get( $prop ) {
+        if ( isset( $this->data[ $prop ] ) ) {
+            return $this->data[ $prop ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Define class properties.
+     */
+    public function set_properties() {
+        // Sessions.
+        $this->set( 'session', new WPInv_Session_Handler() );
+        $GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+        $GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
+
+        // Init other objects.
+        $this->set( 'notes', new WPInv_Notes() );
+        $this->set( 'api', new WPInv_API() );
+        $this->set( 'post_types', new GetPaid_Post_Types() );
+        $this->set( 'template', new GetPaid_Template() );
+        $this->set( 'admin', new GetPaid_Admin() );
+        $this->set( 'subscriptions', new WPInv_Subscriptions() );
+        $this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
+        $this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
+        $this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
+        $this->set( 'payment_forms', new GetPaid_Payment_Forms() );
+        $this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+    }
+
+        /**
+         * Define plugin constants.
+         */
+    public function define_constants() {
+        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
+        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        $this->version = WPINV_VERSION;
+    }
+
+    /**
+     * Hook into actions and filters.
+     *
+     * @since 1.0.19
+     */
+    protected function init_hooks() {
+        /* Internationalize the text strings used. */
+        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+
+        // Init the plugin after WordPress inits.
+        add_action( 'init', array( $this, 'init' ), 1 );
+        add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
+        add_action( 'init', array( $this, 'wpinv_actions' ) );
+        add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
+        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
+        add_action( 'wp_footer', array( $this, 'wp_footer' ) );
+        add_action( 'wp_head', array( $this, 'wp_head' ) );
+        add_action( 'widgets_init', array( $this, 'register_widgets' ) );
+        add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
+        add_filter( 'the_seo_framework_sitemap_supported_post_types', array( $this, 'exclude_invoicing_post_types' ) );
+        add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+
+        add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
+        add_action( 'init', array( $this, 'add_rewrite_rule' ), 10, 0 );
+        add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
+
+        // Fires after registering actions.
+        do_action( 'wpinv_actions', $this );
+        do_action( 'getpaid_actions', $this );
+    }
+
+    public function plugins_loaded() {
+        /* Internationalize the text strings used. */
+        $this->load_textdomain();
+
+        do_action( 'wpinv_loaded' );
+
+        // Fix oxygen page builder conflict
+        if ( function_exists( 'ct_css_output' ) ) {
+            wpinv_oxygen_fix_conflict();
+        }
+    }
+
+    /**
+     * Load Localisation files.
+     *
+     * Note: the first-loaded translation file overrides any following ones if the same translation is present.
+     *
+     * Locales found in:
+     *      - WP_LANG_DIR/plugins/invoicing-LOCALE.mo
+     *      - WP_PLUGIN_DIR/invoicing/languages/invoicing-LOCALE.mo
+     *
+     * @since 1.0.0
+     */
+    public function load_textdomain() {
+        // Determines the current locale.
+        if ( function_exists( 'determine_locale' ) ) {
+            $locale = determine_locale();
+        } else if ( function_exists( 'get_user_locale' ) ) {
+            $locale = get_user_locale();
+        } else {
+            $locale = get_locale();
+        }
+
+        /**
+         * Filter the locale to use for translations.
+         */
+        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+
+        unload_textdomain( 'invoicing' );
+        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
+        load_plugin_textdomain( 'invoicing', false, plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/' );
+    }
+
+    /**
+     * Include required core files used in admin and on the frontend.
+     */
+    public function includes() {
+        // Start with the settings.
+        require_once WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php';
+
+        // Packages/libraries.
+        require_once WPINV_PLUGIN_DIR . 'vendor/autoload.php';
+        require_once WPINV_PLUGIN_DIR . 'vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php';
+
+        // Load functions.
+        require_once WPINV_PLUGIN_DIR . 'includes/deprecated-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/invoice-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/subscription-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/user-functions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/error-functions.php';
+
+        // Register autoloader.
+        try {
+            spl_autoload_register( array( $this, 'autoload' ), true );
+        } catch ( Exception $e ) {
+            wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+        }
+
+        require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-session-handler.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-privacy.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/libraries/class-ayecode-addons.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-addons.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/checkout.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice-history.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice-receipt.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice-messages.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/subscriptions.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/buy-item.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/getpaid.php';
+        require_once WPINV_PLUGIN_DIR . 'widgets/invoice.php';
+        require_once WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php';
+
+        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+            GetPaid_Post_Types_Admin::init();
+
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-payment-form.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-admin-menus.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php';
+            require_once WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php';
+            // load the user class only on the users.php page
+            global $pagenow;
+            if ( $pagenow == 'users.php' ) {
+                new WPInv_Admin_Users();
+            }
+        }
+
+        // Register cli commands
+        if ( defined( 'WP_CLI' ) && WP_CLI ) {
+            require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php';
+            WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+        }
+    }
+
+    /**
+     * Class autoloader
+     *
+     * @param       string $class_name The name of the class to load.
+     * @access      public
+     * @since       1.0.19
+     * @return      void
+     */
+    public function autoload( $class_name ) {
+        // Normalize the class name...
+        $class_name  = strtolower( $class_name );
+
+        // ... and make sure it is our class.
+        if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+            return;
+        }
+
+        // Next, prepare the file name from the class.
+        $file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+
+        // Base path of the classes.
+        $plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+
+        // And an array of possible locations in order of importance.
+        $locations = array(
+            "$plugin_path/includes",
+            "$plugin_path/includes/data-stores",
+            "$plugin_path/includes/gateways",
+            "$plugin_path/includes/payments",
+            "$plugin_path/includes/geolocation",
+            "$plugin_path/includes/reports",
+            "$plugin_path/includes/api",
+            "$plugin_path/includes/admin",
+            "$plugin_path/includes/admin/meta-boxes",
+        );
+
+        foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
+            if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
+                include trailingslashit( $location ) . $file_name;
+                break;
+            }
+        }
+    }
+
+    /**
+     * Inits hooks etc.
+     */
+    public function init() {
+        // Fires before getpaid inits.
+        do_action( 'before_getpaid_init', $this );
+
+        // Maybe upgrade.
+        $this->maybe_upgrade_database();
+
+        // Load default gateways.
+        $gateways = apply_filters(
+            'getpaid_default_gateways',
+            array(
+                'manual'        => 'GetPaid_Manual_Gateway',
+                'paypal'        => 'GetPaid_Paypal_Gateway',
+                'worldpay'      => 'GetPaid_Worldpay_Gateway',
+                'bank_transfer' => 'GetPaid_Bank_Transfer_Gateway',
+                'authorizenet'  => 'GetPaid_Authorize_Net_Gateway',
+            )
+        );
+
+        foreach ( $gateways as $id => $class ) {
+            $this->gateways[ $id ] = new $class();
+        }
+
+        if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
+            GetPaid_Installer::rename_gateways_label();
+            update_option( 'wpinv_renamed_gateways', 'yes' );
+        }
+
+        // Fires after getpaid inits.
+        do_action( 'getpaid_init', $this );
+    }
+
+    /**
+     * Checks if this is an IPN request and processes it.
+     */
+    public function maybe_process_ipn() {
+        // Ensure that this is an IPN request.
+        if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+            return;
+        }
+
+        $gateway = sanitize_text_field( $_GET['wpi-gateway'] );
+
+        do_action( 'wpinv_verify_payment_ipn', $gateway );
+        do_action( "wpinv_verify_{$gateway}_ipn" );
+        exit;
+    }
+
+    public function enqueue_scripts() {
+        // Fires before adding scripts.
+        do_action( 'getpaid_enqueue_scripts' );
+
+        $localize                         = array();
+        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+        $localize['thousands']            = wpinv_thousands_separator();
+        $localize['decimals']             = wpinv_decimal_separator();
+        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['txtComplete']          = __( 'Continue', 'invoicing' );
+        $localize['UseTaxes']             = wpinv_use_taxes();
+        $localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
+        $localize['loading']              = __( 'Loading...', 'invoicing' );
+        $localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+        $localize['recaptchaSettings']    = getpaid_get_recaptcha_settings();
+
+        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+
+        // reCaptcha.
+        if ( getpaid_is_recaptcha_enabled() && ( $recaptcha_js = getpaid_recaptcha_api_url() ) ) {
+            wp_enqueue_script( 'recaptcha', $recaptcha_js, array(), null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+        }
+
+        $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
+        wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ), $version, true );
+        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+    }
+
+    public function wpinv_actions() {
+        if ( isset( $_REQUEST['wpi_action'] ) ) {
+            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        }
+
+        if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
+            include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
+        }
+    }
+
+    /**
+     * Fires an action after verifying that a user can fire them.
+     *
+     * Note: If the action is on an invoice, subscription etc, esure that the
+     * current user owns the invoice/subscription.
+     */
+    public function maybe_do_authenticated_action() {
+        if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
+            $key  = sanitize_key( $_REQUEST['getpaid-action'] );
+            $data = wp_unslash( $_REQUEST );
+
+            if ( is_user_logged_in() ) {
+                do_action( "getpaid_authenticated_action_$key", $data );
+            }
+
+            do_action( "getpaid_unauthenticated_action_$key", $data );
+        }
+    }
+
+    public function pre_get_posts( $wp_query ) {
+        if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
+            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+        }
+
+        return $wp_query;
+    }
+
+    /**
+     * Register widgets
+     *
+     */
+    public function register_widgets() {
+        global $pagenow;
+
+        // Currently, UX Builder does not work particulaly well with SuperDuper.
+        // So we disable our widgets when editing a page with UX Builder.
+        if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
+            return;
+        }
+
+        $block_widget_init_screens = function_exists( 'sd_pagenow_exclude' ) ? sd_pagenow_exclude() : array();
+
+        if ( is_admin() && $pagenow && in_array( $pagenow, $block_widget_init_screens ) ) {
+            // don't initiate in these conditions.
+        } else {
+            // Only load allowed widgets.
+            $exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
+            $widgets = apply_filters(
+                'getpaid_widget_classes',
+                array(
+                    'WPInv_Checkout_Widget',
+                    'WPInv_History_Widget',
+                    'WPInv_Receipt_Widget',
+                    'WPInv_Subscriptions_Widget',
+                    'WPInv_Buy_Item_Widget',
+                    'WPInv_Messages_Widget',
+                    'WPInv_GetPaid_Widget',
+                    'WPInv_Invoice_Widget',
+                )
+            );
+
+            // For each widget...
+            foreach ( $widgets as $widget ) {
+                // Abort early if it is excluded for this page.
+                if ( in_array( $widget, $exclude ) ) {
+                    continue;
+                }
+
+                // SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
+                if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
+                    register_widget( $widget );
+                } else {
+                    new $widget();
+                }
+            }
+        }
+    }
+
+    /**
+     * Upgrades the database.
+     *
+     * @since 2.0.2
+     */
+    public function maybe_upgrade_database() {
+        // Ensure the database tables are up to date.
+        GetPaid_Installer::maybe_create_db_tables();
+
+        $wpi_version = get_option( 'wpinv_version', 0 );
+
+        if ( $wpi_version == WPINV_VERSION ) {
+            return;
+        }
+
+        $installer = new GetPaid_Installer();
+
+        if ( empty( $wpi_version ) ) {
+            return $installer->upgrade_db( 0 );
+        }
+
+        $upgrades  = array(
+            '0.0.5' => '004',
+            '1.0.3' => '102',
+            '2.0.0' => '118',
+            '2.8.0' => '279',
+        );
+
+        foreach ( $upgrades as $key => $method ) {
+            if ( version_compare( $wpi_version, $key, '<' ) ) {
+                return $installer->upgrade_db( $method );
+            }
+        }
+    }
+
+    /**
+     * Flushes the permalinks if needed.
+     *
+     * @since 2.0.8
+     */
+    public function maybe_flush_permalinks() {
+        $flush = get_option( 'wpinv_flush_permalinks', 0 );
+
+        if ( ! empty( $flush ) ) {
+            flush_rewrite_rules();
+            delete_option( 'wpinv_flush_permalinks' );
+        }
+    }
+
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param int[] $excluded_posts_ids
+     */
+    public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ) {
+        // Ensure that we have an array.
+        if ( ! is_array( $excluded_posts_ids ) ) {
+            $excluded_posts_ids = array();
+        }
+
+        // Prepare our pages.
+        $our_pages = array();
+
+        // Checkout page.
+        $our_pages[] = wpinv_get_option( 'checkout_page', false );
+
+        // Success page.
+        $our_pages[] = wpinv_get_option( 'success_page', false );
+
+        // Failure page.
+        $our_pages[] = wpinv_get_option( 'failure_page', false );
+
+        // History page.
+        $our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+
+        // Subscriptions page.
+        $our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+
+        $our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+
+        $excluded_posts_ids = $excluded_posts_ids + $our_pages;
+
+        return array_unique( $excluded_posts_ids );
+    }
+
+    /**
+     * Remove our pages from yoast sitemaps.
+     *
+     * @since 1.0.19
+     * @param string[] $post_types
+     */
+    public function exclude_invoicing_post_types( $post_types ) {
+        // Ensure that we have an array.
+        if ( ! is_array( $post_types ) ) {
+            $post_types = array();
+        }
+
+        // Remove our post types.
+        return array_diff( $post_types, array_keys( getpaid_get_invoice_post_types() ) );
+    }
+
+    /**
+     * Displays additional footer code.
+     *
+     * @since 2.0.0
+     */
+    public function wp_footer() {
+        wpinv_get_template( 'frontend-footer.php' );
+    }
+
+    /**
+     * Displays additional header code.
+     *
+     * @since 2.0.0
+     */
+    public function wp_head() {
+        wpinv_get_template( 'frontend-head.php' );
+    }
+
+    /**
+     * Custom query vars.
+     *
+     */
+    public function custom_query_vars( $vars ) {
+        $vars[] = 'getpaid-ipn';
+        return $vars;
+    }
+
+    /**
+     * Add rewrite tags and rules.
+     *
+     */
+    public function add_rewrite_rule() {
+        $tag = 'getpaid-ipn';
+        add_rewrite_tag( "%$tag%", '([^&]+)' );
+        add_rewrite_rule( "^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top' );
+    }
+
+    /**
+     * Processes non-query string ipns.
+     *
+     */
+    public function maybe_process_new_ipn( $query ) {
+        if ( is_admin() || ! $query->is_main_query() ) {
+            return;
+        }
+
+        $gateway = get_query_var( 'getpaid-ipn' );
+
+        if ( ! empty( $gateway ) ) {
+            $gateway = sanitize_text_field( $gateway );
+            nocache_headers();
+            do_action( 'wpinv_verify_payment_ipn', $gateway );
+            do_action( "wpinv_verify_{$gateway}_ipn" );
+            exit;
+        }
+    }
 }

Spacing +141 added lines, -141 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Invoicing class.
@@ -56,8 +56,8 @@ 
 	 * @param string $prop The prop to set.
 	 * @param mixed $value The value to retrieve.
 	 */
-	public function set( $prop, $value ) {
-		$this->data[ $prop ] = $value;
+	public function set($prop, $value) {
+		$this->data[$prop] = $value;
 	}
 
 	/**
@@ -66,9 +66,9 @@ 
 	 * @param string $prop The prop to set.
 	 * @return mixed The value.
 	 */
-	public function get( $prop ) {
-		if ( isset( $this->data[ $prop ] ) ) {
-			return $this->data[ $prop ];
+	public function get($prop) {
+		if (isset($this->data[$prop])) {
+			return $this->data[$prop];
 		}
 
 		return null;
@@ -79,30 +79,30 @@ 
 	 */
 	public function set_properties() {
 		// Sessions.
-		$this->set( 'session', new WPInv_Session_Handler() );
-		$GLOBALS['wpi_session'] = $this->get( 'session' ); // Backwards compatibility.
+		$this->set('session', new WPInv_Session_Handler());
+		$GLOBALS['wpi_session'] = $this->get('session'); // Backwards compatibility.
 		$GLOBALS['wpinv_euvat'] = new WPInv_EUVat(); // Backwards compatibility.
 
 		// Init other objects.
-		$this->set( 'notes', new WPInv_Notes() );
-		$this->set( 'api', new WPInv_API() );
-		$this->set( 'post_types', new GetPaid_Post_Types() );
-		$this->set( 'template', new GetPaid_Template() );
-		$this->set( 'admin', new GetPaid_Admin() );
-		$this->set( 'subscriptions', new WPInv_Subscriptions() );
-		$this->set( 'invoice_emails', new GetPaid_Invoice_Notification_Emails() );
-		$this->set( 'subscription_emails', new GetPaid_Subscription_Notification_Emails() );
-		$this->set( 'daily_maintenace', new GetPaid_Daily_Maintenance() );
-		$this->set( 'payment_forms', new GetPaid_Payment_Forms() );
-		$this->set( 'maxmind', new GetPaid_MaxMind_Geolocation() );
+		$this->set('notes', new WPInv_Notes());
+		$this->set('api', new WPInv_API());
+		$this->set('post_types', new GetPaid_Post_Types());
+		$this->set('template', new GetPaid_Template());
+		$this->set('admin', new GetPaid_Admin());
+		$this->set('subscriptions', new WPInv_Subscriptions());
+		$this->set('invoice_emails', new GetPaid_Invoice_Notification_Emails());
+		$this->set('subscription_emails', new GetPaid_Subscription_Notification_Emails());
+		$this->set('daily_maintenace', new GetPaid_Daily_Maintenance());
+		$this->set('payment_forms', new GetPaid_Payment_Forms());
+		$this->set('maxmind', new GetPaid_MaxMind_Geolocation());
 	}
 
 	 /**
 	 * Define plugin constants.
 	 */
 	public function define_constants() {
-		define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-		define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+		define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+		define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
 		$this->version = WPINV_VERSION;
 	}
 
@@ -113,38 +113,38 @@ 
 	 */
 	protected function init_hooks() {
 		/* Internationalize the text strings used. */
-		add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+		add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
 
 		// Init the plugin after WordPress inits.
-		add_action( 'init', array( $this, 'init' ), 1 );
-		add_action( 'init', array( $this, 'maybe_process_ipn' ), 10 );
-		add_action( 'init', array( $this, 'wpinv_actions' ) );
-		add_action( 'init', array( $this, 'maybe_do_authenticated_action' ), 100 );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 11 );
-		add_action( 'wp_footer', array( $this, 'wp_footer' ) );
-		add_action( 'wp_head', array( $this, 'wp_head' ) );
-		add_action( 'widgets_init', array( $this, 'register_widgets' ) );
-		add_filter( 'wpseo_exclude_from_sitemap_by_post_ids', array( $this, 'wpseo_exclude_from_sitemap_by_post_ids' ) );
-		add_filter( 'the_seo_framework_sitemap_supported_post_types', array( $this, 'exclude_invoicing_post_types' ) );
-		add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
-
-		add_filter( 'query_vars', array( $this, 'custom_query_vars' ) );
-		add_action( 'init', array( $this, 'add_rewrite_rule' ), 10, 0 );
-		add_action( 'pre_get_posts', array( $this, 'maybe_process_new_ipn' ), 1 );
+		add_action('init', array($this, 'init'), 1);
+		add_action('init', array($this, 'maybe_process_ipn'), 10);
+		add_action('init', array($this, 'wpinv_actions'));
+		add_action('init', array($this, 'maybe_do_authenticated_action'), 100);
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 11);
+		add_action('wp_footer', array($this, 'wp_footer'));
+		add_action('wp_head', array($this, 'wp_head'));
+		add_action('widgets_init', array($this, 'register_widgets'));
+		add_filter('wpseo_exclude_from_sitemap_by_post_ids', array($this, 'wpseo_exclude_from_sitemap_by_post_ids'));
+		add_filter('the_seo_framework_sitemap_supported_post_types', array($this, 'exclude_invoicing_post_types'));
+		add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
+
+		add_filter('query_vars', array($this, 'custom_query_vars'));
+		add_action('init', array($this, 'add_rewrite_rule'), 10, 0);
+		add_action('pre_get_posts', array($this, 'maybe_process_new_ipn'), 1);
 
 		// Fires after registering actions.
-		do_action( 'wpinv_actions', $this );
-		do_action( 'getpaid_actions', $this );
+		do_action('wpinv_actions', $this);
+		do_action('getpaid_actions', $this);
 	}
 
 	public function plugins_loaded() {
 		/* Internationalize the text strings used. */
 		$this->load_textdomain();
 
-		do_action( 'wpinv_loaded' );
+		do_action('wpinv_loaded');
 
 		// Fix oxygen page builder conflict
-		if ( function_exists( 'ct_css_output' ) ) {
+		if (function_exists('ct_css_output')) {
 			wpinv_oxygen_fix_conflict();
 		}
 	}
@@ -162,9 +162,9 @@ 
 	 */
 	public function load_textdomain() {
 		// Determines the current locale.
-		if ( function_exists( 'determine_locale' ) ) {
+		if (function_exists('determine_locale')) {
 			$locale = determine_locale();
-		} else if ( function_exists( 'get_user_locale' ) ) {
+		} else if (function_exists('get_user_locale')) {
 			$locale = get_user_locale();
 		} else {
 			$locale = get_locale();
@@ -173,11 +173,11 @@ 
 		/**
 		 * Filter the locale to use for translations.
 		 */
-		$locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
+		$locale = apply_filters('plugin_locale', $locale, 'invoicing');
 
-		unload_textdomain( 'invoicing' );
-		load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-		load_plugin_textdomain( 'invoicing', false, plugin_basename( dirname( WPINV_PLUGIN_FILE ) ) . '/languages/' );
+		unload_textdomain('invoicing');
+		load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+		load_plugin_textdomain('invoicing', false, plugin_basename(dirname(WPINV_PLUGIN_FILE)) . '/languages/');
 	}
 
 	/**
@@ -210,9 +210,9 @@ 
 
 		// Register autoloader.
 		try {
-			spl_autoload_register( array( $this, 'autoload' ), true );
-		} catch ( Exception $e ) {
-			wpinv_error_log( $e->getMessage(), '', __FILE__, 149, true );
+			spl_autoload_register(array($this, 'autoload'), true);
+		} catch (Exception $e) {
+			wpinv_error_log($e->getMessage(), '', __FILE__, 149, true);
 		}
 
 		require_once WPINV_PLUGIN_DIR . 'includes/abstracts/abstract-wpinv-session.php';
@@ -238,7 +238,7 @@ 
 		require_once WPINV_PLUGIN_DIR . 'widgets/invoice.php';
 		require_once WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php';
 
-		if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
+		if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
 			GetPaid_Post_Types_Admin::init();
 
 			require_once WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php';
@@ -249,15 +249,15 @@ 
 			require_once WPINV_PLUGIN_DIR . 'includes/admin/class-getpaid-admin-profile.php';
 			// load the user class only on the users.php page
 			global $pagenow;
-			if ( $pagenow == 'users.php' ) {
+			if ($pagenow == 'users.php') {
 				new WPInv_Admin_Users();
 			}
 		}
 
 		// Register cli commands
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
+		if (defined('WP_CLI') && WP_CLI) {
 			require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-cli.php';
-			WP_CLI::add_command( 'invoicing', 'WPInv_CLI' );
+			WP_CLI::add_command('invoicing', 'WPInv_CLI');
 		}
 	}
 
@@ -269,20 +269,20 @@ 
 	 * @since       1.0.19
 	 * @return      void
 	 */
-	public function autoload( $class_name ) {
+	public function autoload($class_name) {
 		// Normalize the class name...
-		$class_name  = strtolower( $class_name );
+		$class_name = strtolower($class_name);
 
 		// ... and make sure it is our class.
-		if ( false === strpos( $class_name, 'getpaid_' ) && false === strpos( $class_name, 'wpinv_' ) ) {
+		if (false === strpos($class_name, 'getpaid_') && false === strpos($class_name, 'wpinv_')) {
 			return;
 		}
 
 		// Next, prepare the file name from the class.
-		$file_name = 'class-' . str_replace( '_', '-', $class_name ) . '.php';
+		$file_name = 'class-' . str_replace('_', '-', $class_name) . '.php';
 
 		// Base path of the classes.
-		$plugin_path = untrailingslashit( WPINV_PLUGIN_DIR );
+		$plugin_path = untrailingslashit(WPINV_PLUGIN_DIR);
 
 		// And an array of possible locations in order of importance.
 		$locations = array(
@@ -297,9 +297,9 @@ 
 			"$plugin_path/includes/admin/meta-boxes",
 		);
 
-		foreach ( apply_filters( 'getpaid_autoload_locations', $locations ) as $location ) {
-			if ( file_exists( trailingslashit( $location ) . $file_name ) ) {
-				include trailingslashit( $location ) . $file_name;
+		foreach (apply_filters('getpaid_autoload_locations', $locations) as $location) {
+			if (file_exists(trailingslashit($location) . $file_name)) {
+				include trailingslashit($location) . $file_name;
 				break;
 			}
 		}
@@ -310,7 +310,7 @@ 
 	 */
 	public function init() {
 		// Fires before getpaid inits.
-		do_action( 'before_getpaid_init', $this );
+		do_action('before_getpaid_init', $this);
 
 		// Maybe upgrade.
 		$this->maybe_upgrade_database();
@@ -327,17 +327,17 @@ 
 			)
 		);
 
-		foreach ( $gateways as $id => $class ) {
-			$this->gateways[ $id ] = new $class();
+		foreach ($gateways as $id => $class) {
+			$this->gateways[$id] = new $class();
 		}
 
-		if ( 'yes' != get_option( 'wpinv_renamed_gateways' ) ) {
+		if ('yes' != get_option('wpinv_renamed_gateways')) {
 			GetPaid_Installer::rename_gateways_label();
-			update_option( 'wpinv_renamed_gateways', 'yes' );
+			update_option('wpinv_renamed_gateways', 'yes');
 		}
 
 		// Fires after getpaid inits.
-		do_action( 'getpaid_init', $this );
+		do_action('getpaid_init', $this);
 	}
 
 	/**
@@ -345,52 +345,52 @@ 
 	 */
 	public function maybe_process_ipn() {
 		// Ensure that this is an IPN request.
-		if ( empty( $_GET['wpi-listener'] ) || 'IPN' !== $_GET['wpi-listener'] || empty( $_GET['wpi-gateway'] ) ) {
+		if (empty($_GET['wpi-listener']) || 'IPN' !== $_GET['wpi-listener'] || empty($_GET['wpi-gateway'])) {
 			return;
 		}
 
-		$gateway = sanitize_text_field( $_GET['wpi-gateway'] );
+		$gateway = sanitize_text_field($_GET['wpi-gateway']);
 
-		do_action( 'wpinv_verify_payment_ipn', $gateway );
-		do_action( "wpinv_verify_{$gateway}_ipn" );
+		do_action('wpinv_verify_payment_ipn', $gateway);
+		do_action("wpinv_verify_{$gateway}_ipn");
 		exit;
 	}
 
 	public function enqueue_scripts() {
 		// Fires before adding scripts.
-		do_action( 'getpaid_enqueue_scripts' );
+		do_action('getpaid_enqueue_scripts');
 
 		$localize                         = array();
-		$localize['ajax_url']             = admin_url( 'admin-ajax.php' );
+		$localize['ajax_url']             = admin_url('admin-ajax.php');
 		$localize['thousands']            = wpinv_thousands_separator();
 		$localize['decimals']             = wpinv_decimal_separator();
-		$localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
-		$localize['txtComplete']          = __( 'Continue', 'invoicing' );
+		$localize['nonce']                = wp_create_nonce('wpinv-nonce');
+		$localize['txtComplete']          = __('Continue', 'invoicing');
 		$localize['UseTaxes']             = wpinv_use_taxes();
-		$localize['formNonce']            = wp_create_nonce( 'getpaid_form_nonce' );
-		$localize['loading']              = __( 'Loading...', 'invoicing' );
-		$localize['connectionError']      = __( 'Could not establish a connection to the server.', 'invoicing' );
+		$localize['formNonce']            = wp_create_nonce('getpaid_form_nonce');
+		$localize['loading']              = __('Loading...', 'invoicing');
+		$localize['connectionError']      = __('Could not establish a connection to the server.', 'invoicing');
 		$localize['recaptchaSettings']    = getpaid_get_recaptcha_settings();
 
-		$localize = apply_filters( 'wpinv_front_js_localize', $localize );
+		$localize = apply_filters('wpinv_front_js_localize', $localize);
 
 		// reCaptcha.
-		if ( getpaid_is_recaptcha_enabled() && ( $recaptcha_js = getpaid_recaptcha_api_url() ) ) {
-			wp_enqueue_script( 'recaptcha', $recaptcha_js, array(), null, true ); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
+		if (getpaid_is_recaptcha_enabled() && ($recaptcha_js = getpaid_recaptcha_api_url())) {
+			wp_enqueue_script('recaptcha', $recaptcha_js, array(), null, true); // phpcs:ignore WordPress.WP.EnqueuedResourceParameters.MissingVersion
 		}
 
-		$version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js' );
-		wp_enqueue_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array( 'jquery' ), $version, true );
-		wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+		$version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/payment-forms.js');
+		wp_enqueue_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/payment-forms.js', array('jquery'), $version, true);
+		wp_localize_script('wpinv-front-script', 'WPInv', $localize);
 	}
 
 	public function wpinv_actions() {
-		if ( isset( $_REQUEST['wpi_action'] ) ) {
-			do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+		if (isset($_REQUEST['wpi_action'])) {
+			do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
 		}
 
-		if ( defined( 'WP_ALL_IMPORT_ROOT_DIR' ) ) {
-			include plugin_dir_path( __FILE__ ) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
+		if (defined('WP_ALL_IMPORT_ROOT_DIR')) {
+			include plugin_dir_path(__FILE__) . 'libraries/wp-all-import/class-getpaid-wp-all-import.php';
 		}
 	}
 
@@ -401,21 +401,21 @@ 
 	 * current user owns the invoice/subscription.
 	 */
 	public function maybe_do_authenticated_action() {
-		if ( isset( $_REQUEST['getpaid-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) ) {
-			$key  = sanitize_key( $_REQUEST['getpaid-action'] );
-			$data = wp_unslash( $_REQUEST );
+		if (isset($_REQUEST['getpaid-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce')) {
+			$key  = sanitize_key($_REQUEST['getpaid-action']);
+			$data = wp_unslash($_REQUEST);
 
-			if ( is_user_logged_in() ) {
-				do_action( "getpaid_authenticated_action_$key", $data );
+			if (is_user_logged_in()) {
+				do_action("getpaid_authenticated_action_$key", $data);
 			}
 
-			do_action( "getpaid_unauthenticated_action_$key", $data );
+			do_action("getpaid_unauthenticated_action_$key", $data);
 		}
 	}
 
-	public function pre_get_posts( $wp_query ) {
-		if ( ! is_admin() && ! empty( $wp_query->query_vars['post_type'] ) && getpaid_is_invoice_post_type( $wp_query->query_vars['post_type'] ) && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-			$wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses( false, false, $wp_query->query_vars['post_type'] ) );
+	public function pre_get_posts($wp_query) {
+		if (!is_admin() && !empty($wp_query->query_vars['post_type']) && getpaid_is_invoice_post_type($wp_query->query_vars['post_type']) && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+			$wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses(false, false, $wp_query->query_vars['post_type']));
 		}
 
 		return $wp_query;
@@ -430,17 +430,17 @@ 
 
 		// Currently, UX Builder does not work particulaly well with SuperDuper.
 		// So we disable our widgets when editing a page with UX Builder.
-		if ( function_exists( 'ux_builder_is_active' ) && ux_builder_is_active() ) {
+		if (function_exists('ux_builder_is_active') && ux_builder_is_active()) {
 			return;
 		}
 
-		$block_widget_init_screens = function_exists( 'sd_pagenow_exclude' ) ? sd_pagenow_exclude() : array();
+		$block_widget_init_screens = function_exists('sd_pagenow_exclude') ? sd_pagenow_exclude() : array();
 
-		if ( is_admin() && $pagenow && in_array( $pagenow, $block_widget_init_screens ) ) {
+		if (is_admin() && $pagenow && in_array($pagenow, $block_widget_init_screens)) {
 			// don't initiate in these conditions.
 		} else {
 			// Only load allowed widgets.
-			$exclude = function_exists( 'sd_widget_exclude' ) ? sd_widget_exclude() : array();
+			$exclude = function_exists('sd_widget_exclude') ? sd_widget_exclude() : array();
 			$widgets = apply_filters(
 				'getpaid_widget_classes',
 				array(
@@ -456,15 +456,15 @@ 
 			);
 
 			// For each widget...
-			foreach ( $widgets as $widget ) {
+			foreach ($widgets as $widget) {
 				// Abort early if it is excluded for this page.
-				if ( in_array( $widget, $exclude ) ) {
+				if (in_array($widget, $exclude)) {
 					continue;
 				}
 
 				// SD V1 used to extend the widget class. V2 does not, so we cannot call register widget on it.
-				if ( is_subclass_of( $widget, 'WP_Widget' ) ) {
-					register_widget( $widget );
+				if (is_subclass_of($widget, 'WP_Widget')) {
+					register_widget($widget);
 				} else {
 					new $widget();
 				}
@@ -481,28 +481,28 @@ 
 		// Ensure the database tables are up to date.
 		GetPaid_Installer::maybe_create_db_tables();
 
-		$wpi_version = get_option( 'wpinv_version', 0 );
+		$wpi_version = get_option('wpinv_version', 0);
 
-		if ( $wpi_version == WPINV_VERSION ) {
+		if ($wpi_version == WPINV_VERSION) {
 			return;
 		}
 
 		$installer = new GetPaid_Installer();
 
-		if ( empty( $wpi_version ) ) {
-			return $installer->upgrade_db( 0 );
+		if (empty($wpi_version)) {
+			return $installer->upgrade_db(0);
 		}
 
-		$upgrades  = array(
+		$upgrades = array(
 			'0.0.5' => '004',
 			'1.0.3' => '102',
 			'2.0.0' => '118',
 			'2.8.0' => '279',
 		);
 
-		foreach ( $upgrades as $key => $method ) {
-			if ( version_compare( $wpi_version, $key, '<' ) ) {
-				return $installer->upgrade_db( $method );
+		foreach ($upgrades as $key => $method) {
+			if (version_compare($wpi_version, $key, '<')) {
+				return $installer->upgrade_db($method);
 			}
 		}
 	}
@@ -513,11 +513,11 @@ 
 	 * @since 2.0.8
 	 */
 	public function maybe_flush_permalinks() {
-		$flush = get_option( 'wpinv_flush_permalinks', 0 );
+		$flush = get_option('wpinv_flush_permalinks', 0);
 
-		if ( ! empty( $flush ) ) {
+		if (!empty($flush)) {
 			flush_rewrite_rules();
-			delete_option( 'wpinv_flush_permalinks' );
+			delete_option('wpinv_flush_permalinks');
 		}
 	}
 
@@ -527,9 +527,9 @@ 
 	 * @since 1.0.19
 	 * @param int[] $excluded_posts_ids
 	 */
-	public function wpseo_exclude_from_sitemap_by_post_ids( $excluded_posts_ids ) {
+	public function wpseo_exclude_from_sitemap_by_post_ids($excluded_posts_ids) {
 		// Ensure that we have an array.
-		if ( ! is_array( $excluded_posts_ids ) ) {
+		if (!is_array($excluded_posts_ids)) {
 			$excluded_posts_ids = array();
 		}
 
@@ -537,25 +537,25 @@ 
 		$our_pages = array();
 
 		// Checkout page.
-		$our_pages[] = wpinv_get_option( 'checkout_page', false );
+		$our_pages[] = wpinv_get_option('checkout_page', false);
 
 		// Success page.
-		$our_pages[] = wpinv_get_option( 'success_page', false );
+		$our_pages[] = wpinv_get_option('success_page', false);
 
 		// Failure page.
-		$our_pages[] = wpinv_get_option( 'failure_page', false );
+		$our_pages[] = wpinv_get_option('failure_page', false);
 
 		// History page.
-		$our_pages[] = wpinv_get_option( 'invoice_history_page', false );
+		$our_pages[] = wpinv_get_option('invoice_history_page', false);
 
 		// Subscriptions page.
-		$our_pages[] = wpinv_get_option( 'invoice_subscription_page', false );
+		$our_pages[] = wpinv_get_option('invoice_subscription_page', false);
 
-		$our_pages   = array_map( 'intval', array_filter( $our_pages ) );
+		$our_pages   = array_map('intval', array_filter($our_pages));
 
 		$excluded_posts_ids = $excluded_posts_ids + $our_pages;
 
-		return array_unique( $excluded_posts_ids );
+		return array_unique($excluded_posts_ids);
 	}
 
 	/**
@@ -564,14 +564,14 @@ 
 	 * @since 1.0.19
 	 * @param string[] $post_types
 	 */
-	public function exclude_invoicing_post_types( $post_types ) {
+	public function exclude_invoicing_post_types($post_types) {
 		// Ensure that we have an array.
-		if ( ! is_array( $post_types ) ) {
+		if (!is_array($post_types)) {
 			$post_types = array();
 		}
 
 		// Remove our post types.
-		return array_diff( $post_types, array_keys( getpaid_get_invoice_post_types() ) );
+		return array_diff($post_types, array_keys(getpaid_get_invoice_post_types()));
 	}
 
 	/**
@@ -580,7 +580,7 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_footer() {
-		wpinv_get_template( 'frontend-footer.php' );
+		wpinv_get_template('frontend-footer.php');
 	}
 
 	/**
@@ -589,14 +589,14 @@ 
 	 * @since 2.0.0
 	 */
 	public function wp_head() {
-		wpinv_get_template( 'frontend-head.php' );
+		wpinv_get_template('frontend-head.php');
 	}
 
 	/**
 	 * Custom query vars.
 	 *
 	 */
-	public function custom_query_vars( $vars ) {
+	public function custom_query_vars($vars) {
 		$vars[] = 'getpaid-ipn';
 		return $vars;
 	}
@@ -607,26 +607,26 @@ 
 	 */
 	public function add_rewrite_rule() {
 		$tag = 'getpaid-ipn';
-		add_rewrite_tag( "%$tag%", '([^&]+)' );
-		add_rewrite_rule( "^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top' );
+		add_rewrite_tag("%$tag%", '([^&]+)');
+		add_rewrite_rule("^$tag/([^/]*)/?", "index.php?$tag=\$matches[1]", 'top');
 	}
 
 	/**
 	 * Processes non-query string ipns.
 	 *
 	 */
-	public function maybe_process_new_ipn( $query ) {
-		if ( is_admin() || ! $query->is_main_query() ) {
+	public function maybe_process_new_ipn($query) {
+		if (is_admin() || !$query->is_main_query()) {
 			return;
 		}
 
-		$gateway = get_query_var( 'getpaid-ipn' );
+		$gateway = get_query_var('getpaid-ipn');
 
-		if ( ! empty( $gateway ) ) {
-			$gateway = sanitize_text_field( $gateway );
+		if (!empty($gateway)) {
+			$gateway = sanitize_text_field($gateway);
 			nocache_headers();
-			do_action( 'wpinv_verify_payment_ipn', $gateway );
-			do_action( "wpinv_verify_{$gateway}_ipn" );
+			do_action('wpinv_verify_payment_ipn', $gateway);
+			do_action("wpinv_verify_{$gateway}_ipn");
 			exit;
 		}
 	}

widgets/subscriptions.php

Indentation +347 added lines, -347 removed lines

@@ -14,143 +14,143 @@ 
  */
 class WPInv_Subscriptions_Widget extends WP_Super_Duper {
 
-	/**
-	 * Register the widget with WordPress.
-	 *
-	 */
-	public function __construct() {
-
-		$options = array(
-			'textdomain'     => 'invoicing',
-			'block-icon'     => 'controls-repeat',
-			'block-category' => 'widgets',
-			'block-keywords' => "['invoicing','subscriptions', 'getpaid']",
-			'class_name'     => __CLASS__,
-			'base_id'        => 'wpinv_subscriptions',
-			'name'           => __( 'GetPaid > Subscriptions', 'invoicing' ),
-			'widget_ops'     => array(
-				'classname'   => 'getpaid-subscriptions bsui',
-				'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
-			),
-			'arguments'      => array(
-				'title' => array(
-					'title'    => __( 'Widget title', 'invoicing' ),
-					'desc'     => __( 'Enter widget title.', 'invoicing' ),
-					'type'     => 'text',
-					'desc_tip' => true,
-					'default'  => '',
-					'advanced' => false,
-				),
-			),
-
-		);
-
-		parent::__construct( $options );
-	}
-
-	/**
-	 * Retrieves current user's subscriptions.
-	 *
-	 * @return GetPaid_Subscriptions_Query
-	 */
-	public function get_subscriptions() {
-
-		// Prepare license args.
-		$args  = array(
-			'customer_in' => get_current_user_id(),
-			'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
-		);
-
-		return new GetPaid_Subscriptions_Query( $args );
-
-	}
-
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		// Ensure that the user is logged in.
-		if ( ! is_user_logged_in() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		// Are we displaying a single subscription?
-		if ( isset( $_GET['subscription'] ) ) {
-			return $this->display_single_subscription( intval( $_GET['subscription'] ) );
-		}
-
-		// Retrieve the user's subscriptions.
-		$subscriptions = $this->get_subscriptions();
-
-		// Start the output buffer.
-		ob_start();
-
-		// Backwards compatibility.
-		do_action( 'wpinv_before_user_subscriptions' );
-
-		// Display errors and notices.
-		wpinv_print_errors();
-
-		do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
-
-		// Print the table header.
-		$this->print_table_header();
-
-		// Print table body.
-		$this->print_table_body( $subscriptions->get_results() );
-
-		// Print table footer.
-		$this->print_table_footer();
-
-		// Print the navigation.
-		$this->print_navigation( $subscriptions->get_total() );
-
-		// Backwards compatibility.
-		do_action( 'wpinv_after_user_subscriptions' );
-
-		// Return the output.
-		return ob_get_clean();
-
-	}
-
-	/**
-	 * Retrieves the subscription columns.
-	 *
-	 * @return array
-	 */
-	public function get_subscriptions_table_columns() {
+    /**
+     * Register the widget with WordPress.
+     *
+     */
+    public function __construct() {
+
+        $options = array(
+            'textdomain'     => 'invoicing',
+            'block-icon'     => 'controls-repeat',
+            'block-category' => 'widgets',
+            'block-keywords' => "['invoicing','subscriptions', 'getpaid']",
+            'class_name'     => __CLASS__,
+            'base_id'        => 'wpinv_subscriptions',
+            'name'           => __( 'GetPaid > Subscriptions', 'invoicing' ),
+            'widget_ops'     => array(
+                'classname'   => 'getpaid-subscriptions bsui',
+                'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
+            ),
+            'arguments'      => array(
+                'title' => array(
+                    'title'    => __( 'Widget title', 'invoicing' ),
+                    'desc'     => __( 'Enter widget title.', 'invoicing' ),
+                    'type'     => 'text',
+                    'desc_tip' => true,
+                    'default'  => '',
+                    'advanced' => false,
+                ),
+            ),
+
+        );
+
+        parent::__construct( $options );
+    }
+
+    /**
+     * Retrieves current user's subscriptions.
+     *
+     * @return GetPaid_Subscriptions_Query
+     */
+    public function get_subscriptions() {
+
+        // Prepare license args.
+        $args  = array(
+            'customer_in' => get_current_user_id(),
+            'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+        );
+
+        return new GetPaid_Subscriptions_Query( $args );
+
+    }
+
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
+    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        // Ensure that the user is logged in.
+        if ( ! is_user_logged_in() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        // Are we displaying a single subscription?
+        if ( isset( $_GET['subscription'] ) ) {
+            return $this->display_single_subscription( intval( $_GET['subscription'] ) );
+        }
+
+        // Retrieve the user's subscriptions.
+        $subscriptions = $this->get_subscriptions();
+
+        // Start the output buffer.
+        ob_start();
+
+        // Backwards compatibility.
+        do_action( 'wpinv_before_user_subscriptions' );
+
+        // Display errors and notices.
+        wpinv_print_errors();
+
+        do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
+
+        // Print the table header.
+        $this->print_table_header();
+
+        // Print table body.
+        $this->print_table_body( $subscriptions->get_results() );
+
+        // Print table footer.
+        $this->print_table_footer();
+
+        // Print the navigation.
+        $this->print_navigation( $subscriptions->get_total() );
+
+        // Backwards compatibility.
+        do_action( 'wpinv_after_user_subscriptions' );
+
+        // Return the output.
+        return ob_get_clean();
+
+    }
+
+    /**
+     * Retrieves the subscription columns.
+     *
+     * @return array
+     */
+    public function get_subscriptions_table_columns() {
 
-		$columns = array(
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'amount'       => __( 'Amount', 'invoicing' ),
-			'renewal-date' => __( 'Next payment', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-		);
+        $columns = array(
+            'subscription' => __( 'Subscription', 'invoicing' ),
+            'amount'       => __( 'Amount', 'invoicing' ),
+            'renewal-date' => __( 'Next payment', 'invoicing' ),
+            'status'       => __( 'Status', 'invoicing' ),
+        );
 
-		return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
-	}
+        return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
+    }
 
-	/**
-	 * Displays the table header.
-	 *
-	 */
-	public function print_table_header() {
+    /**
+     * Displays the table header.
+     *
+     */
+    public function print_table_header() {
 
-		?>
+        ?>
 
 			<table class="table table-bordered table-striped">
 
@@ -166,122 +166,122 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the table body.
-	 *
-	 * @param WPInv_Subscription[] $subscriptions
-	 */
-	public function print_table_body( $subscriptions ) {
+    /**
+     * Displays the table body.
+     *
+     * @param WPInv_Subscription[] $subscriptions
+     */
+    public function print_table_body( $subscriptions ) {
 
-		if ( empty( $subscriptions ) ) {
-			$this->print_table_body_no_subscriptions();
-		} else {
-			$this->print_table_body_subscriptions( $subscriptions );
-		}
+        if ( empty( $subscriptions ) ) {
+            $this->print_table_body_no_subscriptions();
+        } else {
+            $this->print_table_body_subscriptions( $subscriptions );
+        }
 
-	}
+    }
 
-	/**
-	 * Displays the table body if no subscriptions were found.
-	 *
-	 */
-	public function print_table_body_no_subscriptions() {
+    /**
+     * Displays the table body if no subscriptions were found.
+     *
+     */
+    public function print_table_body_no_subscriptions() {
 
-		?>
+        ?>
 		<tbody>
 
 			<tr>
 				<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
 
 					<?php
-						aui()->alert(
-							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
-								'type'    => 'warning',
-							),
+                        aui()->alert(
+                            array(
+                                'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+                                'type'    => 'warning',
+                            ),
                             true
-						);
-					?>
+                        );
+                    ?>
 
 				</td>
 			</tr>
 
 		</tbody>
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the table body if subscriptions were found.
-	 *
-	 * @param WPInv_Subscription[] $subscriptions
-	 */
-	public function print_table_body_subscriptions( $subscriptions ) {
+    /**
+     * Displays the table body if subscriptions were found.
+     *
+     * @param WPInv_Subscription[] $subscriptions
+     */
+    public function print_table_body_subscriptions( $subscriptions ) {
 
-		?>
+        ?>
 		<tbody>
 
 			<?php foreach ( $subscriptions as $subscription ) : ?>
 				<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
 					<?php
-						wpinv_get_template(
-							'subscriptions/subscriptions-table-row.php',
-							array(
-								'subscription' => $subscription,
-								'widget'       => $this,
-							)
-						);
-					?>
+                        wpinv_get_template(
+                            'subscriptions/subscriptions-table-row.php',
+                            array(
+                                'subscription' => $subscription,
+                                'widget'       => $this,
+                            )
+                        );
+                    ?>
 				</tr>
 			<?php endforeach; ?>
 
 		</tbody>
 		<?php
-	}
-
-	/**
-	 * Adds row actions to a column
-	 *
-	 * @param string $content column content
-	 * @param WPInv_Subscription $subscription
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function add_row_actions( $content, $subscription ) {
-
-		// Prepare row actions.
-		$actions = array();
-
-		// View subscription action.
-		$view_url        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
-		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
-
-		// Filter the actions.
-		$actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
-
-		$sanitized  = array();
-		foreach ( $actions as $key => $action ) {
-			$key         = sanitize_html_class( $key );
-			$action      = wp_kses_post( $action );
-			$sanitized[] = "<span class='$key'>$action</span>";
-		}
-
-		$row_actions  = "<small class='form-text getpaid-subscription-item-actions'>";
-		$row_actions .= implode( ' | ', $sanitized );
-		$row_actions .= '</small>';
-
-		return $content . $row_actions;
-	}
-
-	/**
-	 * Displays the table footer.
-	 *
-	 */
-	public function print_table_footer() {
-
-		?>
+    }
+
+    /**
+     * Adds row actions to a column
+     *
+     * @param string $content column content
+     * @param WPInv_Subscription $subscription
+     * @since       1.0.0
+     * @return      string
+     */
+    public function add_row_actions( $content, $subscription ) {
+
+        // Prepare row actions.
+        $actions = array();
+
+        // View subscription action.
+        $view_url        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
+        $view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
+        $actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
+
+        // Filter the actions.
+        $actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
+
+        $sanitized  = array();
+        foreach ( $actions as $key => $action ) {
+            $key         = sanitize_html_class( $key );
+            $action      = wp_kses_post( $action );
+            $sanitized[] = "<span class='$key'>$action</span>";
+        }
+
+        $row_actions  = "<small class='form-text getpaid-subscription-item-actions'>";
+        $row_actions .= implode( ' | ', $sanitized );
+        $row_actions .= '</small>';
+
+        return $content . $row_actions;
+    }
+
+    /**
+     * Displays the table footer.
+     *
+     */
+    public function print_table_footer() {
+
+        ?>
 
 				<tfoot>
 					<tr>
@@ -296,145 +296,145 @@ 
 			</table>
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the navigation.
-	 *
-	 * @param int $total
-	 */
-	public function print_navigation( $total ) {
+    /**
+     * Displays the navigation.
+     *
+     * @param int $total
+     */
+    public function print_navigation( $total ) {
 
-		if ( $total < 1 ) {
+        if ( $total < 1 ) {
 
-			// Out-of-bounds, run the query again without LIMIT for total count.
-			$args  = array(
-				'customer_in' => get_current_user_id(),
-				'fields'      => 'id',
-			);
+            // Out-of-bounds, run the query again without LIMIT for total count.
+            $args  = array(
+                'customer_in' => get_current_user_id(),
+                'fields'      => 'id',
+            );
 
-			$count_query = new GetPaid_Subscriptions_Query( $args );
-			$total       = $count_query->get_total();
-		}
+            $count_query = new GetPaid_Subscriptions_Query( $args );
+            $total       = $count_query->get_total();
+        }
 
-		// Abort if we do not have pages.
-		if ( 2 > $total ) {
-			return;
-		}
+        // Abort if we do not have pages.
+        if ( 2 > $total ) {
+            return;
+        }
 
-		?>
+        ?>
 
 		<div class="getpaid-subscriptions-pagination">
 			<?php
-				$big = 999999;
-
-				echo wp_kses_post(
-					getpaid_paginate_links(
-						array(
-							'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-							'format' => '?paged=%#%',
-							'total'  => (int) ceil( $total / 10 ),
-						)
-					)
-				);
-			?>
+                $big = 999999;
+
+                echo wp_kses_post(
+                    getpaid_paginate_links(
+                        array(
+                            'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                            'format' => '?paged=%#%',
+                            'total'  => (int) ceil( $total / 10 ),
+                        )
+                    )
+                );
+            ?>
 		</div>
 
 		<?php
-	}
-
-	/**
-	 * Returns a single subscription's columns.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 *
-	 * @return array
-	 */
-	public function get_single_subscription_columns( $subscription ) {
-
-		// Prepare subscription detail columns.
-		$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
-		$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
-		$fields             = apply_filters(
-			'getpaid_single_subscription_details_fields',
-			array(
-				'status'           => __( 'Status', 'invoicing' ),
-				'initial_amount'   => __( 'Initial amount', 'invoicing' ),
-				'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
-				'start_date'       => __( 'Start date', 'invoicing' ),
-				'expiry_date'      => __( 'Next payment', 'invoicing' ),
-				'payments'         => __( 'Payments', 'invoicing' ),
-				'item'             => $items_count > 1 ? __( 'Items', $items_count, 'invoicing' ) : __( 'Item', 'invoicing' )
-			),
-			$subscription,
-			$items_count
-		);
-
-		if ( isset( $fields['expiry_date'] ) ) {
-
-			if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
-				$fields['expiry_date'] = __( 'End date', 'invoicing' );
-			}
-
-			if ( 'pending' === $subscription->get_status() ) {
-				unset( $fields['expiry_date'] );
-			}
-		}
-
-		if ( isset( $fields['start_date'] ) && 'pending' === $subscription->get_status() ) {
-			unset( $fields['start_date'] );
-		}
-
-		if ( $subscription->get_initial_amount() === $subscription->get_recurring_amount() ) {
-			unset( $fields['initial_amount'] );
-		}
-
-		return $fields;
-	}
-
-	/**
-	 * Displays a single subscription.
-	 *
-	 * @param string $subscription
-	 *
-	 * @return string
-	 */
-	public function display_single_subscription( $subscription ) {
-
-		// Fetch the subscription.
-		$subscription = new WPInv_Subscription( (int) $subscription );
-
-		if ( ! $subscription->exists() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		// Ensure that the user owns this subscription key.
-		if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		return wpinv_get_template_html(
-			'subscriptions/subscription-details.php',
-			array(
-				'subscription' => $subscription,
-				'widget'       => $this,
-			)
-		);
-
-	}
+    }
+
+    /**
+     * Returns a single subscription's columns.
+     *
+     * @param WPInv_Subscription $subscription
+     *
+     * @return array
+     */
+    public function get_single_subscription_columns( $subscription ) {
+
+        // Prepare subscription detail columns.
+        $subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+        $items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+        $fields             = apply_filters(
+            'getpaid_single_subscription_details_fields',
+            array(
+                'status'           => __( 'Status', 'invoicing' ),
+                'initial_amount'   => __( 'Initial amount', 'invoicing' ),
+                'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
+                'start_date'       => __( 'Start date', 'invoicing' ),
+                'expiry_date'      => __( 'Next payment', 'invoicing' ),
+                'payments'         => __( 'Payments', 'invoicing' ),
+                'item'             => $items_count > 1 ? __( 'Items', $items_count, 'invoicing' ) : __( 'Item', 'invoicing' )
+            ),
+            $subscription,
+            $items_count
+        );
+
+        if ( isset( $fields['expiry_date'] ) ) {
+
+            if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
+                $fields['expiry_date'] = __( 'End date', 'invoicing' );
+            }
+
+            if ( 'pending' === $subscription->get_status() ) {
+                unset( $fields['expiry_date'] );
+            }
+        }
+
+        if ( isset( $fields['start_date'] ) && 'pending' === $subscription->get_status() ) {
+            unset( $fields['start_date'] );
+        }
+
+        if ( $subscription->get_initial_amount() === $subscription->get_recurring_amount() ) {
+            unset( $fields['initial_amount'] );
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Displays a single subscription.
+     *
+     * @param string $subscription
+     *
+     * @return string
+     */
+    public function display_single_subscription( $subscription ) {
+
+        // Fetch the subscription.
+        $subscription = new WPInv_Subscription( (int) $subscription );
+
+        if ( ! $subscription->exists() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        // Ensure that the user owns this subscription key.
+        if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        return wpinv_get_template_html(
+            'subscriptions/subscription-details.php',
+            array(
+                'subscription' => $subscription,
+                'widget'       => $this,
+            )
+        );
+
+    }
 
 }

Spacing +79 added lines, -79 removed lines

@@ -5,7 +5,7 @@ 
  * @version 1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Contains the subscriptions widget.
@@ -27,15 +27,15 @@ 
 			'block-keywords' => "['invoicing','subscriptions', 'getpaid']",
 			'class_name'     => __CLASS__,
 			'base_id'        => 'wpinv_subscriptions',
-			'name'           => __( 'GetPaid > Subscriptions', 'invoicing' ),
+			'name'           => __('GetPaid > Subscriptions', 'invoicing'),
 			'widget_ops'     => array(
 				'classname'   => 'getpaid-subscriptions bsui',
-				'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
+				'description' => esc_html__("Displays the current user's subscriptions.", 'invoicing'),
 			),
 			'arguments'      => array(
 				'title' => array(
-					'title'    => __( 'Widget title', 'invoicing' ),
-					'desc'     => __( 'Enter widget title.', 'invoicing' ),
+					'title'    => __('Widget title', 'invoicing'),
+					'desc'     => __('Enter widget title.', 'invoicing'),
 					'type'     => 'text',
 					'desc_tip' => true,
 					'default'  => '',
@@ -45,7 +45,7 @@ 
 
 		);
 
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 	/**
@@ -56,12 +56,12 @@ 
 	public function get_subscriptions() {
 
 		// Prepare license args.
-		$args  = array(
+		$args = array(
 			'customer_in' => get_current_user_id(),
-			'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+			'paged'       => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
 		);
 
-		return new GetPaid_Subscriptions_Query( $args );
+		return new GetPaid_Subscriptions_Query($args);
 
 	}
 
@@ -74,14 +74,14 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
+	public function output($args = array(), $widget_args = array(), $content = '') {
 
 		// Ensure that the user is logged in.
-		if ( ! is_user_logged_in() ) {
+		if (!is_user_logged_in()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('You need to log-in or create an account to view this section.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);
@@ -89,8 +89,8 @@ 
 		}
 
 		// Are we displaying a single subscription?
-		if ( isset( $_GET['subscription'] ) ) {
-			return $this->display_single_subscription( intval( $_GET['subscription'] ) );
+		if (isset($_GET['subscription'])) {
+			return $this->display_single_subscription(intval($_GET['subscription']));
 		}
 
 		// Retrieve the user's subscriptions.
@@ -100,27 +100,27 @@ 
 		ob_start();
 
 		// Backwards compatibility.
-		do_action( 'wpinv_before_user_subscriptions' );
+		do_action('wpinv_before_user_subscriptions');
 
 		// Display errors and notices.
 		wpinv_print_errors();
 
-		do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
+		do_action('getpaid_license_manager_before_subscriptions', $subscriptions);
 
 		// Print the table header.
 		$this->print_table_header();
 
 		// Print table body.
-		$this->print_table_body( $subscriptions->get_results() );
+		$this->print_table_body($subscriptions->get_results());
 
 		// Print table footer.
 		$this->print_table_footer();
 
 		// Print the navigation.
-		$this->print_navigation( $subscriptions->get_total() );
+		$this->print_navigation($subscriptions->get_total());
 
 		// Backwards compatibility.
-		do_action( 'wpinv_after_user_subscriptions' );
+		do_action('wpinv_after_user_subscriptions');
 
 		// Return the output.
 		return ob_get_clean();
@@ -135,13 +135,13 @@ 
 	public function get_subscriptions_table_columns() {
 
 		$columns = array(
-			'subscription' => __( 'Subscription', 'invoicing' ),
-			'amount'       => __( 'Amount', 'invoicing' ),
-			'renewal-date' => __( 'Next payment', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
+			'subscription' => __('Subscription', 'invoicing'),
+			'amount'       => __('Amount', 'invoicing'),
+			'renewal-date' => __('Next payment', 'invoicing'),
+			'status'       => __('Status', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
+		return apply_filters('getpaid_frontend_subscriptions_table_columns', $columns);
 	}
 
 	/**
@@ -156,9 +156,9 @@ 
 
 				<thead>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo esc_attr( $key ); ?>">
-								<?php echo esc_html( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo esc_attr($key); ?>">
+								<?php echo esc_html($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -173,12 +173,12 @@ 
 	 *
 	 * @param WPInv_Subscription[] $subscriptions
 	 */
-	public function print_table_body( $subscriptions ) {
+	public function print_table_body($subscriptions) {
 
-		if ( empty( $subscriptions ) ) {
+		if (empty($subscriptions)) {
 			$this->print_table_body_no_subscriptions();
 		} else {
-			$this->print_table_body_subscriptions( $subscriptions );
+			$this->print_table_body_subscriptions($subscriptions);
 		}
 
 	}
@@ -193,12 +193,12 @@ 
 		<tbody>
 
 			<tr>
-				<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
+				<td colspan="<?php echo count($this->get_subscriptions_table_columns()); ?>">
 
 					<?php
 						aui()->alert(
 							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+								'content' => wp_kses_post(__('No subscriptions found.', 'invoicing')),
 								'type'    => 'warning',
 							),
                             true
@@ -217,12 +217,12 @@ 
 	 *
 	 * @param WPInv_Subscription[] $subscriptions
 	 */
-	public function print_table_body_subscriptions( $subscriptions ) {
+	public function print_table_body_subscriptions($subscriptions) {
 
 		?>
 		<tbody>
 
-			<?php foreach ( $subscriptions as $subscription ) : ?>
+			<?php foreach ($subscriptions as $subscription) : ?>
 				<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
 					<?php
 						wpinv_get_template(
@@ -248,28 +248,28 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function add_row_actions( $content, $subscription ) {
+	public function add_row_actions($content, $subscription) {
 
 		// Prepare row actions.
 		$actions = array();
 
 		// View subscription action.
-		$view_url        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
-		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
+		$view_url        = getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')));
+		$view_url        = esc_url(add_query_arg('subscription', (int) $subscription->get_id(), $view_url));
+		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __('Manage Subscription', 'invoicing') . '</a>';
 
 		// Filter the actions.
-		$actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
+		$actions = apply_filters('getpaid_subscriptions_table_subscription_actions', $actions, $subscription);
 
-		$sanitized  = array();
-		foreach ( $actions as $key => $action ) {
-			$key         = sanitize_html_class( $key );
-			$action      = wp_kses_post( $action );
+		$sanitized = array();
+		foreach ($actions as $key => $action) {
+			$key         = sanitize_html_class($key);
+			$action      = wp_kses_post($action);
 			$sanitized[] = "<span class='$key'>$action</span>";
 		}
 
 		$row_actions  = "<small class='form-text getpaid-subscription-item-actions'>";
-		$row_actions .= implode( ' | ', $sanitized );
+		$row_actions .= implode(' | ', $sanitized);
 		$row_actions .= '</small>';
 
 		return $content . $row_actions;
@@ -285,9 +285,9 @@ 
 
 				<tfoot>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th class="font-weight-bold getpaid-subscriptions-<?php echo esc_attr( $key ); ?>">
-								<?php echo esc_html( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th class="font-weight-bold getpaid-subscriptions-<?php echo esc_attr($key); ?>">
+								<?php echo esc_html($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -303,22 +303,22 @@ 
 	 *
 	 * @param int $total
 	 */
-	public function print_navigation( $total ) {
+	public function print_navigation($total) {
 
-		if ( $total < 1 ) {
+		if ($total < 1) {
 
 			// Out-of-bounds, run the query again without LIMIT for total count.
-			$args  = array(
+			$args = array(
 				'customer_in' => get_current_user_id(),
 				'fields'      => 'id',
 			);
 
-			$count_query = new GetPaid_Subscriptions_Query( $args );
+			$count_query = new GetPaid_Subscriptions_Query($args);
 			$total       = $count_query->get_total();
 		}
 
 		// Abort if we do not have pages.
-		if ( 2 > $total ) {
+		if (2 > $total) {
 			return;
 		}
 
@@ -331,9 +331,9 @@ 
 				echo wp_kses_post(
 					getpaid_paginate_links(
 						array(
-							'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+							'base'   => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 							'format' => '?paged=%#%',
-							'total'  => (int) ceil( $total / 10 ),
+							'total'  => (int) ceil($total / 10),
 						)
 					)
 				);
@@ -350,43 +350,43 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_single_subscription_columns( $subscription ) {
+	public function get_single_subscription_columns($subscription) {
 
 		// Prepare subscription detail columns.
-		$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
-		$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+		$subscription_group = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
+		$items_count        = empty($subscription_group) ? 1 : count($subscription_group['items']);
 		$fields             = apply_filters(
 			'getpaid_single_subscription_details_fields',
 			array(
-				'status'           => __( 'Status', 'invoicing' ),
-				'initial_amount'   => __( 'Initial amount', 'invoicing' ),
-				'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
-				'start_date'       => __( 'Start date', 'invoicing' ),
-				'expiry_date'      => __( 'Next payment', 'invoicing' ),
-				'payments'         => __( 'Payments', 'invoicing' ),
-				'item'             => $items_count > 1 ? __( 'Items', $items_count, 'invoicing' ) : __( 'Item', 'invoicing' )
+				'status'           => __('Status', 'invoicing'),
+				'initial_amount'   => __('Initial amount', 'invoicing'),
+				'recurring_amount' => __('Recurring amount', 'invoicing'),
+				'start_date'       => __('Start date', 'invoicing'),
+				'expiry_date'      => __('Next payment', 'invoicing'),
+				'payments'         => __('Payments', 'invoicing'),
+				'item'             => $items_count > 1 ? __('Items', $items_count, 'invoicing') : __('Item', 'invoicing')
 			),
 			$subscription,
 			$items_count
 		);
 
-		if ( isset( $fields['expiry_date'] ) ) {
+		if (isset($fields['expiry_date'])) {
 
-			if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
-				$fields['expiry_date'] = __( 'End date', 'invoicing' );
+			if (!$subscription->is_active() || $subscription->is_last_renewal()) {
+				$fields['expiry_date'] = __('End date', 'invoicing');
 			}
 
-			if ( 'pending' === $subscription->get_status() ) {
-				unset( $fields['expiry_date'] );
+			if ('pending' === $subscription->get_status()) {
+				unset($fields['expiry_date']);
 			}
 		}
 
-		if ( isset( $fields['start_date'] ) && 'pending' === $subscription->get_status() ) {
-			unset( $fields['start_date'] );
+		if (isset($fields['start_date']) && 'pending' === $subscription->get_status()) {
+			unset($fields['start_date']);
 		}
 
-		if ( $subscription->get_initial_amount() === $subscription->get_recurring_amount() ) {
-			unset( $fields['initial_amount'] );
+		if ($subscription->get_initial_amount() === $subscription->get_recurring_amount()) {
+			unset($fields['initial_amount']);
 		}
 
 		return $fields;
@@ -399,16 +399,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function display_single_subscription( $subscription ) {
+	public function display_single_subscription($subscription) {
 
 		// Fetch the subscription.
-		$subscription = new WPInv_Subscription( (int) $subscription );
+		$subscription = new WPInv_Subscription((int) $subscription);
 
-		if ( ! $subscription->exists() ) {
+		if (!$subscription->exists()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('Subscription not found.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);
@@ -416,11 +416,11 @@ 
 		}
 
 		// Ensure that the user owns this subscription key.
-		if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
+		if (get_current_user_id() != $subscription->get_customer_id() && !wpinv_current_user_can_manage_invoicing()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);

templates/payment-forms/elements/file_upload.php

Indentation +9 added lines, -9 removed lines

@@ -21,20 +21,20 @@
 
 foreach ( $file_types as $file_type ) {
 
-	if ( isset( $all_types[ $file_type ] ) ) {
-		$types[]   = $all_types[ $file_type ];
-		$file_type = explode( '|', $file_type );
+    if ( isset( $all_types[ $file_type ] ) ) {
+        $types[]   = $all_types[ $file_type ];
+        $file_type = explode( '|', $file_type );
 
-		foreach ( $file_type as $type ) {
-			$type     = trim( $type );
-			$types[]  = ".$type";
-			$_types[] = $type;
-		}
+        foreach ( $file_type as $type ) {
+            $type     = trim( $type );
+            $types[]  = ".$type";
+            $_types[] = $type;
+        }
 }
 }
 
 if ( ! empty( $required ) ) {
-	$label .= "<span class='text-danger'> *</span>";
+    $label .= "<span class='text-danger'> *</span>";
 }
 ?>
 <label><span v-html="form_element.label"></span></label>

Switch Indentation +25 added lines, -25 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 /**
  * Displays a file_upload input in a payment form
  *
@@ -7,36 +7,36 @@ 
  * @version 2.8.9
  */
 
-defined( 'ABSPATH' ) || exit;
+    defined( 'ABSPATH' ) || exit;
 
-$label        = empty( $label ) ? '' : wp_kses_post( $label );
-$label_class  = sanitize_key( preg_replace( '/[^A-Za-z0-9_-]/', '-', $label ) );
-$id           = esc_attr( $id );
-$_id          = $id . uniqid( '_' );
-$max_file_num = empty( $max_file_num ) ? 1 : absint( $max_file_num );
-$file_types   = empty( $file_types ) ? array( 'jpg|jpeg|jpe', 'gif', 'png' ) : $file_types;
-$all_types    = getpaid_get_allowed_mime_types();
-$types        = array();
-$_types       = array();
+    $label        = empty( $label ) ? '' : wp_kses_post( $label );
+    $label_class  = sanitize_key( preg_replace( '/[^A-Za-z0-9_-]/', '-', $label ) );
+    $id           = esc_attr( $id );
+    $_id          = $id . uniqid( '_' );
+    $max_file_num = empty( $max_file_num ) ? 1 : absint( $max_file_num );
+    $file_types   = empty( $file_types ) ? array( 'jpg|jpeg|jpe', 'gif', 'png' ) : $file_types;
+    $all_types    = getpaid_get_allowed_mime_types();
+    $types        = array();
+    $_types       = array();
 
-foreach ( $file_types as $file_type ) {
+    foreach ( $file_types as $file_type ) {
 
-	if ( isset( $all_types[ $file_type ] ) ) {
-		$types[]   = $all_types[ $file_type ];
-		$file_type = explode( '|', $file_type );
+	    if ( isset( $all_types[ $file_type ] ) ) {
+		    $types[]   = $all_types[ $file_type ];
+		    $file_type = explode( '|', $file_type );
 
-		foreach ( $file_type as $type ) {
-			$type     = trim( $type );
-			$types[]  = ".$type";
-			$_types[] = $type;
-		}
+		    foreach ( $file_type as $type ) {
+			    $type     = trim( $type );
+			    $types[]  = ".$type";
+			    $_types[] = $type;
+		    }
 }
 }
 
-if ( ! empty( $required ) ) {
-	$label .= "<span class='text-danger'> *</span>";
+    if ( ! empty( $required ) ) {
+	    $label .= "<span class='text-danger'> *</span>";
 }
-?>
+    ?>
 <label><span v-html="form_element.label"></span></label>
 <div class="form-group mb-3 <?php echo esc_attr( $label_class ); ?>" data-name="<?php echo esc_attr( $id ); ?>" data-max="<?php echo esc_attr( $max_file_num ); ?>">
 	<label for="<?php echo esc_attr( $id ); ?>"><?php echo wp_kses_post( $label ); ?></label>
@@ -44,9 +44,9 @@ 
 	<label for="<?php echo esc_attr( $id ); ?>" class="getpaid-file-upload-element d-flex w-100 flex-column align-items-center justify-content-center p-2 mb-2">
 		<div class="h5 text-dark">
 			<?php echo esc_html( ( $max_file_num > 1 ? __( 'Drag files to this area or click to upload', 'invoicing' ) : __( 'Drag your file to this area or click to upload', 'invoicing' ) ) ); ?>
-		</div>
+    		</div>
 		<?php if ( ! empty( $description ) ) : ?>
-			<small class="form-text text-muted"><?php echo wp_kses_post( $description ); ?></small>
+    			<small class="form-text text-muted"><?php echo wp_kses_post( $description ); ?></small>
 		<?php endif; ?>
 	</label>
 	<div class="getpaid-uploaded-files"></div>

Spacing +22 added lines, -22 removed lines

@@ -7,52 +7,52 @@
  * @version 2.8.9
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$label        = empty( $label ) ? '' : wp_kses_post( $label );
-$label_class  = sanitize_key( preg_replace( '/[^A-Za-z0-9_-]/', '-', $label ) );
-$id           = esc_attr( $id );
-$_id          = $id . uniqid( '_' );
-$max_file_num = empty( $max_file_num ) ? 1 : absint( $max_file_num );
-$file_types   = empty( $file_types ) ? array( 'jpg|jpeg|jpe', 'gif', 'png' ) : $file_types;
+$label        = empty($label) ? '' : wp_kses_post($label);
+$label_class  = sanitize_key(preg_replace('/[^A-Za-z0-9_-]/', '-', $label));
+$id           = esc_attr($id);
+$_id          = $id . uniqid('_');
+$max_file_num = empty($max_file_num) ? 1 : absint($max_file_num);
+$file_types   = empty($file_types) ? array('jpg|jpeg|jpe', 'gif', 'png') : $file_types;
 $all_types    = getpaid_get_allowed_mime_types();
 $types        = array();
 $_types       = array();
 
-foreach ( $file_types as $file_type ) {
+foreach ($file_types as $file_type) {
 
-	if ( isset( $all_types[ $file_type ] ) ) {
-		$types[]   = $all_types[ $file_type ];
-		$file_type = explode( '|', $file_type );
+	if (isset($all_types[$file_type])) {
+		$types[]   = $all_types[$file_type];
+		$file_type = explode('|', $file_type);
 
-		foreach ( $file_type as $type ) {
-			$type     = trim( $type );
+		foreach ($file_type as $type) {
+			$type     = trim($type);
 			$types[]  = ".$type";
 			$_types[] = $type;
 		}
 }
 }
 
-if ( ! empty( $required ) ) {
+if (!empty($required)) {
 	$label .= "<span class='text-danger'> *</span>";
 }
 ?>
 <label><span v-html="form_element.label"></span></label>
-<div class="form-group mb-3 <?php echo esc_attr( $label_class ); ?>" data-name="<?php echo esc_attr( $id ); ?>" data-max="<?php echo esc_attr( $max_file_num ); ?>">
-	<label for="<?php echo esc_attr( $id ); ?>"><?php echo wp_kses_post( $label ); ?></label>
-	<input type="file" class="sr-only getpaid-files-input" id="<?php echo esc_attr( $id ); ?>" accept="<?php echo esc_attr( implode( ', ', $types ) ); ?>" data-extensions="<?php echo esc_attr( wp_json_encode( $_types ) ); ?>" <?php echo $max_file_num == 1 ? '' : 'multiple="multiple"'; ?>>
-	<label for="<?php echo esc_attr( $id ); ?>" class="getpaid-file-upload-element d-flex w-100 flex-column align-items-center justify-content-center p-2 mb-2">
+<div class="form-group mb-3 <?php echo esc_attr($label_class); ?>" data-name="<?php echo esc_attr($id); ?>" data-max="<?php echo esc_attr($max_file_num); ?>">
+	<label for="<?php echo esc_attr($id); ?>"><?php echo wp_kses_post($label); ?></label>
+	<input type="file" class="sr-only getpaid-files-input" id="<?php echo esc_attr($id); ?>" accept="<?php echo esc_attr(implode(', ', $types)); ?>" data-extensions="<?php echo esc_attr(wp_json_encode($_types)); ?>" <?php echo $max_file_num == 1 ? '' : 'multiple="multiple"'; ?>>
+	<label for="<?php echo esc_attr($id); ?>" class="getpaid-file-upload-element d-flex w-100 flex-column align-items-center justify-content-center p-2 mb-2">
 		<div class="h5 text-dark">
-			<?php echo esc_html( ( $max_file_num > 1 ? __( 'Drag files to this area or click to upload', 'invoicing' ) : __( 'Drag your file to this area or click to upload', 'invoicing' ) ) ); ?>
+			<?php echo esc_html(($max_file_num > 1 ? __('Drag files to this area or click to upload', 'invoicing') : __('Drag your file to this area or click to upload', 'invoicing'))); ?>
 		</div>
-		<?php if ( ! empty( $description ) ) : ?>
-			<small class="form-text text-muted"><?php echo wp_kses_post( $description ); ?></small>
+		<?php if (!empty($description)) : ?>
+			<small class="form-text text-muted"><?php echo wp_kses_post($description); ?></small>
 		<?php endif; ?>
 	</label>
 	<div class="getpaid-uploaded-files"></div>
 	<div class="form-row row mb-3 d-none getpaid-progress-template">
 		<div class="overflow-hidden text-nowrap col-7 col-sm-4">
-			<a href="" class="close float-none" title="<?php esc_attr_e( 'Remove File', 'invoicing' ); ?>">&times;<span class="sr-only"><?php esc_html_e( 'Close', 'invoicing' ); ?></span></a>&nbsp;
+			<a href="" class="close float-none" title="<?php esc_attr_e('Remove File', 'invoicing'); ?>">&times;<span class="sr-only"><?php esc_html_e('Close', 'invoicing'); ?></span></a>&nbsp;
 			<i class="fa fa-file" aria-hidden="true"></i>&nbsp; <span class="getpaid-progress-file-name"></span>&nbsp;
 		</div>
 		<div class="col-5 col-sm-8 getpaid-progress">

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

Braces +1 added lines, -1 removed lines

@@ -3723,7 +3723,7 @@
 
 			$block_content = do_shortcode($block_content);
 
-		}elseif(! empty($parsed_block['attrs']['sd_shortcode'])){
+		} elseif(! empty($parsed_block['attrs']['sd_shortcode'])){
 			$has_warp = false;
 			if($block_content && strpos(trim($block_content), '<div class="wp-block-') === 0 ){
 				$parts = explode('></', $block_content);

Indentation +2790 added lines, -2790 removed lines

@@ -11,21 +11,21 @@ 
  * @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',
+        )
+    );
 }
 
 
@@ -37,7 +37,7 @@ 
  * @return mixed|void
  */
 function sd_widget_exclude() {
-	return apply_filters( 'sd_widget_exclude', array() );
+    return apply_filters( 'sd_widget_exclude', array() );
 }
 
 
@@ -50,83 +50,83 @@ 
  * @return array
  */
 function sd_get_margin_input( $type = 'mt', $overwrite = array(), $include_negatives = true ) {
-	global $aui_bs5;
-	$options = array(
-		''     => __( 'None', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
-		'0'    => '0',
-		'1'    => '1',
-		'2'    => '2',
-		'3'    => '3',
-		'4'    => '4',
-		'5'    => '5',
-		'6'    => '6',
-		'7'    => '7',
-		'8'    => '8',
-		'9'    => '9',
-		'10'   => '10',
-		'11'   => '11',
-		'12'   => '12',
-	);
-
-	if ( $include_negatives ) {
-		$options['n1']  = '-1';
-		$options['n2']  = '-2';
-		$options['n3']  = '-3';
-		$options['n4']  = '-4';
-		$options['n5']  = '-5';
-		$options['n6']  = '-6';
-		$options['n7']  = '-7';
-		$options['n8']  = '-8';
-		$options['n9']  = '-9';
-		$options['n10'] = '-10';
-		$options['n11'] = '-11';
-		$options['n12'] = '-12';
-	}
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Margin top', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	// title
-	if ( $type == 'mt' ) {
-		$defaults['title'] = __( 'Margin top', 'ayecode-connect' );
-		$defaults['icon']  = 'box-top';
-		$defaults['row']   = array(
-			'title' => __( 'Margins', 'ayecode-connect' ),
-			'key'   => 'wrapper-margins',
-			'open'  => true,
-			'class' => 'text-center',
-		);
-	} elseif ( $type == 'mr' ) {
-		$defaults['title'] = __( 'Margin right', 'ayecode-connect' );
-		$defaults['icon']  = 'box-right';
-		$defaults['row']   = array(
-			'key' => 'wrapper-margins',
-		);
-	} elseif ( $type == 'mb' ) {
-		$defaults['title'] = __( 'Margin bottom', 'ayecode-connect' );
-		$defaults['icon']  = 'box-bottom';
-		$defaults['row']   = array(
-			'key' => 'wrapper-margins',
-		);
-	} elseif ( $type == 'ml' ) {
-		$defaults['title'] = __( 'Margin left', 'ayecode-connect' );
-		$defaults['icon']  = 'box-left';
-		$defaults['row']   = array(
-			'key'   => 'wrapper-margins',
-			'close' => true,
-		);
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    global $aui_bs5;
+    $options = array(
+        ''     => __( 'None', 'ayecode-connect' ),
+        'auto' => __( 'auto', 'ayecode-connect' ),
+        '0'    => '0',
+        '1'    => '1',
+        '2'    => '2',
+        '3'    => '3',
+        '4'    => '4',
+        '5'    => '5',
+        '6'    => '6',
+        '7'    => '7',
+        '8'    => '8',
+        '9'    => '9',
+        '10'   => '10',
+        '11'   => '11',
+        '12'   => '12',
+    );
+
+    if ( $include_negatives ) {
+        $options['n1']  = '-1';
+        $options['n2']  = '-2';
+        $options['n3']  = '-3';
+        $options['n4']  = '-4';
+        $options['n5']  = '-5';
+        $options['n6']  = '-6';
+        $options['n7']  = '-7';
+        $options['n8']  = '-8';
+        $options['n9']  = '-9';
+        $options['n10'] = '-10';
+        $options['n11'] = '-11';
+        $options['n12'] = '-12';
+    }
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Margin top', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    // title
+    if ( $type == 'mt' ) {
+        $defaults['title'] = __( 'Margin top', 'ayecode-connect' );
+        $defaults['icon']  = 'box-top';
+        $defaults['row']   = array(
+            'title' => __( 'Margins', 'ayecode-connect' ),
+            'key'   => 'wrapper-margins',
+            'open'  => true,
+            'class' => 'text-center',
+        );
+    } elseif ( $type == 'mr' ) {
+        $defaults['title'] = __( 'Margin right', 'ayecode-connect' );
+        $defaults['icon']  = 'box-right';
+        $defaults['row']   = array(
+            'key' => 'wrapper-margins',
+        );
+    } elseif ( $type == 'mb' ) {
+        $defaults['title'] = __( 'Margin bottom', 'ayecode-connect' );
+        $defaults['icon']  = 'box-bottom';
+        $defaults['row']   = array(
+            'key' => 'wrapper-margins',
+        );
+    } elseif ( $type == 'ml' ) {
+        $defaults['title'] = __( 'Margin left', 'ayecode-connect' );
+        $defaults['icon']  = 'box-left';
+        $defaults['row']   = array(
+            'key'   => 'wrapper-margins',
+            'close' => true,
+        );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -138,67 +138,67 @@ 
  * @return array
  */
 function sd_get_padding_input( $type = 'pt', $overwrite = array() ) {
-	$options = array(
-		''   => __( 'None', 'ayecode-connect' ),
-		'0'  => '0',
-		'1'  => '1',
-		'2'  => '2',
-		'3'  => '3',
-		'4'  => '4',
-		'5'  => '5',
-		'6'  => '6',
-		'7'  => '7',
-		'8'  => '8',
-		'9'  => '9',
-		'10' => '10',
-		'11' => '11',
-		'12' => '12',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Padding top', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	// title
-	if ( $type == 'pt' ) {
-		$defaults['title'] = __( 'Padding top', 'ayecode-connect' );
-		$defaults['icon']  = 'box-top';
-		$defaults['row']   = array(
-			'title' => __( 'Padding', 'ayecode-connect' ),
-			'key'   => 'wrapper-padding',
-			'open'  => true,
-			'class' => 'text-center',
-		);
-	} elseif ( $type == 'pr' ) {
-		$defaults['title'] = __( 'Padding right', 'ayecode-connect' );
-		$defaults['icon']  = 'box-right';
-		$defaults['row']   = array(
-			'key' => 'wrapper-padding',
-		);
-	} elseif ( $type == 'pb' ) {
-		$defaults['title'] = __( 'Padding bottom', 'ayecode-connect' );
-		$defaults['icon']  = 'box-bottom';
-		$defaults['row']   = array(
-			'key' => 'wrapper-padding',
-		);
-	} elseif ( $type == 'pl' ) {
-		$defaults['title'] = __( 'Padding left', 'ayecode-connect' );
-		$defaults['icon']  = 'box-left';
-		$defaults['row']   = array(
-			'key'   => 'wrapper-padding',
-			'close' => true,
-
-		);
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        ''   => __( 'None', 'ayecode-connect' ),
+        '0'  => '0',
+        '1'  => '1',
+        '2'  => '2',
+        '3'  => '3',
+        '4'  => '4',
+        '5'  => '5',
+        '6'  => '6',
+        '7'  => '7',
+        '8'  => '8',
+        '9'  => '9',
+        '10' => '10',
+        '11' => '11',
+        '12' => '12',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Padding top', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    // title
+    if ( $type == 'pt' ) {
+        $defaults['title'] = __( 'Padding top', 'ayecode-connect' );
+        $defaults['icon']  = 'box-top';
+        $defaults['row']   = array(
+            'title' => __( 'Padding', 'ayecode-connect' ),
+            'key'   => 'wrapper-padding',
+            'open'  => true,
+            'class' => 'text-center',
+        );
+    } elseif ( $type == 'pr' ) {
+        $defaults['title'] = __( 'Padding right', 'ayecode-connect' );
+        $defaults['icon']  = 'box-right';
+        $defaults['row']   = array(
+            'key' => 'wrapper-padding',
+        );
+    } elseif ( $type == 'pb' ) {
+        $defaults['title'] = __( 'Padding bottom', 'ayecode-connect' );
+        $defaults['icon']  = 'box-bottom';
+        $defaults['row']   = array(
+            'key' => 'wrapper-padding',
+        );
+    } elseif ( $type == 'pl' ) {
+        $defaults['title'] = __( 'Padding left', 'ayecode-connect' );
+        $defaults['icon']  = 'box-left';
+        $defaults['row']   = array(
+            'key'   => 'wrapper-padding',
+            'close' => true,
+
+        );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -210,96 +210,96 @@ 
  * @return array
  */
 function sd_get_border_input( $type = 'border', $overwrite = array() ) {
-	global $aui_bs5;
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Border', 'ayecode-connect' ),
-		'options'  => array(),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	// title
-	if ( 'rounded' === $type ) {
-		$defaults['title']           = __( 'Border radius type', 'ayecode-connect' );
-		$defaults['options']         = array(
-			''               => __( 'Default', 'ayecode-connect' ),
-			'rounded'        => 'rounded',
-			'rounded-top'    => 'rounded-top',
-			'rounded-right'  => 'rounded-right',
-			'rounded-bottom' => 'rounded-bottom',
-			'rounded-left'   => 'rounded-left',
-		);
-		$defaults['element_require'] = '([%border%]&&[%border%]!="0")';
-	} elseif ( 'rounded_size' === $type ) {
-		$defaults['title'] = __( 'Border radius size', 'ayecode-connect' );
-
-		if ( $aui_bs5 ) {
-			$defaults['options'] = array(
-				''       => __( 'Default', 'ayecode-connect' ),
-				'0'      => '0',
-				'1'      => '1',
-				'2'      => '2',
-				'3'      => '3',
-				'4'      => '4',
-				'circle' => 'circle',
-				'pill'   => 'pill',
-			);
-		} else {
-			$defaults['options'] = array(
-				''   => __( 'Default', 'ayecode-connect' ),
-				'sm' => __( 'Small', 'ayecode-connect' ),
-				'lg' => __( 'Large', 'ayecode-connect' ),
-			);
-		}
-		$defaults['element_require'] = '([%border%]&&[%border%]!="0")';
-	} elseif ( 'width' === $type ) { // BS%
-		$defaults['title']           = __( 'Border width', 'ayecode-connect' );
-		$defaults['options']         = array(
-			''         => __( 'Default', 'ayecode-connect' ),
-			'border-2' => '2',
-			'border-3' => '3',
-			'border-4' => '4',
-			'border-5' => '5',
-		);
-		$defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
-	} elseif ( 'opacity' === $type ) { // BS%
-		$defaults['title']           = __( 'Border opacity', 'ayecode-connect' );
-		$defaults['options']         = array(
-			''                  => __( 'Default', 'ayecode-connect' ),
-			'border-opacity-75' => '75%',
-			'border-opacity-50' => '50%',
-			'border-opacity-25' => '25%',
-			'border-opacity-10' => '10%',
-		);
-		$defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
-	} elseif ( 'type' === $type ) {
-		$defaults['title']           = __( 'Border show', 'ayecode-connect' );
-		$defaults['options']         = array(
-			'border'          => __( 'Full (set color to show)', 'ayecode-connect' ),
-			'border-top'      => __( 'Top', 'ayecode-connect' ),
-			'border-bottom'   => __( 'Bottom', 'ayecode-connect' ),
-			'border-left'     => __( 'Left', 'ayecode-connect' ),
-			'border-right'    => __( 'Right', 'ayecode-connect' ),
-			'border-top-0'    => __( '-Top', 'ayecode-connect' ),
-			'border-bottom-0' => __( '-Bottom', 'ayecode-connect' ),
-			'border-left-0'   => __( '-Left', 'ayecode-connect' ),
-			'border-right-0'  => __( '-Right', 'ayecode-connect' ),
-		);
-		$defaults['element_require'] = '([%border%]&&[%border%]!="0")';
-	} else {
-		$defaults['title']   = __( 'Border color', 'ayecode-connect' );
-		$defaults['options'] = array(
-			''  => __( 'Default', 'ayecode-connect' ),
-			'0' => __( 'None', 'ayecode-connect' )
-		) + sd_aui_colors( false, false, false, false, true );
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    global $aui_bs5;
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Border', 'ayecode-connect' ),
+        'options'  => array(),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    // title
+    if ( 'rounded' === $type ) {
+        $defaults['title']           = __( 'Border radius type', 'ayecode-connect' );
+        $defaults['options']         = array(
+            ''               => __( 'Default', 'ayecode-connect' ),
+            'rounded'        => 'rounded',
+            'rounded-top'    => 'rounded-top',
+            'rounded-right'  => 'rounded-right',
+            'rounded-bottom' => 'rounded-bottom',
+            'rounded-left'   => 'rounded-left',
+        );
+        $defaults['element_require'] = '([%border%]&&[%border%]!="0")';
+    } elseif ( 'rounded_size' === $type ) {
+        $defaults['title'] = __( 'Border radius size', 'ayecode-connect' );
+
+        if ( $aui_bs5 ) {
+            $defaults['options'] = array(
+                ''       => __( 'Default', 'ayecode-connect' ),
+                '0'      => '0',
+                '1'      => '1',
+                '2'      => '2',
+                '3'      => '3',
+                '4'      => '4',
+                'circle' => 'circle',
+                'pill'   => 'pill',
+            );
+        } else {
+            $defaults['options'] = array(
+                ''   => __( 'Default', 'ayecode-connect' ),
+                'sm' => __( 'Small', 'ayecode-connect' ),
+                'lg' => __( 'Large', 'ayecode-connect' ),
+            );
+        }
+        $defaults['element_require'] = '([%border%]&&[%border%]!="0")';
+    } elseif ( 'width' === $type ) { // BS%
+        $defaults['title']           = __( 'Border width', 'ayecode-connect' );
+        $defaults['options']         = array(
+            ''         => __( 'Default', 'ayecode-connect' ),
+            'border-2' => '2',
+            'border-3' => '3',
+            'border-4' => '4',
+            'border-5' => '5',
+        );
+        $defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
+    } elseif ( 'opacity' === $type ) { // BS%
+        $defaults['title']           = __( 'Border opacity', 'ayecode-connect' );
+        $defaults['options']         = array(
+            ''                  => __( 'Default', 'ayecode-connect' ),
+            'border-opacity-75' => '75%',
+            'border-opacity-50' => '50%',
+            'border-opacity-25' => '25%',
+            'border-opacity-10' => '10%',
+        );
+        $defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
+    } elseif ( 'type' === $type ) {
+        $defaults['title']           = __( 'Border show', 'ayecode-connect' );
+        $defaults['options']         = array(
+            'border'          => __( 'Full (set color to show)', 'ayecode-connect' ),
+            'border-top'      => __( 'Top', 'ayecode-connect' ),
+            'border-bottom'   => __( 'Bottom', 'ayecode-connect' ),
+            'border-left'     => __( 'Left', 'ayecode-connect' ),
+            'border-right'    => __( 'Right', 'ayecode-connect' ),
+            'border-top-0'    => __( '-Top', 'ayecode-connect' ),
+            'border-bottom-0' => __( '-Bottom', 'ayecode-connect' ),
+            'border-left-0'   => __( '-Left', 'ayecode-connect' ),
+            'border-right-0'  => __( '-Right', 'ayecode-connect' ),
+        );
+        $defaults['element_require'] = '([%border%]&&[%border%]!="0")';
+    } else {
+        $defaults['title']   = __( 'Border color', 'ayecode-connect' );
+        $defaults['options'] = array(
+            ''  => __( 'Default', 'ayecode-connect' ),
+            '0' => __( 'None', 'ayecode-connect' )
+        ) + sd_aui_colors( false, false, false, false, true );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -311,25 +311,25 @@ 
  * @return array
  */
 function sd_get_shadow_input( $type = 'shadow', $overwrite = array() ) {
-	$options = array(
-		''          => __( 'None', 'ayecode-connect' ),
-		'shadow-sm' => __( 'Small', 'ayecode-connect' ),
-		'shadow'    => __( 'Regular', 'ayecode-connect' ),
-		'shadow-lg' => __( 'Large', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''          => __( 'None', 'ayecode-connect' ),
+        'shadow-sm' => __( 'Small', 'ayecode-connect' ),
+        'shadow'    => __( 'Regular', 'ayecode-connect' ),
+        'shadow-lg' => __( 'Large', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Shadow', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Shadow', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -341,23 +341,23 @@ 
  * @return array
  */
 function sd_get_background_input( $type = 'bg', $overwrite = array() ) {
-	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + sd_aui_colors(false,false,false,false,true);
+    $options = array(
+                    ''            => __( 'None', 'ayecode-connect' ),
+                    'transparent' => __( 'Transparent', 'ayecode-connect' ),
+                ) + sd_aui_colors(false,false,false,false,true);
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Background color', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Background color', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -369,35 +369,35 @@ 
  * @return array
  */
 function sd_get_opacity_input( $type = 'opacity', $overwrite = array() ) {
-	$options = array(
-		''            => __( 'Default', 'ayecode-connect' ),
-		'opacity-10'  => '10%',
-		'opacity-15'  => '15%',
-		'opacity-25'  => '25%',
-		'opacity-35'  => '35%',
-		'opacity-40'  => '40%',
-		'opacity-50'  => '50%',
-		'opacity-60'  => '60%',
-		'opacity-65'  => '65%',
-		'opacity-70'  => '70%',
-		'opacity-75'  => '75%',
-		'opacity-80'  => '80%',
-		'opacity-90'  => '90%',
-		'opacity-100' => '100%',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Opacity', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        ''            => __( 'Default', 'ayecode-connect' ),
+        'opacity-10'  => '10%',
+        'opacity-15'  => '15%',
+        'opacity-25'  => '25%',
+        'opacity-35'  => '35%',
+        'opacity-40'  => '40%',
+        'opacity-50'  => '50%',
+        'opacity-60'  => '60%',
+        'opacity-65'  => '65%',
+        'opacity-70'  => '70%',
+        'opacity-75'  => '75%',
+        'opacity-80'  => '80%',
+        'opacity-90'  => '90%',
+        'opacity-100' => '100%',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Opacity', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -410,124 +410,124 @@ 
  */
 function sd_get_background_inputs( $type = 'bg', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array(), $include_button_colors = false ) {
 
-	$color_options = $include_button_colors ? sd_aui_colors( false, true, true, true, true ) : sd_aui_colors(false, false, false, false, true );
-
-	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + $color_options;
-
-	if ( false !== $overwrite_color ) {
-		$options['custom-color'] = __( 'Custom Color', 'ayecode-connect' );
-	}
-
-	if ( false !== $overwrite_gradient ) {
-		$options['custom-gradient'] = __( 'Custom Gradient', 'ayecode-connect' );
-	}
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Background Color', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Background', 'ayecode-connect' ),
-	);
-
-	if ( $overwrite !== false ) {
-		$input[ $type ] = wp_parse_args( $overwrite, $defaults );
-	}
-
-	if ( $overwrite_color !== false ) {
-		$input[ $type . '_color' ] = wp_parse_args(
-			$overwrite_color,
-			array(
-				'type'            => 'color',
-				'title'           => __( 'Custom color', 'ayecode-connect' ),
-				'placeholder'     => '',
-				'default'         => '#0073aa',
-				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
-				'element_require' => '[%' . $type . '%]=="custom-color"',
-			)
-		);
-	}
-
-	if ( $overwrite_gradient !== false ) {
-		$input[ $type . '_gradient' ] = wp_parse_args(
-			$overwrite_gradient,
-			array(
-				'type'            => 'gradient',
-				'title'           => __( 'Custom gradient', 'ayecode-connect' ),
-				'placeholder'     => '',
-				'default'         => 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
-				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
-				'element_require' => '[%' . $type . '%]=="custom-gradient"',
-			)
-		);
-	}
-
-	if ( $overwrite_image !== false ) {
-
-		$input[ $type . '_image_fixed' ] = array(
-			'type'            => 'checkbox',
-			'title'           => __( 'Fixed background', 'ayecode-connect' ),
-			'default'         => '',
-			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
-			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
-
-		);
-
-		$input[ $type . '_image_use_featured' ] = array(
-			'type'            => 'checkbox',
-			'title'           => __( 'Use featured image', 'ayecode-connect' ),
-			'default'         => '',
-			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
-			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
-
-		);
-
-		$input[ $type . '_image' ] = wp_parse_args(
-			$overwrite_image,
-			array(
-				'type'        => 'image',
-				'title'       => __( 'Custom image', 'ayecode-connect' ),
-				'placeholder' => '',
-				'default'     => '',
-				'desc_tip'    => true,
-				'group'       => __( 'Background', 'ayecode-connect' ),
-				//          'element_require' => ' ![%' . $type . '_image_use_featured%] '
-			)
-		);
-
-		$input[ $type . '_image_id' ] = wp_parse_args(
-			$overwrite_image,
-			array(
-				'type'        => 'hidden',
-				'hidden_type' => 'number',
-				'title'       => '',
-				'placeholder' => '',
-				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
-			)
-		);
-
-		$input[ $type . '_image_xy' ] = wp_parse_args(
-			$overwrite_image,
-			array(
-				'type'        => 'image_xy',
-				'title'       => '',
-				'placeholder' => '',
-				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
-			)
-		);
-	}
-
-	return $input;
+    $color_options = $include_button_colors ? sd_aui_colors( false, true, true, true, true ) : sd_aui_colors(false, false, false, false, true );
+
+    $options = array(
+                    ''            => __( 'None', 'ayecode-connect' ),
+                    'transparent' => __( 'Transparent', 'ayecode-connect' ),
+                ) + $color_options;
+
+    if ( false !== $overwrite_color ) {
+        $options['custom-color'] = __( 'Custom Color', 'ayecode-connect' );
+    }
+
+    if ( false !== $overwrite_gradient ) {
+        $options['custom-gradient'] = __( 'Custom Gradient', 'ayecode-connect' );
+    }
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Background Color', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Background', 'ayecode-connect' ),
+    );
+
+    if ( $overwrite !== false ) {
+        $input[ $type ] = wp_parse_args( $overwrite, $defaults );
+    }
+
+    if ( $overwrite_color !== false ) {
+        $input[ $type . '_color' ] = wp_parse_args(
+            $overwrite_color,
+            array(
+                'type'            => 'color',
+                'title'           => __( 'Custom color', 'ayecode-connect' ),
+                'placeholder'     => '',
+                'default'         => '#0073aa',
+                'desc_tip'        => true,
+                'group'           => __( 'Background', 'ayecode-connect' ),
+                'element_require' => '[%' . $type . '%]=="custom-color"',
+            )
+        );
+    }
+
+    if ( $overwrite_gradient !== false ) {
+        $input[ $type . '_gradient' ] = wp_parse_args(
+            $overwrite_gradient,
+            array(
+                'type'            => 'gradient',
+                'title'           => __( 'Custom gradient', 'ayecode-connect' ),
+                'placeholder'     => '',
+                'default'         => 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
+                'desc_tip'        => true,
+                'group'           => __( 'Background', 'ayecode-connect' ),
+                'element_require' => '[%' . $type . '%]=="custom-gradient"',
+            )
+        );
+    }
+
+    if ( $overwrite_image !== false ) {
+
+        $input[ $type . '_image_fixed' ] = array(
+            'type'            => 'checkbox',
+            'title'           => __( 'Fixed background', 'ayecode-connect' ),
+            'default'         => '',
+            'desc_tip'        => true,
+            'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+            'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
+
+        );
+
+        $input[ $type . '_image_use_featured' ] = array(
+            'type'            => 'checkbox',
+            'title'           => __( 'Use featured image', 'ayecode-connect' ),
+            'default'         => '',
+            'desc_tip'        => true,
+            'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+            'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
+
+        );
+
+        $input[ $type . '_image' ] = wp_parse_args(
+            $overwrite_image,
+            array(
+                'type'        => 'image',
+                'title'       => __( 'Custom image', 'ayecode-connect' ),
+                'placeholder' => '',
+                'default'     => '',
+                'desc_tip'    => true,
+                'group'       => __( 'Background', 'ayecode-connect' ),
+                //          'element_require' => ' ![%' . $type . '_image_use_featured%] '
+            )
+        );
+
+        $input[ $type . '_image_id' ] = wp_parse_args(
+            $overwrite_image,
+            array(
+                'type'        => 'hidden',
+                'hidden_type' => 'number',
+                'title'       => '',
+                'placeholder' => '',
+                'default'     => '',
+                'group'       => __( 'Background', 'ayecode-connect' ),
+            )
+        );
+
+        $input[ $type . '_image_xy' ] = wp_parse_args(
+            $overwrite_image,
+            array(
+                'type'        => 'image_xy',
+                'title'       => '',
+                'placeholder' => '',
+                'default'     => '',
+                'group'       => __( 'Background', 'ayecode-connect' ),
+            )
+        );
+    }
+
+    return $input;
 }
 
 /**
@@ -540,175 +540,175 @@ 
  */
 function sd_get_shape_divider_inputs( $type = 'sd', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array() ) {
 
-	$options = array(
-		''                      => __( 'None', 'ayecode-connect' ),
-		'mountains'             => __( 'Mountains', 'ayecode-connect' ),
-		'drops'                 => __( 'Drops', 'ayecode-connect' ),
-		'clouds'                => __( 'Clouds', 'ayecode-connect' ),
-		'zigzag'                => __( 'Zigzag', 'ayecode-connect' ),
-		'pyramids'              => __( 'Pyramids', 'ayecode-connect' ),
-		'triangle'              => __( 'Triangle', 'ayecode-connect' ),
-		'triangle-asymmetrical' => __( 'Triangle Asymmetrical', 'ayecode-connect' ),
-		'tilt'                  => __( 'Tilt', 'ayecode-connect' ),
-		'opacity-tilt'          => __( 'Opacity Tilt', 'ayecode-connect' ),
-		'opacity-fan'           => __( 'Opacity Fan', 'ayecode-connect' ),
-		'curve'                 => __( 'Curve', 'ayecode-connect' ),
-		'curve-asymmetrical'    => __( 'Curve Asymmetrical', 'ayecode-connect' ),
-		'waves'                 => __( 'Waves', 'ayecode-connect' ),
-		'wave-brush'            => __( 'Wave Brush', 'ayecode-connect' ),
-		'waves-pattern'         => __( 'Waves Pattern', 'ayecode-connect' ),
-		'arrow'                 => __( 'Arrow', 'ayecode-connect' ),
-		'split'                 => __( 'Split', 'ayecode-connect' ),
-		'book'                  => __( 'Book', 'ayecode-connect' ),
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Shape Divider', 'ayecode-connect' ),
-	);
-
-	$input[ $type ] = wp_parse_args( $overwrite, $defaults );
-
-	$input[ $type . '_notice' ] = array(
-		'type'            => 'notice',
-		'desc'            => __( 'Parent element must be position `relative`', 'ayecode-connect' ),
-		'status'          => 'warning',
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => '[%' . $type . '%]!=""',
-	);
-
-	$input[ $type . '_position' ] = wp_parse_args(
-		$overwrite_color,
-		array(
-			'type'            => 'select',
-			'title'           => __( 'Position', 'ayecode-connect' ),
-			'options'         => array(
-				'top'    => __( 'Top', 'ayecode-connect' ),
-				'bottom' => __( 'Bottom', 'ayecode-connect' ),
-			),
-			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require' => '[%' . $type . '%]!=""',
-		)
-	);
-
-	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + sd_aui_colors(false,false,false,false,true )
-	           + array(
-		           'custom-color' => __( 'Custom Color', 'ayecode-connect' ),
-	           );
-
-	$input[ $type . '_color' ] = wp_parse_args(
-		$overwrite_color,
-		array(
-			'type'            => 'select',
-			'title'           => __( 'Color', 'ayecode-connect' ),
-			'options'         => $options,
-			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require' => '[%' . $type . '%]!=""',
-		)
-	);
-
-	$input[ $type . '_custom_color' ] = wp_parse_args(
-		$overwrite_color,
-		array(
-			'type'            => 'color',
-			'title'           => __( 'Custom color', 'ayecode-connect' ),
-			'placeholder'     => '',
-			'default'         => '#0073aa',
-			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require' => '[%' . $type . '_color%]=="custom-color" && [%' . $type . '%]!=""',
-		)
-	);
-
-	$input[ $type . '_width' ] = wp_parse_args(
-		$overwrite_gradient,
-		array(
-			'type'              => 'range',
-			'title'             => __( 'Width', 'ayecode-connect' ),
-			'placeholder'       => '',
-			'default'           => '200',
-			'desc_tip'          => true,
-			'custom_attributes' => array(
-				'min' => 100,
-				'max' => 300,
-			),
-			'group'             => __( 'Shape Divider', 'ayecode-connect' ),
-			'element_require'   => '[%' . $type . '%]!=""',
-		)
-	);
-
-	$input[ $type . '_height' ] = array(
-		'type'              => 'range',
-		'title'             => __( 'Height', 'ayecode-connect' ),
-		'default'           => '100',
-		'desc_tip'          => true,
-		'custom_attributes' => array(
-			'min' => 0,
-			'max' => 500,
-		),
-		'group'             => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require'   => '[%' . $type . '%]!=""',
-	);
-
-	$requires = array(
-		'mountains'             => array( 'flip' ),
-		'drops'                 => array( 'flip', 'invert' ),
-		'clouds'                => array( 'flip', 'invert' ),
-		'zigzag'                => array(),
-		'pyramids'              => array( 'flip', 'invert' ),
-		'triangle'              => array( 'invert' ),
-		'triangle-asymmetrical' => array( 'flip', 'invert' ),
-		'tilt'                  => array( 'flip' ),
-		'opacity-tilt'          => array( 'flip' ),
-		'opacity-fan'           => array(),
-		'curve'                 => array( 'invert' ),
-		'curve-asymmetrical'    => array( 'flip', 'invert' ),
-		'waves'                 => array( 'flip', 'invert' ),
-		'wave-brush'            => array( 'flip' ),
-		'waves-pattern'         => array( 'flip' ),
-		'arrow'                 => array( 'invert' ),
-		'split'                 => array( 'invert' ),
-		'book'                  => array( 'invert' ),
-	);
-
-	$input[ $type . '_flip' ] = array(
-		'type'            => 'checkbox',
-		'title'           => __( 'Flip', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'flip', 'sd' ),
-	);
-
-	$input[ $type . '_invert' ] = array(
-		'type'            => 'checkbox',
-		'title'           => __( 'Invert', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'invert', 'sd' ),
-	);
-
-	$input[ $type . '_btf' ] = array(
-		'type'            => 'checkbox',
-		'title'           => __( 'Bring to front', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => '[%' . $type . '%]!=""',
-
-	);
-
-	return $input;
+    $options = array(
+        ''                      => __( 'None', 'ayecode-connect' ),
+        'mountains'             => __( 'Mountains', 'ayecode-connect' ),
+        'drops'                 => __( 'Drops', 'ayecode-connect' ),
+        'clouds'                => __( 'Clouds', 'ayecode-connect' ),
+        'zigzag'                => __( 'Zigzag', 'ayecode-connect' ),
+        'pyramids'              => __( 'Pyramids', 'ayecode-connect' ),
+        'triangle'              => __( 'Triangle', 'ayecode-connect' ),
+        'triangle-asymmetrical' => __( 'Triangle Asymmetrical', 'ayecode-connect' ),
+        'tilt'                  => __( 'Tilt', 'ayecode-connect' ),
+        'opacity-tilt'          => __( 'Opacity Tilt', 'ayecode-connect' ),
+        'opacity-fan'           => __( 'Opacity Fan', 'ayecode-connect' ),
+        'curve'                 => __( 'Curve', 'ayecode-connect' ),
+        'curve-asymmetrical'    => __( 'Curve Asymmetrical', 'ayecode-connect' ),
+        'waves'                 => __( 'Waves', 'ayecode-connect' ),
+        'wave-brush'            => __( 'Wave Brush', 'ayecode-connect' ),
+        'waves-pattern'         => __( 'Waves Pattern', 'ayecode-connect' ),
+        'arrow'                 => __( 'Arrow', 'ayecode-connect' ),
+        'split'                 => __( 'Split', 'ayecode-connect' ),
+        'book'                  => __( 'Book', 'ayecode-connect' ),
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Type', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Shape Divider', 'ayecode-connect' ),
+    );
+
+    $input[ $type ] = wp_parse_args( $overwrite, $defaults );
+
+    $input[ $type . '_notice' ] = array(
+        'type'            => 'notice',
+        'desc'            => __( 'Parent element must be position `relative`', 'ayecode-connect' ),
+        'status'          => 'warning',
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => '[%' . $type . '%]!=""',
+    );
+
+    $input[ $type . '_position' ] = wp_parse_args(
+        $overwrite_color,
+        array(
+            'type'            => 'select',
+            'title'           => __( 'Position', 'ayecode-connect' ),
+            'options'         => array(
+                'top'    => __( 'Top', 'ayecode-connect' ),
+                'bottom' => __( 'Bottom', 'ayecode-connect' ),
+            ),
+            'desc_tip'        => true,
+            'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require' => '[%' . $type . '%]!=""',
+        )
+    );
+
+    $options = array(
+                    ''            => __( 'None', 'ayecode-connect' ),
+                    'transparent' => __( 'Transparent', 'ayecode-connect' ),
+                ) + sd_aui_colors(false,false,false,false,true )
+               + array(
+                    'custom-color' => __( 'Custom Color', 'ayecode-connect' ),
+                );
+
+    $input[ $type . '_color' ] = wp_parse_args(
+        $overwrite_color,
+        array(
+            'type'            => 'select',
+            'title'           => __( 'Color', 'ayecode-connect' ),
+            'options'         => $options,
+            'desc_tip'        => true,
+            'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require' => '[%' . $type . '%]!=""',
+        )
+    );
+
+    $input[ $type . '_custom_color' ] = wp_parse_args(
+        $overwrite_color,
+        array(
+            'type'            => 'color',
+            'title'           => __( 'Custom color', 'ayecode-connect' ),
+            'placeholder'     => '',
+            'default'         => '#0073aa',
+            'desc_tip'        => true,
+            'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require' => '[%' . $type . '_color%]=="custom-color" && [%' . $type . '%]!=""',
+        )
+    );
+
+    $input[ $type . '_width' ] = wp_parse_args(
+        $overwrite_gradient,
+        array(
+            'type'              => 'range',
+            'title'             => __( 'Width', 'ayecode-connect' ),
+            'placeholder'       => '',
+            'default'           => '200',
+            'desc_tip'          => true,
+            'custom_attributes' => array(
+                'min' => 100,
+                'max' => 300,
+            ),
+            'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+            'element_require'   => '[%' . $type . '%]!=""',
+        )
+    );
+
+    $input[ $type . '_height' ] = array(
+        'type'              => 'range',
+        'title'             => __( 'Height', 'ayecode-connect' ),
+        'default'           => '100',
+        'desc_tip'          => true,
+        'custom_attributes' => array(
+            'min' => 0,
+            'max' => 500,
+        ),
+        'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require'   => '[%' . $type . '%]!=""',
+    );
+
+    $requires = array(
+        'mountains'             => array( 'flip' ),
+        'drops'                 => array( 'flip', 'invert' ),
+        'clouds'                => array( 'flip', 'invert' ),
+        'zigzag'                => array(),
+        'pyramids'              => array( 'flip', 'invert' ),
+        'triangle'              => array( 'invert' ),
+        'triangle-asymmetrical' => array( 'flip', 'invert' ),
+        'tilt'                  => array( 'flip' ),
+        'opacity-tilt'          => array( 'flip' ),
+        'opacity-fan'           => array(),
+        'curve'                 => array( 'invert' ),
+        'curve-asymmetrical'    => array( 'flip', 'invert' ),
+        'waves'                 => array( 'flip', 'invert' ),
+        'wave-brush'            => array( 'flip' ),
+        'waves-pattern'         => array( 'flip' ),
+        'arrow'                 => array( 'invert' ),
+        'split'                 => array( 'invert' ),
+        'book'                  => array( 'invert' ),
+    );
+
+    $input[ $type . '_flip' ] = array(
+        'type'            => 'checkbox',
+        'title'           => __( 'Flip', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => sd_get_element_require_string( $requires, 'flip', 'sd' ),
+    );
+
+    $input[ $type . '_invert' ] = array(
+        'type'            => 'checkbox',
+        'title'           => __( 'Invert', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => sd_get_element_require_string( $requires, 'invert', 'sd' ),
+    );
+
+    $input[ $type . '_btf' ] = array(
+        'type'            => 'checkbox',
+        'title'           => __( 'Bring to front', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+        'element_require' => '[%' . $type . '%]!=""',
+
+    );
+
+    return $input;
 }
 
 /**
@@ -721,22 +721,22 @@ 
  * @return string
  */
 function sd_get_element_require_string( $args, $key, $type ) {
-	$output   = '';
-	$requires = array();
+    $output   = '';
+    $requires = array();
 
-	if ( ! empty( $args ) ) {
-		foreach ( $args as $t => $k ) {
-			if ( in_array( $key, $k ) ) {
-				$requires[] = '[%' . $type . '%]=="' . $t . '"';
-			}
-		}
+    if ( ! empty( $args ) ) {
+        foreach ( $args as $t => $k ) {
+            if ( in_array( $key, $k ) ) {
+                $requires[] = '[%' . $type . '%]=="' . $t . '"';
+            }
+        }
 
-		if ( ! empty( $requires ) ) {
-			$output = '(' . implode( ' || ', $requires ) . ')';
-		}
-	}
+        if ( ! empty( $requires ) ) {
+            $output = '(' . implode( ' || ', $requires ) . ')';
+        }
+    }
 
-	return $output;
+    return $output;
 }
 
 /**
@@ -748,41 +748,41 @@ 
  * @return array
  */
 function sd_get_text_color_input( $type = 'text_color', $overwrite = array(), $has_custom = false, $emphasis = true ) {
-	$options = array(
-		           '' => __( 'None', 'ayecode-connect' ),
-	           ) + sd_aui_colors(false,false,false,false,false, true);
+    $options = array(
+                    '' => __( 'None', 'ayecode-connect' ),
+                ) + sd_aui_colors(false,false,false,false,false, true);
 
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom color', 'ayecode-connect' );
-	}
+    if ( $has_custom ) {
+        $options['custom'] = __( 'Custom color', 'ayecode-connect' );
+    }
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Text color', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Text color', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 function sd_get_text_color_input_group( $type = 'text_color', $overwrite = array(), $overwrite_custom = array() ) {
-	$inputs = array();
+    $inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_text_color_input( $type, $overwrite, true );
-	}
+    if ( $overwrite !== false ) {
+        $inputs[ $type ] = sd_get_text_color_input( $type, $overwrite, true );
+    }
 
-	if ( $overwrite_custom !== false ) {
-		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_custom_color_input( $custom, $overwrite_custom, $type );
-	}
+    if ( $overwrite_custom !== false ) {
+        $custom            = $type . '_custom';
+        $inputs[ $custom ] = sd_get_custom_color_input( $custom, $overwrite_custom, $type );
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 /**
@@ -795,22 +795,22 @@ 
  */
 function sd_get_custom_color_input( $type = 'color_custom', $overwrite = array(), $parent_type = '' ) {
 
-	$defaults = array(
-		'type'        => 'color',
-		'title'       => __( 'Custom color', 'ayecode-connect' ),
-		'default'     => '',
-		'placeholder' => '',
-		'desc_tip'    => true,
-		'group'       => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'        => 'color',
+        'title'       => __( 'Custom color', 'ayecode-connect' ),
+        'default'     => '',
+        'placeholder' => '',
+        'desc_tip'    => true,
+        'group'       => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	if ( $parent_type ) {
-		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
-	}
+    if ( $parent_type ) {
+        $defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
+    }
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -823,44 +823,44 @@ 
  */
 function sd_get_col_input( $type = 'col', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''     => __( 'Default', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
-		'1'    => '1/12',
-		'2'    => '2/12',
-		'3'    => '3/12',
-		'4'    => '4/12',
-		'5'    => '5/12',
-		'6'    => '6/12',
-		'7'    => '7/12',
-		'8'    => '8/12',
-		'9'    => '9/12',
-		'10'   => '10/12',
-		'11'   => '11/12',
-		'12'   => '12/12',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Column width', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
-		'element_require' => '[%container%]=="col"',
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''     => __( 'Default', 'ayecode-connect' ),
+        'auto' => __( 'auto', 'ayecode-connect' ),
+        '1'    => '1/12',
+        '2'    => '2/12',
+        '3'    => '3/12',
+        '4'    => '4/12',
+        '5'    => '5/12',
+        '6'    => '6/12',
+        '7'    => '7/12',
+        '8'    => '8/12',
+        '9'    => '9/12',
+        '10'   => '10/12',
+        '11'   => '11/12',
+        '12'   => '12/12',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Column width', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Container', 'ayecode-connect' ),
+        'element_require' => '[%container%]=="col"',
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -873,37 +873,37 @@ 
  */
 function sd_get_row_cols_input( $type = 'row_cols', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''  => __( 'auto', 'ayecode-connect' ),
-		'1' => '1',
-		'2' => '2',
-		'3' => '3',
-		'4' => '4',
-		'5' => '5',
-		'6' => '6',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Row columns', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
-		'element_require' => '[%container%]=="row"',
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''  => __( 'auto', 'ayecode-connect' ),
+        '1' => '1',
+        '2' => '2',
+        '3' => '3',
+        '4' => '4',
+        '5' => '5',
+        '6' => '6',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Row columns', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Container', 'ayecode-connect' ),
+        'element_require' => '[%container%]=="row"',
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -916,33 +916,33 @@ 
  */
 function sd_get_text_align_input( $type = 'text_align', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                => __( 'Default', 'ayecode-connect' ),
-		'text' . $device_size . '-left'   => __( 'Left', 'ayecode-connect' ),
-		'text' . $device_size . '-right'  => __( 'Right', 'ayecode-connect' ),
-		'text' . $device_size . '-center' => __( 'Center', 'ayecode-connect' ),
-	);
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                => __( 'Default', 'ayecode-connect' ),
+        'text' . $device_size . '-left'   => __( 'Left', 'ayecode-connect' ),
+        'text' . $device_size . '-right'  => __( 'Right', 'ayecode-connect' ),
+        'text' . $device_size . '-center' => __( 'Center', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Text align', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Text align', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -955,39 +955,39 @@ 
  */
 function sd_get_display_input( $type = 'display', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                   => __( 'Default', 'ayecode-connect' ),
-		'd' . $device_size . '-none'         => 'none',
-		'd' . $device_size . '-inline'       => 'inline',
-		'd' . $device_size . '-inline-block' => 'inline-block',
-		'd' . $device_size . '-block'        => 'block',
-		'd' . $device_size . '-table'        => 'table',
-		'd' . $device_size . '-table-cell'   => 'table-cell',
-		'd' . $device_size . '-table-row'    => 'table-row',
-		'd' . $device_size . '-flex'         => 'flex',
-		'd' . $device_size . '-inline-flex'  => 'inline-flex',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Display', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                   => __( 'Default', 'ayecode-connect' ),
+        'd' . $device_size . '-none'         => 'none',
+        'd' . $device_size . '-inline'       => 'inline',
+        'd' . $device_size . '-inline-block' => 'inline-block',
+        'd' . $device_size . '-block'        => 'block',
+        'd' . $device_size . '-table'        => 'table',
+        'd' . $device_size . '-table-cell'   => 'table-cell',
+        'd' . $device_size . '-table-row'    => 'table-row',
+        'd' . $device_size . '-flex'         => 'flex',
+        'd' . $device_size . '-inline-flex'  => 'inline-flex',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Display', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1000,17 +1000,17 @@ 
  */
 function sd_get_text_justify_input( $type = 'text_justify', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'checkbox',
-		'title'    => __( 'Text justify', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'checkbox',
+        'title'    => __( 'Text justify', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1023,114 +1023,114 @@ 
  * @return array
  */
 function sd_aui_colors( $include_branding = false, $include_outlines = false, $outline_button_only_text = false, $include_translucent = false, $include_subtle = false, $include_emphasis = false ) {
-	$theme_colors = array();
-
-	$theme_colors['primary']   = __( 'Primary', 'ayecode-connect' );
-	$theme_colors['secondary'] = __( 'Secondary', 'ayecode-connect' );
-	$theme_colors['success']   = __( 'Success', 'ayecode-connect' );
-	$theme_colors['danger']    = __( 'Danger', 'ayecode-connect' );
-	$theme_colors['warning']   = __( 'Warning', 'ayecode-connect' );
-	$theme_colors['info']      = __( 'Info', 'ayecode-connect' );
-	$theme_colors['light']     = __( 'Light', 'ayecode-connect' );
-	$theme_colors['dark']      = __( 'Dark', 'ayecode-connect' );
-	$theme_colors['black']     = __( 'Black', 'ayecode-connect' );
-	$theme_colors['white']     = __( 'White', 'ayecode-connect' );
-	$theme_colors['purple']    = __( 'Purple', 'ayecode-connect' );
-	$theme_colors['salmon']    = __( 'Salmon', 'ayecode-connect' );
-	$theme_colors['cyan']      = __( 'Cyan', 'ayecode-connect' );
-	$theme_colors['gray']      = __( 'Gray', 'ayecode-connect' );
-	$theme_colors['muted']     = __( 'Muted', 'ayecode-connect' );
-	$theme_colors['gray-dark'] = __( 'Gray dark', 'ayecode-connect' );
-	$theme_colors['indigo']    = __( 'Indigo', 'ayecode-connect' );
-	$theme_colors['orange']    = __( 'Orange', 'ayecode-connect' );
-	$theme_colors['body']      = __( 'Body', 'ayecode-connect' );
-
-
-	// for bg and borders
-	if ( $include_subtle ) {
-		$theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
-		$theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
-		$theme_colors['secondary-subtle'] = __( 'Secondary Subtle', 'ayecode-connect' );
-		$theme_colors['success-subtle']   = __( 'Success Subtle', 'ayecode-connect' );
-		$theme_colors['danger-subtle']    = __( 'Danger Subtle', 'ayecode-connect' );
-		$theme_colors['warning-subtle']   = __( 'Warning Subtle', 'ayecode-connect' );
-		$theme_colors['info-subtle']      = __( 'Info Subtle', 'ayecode-connect' );
-		$theme_colors['light-subtle']     = __( 'Light Subtle', 'ayecode-connect' );
-		$theme_colors['dark-subtle']      = __( 'Dark Subtle', 'ayecode-connect' );
-		$theme_colors['purple-subtle']    = __( 'Purple Subtle', 'ayecode-connect' );
-		$theme_colors['salmon-subtle']    = __( 'Salmon Subtle', 'ayecode-connect' );
-		$theme_colors['cyan-subtle']      = __( 'Cyan Subtle', 'ayecode-connect' );
-		$theme_colors['gray-subtle']      = __( 'Gray Subtle', 'ayecode-connect' );
-		$theme_colors['gray-dark-subtle'] = __( 'Gray dark Subtle', 'ayecode-connect' );
-		$theme_colors['indigo-subtle']    = __( 'Indigo Subtle', 'ayecode-connect' );
-		$theme_colors['orange-subtle']    = __( 'Orange Subtle', 'ayecode-connect' );
-	}
-
-	// for texts
-	if ($include_emphasis) {
-		$theme_colors['primary-emphasis']   = __( 'Primary Emphasis', 'ayecode-connect' );
-		$theme_colors['secondary-emphasis'] = __( 'Secondary Emphasis', 'ayecode-connect' );
-		$theme_colors['success-emphasis']   = __( 'Success Emphasis', 'ayecode-connect' );
-		$theme_colors['danger-emphasis']    = __( 'Danger Emphasis', 'ayecode-connect' );
-		$theme_colors['warning-emphasis']   = __( 'Warning Emphasis', 'ayecode-connect' );
-		$theme_colors['info-emphasis']      = __( 'Info Emphasis', 'ayecode-connect' );
-		$theme_colors['light-emphasis']     = __( 'Light Emphasis', 'ayecode-connect' );
-		$theme_colors['dark-emphasis']      = __( 'Dark Emphasis', 'ayecode-connect' );
-		$theme_colors['purple-emphasis']    = __( 'Purple Emphasis', 'ayecode-connect' );
-		$theme_colors['salmon-emphasis']    = __( 'Salmon Emphasis', 'ayecode-connect' );
-		$theme_colors['cyan-emphasis']      = __( 'Cyan Emphasis', 'ayecode-connect' );
-		$theme_colors['gray-emphasis']      = __( 'Gray Emphasis', 'ayecode-connect' );
-		$theme_colors['muted-emphasis']     = __( 'Muted Emphasis', 'ayecode-connect' );
-		$theme_colors['gray-dark-emphasis'] = __( 'Gray dark Emphasis', 'ayecode-connect' );
-		$theme_colors['indigo-emphasis']    = __( 'Indigo Emphasis', 'ayecode-connect' );
-		$theme_colors['orange-emphasis']    = __( 'Orange Emphasis', 'ayecode-connect' );
-	}
-
-	if ( $include_outlines ) {
-		$button_only                       = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['outline-primary']   = __( 'Primary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-secondary'] = __( 'Secondary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-success']   = __( 'Success outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-danger']    = __( 'Danger outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-warning']   = __( 'Warning outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-info']      = __( 'Info outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-light']     = __( 'Light outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-dark']      = __( 'Dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-white']     = __( 'White outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-purple']    = __( 'Purple outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-salmon']    = __( 'Salmon outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-cyan']      = __( 'Cyan outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray']      = __( 'Gray outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray-dark'] = __( 'Gray dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-indigo']    = __( 'Indigo outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-orange']    = __( 'Orange outline', 'ayecode-connect' ) . $button_only;
-	}
-
-	if ( $include_branding ) {
-		$theme_colors = $theme_colors + sd_aui_branding_colors();
-	}
-
-	if ( $include_translucent ) {
-		$button_only                           = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['translucent-primary']   = __( 'Primary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-secondary'] = __( 'Secondary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-success']   = __( 'Success translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-danger']    = __( 'Danger translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-warning']   = __( 'Warning translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-info']      = __( 'Info translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-light']     = __( 'Light translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-dark']      = __( 'Dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-white']     = __( 'White translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-purple']    = __( 'Purple translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-salmon']    = __( 'Salmon translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-cyan']      = __( 'Cyan translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray']      = __( 'Gray translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray-dark'] = __( 'Gray dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-indigo']    = __( 'Indigo translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-orange']    = __( 'Orange translucent', 'ayecode-connect' ) . $button_only;
-	}
-
-	return apply_filters( 'sd_aui_colors', $theme_colors, $include_outlines, $include_branding );
+    $theme_colors = array();
+
+    $theme_colors['primary']   = __( 'Primary', 'ayecode-connect' );
+    $theme_colors['secondary'] = __( 'Secondary', 'ayecode-connect' );
+    $theme_colors['success']   = __( 'Success', 'ayecode-connect' );
+    $theme_colors['danger']    = __( 'Danger', 'ayecode-connect' );
+    $theme_colors['warning']   = __( 'Warning', 'ayecode-connect' );
+    $theme_colors['info']      = __( 'Info', 'ayecode-connect' );
+    $theme_colors['light']     = __( 'Light', 'ayecode-connect' );
+    $theme_colors['dark']      = __( 'Dark', 'ayecode-connect' );
+    $theme_colors['black']     = __( 'Black', 'ayecode-connect' );
+    $theme_colors['white']     = __( 'White', 'ayecode-connect' );
+    $theme_colors['purple']    = __( 'Purple', 'ayecode-connect' );
+    $theme_colors['salmon']    = __( 'Salmon', 'ayecode-connect' );
+    $theme_colors['cyan']      = __( 'Cyan', 'ayecode-connect' );
+    $theme_colors['gray']      = __( 'Gray', 'ayecode-connect' );
+    $theme_colors['muted']     = __( 'Muted', 'ayecode-connect' );
+    $theme_colors['gray-dark'] = __( 'Gray dark', 'ayecode-connect' );
+    $theme_colors['indigo']    = __( 'Indigo', 'ayecode-connect' );
+    $theme_colors['orange']    = __( 'Orange', 'ayecode-connect' );
+    $theme_colors['body']      = __( 'Body', 'ayecode-connect' );
+
+
+    // for bg and borders
+    if ( $include_subtle ) {
+        $theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
+        $theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
+        $theme_colors['secondary-subtle'] = __( 'Secondary Subtle', 'ayecode-connect' );
+        $theme_colors['success-subtle']   = __( 'Success Subtle', 'ayecode-connect' );
+        $theme_colors['danger-subtle']    = __( 'Danger Subtle', 'ayecode-connect' );
+        $theme_colors['warning-subtle']   = __( 'Warning Subtle', 'ayecode-connect' );
+        $theme_colors['info-subtle']      = __( 'Info Subtle', 'ayecode-connect' );
+        $theme_colors['light-subtle']     = __( 'Light Subtle', 'ayecode-connect' );
+        $theme_colors['dark-subtle']      = __( 'Dark Subtle', 'ayecode-connect' );
+        $theme_colors['purple-subtle']    = __( 'Purple Subtle', 'ayecode-connect' );
+        $theme_colors['salmon-subtle']    = __( 'Salmon Subtle', 'ayecode-connect' );
+        $theme_colors['cyan-subtle']      = __( 'Cyan Subtle', 'ayecode-connect' );
+        $theme_colors['gray-subtle']      = __( 'Gray Subtle', 'ayecode-connect' );
+        $theme_colors['gray-dark-subtle'] = __( 'Gray dark Subtle', 'ayecode-connect' );
+        $theme_colors['indigo-subtle']    = __( 'Indigo Subtle', 'ayecode-connect' );
+        $theme_colors['orange-subtle']    = __( 'Orange Subtle', 'ayecode-connect' );
+    }
+
+    // for texts
+    if ($include_emphasis) {
+        $theme_colors['primary-emphasis']   = __( 'Primary Emphasis', 'ayecode-connect' );
+        $theme_colors['secondary-emphasis'] = __( 'Secondary Emphasis', 'ayecode-connect' );
+        $theme_colors['success-emphasis']   = __( 'Success Emphasis', 'ayecode-connect' );
+        $theme_colors['danger-emphasis']    = __( 'Danger Emphasis', 'ayecode-connect' );
+        $theme_colors['warning-emphasis']   = __( 'Warning Emphasis', 'ayecode-connect' );
+        $theme_colors['info-emphasis']      = __( 'Info Emphasis', 'ayecode-connect' );
+        $theme_colors['light-emphasis']     = __( 'Light Emphasis', 'ayecode-connect' );
+        $theme_colors['dark-emphasis']      = __( 'Dark Emphasis', 'ayecode-connect' );
+        $theme_colors['purple-emphasis']    = __( 'Purple Emphasis', 'ayecode-connect' );
+        $theme_colors['salmon-emphasis']    = __( 'Salmon Emphasis', 'ayecode-connect' );
+        $theme_colors['cyan-emphasis']      = __( 'Cyan Emphasis', 'ayecode-connect' );
+        $theme_colors['gray-emphasis']      = __( 'Gray Emphasis', 'ayecode-connect' );
+        $theme_colors['muted-emphasis']     = __( 'Muted Emphasis', 'ayecode-connect' );
+        $theme_colors['gray-dark-emphasis'] = __( 'Gray dark Emphasis', 'ayecode-connect' );
+        $theme_colors['indigo-emphasis']    = __( 'Indigo Emphasis', 'ayecode-connect' );
+        $theme_colors['orange-emphasis']    = __( 'Orange Emphasis', 'ayecode-connect' );
+    }
+
+    if ( $include_outlines ) {
+        $button_only                       = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
+        $theme_colors['outline-primary']   = __( 'Primary outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-secondary'] = __( 'Secondary outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-success']   = __( 'Success outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-danger']    = __( 'Danger outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-warning']   = __( 'Warning outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-info']      = __( 'Info outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-light']     = __( 'Light outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-dark']      = __( 'Dark outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-white']     = __( 'White outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-purple']    = __( 'Purple outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-salmon']    = __( 'Salmon outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-cyan']      = __( 'Cyan outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-gray']      = __( 'Gray outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-gray-dark'] = __( 'Gray dark outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-indigo']    = __( 'Indigo outline', 'ayecode-connect' ) . $button_only;
+        $theme_colors['outline-orange']    = __( 'Orange outline', 'ayecode-connect' ) . $button_only;
+    }
+
+    if ( $include_branding ) {
+        $theme_colors = $theme_colors + sd_aui_branding_colors();
+    }
+
+    if ( $include_translucent ) {
+        $button_only                           = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
+        $theme_colors['translucent-primary']   = __( 'Primary translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-secondary'] = __( 'Secondary translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-success']   = __( 'Success translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-danger']    = __( 'Danger translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-warning']   = __( 'Warning translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-info']      = __( 'Info translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-light']     = __( 'Light translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-dark']      = __( 'Dark translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-white']     = __( 'White translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-purple']    = __( 'Purple translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-salmon']    = __( 'Salmon translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-cyan']      = __( 'Cyan translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-gray']      = __( 'Gray translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-gray-dark'] = __( 'Gray dark translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-indigo']    = __( 'Indigo translucent', 'ayecode-connect' ) . $button_only;
+        $theme_colors['translucent-orange']    = __( 'Orange translucent', 'ayecode-connect' ) . $button_only;
+    }
+
+    return apply_filters( 'sd_aui_colors', $theme_colors, $include_outlines, $include_branding );
 }
 
 /**
@@ -1139,19 +1139,19 @@ 
  * @return array
  */
 function sd_aui_branding_colors() {
-	return array(
-		'facebook'  => __( 'Facebook', 'ayecode-connect' ),
-		'twitter'   => __( 'Twitter', 'ayecode-connect' ),
-		'instagram' => __( 'Instagram', 'ayecode-connect' ),
-		'linkedin'  => __( 'Linkedin', 'ayecode-connect' ),
-		'flickr'    => __( 'Flickr', 'ayecode-connect' ),
-		'github'    => __( 'GitHub', 'ayecode-connect' ),
-		'youtube'   => __( 'YouTube', 'ayecode-connect' ),
-		'wordpress' => __( 'WordPress', 'ayecode-connect' ),
-		'google'    => __( 'Google', 'ayecode-connect' ),
-		'yahoo'     => __( 'Yahoo', 'ayecode-connect' ),
-		'vkontakte' => __( 'Vkontakte', 'ayecode-connect' ),
-	);
+    return array(
+        'facebook'  => __( 'Facebook', 'ayecode-connect' ),
+        'twitter'   => __( 'Twitter', 'ayecode-connect' ),
+        'instagram' => __( 'Instagram', 'ayecode-connect' ),
+        'linkedin'  => __( 'Linkedin', 'ayecode-connect' ),
+        'flickr'    => __( 'Flickr', 'ayecode-connect' ),
+        'github'    => __( 'GitHub', 'ayecode-connect' ),
+        'youtube'   => __( 'YouTube', 'ayecode-connect' ),
+        'wordpress' => __( 'WordPress', 'ayecode-connect' ),
+        'google'    => __( 'Google', 'ayecode-connect' ),
+        'yahoo'     => __( 'Yahoo', 'ayecode-connect' ),
+        'vkontakte' => __( 'Vkontakte', 'ayecode-connect' ),
+    );
 }
 
 
@@ -1165,38 +1165,38 @@ 
  */
 function sd_get_container_class_input( $type = 'container', $overwrite = array() ) {
 
-	$options = array(
-		'container'       => __( 'container (default)', 'ayecode-connect' ),
-		'container-sm'    => 'container-sm',
-		'container-md'    => 'container-md',
-		'container-lg'    => 'container-lg',
-		'container-xl'    => 'container-xl',
-		'container-xxl'   => 'container-xxl',
-		'container-fluid' => 'container-fluid',
-		'row'             => 'row',
-		'col'             => 'col',
-		'card'            => 'card',
-		'card-header'     => 'card-header',
-		'card-img-top'    => 'card-img-top',
-		'card-body'       => 'card-body',
-		'card-footer'     => 'card-footer',
-		'list-group'      => 'list-group',
-		'list-group-item' => 'list-group-item',
-		''                => __( 'no container class', 'ayecode-connect' ),
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Container', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $options = array(
+        'container'       => __( 'container (default)', 'ayecode-connect' ),
+        'container-sm'    => 'container-sm',
+        'container-md'    => 'container-md',
+        'container-lg'    => 'container-lg',
+        'container-xl'    => 'container-xl',
+        'container-xxl'   => 'container-xxl',
+        'container-fluid' => 'container-fluid',
+        'row'             => 'row',
+        'col'             => 'col',
+        'card'            => 'card',
+        'card-header'     => 'card-header',
+        'card-img-top'    => 'card-img-top',
+        'card-body'       => 'card-body',
+        'card-footer'     => 'card-footer',
+        'list-group'      => 'list-group',
+        'list-group-item' => 'list-group-item',
+        ''                => __( 'no container class', 'ayecode-connect' ),
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Type', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Container', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1209,30 +1209,30 @@ 
  */
 function sd_get_position_class_input( $type = 'position', $overwrite = array() ) {
 
-	$options = array(
-		''                  => __( 'Default', 'ayecode-connect' ),
-		'position-static'   => 'static',
-		'position-relative' => 'relative',
-		'position-absolute' => 'absolute',
-		'position-fixed'    => 'fixed',
-		'position-sticky'   => 'sticky',
-		'fixed-top'         => 'fixed-top',
-		'fixed-bottom'      => 'fixed-bottom',
-		'sticky-top'        => 'sticky-top',
-	);
+    $options = array(
+        ''                  => __( 'Default', 'ayecode-connect' ),
+        'position-static'   => 'static',
+        'position-relative' => 'relative',
+        'position-absolute' => 'absolute',
+        'position-fixed'    => 'fixed',
+        'position-sticky'   => 'sticky',
+        'fixed-top'         => 'fixed-top',
+        'fixed-bottom'      => 'fixed-bottom',
+        'sticky-top'        => 'sticky-top',
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Position', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Position', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1243,32 +1243,32 @@ 
  */
 function sd_get_absolute_position_input( $type = 'absolute_position', $overwrite = array() ) {
 
-	$options = array(
-		''              => __( 'Default', 'ayecode-connect' ),
-		'top-left'      => 'top-left',
-		'top-center'    => 'top-center',
-		'top-right'     => 'top-right',
-		'center-left'   => 'middle-left',
-		'center'        => 'center',
-		'center-right'  => 'middle-right',
-		'bottom-left'   => 'bottom-left',
-		'bottom-center' => 'bottom-center',
-		'bottom-right'  => 'bottom-right',
-	);
+    $options = array(
+        ''              => __( 'Default', 'ayecode-connect' ),
+        'top-left'      => 'top-left',
+        'top-center'    => 'top-center',
+        'top-right'     => 'top-right',
+        'center-left'   => 'middle-left',
+        'center'        => 'center',
+        'center-right'  => 'middle-right',
+        'bottom-left'   => 'bottom-left',
+        'bottom-center' => 'bottom-center',
+        'bottom-right'  => 'bottom-right',
+    );
 
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Absolute Position', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => '[%position%]=="position-absolute"',
-	);
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Absolute Position', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => '[%position%]=="position-absolute"',
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1281,38 +1281,38 @@ 
  */
 function sd_get_sticky_offset_input( $type = 'top', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'            => 'number',
-		'title'           => __( 'Sticky offset', 'ayecode-connect' ),
-		//'desc' =>  __( 'Sticky offset', 'ayecode-connect' ),
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => '[%position%]=="sticky" || [%position%]=="sticky-top"',
-	);
-
-	// title
-	if ( $type == 'top' ) {
-		$defaults['title'] = __( 'Top offset', 'ayecode-connect' );
-		$defaults['icon']  = 'box-top';
-		$defaults['row']   = array(
-			'title' => __( 'Sticky offset', 'ayecode-connect' ),
-			'key'   => 'sticky-offset',
-			'open'  => true,
-			'class' => 'text-center',
-		);
-	} elseif ( $type == 'bottom' ) {
-		$defaults['title'] = __( 'Bottom offset', 'ayecode-connect' );
-		$defaults['icon']  = 'box-bottom';
-		$defaults['row']   = array(
-			'key'   => 'sticky-offset',
-			'close' => true,
-		);
-	}
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $defaults = array(
+        'type'            => 'number',
+        'title'           => __( 'Sticky offset', 'ayecode-connect' ),
+        //'desc' =>  __( 'Sticky offset', 'ayecode-connect' ),
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => '[%position%]=="sticky" || [%position%]=="sticky-top"',
+    );
+
+    // title
+    if ( $type == 'top' ) {
+        $defaults['title'] = __( 'Top offset', 'ayecode-connect' );
+        $defaults['icon']  = 'box-top';
+        $defaults['row']   = array(
+            'title' => __( 'Sticky offset', 'ayecode-connect' ),
+            'key'   => 'sticky-offset',
+            'open'  => true,
+            'class' => 'text-center',
+        );
+    } elseif ( $type == 'bottom' ) {
+        $defaults['title'] = __( 'Bottom offset', 'ayecode-connect' );
+        $defaults['icon']  = 'box-bottom';
+        $defaults['row']   = array(
+            'key'   => 'sticky-offset',
+            'close' => true,
+        );
+    }
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1324,61 +1324,61 @@ 
  * @return array
  */
 function sd_get_font_size_input( $type = 'font_size', $overwrite = array(), $has_custom = false ) {
-	global $aui_bs5;
-
-	$options[] = __( 'Inherit from parent', 'ayecode-connect' );
-	if ( $aui_bs5 ) {
-		// responsive font sizes
-		$options['fs-base'] = 'fs-base (body default)';
-		$options['fs-6']    = 'fs-6';
-		$options['fs-5']    = 'fs-5';
-		$options['fs-4']    = 'fs-4';
-		$options['fs-3']    = 'fs-3';
-		$options['fs-2']    = 'fs-2';
-		$options['fs-1']    = 'fs-1';
-
-		// custom
-		$options['fs-lg']  = 'fs-lg';
-		$options['fs-sm']  = 'fs-sm';
-		$options['fs-xs']  = 'fs-xs';
-		$options['fs-xxs'] = 'fs-xxs';
-
-	}
-
-	$options = $options + array(
-			'h6'        => 'h6',
-			'h5'        => 'h5',
-			'h4'        => 'h4',
-			'h3'        => 'h3',
-			'h2'        => 'h2',
-			'h1'        => 'h1',
-			'display-1' => 'display-1',
-			'display-2' => 'display-2',
-			'display-3' => 'display-3',
-			'display-4' => 'display-4',
-		);
-
-	if ( $aui_bs5 ) {
-		$options['display-5'] = 'display-5';
-		$options['display-6'] = 'display-6';
-	}
-
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom size', 'ayecode-connect' );
-	}
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Font size', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    global $aui_bs5;
+
+    $options[] = __( 'Inherit from parent', 'ayecode-connect' );
+    if ( $aui_bs5 ) {
+        // responsive font sizes
+        $options['fs-base'] = 'fs-base (body default)';
+        $options['fs-6']    = 'fs-6';
+        $options['fs-5']    = 'fs-5';
+        $options['fs-4']    = 'fs-4';
+        $options['fs-3']    = 'fs-3';
+        $options['fs-2']    = 'fs-2';
+        $options['fs-1']    = 'fs-1';
+
+        // custom
+        $options['fs-lg']  = 'fs-lg';
+        $options['fs-sm']  = 'fs-sm';
+        $options['fs-xs']  = 'fs-xs';
+        $options['fs-xxs'] = 'fs-xxs';
+
+    }
+
+    $options = $options + array(
+            'h6'        => 'h6',
+            'h5'        => 'h5',
+            'h4'        => 'h4',
+            'h3'        => 'h3',
+            'h2'        => 'h2',
+            'h1'        => 'h1',
+            'display-1' => 'display-1',
+            'display-2' => 'display-2',
+            'display-3' => 'display-3',
+            'display-4' => 'display-4',
+        );
+
+    if ( $aui_bs5 ) {
+        $options['display-5'] = 'display-5';
+        $options['display-6'] = 'display-6';
+    }
+
+    if ( $has_custom ) {
+        $options['custom'] = __( 'Custom size', 'ayecode-connect' );
+    }
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Font size', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1391,27 +1391,27 @@ 
  */
 function sd_get_font_custom_size_input( $type = 'font_size_custom', $overwrite = array(), $parent_type = '' ) {
 
-	$defaults = array(
-		'type'              => 'number',
-		'title'             => __( 'Font size (rem)', 'ayecode-connect' ),
-		'default'           => '',
-		'placeholder'       => '1.25',
-		'custom_attributes' => array(
-			'step' => '0.1',
-			'min'  => '0',
-			'max'  => '100',
-		),
-		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'              => 'number',
+        'title'             => __( 'Font size (rem)', 'ayecode-connect' ),
+        'default'           => '',
+        'placeholder'       => '1.25',
+        'custom_attributes' => array(
+            'step' => '0.1',
+            'min'  => '0',
+            'max'  => '100',
+        ),
+        'desc_tip'          => true,
+        'group'             => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	if ( $parent_type ) {
-		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
-	}
+    if ( $parent_type ) {
+        $defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
+    }
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1424,23 +1424,23 @@ 
  */
 function sd_get_font_line_height_input( $type = 'font_line_height', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'              => 'number',
-		'title'             => __( 'Font Line Height', 'ayecode-connect' ),
-		'default'           => '',
-		'placeholder'       => '1.75',
-		'custom_attributes' => array(
-			'step' => '0.1',
-			'min'  => '0',
-			'max'  => '100',
-		),
-		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'              => 'number',
+        'title'             => __( 'Font Line Height', 'ayecode-connect' ),
+        'default'           => '',
+        'placeholder'       => '1.75',
+        'custom_attributes' => array(
+            'step' => '0.1',
+            'min'  => '0',
+            'max'  => '100',
+        ),
+        'desc_tip'          => true,
+        'group'             => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1453,18 +1453,18 @@ 
  */
 function sd_get_font_size_input_group( $type = 'font_size', $overwrite = array(), $overwrite_custom = array() ) {
 
-	$inputs = array();
+    $inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_font_size_input( $type, $overwrite, true );
-	}
+    if ( $overwrite !== false ) {
+        $inputs[ $type ] = sd_get_font_size_input( $type, $overwrite, true );
+    }
 
-	if ( $overwrite_custom !== false ) {
-		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_font_custom_size_input( $custom, $overwrite_custom, $type );
-	}
+    if ( $overwrite_custom !== false ) {
+        $custom            = $type . '_custom';
+        $inputs[ $custom ] = sd_get_font_custom_size_input( $custom, $overwrite_custom, $type );
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 /**
@@ -1477,33 +1477,33 @@ 
  */
 function sd_get_font_weight_input( $type = 'font_weight', $overwrite = array() ) {
 
-	$options = array(
-		''                                => __( 'Inherit', 'ayecode-connect' ),
-		'font-weight-bold'                => 'bold',
-		'font-weight-bolder'              => 'bolder',
-		'font-weight-normal'              => 'normal',
-		'font-weight-light'               => 'light',
-		'font-weight-lighter'             => 'lighter',
-		'font-italic'                     => 'italic',
-		'font-weight-bold font-italic'    => 'bold italic',
-		'font-weight-bolder font-italic'  => 'bolder italic',
-		'font-weight-normal font-italic'  => 'normal italic',
-		'font-weight-light font-italic'   => 'light italic',
-		'font-weight-lighter font-italic' => 'lighter italic',
-	);
+    $options = array(
+        ''                                => __( 'Inherit', 'ayecode-connect' ),
+        'font-weight-bold'                => 'bold',
+        'font-weight-bolder'              => 'bolder',
+        'font-weight-normal'              => 'normal',
+        'font-weight-light'               => 'light',
+        'font-weight-lighter'             => 'lighter',
+        'font-italic'                     => 'italic',
+        'font-weight-bold font-italic'    => 'bold italic',
+        'font-weight-bolder font-italic'  => 'bolder italic',
+        'font-weight-normal font-italic'  => 'normal italic',
+        'font-weight-light font-italic'   => 'light italic',
+        'font-weight-lighter font-italic' => 'lighter italic',
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Appearance', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Appearance', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1516,25 +1516,25 @@ 
  */
 function sd_get_font_case_input( $type = 'font_weight', $overwrite = array() ) {
 
-	$options = array(
-		''                => __( 'Default', 'ayecode-connect' ),
-		'text-lowercase'  => __( 'lowercase', 'ayecode-connect' ),
-		'text-uppercase'  => __( 'UPPERCASE', 'ayecode-connect' ),
-		'text-capitalize' => __( 'Capitalize', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''                => __( 'Default', 'ayecode-connect' ),
+        'text-lowercase'  => __( 'lowercase', 'ayecode-connect' ),
+        'text-uppercase'  => __( 'UPPERCASE', 'ayecode-connect' ),
+        'text-capitalize' => __( 'Capitalize', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Letter case', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Letter case', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1548,23 +1548,23 @@ 
  */
 function sd_get_font_italic_input( $type = 'font_italic', $overwrite = array() ) {
 
-	$options = array(
-		''            => __( 'No', 'ayecode-connect' ),
-		'font-italic' => __( 'Yes', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''            => __( 'No', 'ayecode-connect' ),
+        'font-italic' => __( 'Yes', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Font italic', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Font italic', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Typography', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1577,18 +1577,18 @@ 
  */
 function sd_get_anchor_input( $type = 'anchor', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'text',
-		'title'    => __( 'HTML anchor', 'ayecode-connect' ),
-		'desc'     => __( 'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'text',
+        'title'    => __( 'HTML anchor', 'ayecode-connect' ),
+        'desc'     => __( 'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Advanced', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1601,18 +1601,18 @@ 
  */
 function sd_get_class_input( $type = 'css_class', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'text',
-		'title'    => __( 'Additional CSS class(es)', 'ayecode-connect' ),
-		'desc'     => __( 'Separate multiple classes with spaces.', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'text',
+        'title'    => __( 'Additional CSS class(es)', 'ayecode-connect' ),
+        'desc'     => __( 'Separate multiple classes with spaces.', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Advanced', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1625,18 +1625,18 @@ 
  */
 function sd_get_custom_name_input( $type = 'metadata_name', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'text',
-		'title'    => __( 'Block Name', 'ayecode-connect' ),
-		'desc'     => __( 'Set a custom name for this block', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'text',
+        'title'    => __( 'Block Name', 'ayecode-connect' ),
+        'desc'     => __( 'Set a custom name for this block', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Advanced', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -1649,341 +1649,341 @@ 
  */
 function sd_get_hover_animations_input( $type = 'hover_animations', $overwrite = array() ) {
 
-	$options = array(
-		''                 => __( 'none', 'ayecode-connect' ),
-		'hover-zoom'       => __( 'Zoom', 'ayecode-connect' ),
-		'hover-shadow'     => __( 'Shadow', 'ayecode-connect' ),
-		'hover-move-up'    => __( 'Move up', 'ayecode-connect' ),
-		'hover-move-down'  => __( 'Move down', 'ayecode-connect' ),
-		'hover-move-left'  => __( 'Move left', 'ayecode-connect' ),
-		'hover-move-right' => __( 'Move right', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''                 => __( 'none', 'ayecode-connect' ),
+        'hover-zoom'       => __( 'Zoom', 'ayecode-connect' ),
+        'hover-shadow'     => __( 'Shadow', 'ayecode-connect' ),
+        'hover-move-up'    => __( 'Move up', 'ayecode-connect' ),
+        'hover-move-down'  => __( 'Move down', 'ayecode-connect' ),
+        'hover-move-left'  => __( 'Move left', 'ayecode-connect' ),
+        'hover-move-right' => __( 'Move right', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'multiple' => true,
-		'title'    => __( 'Hover Animations', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Hover Animations', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'multiple' => true,
+        'title'    => __( 'Hover Animations', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Hover Animations', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 
 function sd_get_flex_align_items_input( $type = 'align-items', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
-		'align-items' . $device_size . '-start'    => 'align-items-start',
-		'align-items' . $device_size . '-end'      => 'align-items-end',
-		'align-items' . $device_size . '-center'   => 'align-items-center',
-		'align-items' . $device_size . '-baseline' => 'align-items-baseline',
-		'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Vertical Align Items', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => ' ( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                         => __( 'Default', 'ayecode-connect' ),
+        'align-items' . $device_size . '-start'    => 'align-items-start',
+        'align-items' . $device_size . '-end'      => 'align-items-end',
+        'align-items' . $device_size . '-center'   => 'align-items-center',
+        'align-items' . $device_size . '-baseline' => 'align-items-baseline',
+        'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Vertical Align Items', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => ' ( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_align_items_input_group( $type = 'flex_align_items', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_items_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_align_items_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_justify_content_input( $type = 'flex_justify_content', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                            => __( 'Default', 'ayecode-connect' ),
-		'justify-content' . $device_size . '-start'   => 'justify-content-start',
-		'justify-content' . $device_size . '-end'     => 'justify-content-end',
-		'justify-content' . $device_size . '-center'  => 'justify-content-center',
-		'justify-content' . $device_size . '-between' => 'justify-content-between',
-		'justify-content' . $device_size . '-stretch' => 'justify-content-around',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Justify content', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => '( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                            => __( 'Default', 'ayecode-connect' ),
+        'justify-content' . $device_size . '-start'   => 'justify-content-start',
+        'justify-content' . $device_size . '-end'     => 'justify-content-end',
+        'justify-content' . $device_size . '-center'  => 'justify-content-center',
+        'justify-content' . $device_size . '-between' => 'justify-content-between',
+        'justify-content' . $device_size . '-stretch' => 'justify-content-around',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Justify content', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => '( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_justify_content_input_group( $type = 'flex_justify_content', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_justify_content_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_justify_content_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 
 function sd_get_flex_align_self_input( $type = 'flex_align_self', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
-		'align-items' . $device_size . '-start'    => 'align-items-start',
-		'align-items' . $device_size . '-end'      => 'align-items-end',
-		'align-items' . $device_size . '-center'   => 'align-items-center',
-		'align-items' . $device_size . '-baseline' => 'align-items-baseline',
-		'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
-	);
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Align Self', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => ' [%container%]=="col" ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                         => __( 'Default', 'ayecode-connect' ),
+        'align-items' . $device_size . '-start'    => 'align-items-start',
+        'align-items' . $device_size . '-end'      => 'align-items-end',
+        'align-items' . $device_size . '-center'   => 'align-items-center',
+        'align-items' . $device_size . '-baseline' => 'align-items-baseline',
+        'align-items' . $device_size . '-stretch'  => 'align-items-stretch',
+    );
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Align Self', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => ' [%container%]=="col" ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_align_self_input_group( $type = 'flex_align_self', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_self_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_align_self_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_order_input( $type = 'flex_order', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		'' => __( 'Default', 'ayecode-connect' ),
-	);
-
-	$i = 0;
-	while ( $i <= 5 ) {
-		$options[ 'order' . $device_size . '-' . $i ] = $i;
-		$i++;
-	}
-
-	$defaults = array(
-		'type'            => 'select',
-		'title'           => __( 'Flex Order', 'ayecode-connect' ),
-		'options'         => $options,
-		'default'         => '',
-		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
-		'element_require' => ' [%container%]=="col" ',
-
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        '' => __( 'Default', 'ayecode-connect' ),
+    );
+
+    $i = 0;
+    while ( $i <= 5 ) {
+        $options[ 'order' . $device_size . '-' . $i ] = $i;
+        $i++;
+    }
+
+    $defaults = array(
+        'type'            => 'select',
+        'title'           => __( 'Flex Order', 'ayecode-connect' ),
+        'options'         => $options,
+        'default'         => '',
+        'desc_tip'        => true,
+        'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+        'element_require' => ' [%container%]=="col" ',
+
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_flex_order_input_group( $type = 'flex_order', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_order_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_order_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_wrap_group( $type = 'flex_wrap', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_wrap_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_flex_wrap_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 
 function sd_get_flex_wrap_input( $type = 'flex_wrap', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
-		'flex' . $device_size . '-nowrap'       => 'nowrap',
-		'flex' . $device_size . '-wrap'         => 'wrap',
-		'flex' . $device_size . '-wrap-reverse' => 'wrap-reverse',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Flex wrap', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                      => __( 'Default', 'ayecode-connect' ),
+        'flex' . $device_size . '-nowrap'       => 'nowrap',
+        'flex' . $device_size . '-wrap'         => 'wrap',
+        'flex' . $device_size . '-wrap-reverse' => 'wrap-reverse',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Flex wrap', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 function sd_get_float_group( $type = 'float', $overwrite = array() ) {
-	$inputs = array();
-	$sizes  = array(
-		''    => 'Mobile',
-		'_md' => 'Tablet',
-		'_lg' => 'Desktop',
-	);
+    $inputs = array();
+    $sizes  = array(
+        ''    => 'Mobile',
+        '_md' => 'Tablet',
+        '_lg' => 'Desktop',
+    );
 
-	if ( $overwrite !== false ) {
+    if ( $overwrite !== false ) {
 
-		foreach ( $sizes as $ds => $dt ) {
-			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_float_input( $type, $overwrite );
-		}
-	}
+        foreach ( $sizes as $ds => $dt ) {
+            $overwrite['device_type'] = $dt;
+            $inputs[ $type . $ds ]    = sd_get_float_input( $type, $overwrite );
+        }
+    }
 
-	return $inputs;
+    return $inputs;
 }
 function sd_get_float_input( $type = 'float', $overwrite = array() ) {
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
-		'float' . $device_size . '-start'       => 'left',
-		'float' . $device_size . '-end'         => 'right',
-		'float' . $device_size . '-none' => 'none',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Float', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        ''                                      => __( 'Default', 'ayecode-connect' ),
+        'float' . $device_size . '-start'       => 'left',
+        'float' . $device_size . '-end'         => 'right',
+        'float' . $device_size . '-none' => 'none',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Float', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -1994,26 +1994,26 @@ 
  */
 function sd_get_zindex_input( $type = 'zindex', $overwrite = array() ) {
 
-	$options = array(
-		''          => __( 'Default', 'ayecode-connect' ),
-		'zindex-0'  => '0',
-		'zindex-1'  => '1',
-		'zindex-5'  => '5',
-		'zindex-10' => '10',
-	);
+    $options = array(
+        ''          => __( 'Default', 'ayecode-connect' ),
+        'zindex-0'  => '0',
+        'zindex-1'  => '1',
+        'zindex-5'  => '5',
+        'zindex-10' => '10',
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Z-index', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Z-index', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2024,26 +2024,26 @@ 
  */
 function sd_get_overflow_input( $type = 'overflow', $overwrite = array() ) {
 
-	$options = array(
-		''                 => __( 'Default', 'ayecode-connect' ),
-		'overflow-auto'    => __( 'Auto', 'ayecode-connect' ),
-		'overflow-hidden'  => __( 'Hidden', 'ayecode-connect' ),
-		'overflow-visible' => __( 'Visible', 'ayecode-connect' ),
-		'overflow-scroll'  => __( 'Scroll', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''                 => __( 'Default', 'ayecode-connect' ),
+        'overflow-auto'    => __( 'Auto', 'ayecode-connect' ),
+        'overflow-hidden'  => __( 'Hidden', 'ayecode-connect' ),
+        'overflow-visible' => __( 'Visible', 'ayecode-connect' ),
+        'overflow-scroll'  => __( 'Scroll', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Overflow', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Overflow', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2054,19 +2054,19 @@ 
  */
 function sd_get_max_height_input( $type = 'max_height', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'        => 'text',
-		'title'       => __( 'Max height', 'ayecode-connect' ),
-		'value'       => '',
-		'default'     => '',
-		'placeholder' => '',
-		'desc_tip'    => true,
-		'group'       => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'        => 'text',
+        'title'       => __( 'Max height', 'ayecode-connect' ),
+        'value'       => '',
+        'default'     => '',
+        'placeholder' => '',
+        'desc_tip'    => true,
+        'group'       => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2077,23 +2077,23 @@ 
  */
 function sd_get_scrollbars_input( $type = 'scrollbars', $overwrite = array() ) {
 
-	$options = array(
-		''               => __( 'Default', 'ayecode-connect' ),
-		'scrollbars-ios' => __( 'IOS Style', 'ayecode-connect' ),
-	);
+    $options = array(
+        ''               => __( 'Default', 'ayecode-connect' ),
+        'scrollbars-ios' => __( 'IOS Style', 'ayecode-connect' ),
+    );
 
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Scrollbars', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Scrollbars', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2104,17 +2104,17 @@ 
  */
 function sd_get_new_window_input( $type = 'target', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'checkbox',
-		'title'    => __( 'Open in new window', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Link', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'checkbox',
+        'title'    => __( 'Open in new window', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Link', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2125,17 +2125,17 @@ 
  */
 function sd_get_nofollow_input( $type = 'nofollow', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'     => 'checkbox',
-		'title'    => __( 'Add nofollow', 'ayecode-connect' ),
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Link', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'     => 'checkbox',
+        'title'    => __( 'Add nofollow', 'ayecode-connect' ),
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Link', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2148,35 +2148,35 @@ 
  */
 function sd_get_width_input( $type = 'width', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		'' => __('Default', 'ayecode-connect'),
-		'w' . $device_size . '-25' => '25%',
-		'w' . $device_size . '-50' => '50%',
-		'w' . $device_size . '-75' => '75%',
-		'w' . $device_size . '-100' => '100%',
-		'w' . $device_size . '-auto' => 'auto',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Width', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        '' => __('Default', 'ayecode-connect'),
+        'w' . $device_size . '-25' => '25%',
+        'w' . $device_size . '-50' => '50%',
+        'w' . $device_size . '-75' => '75%',
+        'w' . $device_size . '-100' => '100%',
+        'w' . $device_size . '-auto' => 'auto',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Width', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -2189,35 +2189,35 @@ 
  */
 function sd_get_height_input( $type = 'height', $overwrite = array() ) {
 
-	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
-			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
-			$device_size = '-lg';
-		}
-	}
-	$options = array(
-		'' => __('Default', 'ayecode-connect'),
-		'h' . $device_size . '-25' => '25%',
-		'h' . $device_size . '-50' => '50%',
-		'h' . $device_size . '-75' => '75%',
-		'h' . $device_size . '-100' => '100%',
-		'h' . $device_size . '-auto' => 'auto',
-	);
-
-	$defaults = array(
-		'type'     => 'select',
-		'title'    => __( 'Height', 'ayecode-connect' ),
-		'options'  => $options,
-		'default'  => '',
-		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
-	);
-
-	$input = wp_parse_args( $overwrite, $defaults );
-
-	return $input;
+    $device_size = '';
+    if ( ! empty( $overwrite['device_type'] ) ) {
+        if ( $overwrite['device_type'] == 'Tablet' ) {
+            $device_size = '-md';
+        } elseif ( $overwrite['device_type'] == 'Desktop' ) {
+            $device_size = '-lg';
+        }
+    }
+    $options = array(
+        '' => __('Default', 'ayecode-connect'),
+        'h' . $device_size . '-25' => '25%',
+        'h' . $device_size . '-50' => '50%',
+        'h' . $device_size . '-75' => '75%',
+        'h' . $device_size . '-100' => '100%',
+        'h' . $device_size . '-auto' => 'auto',
+    );
+
+    $defaults = array(
+        'type'     => 'select',
+        'title'    => __( 'Height', 'ayecode-connect' ),
+        'options'  => $options,
+        'default'  => '',
+        'desc_tip' => true,
+        'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+    );
+
+    $input = wp_parse_args( $overwrite, $defaults );
+
+    return $input;
 }
 
 /**
@@ -2228,19 +2228,19 @@ 
  */
 function sd_get_attributes_input( $type = 'attributes', $overwrite = array() ) {
 
-	$defaults = array(
-		'type'        => 'text',
-		'title'       => __( 'Custom Attributes', 'ayecode-connect' ),
-		'value'       => '',
-		'default'     => '',
-		'placeholder' => 'key|value,key2|value2',
-		'desc_tip'    => true,
-		'group'       => __( 'Link', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'        => 'text',
+        'title'       => __( 'Custom Attributes', 'ayecode-connect' ),
+        'value'       => '',
+        'default'     => '',
+        'placeholder' => 'key|value,key2|value2',
+        'desc_tip'    => true,
+        'group'       => __( 'Link', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -2249,32 +2249,32 @@ 
  * @return string
  */
 function sd_build_attributes_string_escaped( $args ) {
-	global $aui_bs5;
+    global $aui_bs5;
 
-	$attributes = array();
-	$string_escaped = '';
+    $attributes = array();
+    $string_escaped = '';
 
-	if ( ! empty( $args['custom'] ) ) {
-		$attributes = sd_parse_custom_attributes($args['custom']);
-	}
+    if ( ! empty( $args['custom'] ) ) {
+        $attributes = sd_parse_custom_attributes($args['custom']);
+    }
 
-	// new window
-	if ( ! empty( $args['new_window'] ) ) {
-		$attributes['target'] = '_blank';
-	}
+    // new window
+    if ( ! empty( $args['new_window'] ) ) {
+        $attributes['target'] = '_blank';
+    }
 
-	// nofollow
-	if ( ! empty( $args['nofollow'] ) ) {
-		$attributes['rel'] = isset($attributes['rel']) ? $attributes['rel'] . ' nofollow' : 'nofollow';
-	}
+    // nofollow
+    if ( ! empty( $args['nofollow'] ) ) {
+        $attributes['rel'] = isset($attributes['rel']) ? $attributes['rel'] . ' nofollow' : 'nofollow';
+    }
 
-	if(!empty($attributes )){
-		foreach ( $attributes as $key => $val ) {
-			$string_escaped .= esc_attr($key) . '="' . esc_attr($val) . '" ';
-		}
-	}
+    if(!empty($attributes )){
+        foreach ( $attributes as $key => $val ) {
+            $string_escaped .= esc_attr($key) . '="' . esc_attr($val) . '" ';
+        }
+    }
 
-	return $string_escaped;
+    return $string_escaped;
 }
 
 /**
@@ -2286,38 +2286,38 @@ 
  * @return array
  */
 function sd_parse_custom_attributes( $attributes_string, $delimiter = ',' ) {
-	$attributes = explode( $delimiter, $attributes_string );
-	$result = [];
+    $attributes = explode( $delimiter, $attributes_string );
+    $result = [];
 
-	foreach ( $attributes as $attribute ) {
-		$attr_key_value = explode( '|', $attribute );
+    foreach ( $attributes as $attribute ) {
+        $attr_key_value = explode( '|', $attribute );
 
-		$attr_key = mb_strtolower( $attr_key_value[0] );
+        $attr_key = mb_strtolower( $attr_key_value[0] );
 
-		// Remove any not allowed characters.
-		preg_match( '/[-_a-z0-9]+/', $attr_key, $attr_key_matches );
+        // Remove any not allowed characters.
+        preg_match( '/[-_a-z0-9]+/', $attr_key, $attr_key_matches );
 
-		if ( empty( $attr_key_matches[0] ) ) {
-			continue;
-		}
+        if ( empty( $attr_key_matches[0] ) ) {
+            continue;
+        }
 
-		$attr_key = $attr_key_matches[0];
+        $attr_key = $attr_key_matches[0];
 
-		// Avoid Javascript events and unescaped href.
-		if ( 'href' === $attr_key || 'on' === substr( $attr_key, 0, 2 ) ) {
-			continue;
-		}
+        // Avoid Javascript events and unescaped href.
+        if ( 'href' === $attr_key || 'on' === substr( $attr_key, 0, 2 ) ) {
+            continue;
+        }
 
-		if ( isset( $attr_key_value[1] ) ) {
-			$attr_value = trim( $attr_key_value[1] );
-		} else {
-			$attr_value = '';
-		}
+        if ( isset( $attr_key_value[1] ) ) {
+            $attr_value = trim( $attr_key_value[1] );
+        } else {
+            $attr_value = '';
+        }
 
-		$result[ $attr_key ] = $attr_value;
-	}
+        $result[ $attr_key ] = $attr_value;
+    }
 
-	return $result;
+    return $result;
 }
 
 /**
@@ -2329,424 +2329,424 @@ 
  * @todo find best way to use px- py- or general p-
  */
 function sd_build_aui_class( $args ) {
-	global $aui_bs5;
-
-	$classes = array();
-
-	if ( $aui_bs5 ) {
-		$p_ml = 'ms-';
-		$p_mr = 'me-';
-
-		$p_pl = 'ps-';
-		$p_pr = 'pe-';
-	} else {
-		$p_ml = 'ml-';
-		$p_mr = 'mr-';
-
-		$p_pl = 'pl-';
-		$p_pr = 'pr-';
-	}
-
-	// margins.
-	if ( isset( $args['mt'] ) && $args['mt'] !== '' ) {
-		$classes[] = 'mt-' . sanitize_html_class( $args['mt'] );
-		$mt        = $args['mt'];
-	} else {
-		$mt = null;
-	}
-	if ( isset( $args['mr'] ) && $args['mr'] !== '' ) {
-		$classes[] = $p_mr . sanitize_html_class( $args['mr'] );
-		$mr        = $args['mr'];
-	} else {
-		$mr = null;
-	}
-	if ( isset( $args['mb'] ) && $args['mb'] !== '' ) {
-		$classes[] = 'mb-' . sanitize_html_class( $args['mb'] );
-		$mb        = $args['mb'];
-	} else {
-		$mb = null;
-	}
-	if ( isset( $args['ml'] ) && $args['ml'] !== '' ) {
-		$classes[] = $p_ml . sanitize_html_class( $args['ml'] );
-		$ml        = $args['ml'];
-	} else {
-		$ml = null;
-	}
-
-	// margins tablet.
-	if ( isset( $args['mt_md'] ) && $args['mt_md'] !== '' ) {
-		$classes[] = 'mt-md-' . sanitize_html_class( $args['mt_md'] );
-		$mt_md     = $args['mt_md'];
-	} else {
-		$mt_md = null;
-	}
-	if ( isset( $args['mr_md'] ) && $args['mr_md'] !== '' ) {
-		$classes[] = $p_mr . 'md-' . sanitize_html_class( $args['mr_md'] );
-		$mt_md     = $args['mr_md'];
-	} else {
-		$mr_md = null;
-	}
-	if ( isset( $args['mb_md'] ) && $args['mb_md'] !== '' ) {
-		$classes[] = 'mb-md-' . sanitize_html_class( $args['mb_md'] );
-		$mt_md     = $args['mb_md'];
-	} else {
-		$mb_md = null;
-	}
-	if ( isset( $args['ml_md'] ) && $args['ml_md'] !== '' ) {
-		$classes[] = $p_ml . 'md-' . sanitize_html_class( $args['ml_md'] );
-		$mt_md     = $args['ml_md'];
-	} else {
-		$ml_md = null;
-	}
-
-	// margins desktop.
-	if ( isset( $args['mt_lg'] ) && $args['mt_lg'] !== '' ) {
-		if ( $mt == null && $mt_md == null ) {
-			$classes[] = 'mt-' . sanitize_html_class( $args['mt_lg'] );
-		} else {
-			$classes[] = 'mt-lg-' . sanitize_html_class( $args['mt_lg'] );
-		}
-	}
-	if ( isset( $args['mr_lg'] ) && $args['mr_lg'] !== '' ) {
-		if ( $mr == null && $mr_md == null ) {
-			$classes[] = $p_mr . sanitize_html_class( $args['mr_lg'] );
-		} else {
-			$classes[] = $p_mr . 'lg-' . sanitize_html_class( $args['mr_lg'] );
-		}
-	}
-	if ( isset( $args['mb_lg'] ) && $args['mb_lg'] !== '' ) {
-		if ( $mb == null && $mb_md == null ) {
-			$classes[] = 'mb-' . sanitize_html_class( $args['mb_lg'] );
-		} else {
-			$classes[] = 'mb-lg-' . sanitize_html_class( $args['mb_lg'] );
-		}
-	}
-	if ( isset( $args['ml_lg'] ) && $args['ml_lg'] !== '' ) {
-		if ( $ml == null && $ml_md == null ) {
-			$classes[] = $p_ml . sanitize_html_class( $args['ml_lg'] );
-		} else {
-			$classes[] = $p_ml . 'lg-' . sanitize_html_class( $args['ml_lg'] );
-		}
-	}
-
-	// padding.
-	if ( isset( $args['pt'] ) && $args['pt'] !== '' ) {
-		$classes[] = 'pt-' . sanitize_html_class( $args['pt'] );
-		$pt        = $args['pt'];
-	} else {
-		$pt = null;
-	}
-	if ( isset( $args['pr'] ) && $args['pr'] !== '' ) {
-		$classes[] = $p_pr . sanitize_html_class( $args['pr'] );
-		$pr        = $args['pr'];
-	} else {
-		$pr = null;
-	}
-	if ( isset( $args['pb'] ) && $args['pb'] !== '' ) {
-		$classes[] = 'pb-' . sanitize_html_class( $args['pb'] );
-		$pb        = $args['pb'];
-	} else {
-		$pb = null;
-	}
-	if ( isset( $args['pl'] ) && $args['pl'] !== '' ) {
-		$classes[] = $p_pl . sanitize_html_class( $args['pl'] );
-		$pl        = $args['pl'];
-	} else {
-		$pl = null;
-	}
-
-	// padding tablet.
-	if ( isset( $args['pt_md'] ) && $args['pt_md'] !== '' ) {
-		$classes[] = 'pt-md-' . sanitize_html_class( $args['pt_md'] );
-		$pt_md     = $args['pt_md'];
-	} else {
-		$pt_md = null;
-	}
-	if ( isset( $args['pr_md'] ) && $args['pr_md'] !== '' ) {
-		$classes[] = $p_pr . 'md-' . sanitize_html_class( $args['pr_md'] );
-		$pr_md     = $args['pr_md'];
-	} else {
-		$pr_md = null;
-	}
-	if ( isset( $args['pb_md'] ) && $args['pb_md'] !== '' ) {
-		$classes[] = 'pb-md-' . sanitize_html_class( $args['pb_md'] );
-		$pb_md     = $args['pb_md'];
-	} else {
-		$pb_md = null;
-	}
-	if ( isset( $args['pl_md'] ) && $args['pl_md'] !== '' ) {
-		$classes[] = $p_pl . 'md-' . sanitize_html_class( $args['pl_md'] );
-		$pl_md     = $args['pl_md'];
-	} else {
-		$pl_md = null;
-	}
-
-	// padding desktop.
-	if ( isset( $args['pt_lg'] ) && $args['pt_lg'] !== '' ) {
-		if ( $pt == null && $pt_md == null ) {
-			$classes[] = 'pt-' . sanitize_html_class( $args['pt_lg'] );
-		} else {
-			$classes[] = 'pt-lg-' . sanitize_html_class( $args['pt_lg'] );
-		}
-	}
-	if ( isset( $args['pr_lg'] ) && $args['pr_lg'] !== '' ) {
-		if ( $pr == null && $pr_md == null ) {
-			$classes[] = $p_pr . sanitize_html_class( $args['pr_lg'] );
-		} else {
-			$classes[] = $p_pr . 'lg-' . sanitize_html_class( $args['pr_lg'] );
-		}
-	}
-	if ( isset( $args['pb_lg'] ) && $args['pb_lg'] !== '' ) {
-		if ( $pb == null && $pb_md == null ) {
-			$classes[] = 'pb-' . sanitize_html_class( $args['pb_lg'] );
-		} else {
-			$classes[] = 'pb-lg-' . sanitize_html_class( $args['pb_lg'] );
-		}
-	}
-	if ( isset( $args['pl_lg'] ) && $args['pl_lg'] !== '' ) {
-		if ( $pl == null && $pl_md == null ) {
-			$classes[] = $p_pl . sanitize_html_class( $args['pl_lg'] );
-		} else {
-			$classes[] = $p_pl . 'lg-' . sanitize_html_class( $args['pl_lg'] );
-		}
-	}
-
-	// row cols, mobile, tablet, desktop
-	if ( ! empty( $args['row_cols'] ) && $args['row_cols'] !== '' ) {
-		$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols'] );
-		$row_cols  = $args['row_cols'];
-	} else {
-		$row_cols = null;
-	}
-	if ( ! empty( $args['row_cols_md'] ) && $args['row_cols_md'] !== '' ) {
-		$classes[]   = sanitize_html_class( 'row-cols-md-' . $args['row_cols_md'] );
-		$row_cols_md = $args['row_cols_md'];
-	} else {
-		$row_cols_md = null;
-	}
-	if ( ! empty( $args['row_cols_lg'] ) && $args['row_cols_lg'] !== '' ) {
-		if ( $row_cols == null && $row_cols_md == null ) {
-			$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols_lg'] );
-		} else {
-			$classes[] = sanitize_html_class( 'row-cols-lg-' . $args['row_cols_lg'] );
-		}
-	}
-
-	// columns , mobile, tablet, desktop
-	if ( ! empty( $args['col'] ) && $args['col'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-' . $args['col'] );
-		$col       = $args['col'];
-	} else {
-		$col = null;
-	}
-	if ( ! empty( $args['col_md'] ) && $args['col_md'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-md-' . $args['col_md'] );
-		$col_md    = $args['col_md'];
-	} else {
-		$col_md = null;
-	}
-	if ( ! empty( $args['col_lg'] ) && $args['col_lg'] !== '' ) {
-		if ( $col == null && $col_md == null ) {
-			$classes[] = sanitize_html_class( 'col-' . $args['col_lg'] );
-		} else {
-			$classes[] = sanitize_html_class( 'col-lg-' . $args['col_lg'] );
-		}
-	}
-
-	// border
-	if ( isset( $args['border'] ) && ( $args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0 ) ) {
-		$classes[] = 'border-0';
-	} elseif ( ! empty( $args['border'] ) ) {
-		$border_class = 'border';
-		if ( ! empty( $args['border_type'] ) && strpos( $args['border_type'], '-0' ) === false ) {
-			$border_class = '';
-		}
-		$classes[] = $border_class . ' border-' . sanitize_html_class( $args['border'] );
-	}
-
-	// border radius type
-	if ( ! empty( $args['rounded'] ) ) {
-		$classes[] = sanitize_html_class( $args['rounded'] );
-	}
-
-	// border radius size BS4
-	if ( isset( $args['rounded_size'] ) && in_array( $args['rounded_size'], array( 'sm', 'lg' ) ) ) {
-		$classes[] = 'rounded-' . sanitize_html_class( $args['rounded_size'] );
-		// if we set a size then we need to remove "rounded" if set
-		if ( ( $key = array_search( 'rounded', $classes ) ) !== false ) {
-			unset( $classes[ $key ] );
-		}
-	} else {
-
-		// border radius size , mobile, tablet, desktop
-		if ( isset( $args['rounded_size'] ) && $args['rounded_size'] !== '' ) {
-			$classes[]    = sanitize_html_class( 'rounded-' . $args['rounded_size'] );
-			$rounded_size = $args['rounded_size'];
-		} else {
-			$rounded_size = null;
-		}
-		if ( isset( $args['rounded_size_md'] ) && $args['rounded_size_md'] !== '' ) {
-			$classes[]       = sanitize_html_class( 'rounded-md-' . $args['rounded_size_md'] );
-			$rounded_size_md = $args['rounded_size_md'];
-		} else {
-			$rounded_size_md = null;
-		}
-		if ( isset( $args['rounded_size_lg'] ) && $args['rounded_size_lg'] !== '' ) {
-			if ( $rounded_size == null && $rounded_size_md == null ) {
-				$classes[] = sanitize_html_class( 'rounded-' . $args['rounded_size_lg'] );
-			} else {
-				$classes[] = sanitize_html_class( 'rounded-lg-' . $args['rounded_size_lg'] );
-			}
-		}
-	}
-
-	// shadow
-	//if ( !empty( $args['shadow'] ) ) { $classes[] = sanitize_html_class($args['shadow']); }
-
-	// background
-	if ( ! empty( $args['bg'] ) ) {
-		$classes[] = 'bg-' . sanitize_html_class( $args['bg'] );
-	}
-
-	// background image fixed bg_image_fixed this helps fix a iOS bug
-	if ( ! empty( $args['bg_image_fixed'] ) ) {
-		$classes[] = 'bg-image-fixed';
-	}
-
-	// text_color
-	if ( ! empty( $args['text_color'] ) ) {
-		$classes[] = 'text-' . sanitize_html_class( $args['text_color'] );
-	}
-
-	// text_align
-	if ( ! empty( $args['text_justify'] ) ) {
-		$classes[] = 'text-justify';
-	} else {
-		if ( ! empty( $args['text_align'] ) ) {
-			$classes[]  = sanitize_html_class( $args['text_align'] );
-			$text_align = $args['text_align'];
-		} else {
-			$text_align = null;
-		}
-		if ( ! empty( $args['text_align_md'] ) && $args['text_align_md'] !== '' ) {
-			$classes[]     = sanitize_html_class( $args['text_align_md'] );
-			$text_align_md = $args['text_align_md'];
-		} else {
-			$text_align_md = null;
-		}
-		if ( ! empty( $args['text_align_lg'] ) && $args['text_align_lg'] !== '' ) {
-			if ( $text_align == null && $text_align_md == null ) {
-				$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['text_align_lg'] ) );
-			} else {
-				$classes[] = sanitize_html_class( $args['text_align_lg'] );
-			}
-		}
-	}
-
-	// display
-	if ( ! empty( $args['display'] ) ) {
-		$classes[] = sanitize_html_class( $args['display'] );
-		$display   = $args['display'];
-	} else {
-		$display = null;
-	}
-	if ( ! empty( $args['display_md'] ) && $args['display_md'] !== '' ) {
-		$classes[]  = sanitize_html_class( $args['display_md'] );
-		$display_md = $args['display_md'];
-	} else {
-		$display_md = null;
-	}
-	if ( ! empty( $args['display_lg'] ) && $args['display_lg'] !== '' ) {
-		if ( $display == null && $display_md == null ) {
-			$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['display_lg'] ) );
-		} else {
-			$classes[] = sanitize_html_class( $args['display_lg'] );
-		}
-	}
-
-	// bgtus - background transparent until scroll
-	if ( ! empty( $args['bgtus'] ) ) {
-		$classes[] = sanitize_html_class( 'bg-transparent-until-scroll' );
-	}
-
-	// cscos - change color scheme on scroll
-	if ( ! empty( $args['bgtus'] ) && ! empty( $args['cscos'] ) ) {
-		$classes[] = sanitize_html_class( 'color-scheme-flip-on-scroll' );
-	}
-
-	// hover animations
-	if ( ! empty( $args['hover_animations'] ) ) {
-		$classes[] = sd_sanitize_html_classes( str_replace( ',', ' ', $args['hover_animations'] ) );
-	}
-
-	// absolute_position
-	if ( ! empty( $args['absolute_position'] ) ) {
-		if ( 'top-left' === $args['absolute_position'] ) {
-			$classes[] = 'start-0 top-0';
-		} elseif ( 'top-center' === $args['absolute_position'] ) {
-			$classes[] = 'start-50 top-0 translate-middle';
-		} elseif ( 'top-right' === $args['absolute_position'] ) {
-			$classes[] = 'end-0 top-0';
-		} elseif ( 'center-left' === $args['absolute_position'] ) {
-			$classes[] = 'start-0 top-50';
-		} elseif ( 'center' === $args['absolute_position'] ) {
-			$classes[] = 'start-50 top-50 translate-middle';
-		} elseif ( 'center-right' === $args['absolute_position'] ) {
-			$classes[] = 'end-0 top-50';
-		} elseif ( 'bottom-left' === $args['absolute_position'] ) {
-			$classes[] = 'start-0 bottom-0';
-		} elseif ( 'bottom-center' === $args['absolute_position'] ) {
-			$classes[] = 'start-50 bottom-0 translate-middle';
-		} elseif ( 'bottom-right' === $args['absolute_position'] ) {
-			$classes[] = 'end-0 bottom-0';
-		}
-	}
-
-	// build classes from build keys
-	$build_keys = sd_get_class_build_keys();
-	if ( ! empty( $build_keys ) ) {
-		foreach ( $build_keys as $key ) {
-
-			if ( substr( $key, -4 ) == '-MTD' ) {
-
-				$k = str_replace( '-MTD', '', $key );
-
-				// Mobile, Tablet, Desktop
-				if ( ! empty( $args[ $k ] ) && $args[ $k ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k ] );
-					$v         = $args[ $k ];
-				} else {
-					$v = null;
-				}
-				if ( ! empty( $args[ $k . '_md' ] ) && $args[ $k . '_md' ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k . '_md' ] );
-					$v_md      = $args[ $k . '_md' ];
-				} else {
-					$v_md = null;
-				}
-				if ( ! empty( $args[ $k . '_lg' ] ) && $args[ $k . '_lg' ] !== '' ) {
-					if ( $v == null && $v_md == null ) {
-						$classes[] = sanitize_html_class( str_replace( '-lg', '', $args[ $k . '_lg' ] ) );
-					} else {
-						$classes[] = sanitize_html_class( $args[ $k . '_lg' ] );
-					}
-				}
-			} else {
-				if ( $key == 'font_size' && ! empty( $args[ $key ] ) && $args[ $key ] == 'custom' ) {
-					continue;
-				}
-				if ( ! empty( $args[ $key ] ) ) {
-					$classes[] = sd_sanitize_html_classes( $args[ $key ] );
-				}
-			}
-		}
-	}
-
-	if ( ! empty( $classes ) ) {
-		$classes = array_unique( array_filter( array_map( 'trim', $classes ) ) );
-	}
-
-	return implode( ' ', $classes );
+    global $aui_bs5;
+
+    $classes = array();
+
+    if ( $aui_bs5 ) {
+        $p_ml = 'ms-';
+        $p_mr = 'me-';
+
+        $p_pl = 'ps-';
+        $p_pr = 'pe-';
+    } else {
+        $p_ml = 'ml-';
+        $p_mr = 'mr-';
+
+        $p_pl = 'pl-';
+        $p_pr = 'pr-';
+    }
+
+    // margins.
+    if ( isset( $args['mt'] ) && $args['mt'] !== '' ) {
+        $classes[] = 'mt-' . sanitize_html_class( $args['mt'] );
+        $mt        = $args['mt'];
+    } else {
+        $mt = null;
+    }
+    if ( isset( $args['mr'] ) && $args['mr'] !== '' ) {
+        $classes[] = $p_mr . sanitize_html_class( $args['mr'] );
+        $mr        = $args['mr'];
+    } else {
+        $mr = null;
+    }
+    if ( isset( $args['mb'] ) && $args['mb'] !== '' ) {
+        $classes[] = 'mb-' . sanitize_html_class( $args['mb'] );
+        $mb        = $args['mb'];
+    } else {
+        $mb = null;
+    }
+    if ( isset( $args['ml'] ) && $args['ml'] !== '' ) {
+        $classes[] = $p_ml . sanitize_html_class( $args['ml'] );
+        $ml        = $args['ml'];
+    } else {
+        $ml = null;
+    }
+
+    // margins tablet.
+    if ( isset( $args['mt_md'] ) && $args['mt_md'] !== '' ) {
+        $classes[] = 'mt-md-' . sanitize_html_class( $args['mt_md'] );
+        $mt_md     = $args['mt_md'];
+    } else {
+        $mt_md = null;
+    }
+    if ( isset( $args['mr_md'] ) && $args['mr_md'] !== '' ) {
+        $classes[] = $p_mr . 'md-' . sanitize_html_class( $args['mr_md'] );
+        $mt_md     = $args['mr_md'];
+    } else {
+        $mr_md = null;
+    }
+    if ( isset( $args['mb_md'] ) && $args['mb_md'] !== '' ) {
+        $classes[] = 'mb-md-' . sanitize_html_class( $args['mb_md'] );
+        $mt_md     = $args['mb_md'];
+    } else {
+        $mb_md = null;
+    }
+    if ( isset( $args['ml_md'] ) && $args['ml_md'] !== '' ) {
+        $classes[] = $p_ml . 'md-' . sanitize_html_class( $args['ml_md'] );
+        $mt_md     = $args['ml_md'];
+    } else {
+        $ml_md = null;
+    }
+
+    // margins desktop.
+    if ( isset( $args['mt_lg'] ) && $args['mt_lg'] !== '' ) {
+        if ( $mt == null && $mt_md == null ) {
+            $classes[] = 'mt-' . sanitize_html_class( $args['mt_lg'] );
+        } else {
+            $classes[] = 'mt-lg-' . sanitize_html_class( $args['mt_lg'] );
+        }
+    }
+    if ( isset( $args['mr_lg'] ) && $args['mr_lg'] !== '' ) {
+        if ( $mr == null && $mr_md == null ) {
+            $classes[] = $p_mr . sanitize_html_class( $args['mr_lg'] );
+        } else {
+            $classes[] = $p_mr . 'lg-' . sanitize_html_class( $args['mr_lg'] );
+        }
+    }
+    if ( isset( $args['mb_lg'] ) && $args['mb_lg'] !== '' ) {
+        if ( $mb == null && $mb_md == null ) {
+            $classes[] = 'mb-' . sanitize_html_class( $args['mb_lg'] );
+        } else {
+            $classes[] = 'mb-lg-' . sanitize_html_class( $args['mb_lg'] );
+        }
+    }
+    if ( isset( $args['ml_lg'] ) && $args['ml_lg'] !== '' ) {
+        if ( $ml == null && $ml_md == null ) {
+            $classes[] = $p_ml . sanitize_html_class( $args['ml_lg'] );
+        } else {
+            $classes[] = $p_ml . 'lg-' . sanitize_html_class( $args['ml_lg'] );
+        }
+    }
+
+    // padding.
+    if ( isset( $args['pt'] ) && $args['pt'] !== '' ) {
+        $classes[] = 'pt-' . sanitize_html_class( $args['pt'] );
+        $pt        = $args['pt'];
+    } else {
+        $pt = null;
+    }
+    if ( isset( $args['pr'] ) && $args['pr'] !== '' ) {
+        $classes[] = $p_pr . sanitize_html_class( $args['pr'] );
+        $pr        = $args['pr'];
+    } else {
+        $pr = null;
+    }
+    if ( isset( $args['pb'] ) && $args['pb'] !== '' ) {
+        $classes[] = 'pb-' . sanitize_html_class( $args['pb'] );
+        $pb        = $args['pb'];
+    } else {
+        $pb = null;
+    }
+    if ( isset( $args['pl'] ) && $args['pl'] !== '' ) {
+        $classes[] = $p_pl . sanitize_html_class( $args['pl'] );
+        $pl        = $args['pl'];
+    } else {
+        $pl = null;
+    }
+
+    // padding tablet.
+    if ( isset( $args['pt_md'] ) && $args['pt_md'] !== '' ) {
+        $classes[] = 'pt-md-' . sanitize_html_class( $args['pt_md'] );
+        $pt_md     = $args['pt_md'];
+    } else {
+        $pt_md = null;
+    }
+    if ( isset( $args['pr_md'] ) && $args['pr_md'] !== '' ) {
+        $classes[] = $p_pr . 'md-' . sanitize_html_class( $args['pr_md'] );
+        $pr_md     = $args['pr_md'];
+    } else {
+        $pr_md = null;
+    }
+    if ( isset( $args['pb_md'] ) && $args['pb_md'] !== '' ) {
+        $classes[] = 'pb-md-' . sanitize_html_class( $args['pb_md'] );
+        $pb_md     = $args['pb_md'];
+    } else {
+        $pb_md = null;
+    }
+    if ( isset( $args['pl_md'] ) && $args['pl_md'] !== '' ) {
+        $classes[] = $p_pl . 'md-' . sanitize_html_class( $args['pl_md'] );
+        $pl_md     = $args['pl_md'];
+    } else {
+        $pl_md = null;
+    }
+
+    // padding desktop.
+    if ( isset( $args['pt_lg'] ) && $args['pt_lg'] !== '' ) {
+        if ( $pt == null && $pt_md == null ) {
+            $classes[] = 'pt-' . sanitize_html_class( $args['pt_lg'] );
+        } else {
+            $classes[] = 'pt-lg-' . sanitize_html_class( $args['pt_lg'] );
+        }
+    }
+    if ( isset( $args['pr_lg'] ) && $args['pr_lg'] !== '' ) {
+        if ( $pr == null && $pr_md == null ) {
+            $classes[] = $p_pr . sanitize_html_class( $args['pr_lg'] );
+        } else {
+            $classes[] = $p_pr . 'lg-' . sanitize_html_class( $args['pr_lg'] );
+        }
+    }
+    if ( isset( $args['pb_lg'] ) && $args['pb_lg'] !== '' ) {
+        if ( $pb == null && $pb_md == null ) {
+            $classes[] = 'pb-' . sanitize_html_class( $args['pb_lg'] );
+        } else {
+            $classes[] = 'pb-lg-' . sanitize_html_class( $args['pb_lg'] );
+        }
+    }
+    if ( isset( $args['pl_lg'] ) && $args['pl_lg'] !== '' ) {
+        if ( $pl == null && $pl_md == null ) {
+            $classes[] = $p_pl . sanitize_html_class( $args['pl_lg'] );
+        } else {
+            $classes[] = $p_pl . 'lg-' . sanitize_html_class( $args['pl_lg'] );
+        }
+    }
+
+    // row cols, mobile, tablet, desktop
+    if ( ! empty( $args['row_cols'] ) && $args['row_cols'] !== '' ) {
+        $classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols'] );
+        $row_cols  = $args['row_cols'];
+    } else {
+        $row_cols = null;
+    }
+    if ( ! empty( $args['row_cols_md'] ) && $args['row_cols_md'] !== '' ) {
+        $classes[]   = sanitize_html_class( 'row-cols-md-' . $args['row_cols_md'] );
+        $row_cols_md = $args['row_cols_md'];
+    } else {
+        $row_cols_md = null;
+    }
+    if ( ! empty( $args['row_cols_lg'] ) && $args['row_cols_lg'] !== '' ) {
+        if ( $row_cols == null && $row_cols_md == null ) {
+            $classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols_lg'] );
+        } else {
+            $classes[] = sanitize_html_class( 'row-cols-lg-' . $args['row_cols_lg'] );
+        }
+    }
+
+    // columns , mobile, tablet, desktop
+    if ( ! empty( $args['col'] ) && $args['col'] !== '' ) {
+        $classes[] = sanitize_html_class( 'col-' . $args['col'] );
+        $col       = $args['col'];
+    } else {
+        $col = null;
+    }
+    if ( ! empty( $args['col_md'] ) && $args['col_md'] !== '' ) {
+        $classes[] = sanitize_html_class( 'col-md-' . $args['col_md'] );
+        $col_md    = $args['col_md'];
+    } else {
+        $col_md = null;
+    }
+    if ( ! empty( $args['col_lg'] ) && $args['col_lg'] !== '' ) {
+        if ( $col == null && $col_md == null ) {
+            $classes[] = sanitize_html_class( 'col-' . $args['col_lg'] );
+        } else {
+            $classes[] = sanitize_html_class( 'col-lg-' . $args['col_lg'] );
+        }
+    }
+
+    // border
+    if ( isset( $args['border'] ) && ( $args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0 ) ) {
+        $classes[] = 'border-0';
+    } elseif ( ! empty( $args['border'] ) ) {
+        $border_class = 'border';
+        if ( ! empty( $args['border_type'] ) && strpos( $args['border_type'], '-0' ) === false ) {
+            $border_class = '';
+        }
+        $classes[] = $border_class . ' border-' . sanitize_html_class( $args['border'] );
+    }
+
+    // border radius type
+    if ( ! empty( $args['rounded'] ) ) {
+        $classes[] = sanitize_html_class( $args['rounded'] );
+    }
+
+    // border radius size BS4
+    if ( isset( $args['rounded_size'] ) && in_array( $args['rounded_size'], array( 'sm', 'lg' ) ) ) {
+        $classes[] = 'rounded-' . sanitize_html_class( $args['rounded_size'] );
+        // if we set a size then we need to remove "rounded" if set
+        if ( ( $key = array_search( 'rounded', $classes ) ) !== false ) {
+            unset( $classes[ $key ] );
+        }
+    } else {
+
+        // border radius size , mobile, tablet, desktop
+        if ( isset( $args['rounded_size'] ) && $args['rounded_size'] !== '' ) {
+            $classes[]    = sanitize_html_class( 'rounded-' . $args['rounded_size'] );
+            $rounded_size = $args['rounded_size'];
+        } else {
+            $rounded_size = null;
+        }
+        if ( isset( $args['rounded_size_md'] ) && $args['rounded_size_md'] !== '' ) {
+            $classes[]       = sanitize_html_class( 'rounded-md-' . $args['rounded_size_md'] );
+            $rounded_size_md = $args['rounded_size_md'];
+        } else {
+            $rounded_size_md = null;
+        }
+        if ( isset( $args['rounded_size_lg'] ) && $args['rounded_size_lg'] !== '' ) {
+            if ( $rounded_size == null && $rounded_size_md == null ) {
+                $classes[] = sanitize_html_class( 'rounded-' . $args['rounded_size_lg'] );
+            } else {
+                $classes[] = sanitize_html_class( 'rounded-lg-' . $args['rounded_size_lg'] );
+            }
+        }
+    }
+
+    // shadow
+    //if ( !empty( $args['shadow'] ) ) { $classes[] = sanitize_html_class($args['shadow']); }
+
+    // background
+    if ( ! empty( $args['bg'] ) ) {
+        $classes[] = 'bg-' . sanitize_html_class( $args['bg'] );
+    }
+
+    // background image fixed bg_image_fixed this helps fix a iOS bug
+    if ( ! empty( $args['bg_image_fixed'] ) ) {
+        $classes[] = 'bg-image-fixed';
+    }
+
+    // text_color
+    if ( ! empty( $args['text_color'] ) ) {
+        $classes[] = 'text-' . sanitize_html_class( $args['text_color'] );
+    }
+
+    // text_align
+    if ( ! empty( $args['text_justify'] ) ) {
+        $classes[] = 'text-justify';
+    } else {
+        if ( ! empty( $args['text_align'] ) ) {
+            $classes[]  = sanitize_html_class( $args['text_align'] );
+            $text_align = $args['text_align'];
+        } else {
+            $text_align = null;
+        }
+        if ( ! empty( $args['text_align_md'] ) && $args['text_align_md'] !== '' ) {
+            $classes[]     = sanitize_html_class( $args['text_align_md'] );
+            $text_align_md = $args['text_align_md'];
+        } else {
+            $text_align_md = null;
+        }
+        if ( ! empty( $args['text_align_lg'] ) && $args['text_align_lg'] !== '' ) {
+            if ( $text_align == null && $text_align_md == null ) {
+                $classes[] = sanitize_html_class( str_replace( '-lg', '', $args['text_align_lg'] ) );
+            } else {
+                $classes[] = sanitize_html_class( $args['text_align_lg'] );
+            }
+        }
+    }
+
+    // display
+    if ( ! empty( $args['display'] ) ) {
+        $classes[] = sanitize_html_class( $args['display'] );
+        $display   = $args['display'];
+    } else {
+        $display = null;
+    }
+    if ( ! empty( $args['display_md'] ) && $args['display_md'] !== '' ) {
+        $classes[]  = sanitize_html_class( $args['display_md'] );
+        $display_md = $args['display_md'];
+    } else {
+        $display_md = null;
+    }
+    if ( ! empty( $args['display_lg'] ) && $args['display_lg'] !== '' ) {
+        if ( $display == null && $display_md == null ) {
+            $classes[] = sanitize_html_class( str_replace( '-lg', '', $args['display_lg'] ) );
+        } else {
+            $classes[] = sanitize_html_class( $args['display_lg'] );
+        }
+    }
+
+    // bgtus - background transparent until scroll
+    if ( ! empty( $args['bgtus'] ) ) {
+        $classes[] = sanitize_html_class( 'bg-transparent-until-scroll' );
+    }
+
+    // cscos - change color scheme on scroll
+    if ( ! empty( $args['bgtus'] ) && ! empty( $args['cscos'] ) ) {
+        $classes[] = sanitize_html_class( 'color-scheme-flip-on-scroll' );
+    }
+
+    // hover animations
+    if ( ! empty( $args['hover_animations'] ) ) {
+        $classes[] = sd_sanitize_html_classes( str_replace( ',', ' ', $args['hover_animations'] ) );
+    }
+
+    // absolute_position
+    if ( ! empty( $args['absolute_position'] ) ) {
+        if ( 'top-left' === $args['absolute_position'] ) {
+            $classes[] = 'start-0 top-0';
+        } elseif ( 'top-center' === $args['absolute_position'] ) {
+            $classes[] = 'start-50 top-0 translate-middle';
+        } elseif ( 'top-right' === $args['absolute_position'] ) {
+            $classes[] = 'end-0 top-0';
+        } elseif ( 'center-left' === $args['absolute_position'] ) {
+            $classes[] = 'start-0 top-50';
+        } elseif ( 'center' === $args['absolute_position'] ) {
+            $classes[] = 'start-50 top-50 translate-middle';
+        } elseif ( 'center-right' === $args['absolute_position'] ) {
+            $classes[] = 'end-0 top-50';
+        } elseif ( 'bottom-left' === $args['absolute_position'] ) {
+            $classes[] = 'start-0 bottom-0';
+        } elseif ( 'bottom-center' === $args['absolute_position'] ) {
+            $classes[] = 'start-50 bottom-0 translate-middle';
+        } elseif ( 'bottom-right' === $args['absolute_position'] ) {
+            $classes[] = 'end-0 bottom-0';
+        }
+    }
+
+    // build classes from build keys
+    $build_keys = sd_get_class_build_keys();
+    if ( ! empty( $build_keys ) ) {
+        foreach ( $build_keys as $key ) {
+
+            if ( substr( $key, -4 ) == '-MTD' ) {
+
+                $k = str_replace( '-MTD', '', $key );
+
+                // Mobile, Tablet, Desktop
+                if ( ! empty( $args[ $k ] ) && $args[ $k ] !== '' ) {
+                    $classes[] = sanitize_html_class( $args[ $k ] );
+                    $v         = $args[ $k ];
+                } else {
+                    $v = null;
+                }
+                if ( ! empty( $args[ $k . '_md' ] ) && $args[ $k . '_md' ] !== '' ) {
+                    $classes[] = sanitize_html_class( $args[ $k . '_md' ] );
+                    $v_md      = $args[ $k . '_md' ];
+                } else {
+                    $v_md = null;
+                }
+                if ( ! empty( $args[ $k . '_lg' ] ) && $args[ $k . '_lg' ] !== '' ) {
+                    if ( $v == null && $v_md == null ) {
+                        $classes[] = sanitize_html_class( str_replace( '-lg', '', $args[ $k . '_lg' ] ) );
+                    } else {
+                        $classes[] = sanitize_html_class( $args[ $k . '_lg' ] );
+                    }
+                }
+            } else {
+                if ( $key == 'font_size' && ! empty( $args[ $key ] ) && $args[ $key ] == 'custom' ) {
+                    continue;
+                }
+                if ( ! empty( $args[ $key ] ) ) {
+                    $classes[] = sd_sanitize_html_classes( $args[ $key ] );
+                }
+            }
+        }
+    }
+
+    if ( ! empty( $classes ) ) {
+        $classes = array_unique( array_filter( array_map( 'trim', $classes ) ) );
+    }
+
+    return implode( ' ', $classes );
 }
 
 /**
@@ -2758,90 +2758,90 @@ 
  */
 function sd_build_aui_styles( $args ) {
 
-	$styles = array();
-
-	// background color
-	if ( ! empty( $args['bg'] ) && $args['bg'] !== '' ) {
-		if ( $args['bg'] == 'custom-color' ) {
-			$styles['background-color'] = $args['bg_color'];
-		} elseif ( $args['bg'] == 'custom-gradient' ) {
-			$styles['background-image'] = $args['bg_gradient'];
-
-			// use background on text.
-			if ( ! empty( $args['bg_on_text'] ) && $args['bg_on_text'] ) {
-				$styles['background-clip']         = 'text';
-				$styles['-webkit-background-clip'] = 'text';
-				$styles['text-fill-color']         = 'transparent';
-				$styles['-webkit-text-fill-color'] = 'transparent';
-			}
-		}
-	}
-
-	if ( ! empty( $args['bg_image'] ) && $args['bg_image'] !== '' ) {
-		$hasImage = true;
-		if ( ! empty( $styles['background-color'] ) && $args['bg'] == 'custom-color' ) {
-			$styles['background-image']      = 'url(' . $args['bg_image'] . ')';
-			$styles['background-blend-mode'] = 'overlay';
-		} elseif ( ! empty( $styles['background-image'] ) && $args['bg'] == 'custom-gradient' ) {
-			$styles['background-image'] .= ',url(' . $args['bg_image'] . ')';
-		} elseif ( ! empty( $args['bg'] ) && $args['bg'] != '' && $args['bg'] != 'transparent' ) {
-			// do nothing as we alreay have a preset
-			$hasImage = false;
-		} else {
-			$styles['background-image'] = 'url(' . $args['bg_image'] . ')';
-		}
-
-		if ( $hasImage ) {
-			$styles['background-size'] = 'cover';
-
-			if ( ! empty( $args['bg_image_fixed'] ) && $args['bg_image_fixed'] ) {
-				$styles['background-attachment'] = 'fixed';
-			}
-		}
-
-		if ( $hasImage && ! empty( $args['bg_image_xy'] ) && ! empty( $args['bg_image_xy']['x'] ) ) {
-			$styles['background-position'] = ( $args['bg_image_xy']['x'] * 100 ) . '% ' . ( $args['bg_image_xy']['y'] * 100 ) . '%';
-		}
-	}
-
-	// sticky offset top
-	if ( ! empty( $args['sticky_offset_top'] ) && $args['sticky_offset_top'] !== '' ) {
-		$styles['top'] = absint( $args['sticky_offset_top'] );
-	}
-
-	// sticky offset bottom
-	if ( ! empty( $args['sticky_offset_bottom'] ) && $args['sticky_offset_bottom'] !== '' ) {
-		$styles['bottom'] = absint( $args['sticky_offset_bottom'] );
-	}
-
-	// font size
-	if ( ! empty( $args['font_size_custom'] ) && $args['font_size_custom'] !== '' ) {
-		$styles['font-size'] = (float) $args['font_size_custom'] . 'rem';
-	}
-
-	// font color
-	if ( ! empty( $args['text_color_custom'] ) && $args['text_color_custom'] !== '' ) {
-		$styles['color'] = esc_attr( $args['text_color_custom'] );
-	}
-
-	// font line height
-	if ( ! empty( $args['font_line_height'] ) && $args['font_line_height'] !== '' ) {
-		$styles['line-height'] = esc_attr( $args['font_line_height'] );
-	}
-
-	// max height
-	if ( ! empty( $args['max_height'] ) && $args['max_height'] !== '' ) {
-		$styles['max-height'] = esc_attr( $args['max_height'] );
-	}
-
-	$style_string = '';
-	if ( ! empty( $styles ) ) {
-		foreach ( $styles as $key => $val ) {
-			$style_string .= esc_attr( $key ) . ':' . esc_attr( $val ) . ';';
-		}
-	}
-
-	return $style_string;
+    $styles = array();
+
+    // background color
+    if ( ! empty( $args['bg'] ) && $args['bg'] !== '' ) {
+        if ( $args['bg'] == 'custom-color' ) {
+            $styles['background-color'] = $args['bg_color'];
+        } elseif ( $args['bg'] == 'custom-gradient' ) {
+            $styles['background-image'] = $args['bg_gradient'];
+
+            // use background on text.
+            if ( ! empty( $args['bg_on_text'] ) && $args['bg_on_text'] ) {
+                $styles['background-clip']         = 'text';
+                $styles['-webkit-background-clip'] = 'text';
+                $styles['text-fill-color']         = 'transparent';
+                $styles['-webkit-text-fill-color'] = 'transparent';
+            }
+        }
+    }
+
+    if ( ! empty( $args['bg_image'] ) && $args['bg_image'] !== '' ) {
+        $hasImage = true;
+        if ( ! empty( $styles['background-color'] ) && $args['bg'] == 'custom-color' ) {
+            $styles['background-image']      = 'url(' . $args['bg_image'] . ')';
+            $styles['background-blend-mode'] = 'overlay';
+        } elseif ( ! empty( $styles['background-image'] ) && $args['bg'] == 'custom-gradient' ) {
+            $styles['background-image'] .= ',url(' . $args['bg_image'] . ')';
+        } elseif ( ! empty( $args['bg'] ) && $args['bg'] != '' && $args['bg'] != 'transparent' ) {
+            // do nothing as we alreay have a preset
+            $hasImage = false;
+        } else {
+            $styles['background-image'] = 'url(' . $args['bg_image'] . ')';
+        }
+
+        if ( $hasImage ) {
+            $styles['background-size'] = 'cover';
+
+            if ( ! empty( $args['bg_image_fixed'] ) && $args['bg_image_fixed'] ) {
+                $styles['background-attachment'] = 'fixed';
+            }
+        }
+
+        if ( $hasImage && ! empty( $args['bg_image_xy'] ) && ! empty( $args['bg_image_xy']['x'] ) ) {
+            $styles['background-position'] = ( $args['bg_image_xy']['x'] * 100 ) . '% ' . ( $args['bg_image_xy']['y'] * 100 ) . '%';
+        }
+    }
+
+    // sticky offset top
+    if ( ! empty( $args['sticky_offset_top'] ) && $args['sticky_offset_top'] !== '' ) {
+        $styles['top'] = absint( $args['sticky_offset_top'] );
+    }
+
+    // sticky offset bottom
+    if ( ! empty( $args['sticky_offset_bottom'] ) && $args['sticky_offset_bottom'] !== '' ) {
+        $styles['bottom'] = absint( $args['sticky_offset_bottom'] );
+    }
+
+    // font size
+    if ( ! empty( $args['font_size_custom'] ) && $args['font_size_custom'] !== '' ) {
+        $styles['font-size'] = (float) $args['font_size_custom'] . 'rem';
+    }
+
+    // font color
+    if ( ! empty( $args['text_color_custom'] ) && $args['text_color_custom'] !== '' ) {
+        $styles['color'] = esc_attr( $args['text_color_custom'] );
+    }
+
+    // font line height
+    if ( ! empty( $args['font_line_height'] ) && $args['font_line_height'] !== '' ) {
+        $styles['line-height'] = esc_attr( $args['font_line_height'] );
+    }
+
+    // max height
+    if ( ! empty( $args['max_height'] ) && $args['max_height'] !== '' ) {
+        $styles['max-height'] = esc_attr( $args['max_height'] );
+    }
+
+    $style_string = '';
+    if ( ! empty( $styles ) ) {
+        foreach ( $styles as $key => $val ) {
+            $style_string .= esc_attr( $key ) . ':' . esc_attr( $val ) . ';';
+        }
+    }
+
+    return $style_string;
 
 }
 
@@ -2854,34 +2854,34 @@ 
  * @return string
  */
 function sd_build_hover_styles( $args, $is_preview = false ) {
-	$rules = '';
-	// text color
-	if ( ! empty( $args['styleid'] ) ) {
-		$styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr( $args['styleid'] ) : 'html .' . esc_attr( $args['styleid'] );
-
-		// text
-		if ( ! empty( $args['text_color_hover'] ) ) {
-			$key    = 'custom' === $args['text_color_hover'] && ! empty( $args['text_color_hover_custom'] ) ? 'text_color_hover_custom' : 'text_color_hover';
-			$color  = sd_get_color_from_var( $args[ $key ] );
-			$rules .= $styleid . ':hover {color: ' . $color . ' !important;} ';
-		}
-
-		// bg
-		if ( ! empty( $args['bg_hover'] ) ) {
-			if ( 'custom-gradient' === $args['bg_hover'] ) {
-				$color  = $args['bg_hover_gradient'];
-				$rules .= $styleid . ':hover {background-image: ' . $color . ' !important;} ';
-				$rules .= $styleid . '.btn:hover {border-color: transparent !important;} ';
-			} else {
-				$key    = 'custom-color' === $args['bg_hover'] ? 'bg_hover_color' : 'bg_hover';
-				$color  = sd_get_color_from_var( $args[ $key ] );
-				$rules .= $styleid . ':hover {background: ' . $color . ' !important;} ';
-				$rules .= $styleid . '.btn:hover {border-color: ' . $color . ' !important;} ';
-			}
-		}
-	}
-
-	return $rules ? '<style>' . $rules . '</style>' : '';
+    $rules = '';
+    // text color
+    if ( ! empty( $args['styleid'] ) ) {
+        $styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr( $args['styleid'] ) : 'html .' . esc_attr( $args['styleid'] );
+
+        // text
+        if ( ! empty( $args['text_color_hover'] ) ) {
+            $key    = 'custom' === $args['text_color_hover'] && ! empty( $args['text_color_hover_custom'] ) ? 'text_color_hover_custom' : 'text_color_hover';
+            $color  = sd_get_color_from_var( $args[ $key ] );
+            $rules .= $styleid . ':hover {color: ' . $color . ' !important;} ';
+        }
+
+        // bg
+        if ( ! empty( $args['bg_hover'] ) ) {
+            if ( 'custom-gradient' === $args['bg_hover'] ) {
+                $color  = $args['bg_hover_gradient'];
+                $rules .= $styleid . ':hover {background-image: ' . $color . ' !important;} ';
+                $rules .= $styleid . '.btn:hover {border-color: transparent !important;} ';
+            } else {
+                $key    = 'custom-color' === $args['bg_hover'] ? 'bg_hover_color' : 'bg_hover';
+                $color  = sd_get_color_from_var( $args[ $key ] );
+                $rules .= $styleid . ':hover {background: ' . $color . ' !important;} ';
+                $rules .= $styleid . '.btn:hover {border-color: ' . $color . ' !important;} ';
+            }
+        }
+    }
+
+    return $rules ? '<style>' . $rules . '</style>' : '';
 }
 
 /**
@@ -2893,12 +2893,12 @@ 
  */
 function sd_get_color_from_var( $var ) {
 
-	//sanitize_hex_color() @todo this does not cover transparency
-	if ( strpos( $var, '#' ) === false ) {
-		$var = defined( 'BLOCKSTRAP_BLOCKS_VERSION' ) ? 'var(--wp--preset--color--' . esc_attr( $var ) . ')' : 'var(--' . esc_attr( $var ) . ')';
-	}
+    //sanitize_hex_color() @todo this does not cover transparency
+    if ( strpos( $var, '#' ) === false ) {
+        $var = defined( 'BLOCKSTRAP_BLOCKS_VERSION' ) ? 'var(--wp--preset--color--' . esc_attr( $var ) . ')' : 'var(--' . esc_attr( $var ) . ')';
+    }
 
-	return $var;
+    return $var;
 }
 
 /**
@@ -2910,19 +2910,19 @@ 
  * @return string
  */
 function sd_sanitize_html_classes( $classes, $sep = ' ' ) {
-	$return = '';
+    $return = '';
 
-	if ( ! is_array( $classes ) ) {
-		$classes = explode( $sep, $classes );
-	}
+    if ( ! is_array( $classes ) ) {
+        $classes = explode( $sep, $classes );
+    }
 
-	if ( ! empty( $classes ) ) {
-		foreach ( $classes as $class ) {
-			$return .= sanitize_html_class( $class ) . ' ';
-		}
-	}
+    if ( ! empty( $classes ) ) {
+        foreach ( $classes as $class ) {
+            $return .= sanitize_html_class( $class ) . ' ';
+        }
+    }
 
-	return $return;
+    return $return;
 }
 
 
@@ -2932,40 +2932,40 @@ 
  * @return void
  */
 function sd_get_class_build_keys() {
-	$keys = array(
-		'container',
-		'position',
-		'flex_direction',
-		'shadow',
-		'rounded',
-		'nav_style',
-		'horizontal_alignment',
-		'nav_fill',
-		'width',
-		'font_weight',
-		'font_size',
-		'font_case',
-		'css_class',
-		'flex_align_items-MTD',
-		'flex_justify_content-MTD',
-		'flex_align_self-MTD',
-		'flex_order-MTD',
-		'styleid',
-		'border_opacity',
-		'border_width',
-		'border_type',
-		'opacity',
-		'zindex',
-		'flex_wrap-MTD',
-		'h100',
-		'overflow',
-		'scrollbars',
-		'float-MTD',
-		'height-MTD',
-		'width-MTD'
-	);
-
-	return apply_filters( 'sd_class_build_keys', $keys );
+    $keys = array(
+        'container',
+        'position',
+        'flex_direction',
+        'shadow',
+        'rounded',
+        'nav_style',
+        'horizontal_alignment',
+        'nav_fill',
+        'width',
+        'font_weight',
+        'font_size',
+        'font_case',
+        'css_class',
+        'flex_align_items-MTD',
+        'flex_justify_content-MTD',
+        'flex_align_self-MTD',
+        'flex_order-MTD',
+        'styleid',
+        'border_opacity',
+        'border_width',
+        'border_type',
+        'opacity',
+        'zindex',
+        'flex_wrap-MTD',
+        'h100',
+        'overflow',
+        'scrollbars',
+        'float-MTD',
+        'height-MTD',
+        'width-MTD'
+    );
+
+    return apply_filters( 'sd_class_build_keys', $keys );
 }
 
 /**
@@ -2977,18 +2977,18 @@ 
  * @return array
  */
 function sd_get_visibility_conditions_input( $type = 'visibility_conditions', $overwrite = array() ) {
-	$defaults = array(
-		'type'         => 'visibility_conditions',
-		'title'        => __( 'Block Visibility', 'ayecode-connect' ),
-		'button_title' => __( 'Set Block Visibility', 'ayecode-connect' ),
-		'default'      => '',
-		'desc_tip'     => true,
-		'group'        => __( 'Visibility Conditions', 'ayecode-connect' ),
-	);
+    $defaults = array(
+        'type'         => 'visibility_conditions',
+        'title'        => __( 'Block Visibility', 'ayecode-connect' ),
+        'button_title' => __( 'Set Block Visibility', 'ayecode-connect' ),
+        'default'      => '',
+        'desc_tip'     => true,
+        'group'        => __( 'Visibility Conditions', 'ayecode-connect' ),
+    );
 
-	$input = wp_parse_args( $overwrite, $defaults );
+    $input = wp_parse_args( $overwrite, $defaults );
 
-	return $input;
+    return $input;
 }
 
 /**
@@ -3000,21 +3000,21 @@ 
  * @return array An array of roles.
  */
 function sd_user_roles_options( $exclude = array() ) {
-	$user_roles = array();
+    $user_roles = array();
 
-	if ( !function_exists('get_editable_roles') ) {
-		require_once( ABSPATH . '/wp-admin/includes/user.php' );
-	}
+    if ( !function_exists('get_editable_roles') ) {
+        require_once( ABSPATH . '/wp-admin/includes/user.php' );
+    }
 
-	$roles = get_editable_roles();
+    $roles = get_editable_roles();
 
-	foreach ( $roles as $role => $data ) {
-		if ( ! ( ! empty( $exclude ) && in_array( $role, $exclude ) ) ) {
-			$user_roles[ esc_attr( $role ) ] = translate_user_role( $data['name'] );
-		}
-	}
+    foreach ( $roles as $role => $data ) {
+        if ( ! ( ! empty( $exclude ) && in_array( $role, $exclude ) ) ) {
+            $user_roles[ esc_attr( $role ) ] = translate_user_role( $data['name'] );
+        }
+    }
 
-	return apply_filters( 'sd_user_roles_options', $user_roles );
+    return apply_filters( 'sd_user_roles_options', $user_roles );
 }
 
 /**
@@ -3025,18 +3025,18 @@ 
  * @return array Rule options.
  */
 function sd_visibility_rules_options() {
-	$options = array(
-		'logged_in'  => __( 'Logged In', 'ayecode-connect' ),
-		'logged_out' => __( 'Logged Out', 'ayecode-connect' ),
-		'post_author'  => __( 'Post Author', 'ayecode-connect' ),
-		'user_roles' => __( 'Specific User Roles', 'ayecode-connect' )
-	);
+    $options = array(
+        'logged_in'  => __( 'Logged In', 'ayecode-connect' ),
+        'logged_out' => __( 'Logged Out', 'ayecode-connect' ),
+        'post_author'  => __( 'Post Author', 'ayecode-connect' ),
+        'user_roles' => __( 'Specific User Roles', 'ayecode-connect' )
+    );
 
-	if ( class_exists( 'GeoDirectory' ) ) {
-		$options['gd_field'] = __( 'GD Field', 'ayecode-connect' );
-	}
+    if ( class_exists( 'GeoDirectory' ) ) {
+        $options['gd_field'] = __( 'GD Field', 'ayecode-connect' );
+    }
 
-	return apply_filters( 'sd_visibility_rules_options', $options );
+    return apply_filters( 'sd_visibility_rules_options', $options );
 }
 
 /**
@@ -3045,39 +3045,39 @@ 
  * @return array
  */
 function sd_visibility_gd_field_options() {
-	$fields = geodir_post_custom_fields( '', 'all', 'all', 'none' );
+    $fields = geodir_post_custom_fields( '', 'all', 'all', 'none' );
 
-	$keys = array();
-	if ( ! empty( $fields ) ) {
-		foreach( $fields as $field ) {
-			if ( apply_filters( 'geodir_badge_field_skip_key', false, $field ) ) {
-				continue;
-			}
+    $keys = array();
+    if ( ! empty( $fields ) ) {
+        foreach( $fields as $field ) {
+            if ( apply_filters( 'geodir_badge_field_skip_key', false, $field ) ) {
+                continue;
+            }
 
-			$keys[ $field['htmlvar_name'] ] = $field['htmlvar_name'] . ' ( ' . __( $field['admin_title'], 'geodirectory' ) . ' )';
+            $keys[ $field['htmlvar_name'] ] = $field['htmlvar_name'] . ' ( ' . __( $field['admin_title'], 'geodirectory' ) . ' )';
 
-			// Extra address fields
-			if ( $field['htmlvar_name'] == 'address' && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				foreach ( $address_fields as $_field => $args ) {
-					if ( $_field != 'map_directions' && $_field != 'street' ) {
-						$keys[ $_field ] = $_field . ' ( ' . $args['frontend_title'] . ' )';
-					}
-				}
-			}
-		}
-	}
+            // Extra address fields
+            if ( $field['htmlvar_name'] == 'address' && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
+                foreach ( $address_fields as $_field => $args ) {
+                    if ( $_field != 'map_directions' && $_field != 'street' ) {
+                        $keys[ $_field ] = $_field . ' ( ' . $args['frontend_title'] . ' )';
+                    }
+                }
+            }
+        }
+    }
 
-	$standard_fields = sd_visibility_gd_standard_field_options();
+    $standard_fields = sd_visibility_gd_standard_field_options();
 
-	if ( ! empty( $standard_fields ) ) {
-		foreach ( $standard_fields as $key => $option ) {
-			$keys[ $key ] = $option;
-		}
-	}
+    if ( ! empty( $standard_fields ) ) {
+        foreach ( $standard_fields as $key => $option ) {
+            $keys[ $key ] = $option;
+        }
+    }
 
-	$options = apply_filters( 'geodir_badge_field_keys', $keys );
+    $options = apply_filters( 'geodir_badge_field_keys', $keys );
 
-	return apply_filters( 'sd_visibility_gd_field_options', $options );
+    return apply_filters( 'sd_visibility_gd_field_options', $options );
 }
 
 /**
@@ -3086,17 +3086,17 @@ 
  * @return array
  */
 function sd_visibility_gd_standard_field_options( $post_type = '' ) {
-	$fields = sd_visibility_gd_standard_fields( $post_type );
+    $fields = sd_visibility_gd_standard_fields( $post_type );
 
-	$options = array();
+    $options = array();
 
-	foreach ( $fields as $key => $field ) {
-		if ( ! empty( $field['frontend_title'] ) ) {
-			$options[ $key ] = $key . ' ( ' . $field['frontend_title'] . ' )';
-		}
-	}
+    foreach ( $fields as $key => $field ) {
+        if ( ! empty( $field['frontend_title'] ) ) {
+            $options[ $key ] = $key . ' ( ' . $field['frontend_title'] . ' )';
+        }
+    }
 
-	return apply_filters( 'sd_visibility_gd_standard_field_options', $options, $fields );
+    return apply_filters( 'sd_visibility_gd_standard_field_options', $options, $fields );
 }
 
 /**
@@ -3105,17 +3105,17 @@ 
  * @return array
  */
 function sd_visibility_gd_standard_fields( $post_type = '' ) {
-	$standard_fields = geodir_post_meta_standard_fields( $post_type );
+    $standard_fields = geodir_post_meta_standard_fields( $post_type );
 
-	$fields = array();
+    $fields = array();
 
-	foreach ( $standard_fields as $key => $field ) {
-		if ( $key != 'post_link' && strpos( $key, 'event' ) === false && ! empty( $field['frontend_title'] ) ) {
-			$fields[ $key ] = $field;
-		}
-	}
+    foreach ( $standard_fields as $key => $field ) {
+        if ( $key != 'post_link' && strpos( $key, 'event' ) === false && ! empty( $field['frontend_title'] ) ) {
+            $fields[ $key ] = $field;
+        }
+    }
 
-	return apply_filters( 'sd_visibility_gd_standard_fields', $fields );
+    return apply_filters( 'sd_visibility_gd_standard_fields', $fields );
 }
 
 /**
@@ -3124,18 +3124,18 @@ 
  * @return array
  */
 function sd_visibility_field_condition_options(){
-	$options = array(
-		'is_empty' => __( 'is empty', 'ayecode-connect' ),
-		'is_not_empty' => __( 'is not empty', 'ayecode-connect' ),
-		'is_equal' => __( 'is equal', 'ayecode-connect' ),
-		'is_not_equal' => __( 'is not equal', 'ayecode-connect' ),
-		'is_greater_than' => __( 'is greater than', 'ayecode-connect' ),
-		'is_less_than' => __( 'is less than', 'ayecode-connect' ),
-		'is_contains' => __( 'is contains', 'ayecode-connect' ),
-		'is_not_contains' => __( 'is not contains', 'ayecode-connect' ),
-	);
+    $options = array(
+        'is_empty' => __( 'is empty', 'ayecode-connect' ),
+        'is_not_empty' => __( 'is not empty', 'ayecode-connect' ),
+        'is_equal' => __( 'is equal', 'ayecode-connect' ),
+        'is_not_equal' => __( 'is not equal', 'ayecode-connect' ),
+        'is_greater_than' => __( 'is greater than', 'ayecode-connect' ),
+        'is_less_than' => __( 'is less than', 'ayecode-connect' ),
+        'is_contains' => __( 'is contains', 'ayecode-connect' ),
+        'is_not_contains' => __( 'is not contains', 'ayecode-connect' ),
+    );
 
-	return apply_filters( 'sd_visibility_field_condition_options', $options );
+    return apply_filters( 'sd_visibility_field_condition_options', $options );
 }
 
 /**
@@ -3146,14 +3146,14 @@ 
  * @return array Template type options.
  */
 function sd_visibility_output_options() {
-	$options = array(
-		'hide'          => __( 'Hide Block', 'ayecode-connect' ),
-		'message'       => __( 'Show Custom Message', 'ayecode-connect' ),
-		'page'          => __( 'Show Page Content', 'ayecode-connect' ),
-		'template_part' => __( 'Show Template Part', 'ayecode-connect' ),
-	);
+    $options = array(
+        'hide'          => __( 'Hide Block', 'ayecode-connect' ),
+        'message'       => __( 'Show Custom Message', 'ayecode-connect' ),
+        'page'          => __( 'Show Page Content', 'ayecode-connect' ),
+        'template_part' => __( 'Show Template Part', 'ayecode-connect' ),
+    );
 
-	return apply_filters( 'sd_visibility_output_options', $options );
+    return apply_filters( 'sd_visibility_output_options', $options );
 }
 
 /**
@@ -3165,45 +3165,45 @@ 
  * @return array Template page options.
  */
 function sd_template_page_options( $args = array() ) {
-	global $sd_tmpl_page_options;
+    global $sd_tmpl_page_options;
 
-	if ( ! empty( $sd_tmpl_page_options ) ) {
-		return $sd_tmpl_page_options;
-	}
+    if ( ! empty( $sd_tmpl_page_options ) ) {
+        return $sd_tmpl_page_options;
+    }
 
-	$args = wp_parse_args( $args, array(
-		'child_of'    => 0,
-		'sort_column' => 'post_title',
-		'sort_order'  => 'ASC'
-	) );
+    $args = wp_parse_args( $args, array(
+        'child_of'    => 0,
+        'sort_column' => 'post_title',
+        'sort_order'  => 'ASC'
+    ) );
 
-	$exclude_pages = array();
-	if ( $page_on_front = get_option( 'page_on_front' ) ) {
-		$exclude_pages[] = $page_on_front;
-	}
+    $exclude_pages = array();
+    if ( $page_on_front = get_option( 'page_on_front' ) ) {
+        $exclude_pages[] = $page_on_front;
+    }
 
-	if ( $page_for_posts = get_option( 'page_for_posts' ) ) {
-		$exclude_pages[] = $page_for_posts;
-	}
+    if ( $page_for_posts = get_option( 'page_for_posts' ) ) {
+        $exclude_pages[] = $page_for_posts;
+    }
 
-	if ( ! empty( $exclude_pages ) ) {
-		$args['exclude'] = $exclude_pages;
-	}
+    if ( ! empty( $exclude_pages ) ) {
+        $args['exclude'] = $exclude_pages;
+    }
 
-	$pages = get_pages( $args );
+    $pages = get_pages( $args );
 
-	$options = array( '' => __( 'Select Page...', 'ayecode-connect' ) );
-	if ( ! empty( $pages ) ) {
-		foreach ( $pages as $page ) {
-			if ( ! empty( $page->ID ) && ! empty( $page->post_title ) ) {
-				$options[ $page->ID ] = $page->post_title . ' (#' . $page->ID . ')';
-			}
-		}
-	}
+    $options = array( '' => __( 'Select Page...', 'ayecode-connect' ) );
+    if ( ! empty( $pages ) ) {
+        foreach ( $pages as $page ) {
+            if ( ! empty( $page->ID ) && ! empty( $page->post_title ) ) {
+                $options[ $page->ID ] = $page->post_title . ' (#' . $page->ID . ')';
+            }
+        }
+    }
 
-	$sd_tmpl_page_options = $options;
+    $sd_tmpl_page_options = $options;
 
-	return apply_filters( 'sd_template_page_options', $options );
+    return apply_filters( 'sd_template_page_options', $options );
 }
 
 /**
@@ -3215,25 +3215,25 @@ 
  * @return array Template part options.
  */
 function sd_template_part_options( $args = array() ) {
-	global $sd_tmpl_part_options;
+    global $sd_tmpl_part_options;
 
-	if ( ! empty( $sd_tmpl_part_options ) ) {
-		return $sd_tmpl_part_options;
-	}
+    if ( ! empty( $sd_tmpl_part_options ) ) {
+        return $sd_tmpl_part_options;
+    }
 
-	$options = array( '' => __( 'Select Template Part...', 'ayecode-connect' ) );
+    $options = array( '' => __( 'Select Template Part...', 'ayecode-connect' ) );
 
-	$parts = get_block_templates( array(), 'wp_template_part' );
+    $parts = get_block_templates( array(), 'wp_template_part' );
 
-	if ( ! empty( $parts ) ) {
-		foreach ( $parts as $part ) {
-			$options[ $part->slug ] = $part->title . ' (#' . $part->slug . ')';
-		}
-	}
+    if ( ! empty( $parts ) ) {
+        foreach ( $parts as $part ) {
+            $options[ $part->slug ] = $part->title . ' (#' . $part->slug . ')';
+        }
+    }
 
-	$sd_tmpl_part_options = $options;
+    $sd_tmpl_part_options = $options;
 
-	return apply_filters( 'sd_template_part_options', $options, $args );
+    return apply_filters( 'sd_template_part_options', $options, $args );
 }
 
 /**
@@ -3245,25 +3245,25 @@ 
  * @return array Template part object.
  */
 function sd_get_template_part_by_slug( $slug ) {
-	global $bs_tmpl_part_by_slug;
+    global $bs_tmpl_part_by_slug;
 
-	if ( empty( $bs_tmpl_part_by_slug ) ) {
-		$bs_tmpl_part_by_slug = array();
-	}
+    if ( empty( $bs_tmpl_part_by_slug ) ) {
+        $bs_tmpl_part_by_slug = array();
+    }
 
-	if ( isset( $bs_tmpl_part_by_slug[ $slug ] ) ) {
-		return $bs_tmpl_part_by_slug[ $slug ];
-	}
+    if ( isset( $bs_tmpl_part_by_slug[ $slug ] ) ) {
+        return $bs_tmpl_part_by_slug[ $slug ];
+    }
 
-	$template_query = get_block_templates( array( 'slug__in' => array( $slug ) ), 'wp_template_part' );
+    $template_query = get_block_templates( array( 'slug__in' => array( $slug ) ), 'wp_template_part' );
 
-	$query_post = ! empty( $template_query ) ? $template_query[0] : array();
+    $query_post = ! empty( $template_query ) ? $template_query[0] : array();
 
-	$template_part = ! empty( $query_post ) && $query_post->status == 'publish' ? $query_post : array();
+    $template_part = ! empty( $query_post ) && $query_post->status == 'publish' ? $query_post : array();
 
-	$bs_tmpl_part_by_slug[ $slug ] = $template_part;
+    $bs_tmpl_part_by_slug[ $slug ] = $template_part;
 
-	return apply_filters( 'sd_get_template_part_by_slug', $template_part, $slug );
+    return apply_filters( 'sd_get_template_part_by_slug', $template_part, $slug );
 }
 
 /**
@@ -3276,471 +3276,471 @@ 
  * @param WP_Block $instance      The block instance.
  */
 function sd_render_block( $block_content, $block, $instance = '' ) {
-	// No block visibility conditions set.
-	if ( empty( $block['attrs']['visibility_conditions'] ) ) {
-		return $block_content;
-	}
-
-	$attributes = json_decode( $block['attrs']['visibility_conditions'], true );
-	$rules = ! empty( $attributes ) ? sd_block_parse_rules( $attributes ) : array();
-
-	// No rules set.
-	if ( empty( $rules ) ) {
-		return $block_content;
-	}
-
-	$_block_content = $block_content;
-
-	if ( ! empty( $rules ) && sd_block_check_rules( $rules ) ) {
-		if ( ! empty( $attributes['output']['type'] ) ) {
-			switch ( $attributes['output']['type'] ) {
-				case 'hide':
-					$valid_type = true;
-					$content = '';
-
-					break;
-				case 'message':
-					$valid_type = true;
-
-					if ( isset( $attributes['output']['message'] ) ) {
-						$content = $attributes['output']['message'] != '' ? __( stripslashes( $attributes['output']['message'] ), 'ayecode-connect' ) : $attributes['output']['message'];
-
-						if ( ! empty( $attributes['output']['message_type'] ) ) {
-							$content = aui()->alert( array(
-									'type'=> $attributes['output']['message_type'],
-									'content'=> $content
-								)
-							);
-						}
-					}
-
-					break;
-				case 'page':
-					$valid_type = true;
-
-					$page_id = ! empty( $attributes['output']['page'] ) ? absint( $attributes['output']['page'] ) : 0;
-					$content = sd_get_page_content( $page_id );
-
-					break;
-				case 'template_part':
-					$valid_type = true;
-
-					$template_part = ! empty( $attributes['output']['template_part'] ) ? $attributes['output']['template_part'] : '';
-					$content = sd_get_template_part_content( $template_part );
-
-					break;
-				default:
-					$valid_type = false;
-					break;
-			}
-
-			if ( $valid_type ) {
-				$block_content = '<div class="' . esc_attr( wp_get_block_default_classname( $instance->name ) ) . ' sd-block-has-rule">' . $content . '</div>';
-			}
-		}
-	}
-
-	return apply_filters( 'sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance );
+    // No block visibility conditions set.
+    if ( empty( $block['attrs']['visibility_conditions'] ) ) {
+        return $block_content;
+    }
+
+    $attributes = json_decode( $block['attrs']['visibility_conditions'], true );
+    $rules = ! empty( $attributes ) ? sd_block_parse_rules( $attributes ) : array();
+
+    // No rules set.
+    if ( empty( $rules ) ) {
+        return $block_content;
+    }
+
+    $_block_content = $block_content;
+
+    if ( ! empty( $rules ) && sd_block_check_rules( $rules ) ) {
+        if ( ! empty( $attributes['output']['type'] ) ) {
+            switch ( $attributes['output']['type'] ) {
+                case 'hide':
+                    $valid_type = true;
+                    $content = '';
+
+                    break;
+                case 'message':
+                    $valid_type = true;
+
+                    if ( isset( $attributes['output']['message'] ) ) {
+                        $content = $attributes['output']['message'] != '' ? __( stripslashes( $attributes['output']['message'] ), 'ayecode-connect' ) : $attributes['output']['message'];
+
+                        if ( ! empty( $attributes['output']['message_type'] ) ) {
+                            $content = aui()->alert( array(
+                                    'type'=> $attributes['output']['message_type'],
+                                    'content'=> $content
+                                )
+                            );
+                        }
+                    }
+
+                    break;
+                case 'page':
+                    $valid_type = true;
+
+                    $page_id = ! empty( $attributes['output']['page'] ) ? absint( $attributes['output']['page'] ) : 0;
+                    $content = sd_get_page_content( $page_id );
+
+                    break;
+                case 'template_part':
+                    $valid_type = true;
+
+                    $template_part = ! empty( $attributes['output']['template_part'] ) ? $attributes['output']['template_part'] : '';
+                    $content = sd_get_template_part_content( $template_part );
+
+                    break;
+                default:
+                    $valid_type = false;
+                    break;
+            }
+
+            if ( $valid_type ) {
+                $block_content = '<div class="' . esc_attr( wp_get_block_default_classname( $instance->name ) ) . ' sd-block-has-rule">' . $content . '</div>';
+            }
+        }
+    }
+
+    return apply_filters( 'sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance );
 }
 add_filter( 'render_block', 'sd_render_block', 9, 3 );
 
 function sd_get_page_content( $page_id ) {
-	$content = $page_id > 0 ? get_post_field( 'post_content', (int) $page_id ) : '';
+    $content = $page_id > 0 ? get_post_field( 'post_content', (int) $page_id ) : '';
 
-	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_page_content', '', $content, $page_id );
-	if ( $bypass_content ) {
-		return $bypass_content;
-	}
+    // Maybe bypass content
+    $bypass_content = apply_filters( 'sd_bypass_page_content', '', $content, $page_id );
+    if ( $bypass_content ) {
+        return $bypass_content;
+    }
 
-	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+    // Run the shortcodes on the content.
+    $content = do_shortcode( $content );
 
-	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
-	}
+    // Run block content if its available.
+    if ( function_exists( 'do_blocks' ) ) {
+        $content = do_blocks( $content );
+    }
 
-	return apply_filters( 'sd_get_page_content', $content, $page_id );
+    return apply_filters( 'sd_get_page_content', $content, $page_id );
 }
 
 function sd_get_template_part_content( $template_part ) {
-	$template_part_post = $template_part ? sd_get_template_part_by_slug( $template_part ) : array();
-	$content = ! empty( $template_part_post ) ? $template_part_post->content : '';
+    $template_part_post = $template_part ? sd_get_template_part_by_slug( $template_part ) : array();
+    $content = ! empty( $template_part_post ) ? $template_part_post->content : '';
 
-	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_template_part_content', '', $content, $template_part );
-	if ( $bypass_content ) {
-		return $bypass_content;
-	}
+    // Maybe bypass content
+    $bypass_content = apply_filters( 'sd_bypass_template_part_content', '', $content, $template_part );
+    if ( $bypass_content ) {
+        return $bypass_content;
+    }
 
-	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+    // Run the shortcodes on the content.
+    $content = do_shortcode( $content );
 
-	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
-	}
+    // Run block content if its available.
+    if ( function_exists( 'do_blocks' ) ) {
+        $content = do_blocks( $content );
+    }
 
-	return apply_filters( 'sd_get_template_part_content', $content, $template_part );
+    return apply_filters( 'sd_get_template_part_content', $content, $template_part );
 }
 
 function sd_block_parse_rules( $attrs ) {
-	$rules = array();
+    $rules = array();
 
-	if ( ! empty( $attrs ) && is_array( $attrs ) ) {
-		$attrs_keys = array_keys( $attrs );
+    if ( ! empty( $attrs ) && is_array( $attrs ) ) {
+        $attrs_keys = array_keys( $attrs );
 
-		for ( $i = 1; $i <= count( $attrs_keys ); $i++ ) {
-			if ( ! empty( $attrs[ 'rule' . $i ] ) && is_array( $attrs[ 'rule' . $i ] ) ) {
-				$rules[] = $attrs[ 'rule' . $i ];
-			}
-		}
-	}
+        for ( $i = 1; $i <= count( $attrs_keys ); $i++ ) {
+            if ( ! empty( $attrs[ 'rule' . $i ] ) && is_array( $attrs[ 'rule' . $i ] ) ) {
+                $rules[] = $attrs[ 'rule' . $i ];
+            }
+        }
+    }
 
-	return apply_filters( 'sd_block_parse_rules', $rules, $attrs );
+    return apply_filters( 'sd_block_parse_rules', $rules, $attrs );
 }
 
 function sd_block_check_rules( $rules ) {
-	if ( ! ( is_array( $rules ) && ! empty( $rules ) ) ) {
-		return true;
-	}
+    if ( ! ( is_array( $rules ) && ! empty( $rules ) ) ) {
+        return true;
+    }
 
-	foreach ( $rules as $key => $rule ) {
-		$match = apply_filters( 'sd_block_check_rule', true, $rule );
+    foreach ( $rules as $key => $rule ) {
+        $match = apply_filters( 'sd_block_check_rule', true, $rule );
 
-		if ( ! $match ) {
-			break;
-		}
-	}
+        if ( ! $match ) {
+            break;
+        }
+    }
 
-	return apply_filters( 'sd_block_check_rules', $match, $rules );
+    return apply_filters( 'sd_block_check_rules', $match, $rules );
 }
 
 function sd_block_check_rule( $match, $rule ) {
-	global $post;
+    global $post;
 
-	if ( $match && ! empty( $rule['type'] ) ) {
-		switch ( $rule['type'] ) {
-			case 'logged_in':
-				$match = (bool) is_user_logged_in();
+    if ( $match && ! empty( $rule['type'] ) ) {
+        switch ( $rule['type'] ) {
+            case 'logged_in':
+                $match = (bool) is_user_logged_in();
 
-				break;
-			case 'logged_out':
-				$match = ! is_user_logged_in();
+                break;
+            case 'logged_out':
+                $match = ! is_user_logged_in();
 
-				break;
-			case 'post_author':
-				if ( ! empty( $post ) && $post->post_type != 'page' && ! empty( $post->post_author ) && is_user_logged_in() ) {
-					$match = (int) $post->post_author === (int) get_current_user_id() ? true : false;
-				} else {
-					$match = false;
-				}
+                break;
+            case 'post_author':
+                if ( ! empty( $post ) && $post->post_type != 'page' && ! empty( $post->post_author ) && is_user_logged_in() ) {
+                    $match = (int) $post->post_author === (int) get_current_user_id() ? true : false;
+                } else {
+                    $match = false;
+                }
 
-				break;
-			case 'user_roles':
-				$match = false;
+                break;
+            case 'user_roles':
+                $match = false;
 
-				if ( ! empty( $rule['user_roles'] ) ) {
-					$user_roles = is_scalar( $rule['user_roles'] ) ? explode( ",", $rule['user_roles'] ) : $rule['user_roles'];
+                if ( ! empty( $rule['user_roles'] ) ) {
+                    $user_roles = is_scalar( $rule['user_roles'] ) ? explode( ",", $rule['user_roles'] ) : $rule['user_roles'];
 
-					if ( is_array( $user_roles ) ) {
-						$user_roles = array_filter( array_map( 'trim', $user_roles ) );
-					}
+                    if ( is_array( $user_roles ) ) {
+                        $user_roles = array_filter( array_map( 'trim', $user_roles ) );
+                    }
 
-					if ( ! empty( $user_roles ) && is_array( $user_roles ) && is_user_logged_in() && ( $current_user = wp_get_current_user() ) ) {
-						$current_user_roles = $current_user->roles;
+                    if ( ! empty( $user_roles ) && is_array( $user_roles ) && is_user_logged_in() && ( $current_user = wp_get_current_user() ) ) {
+                        $current_user_roles = $current_user->roles;
 
-						foreach ( $user_roles as $role ) {
-							if ( in_array( $role, $current_user_roles ) ) {
-								$match = true;
-							}
-						}
-					}
-				}
+                        foreach ( $user_roles as $role ) {
+                            if ( in_array( $role, $current_user_roles ) ) {
+                                $match = true;
+                            }
+                        }
+                    }
+                }
 
-				break;
-			case 'gd_field':
-				$match = sd_block_check_rule_gd_field( $rule );
+                break;
+            case 'gd_field':
+                $match = sd_block_check_rule_gd_field( $rule );
 
-				break;
-		}
-	}
+                break;
+        }
+    }
 
-	return $match;
+    return $match;
 }
 add_filter( 'sd_block_check_rule', 'sd_block_check_rule', 10, 2 );
 
 function sd_block_check_rule_gd_field( $rule ) {
-	global $gd_post;
-
-	$match_found = false;
-
-	if ( class_exists( 'GeoDirectory' ) && ! empty( $gd_post->ID ) && ! empty( $rule['field'] ) && ! empty( $rule['condition'] ) ) {
-		$args['block_visibility'] = true;
-		$args['key'] = $rule['field'];
-		$args['condition'] = $rule['condition'];
-		$args['search'] = isset( $rule['search'] ) ? $rule['search'] : '';
-
-		if ( $args['key'] == 'street' ) {
-			$args['key'] = 'address';
-		}
-
-		$match_field = $_match_field = $args['key'];
-
-		if ( $match_field == 'address' ) {
-			$match_field = 'street';
-		} elseif ( $match_field == 'post_images' ) {
-			$match_field = 'featured_image';
-		}
-
-		$find_post = $gd_post;
-		$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
-
-		if ( ! empty( $find_post->ID ) && ! in_array( 'post_category', $find_post_keys ) ) {
-			$find_post = geodir_get_post_info( (int) $find_post->ID );
-			$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
-		}
-
-		if ( $match_field === '' || ( ! empty( $find_post_keys ) && ( in_array( $match_field, $find_post_keys ) || in_array( $_match_field, $find_post_keys ) ) ) ) {
-			$address_fields = array( 'street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude' ); // Address fields
-			$field = array();
-			$empty_field = false;
-
-			$standard_fields = sd_visibility_gd_standard_fields();
-
-			if ( $match_field && ! in_array( $match_field, array_keys( $standard_fields ) ) && ! in_array( $match_field, $address_fields ) ) {
-				$package_id = geodir_get_post_package_id( $find_post->ID, $find_post->post_type );
-				$fields = geodir_post_custom_fields( $package_id, 'all', $find_post->post_type, 'none' );
-
-				foreach ( $fields as $field_info ) {
-					if ( $match_field == $field_info['htmlvar_name'] ) {
-						$field = $field_info;
-						break;
-					} elseif( $_match_field == $field_info['htmlvar_name'] ) {
-						$field = $field_info;
-						break;
-					}
-				}
-
-				if ( empty( $field ) ) {
-					$empty_field = true;
-				}
-			}
-
-			// Address fields.
-			if ( in_array( $match_field, $address_fields ) && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				if ( ! empty( $address_fields[ $match_field ] ) ) {
-					$field = $address_fields[ $match_field ];
-				}
-			} else if ( in_array( $match_field, array_keys( $standard_fields ) ) ) {
-				if ( ! empty( $standard_fields[ $match_field ] ) ) {
-					$field = $standard_fields[ $match_field ];
-				}
-			}
-
-			// Parse search.
-			$search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
-
-			$is_date = ( ! empty( $field['type'] ) && $field['type'] == 'datepicker' ) || in_array( $match_field, array( 'post_date', 'post_modified' ) ) ? true : false;
-			$is_date = apply_filters( 'geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post );
-
-			$match_value = isset( $find_post->{$match_field} ) && empty( $empty_field ) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
-			$match_found = $match_field === '' ? true : false;
-
-			if ( ! $match_found ) {
-				if ( ( $match_field == 'post_date' || $match_field == 'post_modified' ) && ( empty( $args['condition'] ) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than' ) ) {
-					if ( strpos( $search, '+' ) === false && strpos( $search, '-' ) === false ) {
-						$search = '+' . $search;
-					}
-					$the_time = $match_field == 'post_modified' ? get_the_modified_date( 'Y-m-d', $find_post ) : get_the_time( 'Y-m-d', $find_post );
-					$until_time = strtotime( $the_time . ' ' . $search . ' days' );
-					$now_time   = strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) );
-					if ( ( empty( $args['condition'] ) || $args['condition'] == 'is_less_than' ) && $until_time > $now_time ) {
-						$match_found = true;
-					} elseif ( $args['condition'] == 'is_greater_than' && $until_time < $now_time ) {
-						$match_found = true;
-					}
-				} else {
-					switch ( $args['condition'] ) {
-						case 'is_equal':
-							$match_found = (bool) ( $search != '' && $match_value == $search );
-							break;
-						case 'is_not_equal':
-							$match_found = (bool) ( $search != '' && $match_value != $search );
-							break;
-						case 'is_greater_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value > $search );
-							break;
-						case 'is_less_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value < $search );
-							break;
-						case 'is_empty':
-							$match_found = (bool) ( $match_value === '' || $match_value === false || $match_value === '0' || is_null( $match_value ) );
-							break;
-						case 'is_not_empty':
-							$match_found = (bool) ( $match_value !== '' && $match_value !== false && $match_value !== '0' && ! is_null( $match_value ) );
-							break;
-						case 'is_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) !== false );
-							break;
-						case 'is_not_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) === false );
-							break;
-					}
-				}
-			}
-
-			$match_found = apply_filters( 'geodir_post_badge_check_match_found', $match_found, $args, $find_post );
-		} else {
-			$field = array();
-
-			// Parse search.
-			$search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
-
-			$match_value = '';
-			$match_found = $match_field === '' ? true : false;
-
-			if ( ! $match_found ) {
-				switch ( $args['condition'] ) {
-					case 'is_equal':
-						$match_found = (bool) ( $search != '' && $match_value == $search );
-						break;
-					case 'is_not_equal':
-						$match_found = (bool) ( $search != '' && $match_value != $search );
-						break;
-					case 'is_greater_than':
-						$match_found = false;
-						break;
-					case 'is_less_than':
-						$match_found = false;
-						break;
-					case 'is_empty':
-						$match_found = true;
-						break;
-					case 'is_not_empty':
-						$match_found = false;
-						break;
-					case 'is_contains':
-						$match_found = false;
-						break;
-					case 'is_not_contains':
-						$match_found = false;
-						break;
-				}
-			}
-
-			$match_found = apply_filters( 'geodir_post_badge_check_match_found_empty', $match_found, $args, $find_post );
-		}
-	}
-
-	return $match_found;
+    global $gd_post;
+
+    $match_found = false;
+
+    if ( class_exists( 'GeoDirectory' ) && ! empty( $gd_post->ID ) && ! empty( $rule['field'] ) && ! empty( $rule['condition'] ) ) {
+        $args['block_visibility'] = true;
+        $args['key'] = $rule['field'];
+        $args['condition'] = $rule['condition'];
+        $args['search'] = isset( $rule['search'] ) ? $rule['search'] : '';
+
+        if ( $args['key'] == 'street' ) {
+            $args['key'] = 'address';
+        }
+
+        $match_field = $_match_field = $args['key'];
+
+        if ( $match_field == 'address' ) {
+            $match_field = 'street';
+        } elseif ( $match_field == 'post_images' ) {
+            $match_field = 'featured_image';
+        }
+
+        $find_post = $gd_post;
+        $find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+
+        if ( ! empty( $find_post->ID ) && ! in_array( 'post_category', $find_post_keys ) ) {
+            $find_post = geodir_get_post_info( (int) $find_post->ID );
+            $find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+        }
+
+        if ( $match_field === '' || ( ! empty( $find_post_keys ) && ( in_array( $match_field, $find_post_keys ) || in_array( $_match_field, $find_post_keys ) ) ) ) {
+            $address_fields = array( 'street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude' ); // Address fields
+            $field = array();
+            $empty_field = false;
+
+            $standard_fields = sd_visibility_gd_standard_fields();
+
+            if ( $match_field && ! in_array( $match_field, array_keys( $standard_fields ) ) && ! in_array( $match_field, $address_fields ) ) {
+                $package_id = geodir_get_post_package_id( $find_post->ID, $find_post->post_type );
+                $fields = geodir_post_custom_fields( $package_id, 'all', $find_post->post_type, 'none' );
+
+                foreach ( $fields as $field_info ) {
+                    if ( $match_field == $field_info['htmlvar_name'] ) {
+                        $field = $field_info;
+                        break;
+                    } elseif( $_match_field == $field_info['htmlvar_name'] ) {
+                        $field = $field_info;
+                        break;
+                    }
+                }
+
+                if ( empty( $field ) ) {
+                    $empty_field = true;
+                }
+            }
+
+            // Address fields.
+            if ( in_array( $match_field, $address_fields ) && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
+                if ( ! empty( $address_fields[ $match_field ] ) ) {
+                    $field = $address_fields[ $match_field ];
+                }
+            } else if ( in_array( $match_field, array_keys( $standard_fields ) ) ) {
+                if ( ! empty( $standard_fields[ $match_field ] ) ) {
+                    $field = $standard_fields[ $match_field ];
+                }
+            }
+
+            // Parse search.
+            $search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
+
+            $is_date = ( ! empty( $field['type'] ) && $field['type'] == 'datepicker' ) || in_array( $match_field, array( 'post_date', 'post_modified' ) ) ? true : false;
+            $is_date = apply_filters( 'geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post );
+
+            $match_value = isset( $find_post->{$match_field} ) && empty( $empty_field ) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
+            $match_found = $match_field === '' ? true : false;
+
+            if ( ! $match_found ) {
+                if ( ( $match_field == 'post_date' || $match_field == 'post_modified' ) && ( empty( $args['condition'] ) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than' ) ) {
+                    if ( strpos( $search, '+' ) === false && strpos( $search, '-' ) === false ) {
+                        $search = '+' . $search;
+                    }
+                    $the_time = $match_field == 'post_modified' ? get_the_modified_date( 'Y-m-d', $find_post ) : get_the_time( 'Y-m-d', $find_post );
+                    $until_time = strtotime( $the_time . ' ' . $search . ' days' );
+                    $now_time   = strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) );
+                    if ( ( empty( $args['condition'] ) || $args['condition'] == 'is_less_than' ) && $until_time > $now_time ) {
+                        $match_found = true;
+                    } elseif ( $args['condition'] == 'is_greater_than' && $until_time < $now_time ) {
+                        $match_found = true;
+                    }
+                } else {
+                    switch ( $args['condition'] ) {
+                        case 'is_equal':
+                            $match_found = (bool) ( $search != '' && $match_value == $search );
+                            break;
+                        case 'is_not_equal':
+                            $match_found = (bool) ( $search != '' && $match_value != $search );
+                            break;
+                        case 'is_greater_than':
+                            $match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value > $search );
+                            break;
+                        case 'is_less_than':
+                            $match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value < $search );
+                            break;
+                        case 'is_empty':
+                            $match_found = (bool) ( $match_value === '' || $match_value === false || $match_value === '0' || is_null( $match_value ) );
+                            break;
+                        case 'is_not_empty':
+                            $match_found = (bool) ( $match_value !== '' && $match_value !== false && $match_value !== '0' && ! is_null( $match_value ) );
+                            break;
+                        case 'is_contains':
+                            $match_found = (bool) ( $search != '' && stripos( $match_value, $search ) !== false );
+                            break;
+                        case 'is_not_contains':
+                            $match_found = (bool) ( $search != '' && stripos( $match_value, $search ) === false );
+                            break;
+                    }
+                }
+            }
+
+            $match_found = apply_filters( 'geodir_post_badge_check_match_found', $match_found, $args, $find_post );
+        } else {
+            $field = array();
+
+            // Parse search.
+            $search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
+
+            $match_value = '';
+            $match_found = $match_field === '' ? true : false;
+
+            if ( ! $match_found ) {
+                switch ( $args['condition'] ) {
+                    case 'is_equal':
+                        $match_found = (bool) ( $search != '' && $match_value == $search );
+                        break;
+                    case 'is_not_equal':
+                        $match_found = (bool) ( $search != '' && $match_value != $search );
+                        break;
+                    case 'is_greater_than':
+                        $match_found = false;
+                        break;
+                    case 'is_less_than':
+                        $match_found = false;
+                        break;
+                    case 'is_empty':
+                        $match_found = true;
+                        break;
+                    case 'is_not_empty':
+                        $match_found = false;
+                        break;
+                    case 'is_contains':
+                        $match_found = false;
+                        break;
+                    case 'is_not_contains':
+                        $match_found = false;
+                        break;
+                }
+            }
+
+            $match_found = apply_filters( 'geodir_post_badge_check_match_found_empty', $match_found, $args, $find_post );
+        }
+    }
+
+    return $match_found;
 }
 
 function sd_gd_field_rule_search( $search, $post_type, $rule, $field = array(), $gd_post = array() ) {
-	global $post;
-
-	if ( ! $search ) {
-		return $search;
-	}
-
-	$orig_search = $search;
-	$_search = strtolower( $search );
-
-	if ( ! empty( $rule['field'] ) && $rule['field'] == 'post_author' ) {
-		if ( $search == 'current_user' ) {
-			$search = is_user_logged_in() ? (int) get_current_user_id() : - 1;
-		} else if ( $search == 'current_author' ) {
-			$search = ( ! empty( $post ) && $post->post_type != 'page' && isset( $post->post_author ) ) ? absint( $post->post_author ) : - 1;
-		}
-	} else if ( $_search == 'date_today' ) {
-		$search = date( 'Y-m-d' );
-	} else if ( $_search == 'date_tomorrow' ) {
-		$search = date( 'Y-m-d', strtotime( "+1 day" ) );
-	} else if ( $_search == 'date_yesterday' ) {
-		$search = date( 'Y-m-d', strtotime( "-1 day" ) );
-	} else if ( $_search == 'time_his' ) {
-		$search = date( 'H:i:s' );
-	} else if ( $_search == 'time_hi' ) {
-		$search = date( 'H:i' );
-	} else if ( $_search == 'datetime_now' ) {
-		$search = date( 'Y-m-d H:i:s' );
-	} else if ( strpos( $_search, 'datetime_after_' ) === 0 ) {
-		$_searches = explode( 'datetime_after_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d H:i:s' );
-		}
-	} else if ( strpos( $_search, 'datetime_before_' ) === 0 ) {
-		$_searches = explode( 'datetime_before_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d H:i:s' );
-		}
-	} else if ( strpos( $_search, 'date_after_' ) === 0 ) {
-		$_searches = explode( 'date_after_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d' );
-		}
-	} else if ( strpos( $_search, 'date_before_' ) === 0 ) {
-		$_searches = explode( 'date_before_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
-		} else {
-			$search = date( 'Y-m-d' );
-		}
-	}
-
-	return apply_filters( 'sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search );
+    global $post;
+
+    if ( ! $search ) {
+        return $search;
+    }
+
+    $orig_search = $search;
+    $_search = strtolower( $search );
+
+    if ( ! empty( $rule['field'] ) && $rule['field'] == 'post_author' ) {
+        if ( $search == 'current_user' ) {
+            $search = is_user_logged_in() ? (int) get_current_user_id() : - 1;
+        } else if ( $search == 'current_author' ) {
+            $search = ( ! empty( $post ) && $post->post_type != 'page' && isset( $post->post_author ) ) ? absint( $post->post_author ) : - 1;
+        }
+    } else if ( $_search == 'date_today' ) {
+        $search = date( 'Y-m-d' );
+    } else if ( $_search == 'date_tomorrow' ) {
+        $search = date( 'Y-m-d', strtotime( "+1 day" ) );
+    } else if ( $_search == 'date_yesterday' ) {
+        $search = date( 'Y-m-d', strtotime( "-1 day" ) );
+    } else if ( $_search == 'time_his' ) {
+        $search = date( 'H:i:s' );
+    } else if ( $_search == 'time_hi' ) {
+        $search = date( 'H:i' );
+    } else if ( $_search == 'datetime_now' ) {
+        $search = date( 'Y-m-d H:i:s' );
+    } else if ( strpos( $_search, 'datetime_after_' ) === 0 ) {
+        $_searches = explode( 'datetime_after_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d H:i:s', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d H:i:s' );
+        }
+    } else if ( strpos( $_search, 'datetime_before_' ) === 0 ) {
+        $_searches = explode( 'datetime_before_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d H:i:s', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d H:i:s' );
+        }
+    } else if ( strpos( $_search, 'date_after_' ) === 0 ) {
+        $_searches = explode( 'date_after_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d' );
+        }
+    } else if ( strpos( $_search, 'date_before_' ) === 0 ) {
+        $_searches = explode( 'date_before_', $_search, 2 );
+
+        if ( ! empty( $_searches[1] ) ) {
+            $search = date( 'Y-m-d', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+        } else {
+            $search = date( 'Y-m-d' );
+        }
+    }
+
+    return apply_filters( 'sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search );
 }
 
 
 if(!function_exists('sd_blocks_render_blocks')){
-	/**
-	 * Add the shortcodes to the block content if set as an attribute.
-	 *
-	 * We have moved the shortcodes from the block content to a block argument to help prevent broken blocks.
-	 *
-	 * @param $block_content
-	 * @param $parsed_block
-	 * @param $thiss
-	 * @return mixed|string
-	 */
-	function sd_blocks_render_blocks($block_content, $parsed_block, $thiss = array() ){
-
-		// Check if ita a nested block that needs to be wrapped
-		if(! empty($parsed_block['attrs']['sd_shortcode_close'])){
-			$content = isset($parsed_block['attrs']['html']) ? $parsed_block['attrs']['html'] : $block_content;
-			$block_content = $parsed_block['attrs']['sd_shortcode'].$content.$parsed_block['attrs']['sd_shortcode_close'];
-
-			$block_content = do_shortcode($block_content);
-
-		}elseif(! empty($parsed_block['attrs']['sd_shortcode'])){
-			$has_warp = false;
-			if($block_content && strpos(trim($block_content), '<div class="wp-block-') === 0 ){
-				$parts = explode('></', $block_content);
-				if(count($parts) === 2){
-					$block_content = $parts[0].'>'.$parsed_block['attrs']['sd_shortcode'].'</'.$parts[1];
-					$has_warp = true;
-				}
-			}
-			if (!$has_warp) {
-				// Add the shortcode if its not a wrapped block
-				$block_content .= $parsed_block['attrs']['sd_shortcode'];
-			}
-
-			$block_content = do_shortcode($block_content);
-		}
-		return  $block_content;
-	}
+    /**
+     * Add the shortcodes to the block content if set as an attribute.
+     *
+     * We have moved the shortcodes from the block content to a block argument to help prevent broken blocks.
+     *
+     * @param $block_content
+     * @param $parsed_block
+     * @param $thiss
+     * @return mixed|string
+     */
+    function sd_blocks_render_blocks($block_content, $parsed_block, $thiss = array() ){
+
+        // Check if ita a nested block that needs to be wrapped
+        if(! empty($parsed_block['attrs']['sd_shortcode_close'])){
+            $content = isset($parsed_block['attrs']['html']) ? $parsed_block['attrs']['html'] : $block_content;
+            $block_content = $parsed_block['attrs']['sd_shortcode'].$content.$parsed_block['attrs']['sd_shortcode_close'];
+
+            $block_content = do_shortcode($block_content);
+
+        }elseif(! empty($parsed_block['attrs']['sd_shortcode'])){
+            $has_warp = false;
+            if($block_content && strpos(trim($block_content), '<div class="wp-block-') === 0 ){
+                $parts = explode('></', $block_content);
+                if(count($parts) === 2){
+                    $block_content = $parts[0].'>'.$parsed_block['attrs']['sd_shortcode'].'</'.$parts[1];
+                    $has_warp = true;
+                }
+            }
+            if (!$has_warp) {
+                // Add the shortcode if its not a wrapped block
+                $block_content .= $parsed_block['attrs']['sd_shortcode'];
+            }
+
+            $block_content = do_shortcode($block_content);
+        }
+        return  $block_content;
+    }
 }
 
 add_filter('render_block', 'sd_blocks_render_blocks',10,3);

Spacing +1061 added lines, -1061 removed lines

@@ -37,7 +37,7 @@ 
  * @return mixed|void
  */
 function sd_widget_exclude() {
-	return apply_filters( 'sd_widget_exclude', array() );
+	return apply_filters('sd_widget_exclude', array());
 }
 
 
@@ -49,11 +49,11 @@ 
  *
  * @return array
  */
-function sd_get_margin_input( $type = 'mt', $overwrite = array(), $include_negatives = true ) {
+function sd_get_margin_input($type = 'mt', $overwrite = array(), $include_negatives = true) {
 	global $aui_bs5;
 	$options = array(
-		''     => __( 'None', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
+		''     => __('None', 'ayecode-connect'),
+		'auto' => __('auto', 'ayecode-connect'),
 		'0'    => '0',
 		'1'    => '1',
 		'2'    => '2',
@@ -69,7 +69,7 @@ 
 		'12'   => '12',
 	);
 
-	if ( $include_negatives ) {
+	if ($include_negatives) {
 		$options['n1']  = '-1';
 		$options['n2']  = '-2';
 		$options['n3']  = '-3';
@@ -86,37 +86,37 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Margin top', 'ayecode-connect' ),
+		'title'    => __('Margin top', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
 	// title
-	if ( $type == 'mt' ) {
-		$defaults['title'] = __( 'Margin top', 'ayecode-connect' );
+	if ($type == 'mt') {
+		$defaults['title'] = __('Margin top', 'ayecode-connect');
 		$defaults['icon']  = 'box-top';
 		$defaults['row']   = array(
-			'title' => __( 'Margins', 'ayecode-connect' ),
+			'title' => __('Margins', 'ayecode-connect'),
 			'key'   => 'wrapper-margins',
 			'open'  => true,
 			'class' => 'text-center',
 		);
-	} elseif ( $type == 'mr' ) {
-		$defaults['title'] = __( 'Margin right', 'ayecode-connect' );
+	} elseif ($type == 'mr') {
+		$defaults['title'] = __('Margin right', 'ayecode-connect');
 		$defaults['icon']  = 'box-right';
 		$defaults['row']   = array(
 			'key' => 'wrapper-margins',
 		);
-	} elseif ( $type == 'mb' ) {
-		$defaults['title'] = __( 'Margin bottom', 'ayecode-connect' );
+	} elseif ($type == 'mb') {
+		$defaults['title'] = __('Margin bottom', 'ayecode-connect');
 		$defaults['icon']  = 'box-bottom';
 		$defaults['row']   = array(
 			'key' => 'wrapper-margins',
 		);
-	} elseif ( $type == 'ml' ) {
-		$defaults['title'] = __( 'Margin left', 'ayecode-connect' );
+	} elseif ($type == 'ml') {
+		$defaults['title'] = __('Margin left', 'ayecode-connect');
 		$defaults['icon']  = 'box-left';
 		$defaults['row']   = array(
 			'key'   => 'wrapper-margins',
@@ -124,7 +124,7 @@ 
 		);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -137,9 +137,9 @@ 
  *
  * @return array
  */
-function sd_get_padding_input( $type = 'pt', $overwrite = array() ) {
+function sd_get_padding_input($type = 'pt', $overwrite = array()) {
 	$options = array(
-		''   => __( 'None', 'ayecode-connect' ),
+		''   => __('None', 'ayecode-connect'),
 		'0'  => '0',
 		'1'  => '1',
 		'2'  => '2',
@@ -157,37 +157,37 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Padding top', 'ayecode-connect' ),
+		'title'    => __('Padding top', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
 	// title
-	if ( $type == 'pt' ) {
-		$defaults['title'] = __( 'Padding top', 'ayecode-connect' );
+	if ($type == 'pt') {
+		$defaults['title'] = __('Padding top', 'ayecode-connect');
 		$defaults['icon']  = 'box-top';
 		$defaults['row']   = array(
-			'title' => __( 'Padding', 'ayecode-connect' ),
+			'title' => __('Padding', 'ayecode-connect'),
 			'key'   => 'wrapper-padding',
 			'open'  => true,
 			'class' => 'text-center',
 		);
-	} elseif ( $type == 'pr' ) {
-		$defaults['title'] = __( 'Padding right', 'ayecode-connect' );
+	} elseif ($type == 'pr') {
+		$defaults['title'] = __('Padding right', 'ayecode-connect');
 		$defaults['icon']  = 'box-right';
 		$defaults['row']   = array(
 			'key' => 'wrapper-padding',
 		);
-	} elseif ( $type == 'pb' ) {
-		$defaults['title'] = __( 'Padding bottom', 'ayecode-connect' );
+	} elseif ($type == 'pb') {
+		$defaults['title'] = __('Padding bottom', 'ayecode-connect');
 		$defaults['icon']  = 'box-bottom';
 		$defaults['row']   = array(
 			'key' => 'wrapper-padding',
 		);
-	} elseif ( $type == 'pl' ) {
-		$defaults['title'] = __( 'Padding left', 'ayecode-connect' );
+	} elseif ($type == 'pl') {
+		$defaults['title'] = __('Padding left', 'ayecode-connect');
 		$defaults['icon']  = 'box-left';
 		$defaults['row']   = array(
 			'key'   => 'wrapper-padding',
@@ -196,7 +196,7 @@ 
 		);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -209,23 +209,23 @@ 
  *
  * @return array
  */
-function sd_get_border_input( $type = 'border', $overwrite = array() ) {
+function sd_get_border_input($type = 'border', $overwrite = array()) {
 	global $aui_bs5;
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Border', 'ayecode-connect' ),
+		'title'    => __('Border', 'ayecode-connect'),
 		'options'  => array(),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
 	// title
-	if ( 'rounded' === $type ) {
-		$defaults['title']           = __( 'Border radius type', 'ayecode-connect' );
+	if ('rounded' === $type) {
+		$defaults['title']           = __('Border radius type', 'ayecode-connect');
 		$defaults['options']         = array(
-			''               => __( 'Default', 'ayecode-connect' ),
+			''               => __('Default', 'ayecode-connect'),
 			'rounded'        => 'rounded',
 			'rounded-top'    => 'rounded-top',
 			'rounded-right'  => 'rounded-right',
@@ -233,12 +233,12 @@ 
 			'rounded-left'   => 'rounded-left',
 		);
 		$defaults['element_require'] = '([%border%]&&[%border%]!="0")';
-	} elseif ( 'rounded_size' === $type ) {
-		$defaults['title'] = __( 'Border radius size', 'ayecode-connect' );
+	} elseif ('rounded_size' === $type) {
+		$defaults['title'] = __('Border radius size', 'ayecode-connect');
 
-		if ( $aui_bs5 ) {
+		if ($aui_bs5) {
 			$defaults['options'] = array(
-				''       => __( 'Default', 'ayecode-connect' ),
+				''       => __('Default', 'ayecode-connect'),
 				'0'      => '0',
 				'1'      => '1',
 				'2'      => '2',
@@ -249,55 +249,55 @@ 
 			);
 		} else {
 			$defaults['options'] = array(
-				''   => __( 'Default', 'ayecode-connect' ),
-				'sm' => __( 'Small', 'ayecode-connect' ),
-				'lg' => __( 'Large', 'ayecode-connect' ),
+				''   => __('Default', 'ayecode-connect'),
+				'sm' => __('Small', 'ayecode-connect'),
+				'lg' => __('Large', 'ayecode-connect'),
 			);
 		}
 		$defaults['element_require'] = '([%border%]&&[%border%]!="0")';
-	} elseif ( 'width' === $type ) { // BS%
-		$defaults['title']           = __( 'Border width', 'ayecode-connect' );
+	} elseif ('width' === $type) { // BS%
+		$defaults['title']           = __('Border width', 'ayecode-connect');
 		$defaults['options']         = array(
-			''         => __( 'Default', 'ayecode-connect' ),
+			''         => __('Default', 'ayecode-connect'),
 			'border-2' => '2',
 			'border-3' => '3',
 			'border-4' => '4',
 			'border-5' => '5',
 		);
 		$defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
-	} elseif ( 'opacity' === $type ) { // BS%
-		$defaults['title']           = __( 'Border opacity', 'ayecode-connect' );
+	} elseif ('opacity' === $type) { // BS%
+		$defaults['title']           = __('Border opacity', 'ayecode-connect');
 		$defaults['options']         = array(
-			''                  => __( 'Default', 'ayecode-connect' ),
+			''                  => __('Default', 'ayecode-connect'),
 			'border-opacity-75' => '75%',
 			'border-opacity-50' => '50%',
 			'border-opacity-25' => '25%',
 			'border-opacity-10' => '10%',
 		);
 		$defaults['element_require'] = $aui_bs5 ? '([%border%]&&[%border%]!="0")' : '1==2';
-	} elseif ( 'type' === $type ) {
-		$defaults['title']           = __( 'Border show', 'ayecode-connect' );
+	} elseif ('type' === $type) {
+		$defaults['title']           = __('Border show', 'ayecode-connect');
 		$defaults['options']         = array(
-			'border'          => __( 'Full (set color to show)', 'ayecode-connect' ),
-			'border-top'      => __( 'Top', 'ayecode-connect' ),
-			'border-bottom'   => __( 'Bottom', 'ayecode-connect' ),
-			'border-left'     => __( 'Left', 'ayecode-connect' ),
-			'border-right'    => __( 'Right', 'ayecode-connect' ),
-			'border-top-0'    => __( '-Top', 'ayecode-connect' ),
-			'border-bottom-0' => __( '-Bottom', 'ayecode-connect' ),
-			'border-left-0'   => __( '-Left', 'ayecode-connect' ),
-			'border-right-0'  => __( '-Right', 'ayecode-connect' ),
+			'border'          => __('Full (set color to show)', 'ayecode-connect'),
+			'border-top'      => __('Top', 'ayecode-connect'),
+			'border-bottom'   => __('Bottom', 'ayecode-connect'),
+			'border-left'     => __('Left', 'ayecode-connect'),
+			'border-right'    => __('Right', 'ayecode-connect'),
+			'border-top-0'    => __('-Top', 'ayecode-connect'),
+			'border-bottom-0' => __('-Bottom', 'ayecode-connect'),
+			'border-left-0'   => __('-Left', 'ayecode-connect'),
+			'border-right-0'  => __('-Right', 'ayecode-connect'),
 		);
 		$defaults['element_require'] = '([%border%]&&[%border%]!="0")';
 	} else {
-		$defaults['title']   = __( 'Border color', 'ayecode-connect' );
+		$defaults['title']   = __('Border color', 'ayecode-connect');
 		$defaults['options'] = array(
-			''  => __( 'Default', 'ayecode-connect' ),
-			'0' => __( 'None', 'ayecode-connect' )
-		) + sd_aui_colors( false, false, false, false, true );
+			''  => __('Default', 'ayecode-connect'),
+			'0' => __('None', 'ayecode-connect')
+		) + sd_aui_colors(false, false, false, false, true);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -310,24 +310,24 @@ 
  *
  * @return array
  */
-function sd_get_shadow_input( $type = 'shadow', $overwrite = array() ) {
+function sd_get_shadow_input($type = 'shadow', $overwrite = array()) {
 	$options = array(
-		''          => __( 'None', 'ayecode-connect' ),
-		'shadow-sm' => __( 'Small', 'ayecode-connect' ),
-		'shadow'    => __( 'Regular', 'ayecode-connect' ),
-		'shadow-lg' => __( 'Large', 'ayecode-connect' ),
+		''          => __('None', 'ayecode-connect'),
+		'shadow-sm' => __('Small', 'ayecode-connect'),
+		'shadow'    => __('Regular', 'ayecode-connect'),
+		'shadow-lg' => __('Large', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Shadow', 'ayecode-connect' ),
+		'title'    => __('Shadow', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -340,22 +340,22 @@ 
  *
  * @return array
  */
-function sd_get_background_input( $type = 'bg', $overwrite = array() ) {
+function sd_get_background_input($type = 'bg', $overwrite = array()) {
 	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + sd_aui_colors(false,false,false,false,true);
+		           ''            => __('None', 'ayecode-connect'),
+		           'transparent' => __('Transparent', 'ayecode-connect'),
+	           ) + sd_aui_colors(false, false, false, false, true);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Background color', 'ayecode-connect' ),
+		'title'    => __('Background color', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -368,9 +368,9 @@ 
  *
  * @return array
  */
-function sd_get_opacity_input( $type = 'opacity', $overwrite = array() ) {
+function sd_get_opacity_input($type = 'opacity', $overwrite = array()) {
 	$options = array(
-		''            => __( 'Default', 'ayecode-connect' ),
+		''            => __('Default', 'ayecode-connect'),
 		'opacity-10'  => '10%',
 		'opacity-15'  => '15%',
 		'opacity-25'  => '25%',
@@ -388,14 +388,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Opacity', 'ayecode-connect' ),
+		'title'    => __('Opacity', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -408,102 +408,102 @@ 
  *
  * @return array
  */
-function sd_get_background_inputs( $type = 'bg', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array(), $include_button_colors = false ) {
+function sd_get_background_inputs($type = 'bg', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array(), $include_button_colors = false) {
 
-	$color_options = $include_button_colors ? sd_aui_colors( false, true, true, true, true ) : sd_aui_colors(false, false, false, false, true );
+	$color_options = $include_button_colors ? sd_aui_colors(false, true, true, true, true) : sd_aui_colors(false, false, false, false, true);
 
 	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
+		           ''            => __('None', 'ayecode-connect'),
+		           'transparent' => __('Transparent', 'ayecode-connect'),
 	           ) + $color_options;
 
-	if ( false !== $overwrite_color ) {
-		$options['custom-color'] = __( 'Custom Color', 'ayecode-connect' );
+	if (false !== $overwrite_color) {
+		$options['custom-color'] = __('Custom Color', 'ayecode-connect');
 	}
 
-	if ( false !== $overwrite_gradient ) {
-		$options['custom-gradient'] = __( 'Custom Gradient', 'ayecode-connect' );
+	if (false !== $overwrite_gradient) {
+		$options['custom-gradient'] = __('Custom Gradient', 'ayecode-connect');
 	}
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Background Color', 'ayecode-connect' ),
+		'title'    => __('Background Color', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Background', 'ayecode-connect' ),
+		'group'    => __('Background', 'ayecode-connect'),
 	);
 
-	if ( $overwrite !== false ) {
-		$input[ $type ] = wp_parse_args( $overwrite, $defaults );
+	if ($overwrite !== false) {
+		$input[$type] = wp_parse_args($overwrite, $defaults);
 	}
 
-	if ( $overwrite_color !== false ) {
-		$input[ $type . '_color' ] = wp_parse_args(
+	if ($overwrite_color !== false) {
+		$input[$type . '_color'] = wp_parse_args(
 			$overwrite_color,
 			array(
 				'type'            => 'color',
-				'title'           => __( 'Custom color', 'ayecode-connect' ),
+				'title'           => __('Custom color', 'ayecode-connect'),
 				'placeholder'     => '',
 				'default'         => '#0073aa',
 				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
+				'group'           => __('Background', 'ayecode-connect'),
 				'element_require' => '[%' . $type . '%]=="custom-color"',
 			)
 		);
 	}
 
-	if ( $overwrite_gradient !== false ) {
-		$input[ $type . '_gradient' ] = wp_parse_args(
+	if ($overwrite_gradient !== false) {
+		$input[$type . '_gradient'] = wp_parse_args(
 			$overwrite_gradient,
 			array(
 				'type'            => 'gradient',
-				'title'           => __( 'Custom gradient', 'ayecode-connect' ),
+				'title'           => __('Custom gradient', 'ayecode-connect'),
 				'placeholder'     => '',
 				'default'         => 'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
 				'desc_tip'        => true,
-				'group'           => __( 'Background', 'ayecode-connect' ),
+				'group'           => __('Background', 'ayecode-connect'),
 				'element_require' => '[%' . $type . '%]=="custom-gradient"',
 			)
 		);
 	}
 
-	if ( $overwrite_image !== false ) {
+	if ($overwrite_image !== false) {
 
-		$input[ $type . '_image_fixed' ] = array(
+		$input[$type . '_image_fixed'] = array(
 			'type'            => 'checkbox',
-			'title'           => __( 'Fixed background', 'ayecode-connect' ),
+			'title'           => __('Fixed background', 'ayecode-connect'),
 			'default'         => '',
 			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+			'group'           => !empty($overwrite_image['group']) ? $overwrite_image['group'] : __('Background', 'ayecode-connect'),
 			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
 
 		);
 
-		$input[ $type . '_image_use_featured' ] = array(
+		$input[$type . '_image_use_featured'] = array(
 			'type'            => 'checkbox',
-			'title'           => __( 'Use featured image', 'ayecode-connect' ),
+			'title'           => __('Use featured image', 'ayecode-connect'),
 			'default'         => '',
 			'desc_tip'        => true,
-			'group'           => ! empty( $overwrite_image['group'] ) ? $overwrite_image['group'] : __( 'Background', 'ayecode-connect' ),
+			'group'           => !empty($overwrite_image['group']) ? $overwrite_image['group'] : __('Background', 'ayecode-connect'),
 			'element_require' => '( [%' . $type . '%]=="" || [%' . $type . '%]=="custom-color" || [%' . $type . '%]=="custom-gradient" || [%' . $type . '%]=="transparent" )',
 
 		);
 
-		$input[ $type . '_image' ] = wp_parse_args(
+		$input[$type . '_image'] = wp_parse_args(
 			$overwrite_image,
 			array(
 				'type'        => 'image',
-				'title'       => __( 'Custom image', 'ayecode-connect' ),
+				'title'       => __('Custom image', 'ayecode-connect'),
 				'placeholder' => '',
 				'default'     => '',
 				'desc_tip'    => true,
-				'group'       => __( 'Background', 'ayecode-connect' ),
+				'group'       => __('Background', 'ayecode-connect'),
 				//          'element_require' => ' ![%' . $type . '_image_use_featured%] '
 			)
 		);
 
-		$input[ $type . '_image_id' ] = wp_parse_args(
+		$input[$type . '_image_id'] = wp_parse_args(
 			$overwrite_image,
 			array(
 				'type'        => 'hidden',
@@ -511,18 +511,18 @@ 
 				'title'       => '',
 				'placeholder' => '',
 				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
+				'group'       => __('Background', 'ayecode-connect'),
 			)
 		);
 
-		$input[ $type . '_image_xy' ] = wp_parse_args(
+		$input[$type . '_image_xy'] = wp_parse_args(
 			$overwrite_image,
 			array(
 				'type'        => 'image_xy',
 				'title'       => '',
 				'placeholder' => '',
 				'default'     => '',
-				'group'       => __( 'Background', 'ayecode-connect' ),
+				'group'       => __('Background', 'ayecode-connect'),
 			)
 		);
 	}
@@ -538,102 +538,102 @@ 
  *
  * @return array
  */
-function sd_get_shape_divider_inputs( $type = 'sd', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array() ) {
+function sd_get_shape_divider_inputs($type = 'sd', $overwrite = array(), $overwrite_color = array(), $overwrite_gradient = array(), $overwrite_image = array()) {
 
 	$options = array(
-		''                      => __( 'None', 'ayecode-connect' ),
-		'mountains'             => __( 'Mountains', 'ayecode-connect' ),
-		'drops'                 => __( 'Drops', 'ayecode-connect' ),
-		'clouds'                => __( 'Clouds', 'ayecode-connect' ),
-		'zigzag'                => __( 'Zigzag', 'ayecode-connect' ),
-		'pyramids'              => __( 'Pyramids', 'ayecode-connect' ),
-		'triangle'              => __( 'Triangle', 'ayecode-connect' ),
-		'triangle-asymmetrical' => __( 'Triangle Asymmetrical', 'ayecode-connect' ),
-		'tilt'                  => __( 'Tilt', 'ayecode-connect' ),
-		'opacity-tilt'          => __( 'Opacity Tilt', 'ayecode-connect' ),
-		'opacity-fan'           => __( 'Opacity Fan', 'ayecode-connect' ),
-		'curve'                 => __( 'Curve', 'ayecode-connect' ),
-		'curve-asymmetrical'    => __( 'Curve Asymmetrical', 'ayecode-connect' ),
-		'waves'                 => __( 'Waves', 'ayecode-connect' ),
-		'wave-brush'            => __( 'Wave Brush', 'ayecode-connect' ),
-		'waves-pattern'         => __( 'Waves Pattern', 'ayecode-connect' ),
-		'arrow'                 => __( 'Arrow', 'ayecode-connect' ),
-		'split'                 => __( 'Split', 'ayecode-connect' ),
-		'book'                  => __( 'Book', 'ayecode-connect' ),
+		''                      => __('None', 'ayecode-connect'),
+		'mountains'             => __('Mountains', 'ayecode-connect'),
+		'drops'                 => __('Drops', 'ayecode-connect'),
+		'clouds'                => __('Clouds', 'ayecode-connect'),
+		'zigzag'                => __('Zigzag', 'ayecode-connect'),
+		'pyramids'              => __('Pyramids', 'ayecode-connect'),
+		'triangle'              => __('Triangle', 'ayecode-connect'),
+		'triangle-asymmetrical' => __('Triangle Asymmetrical', 'ayecode-connect'),
+		'tilt'                  => __('Tilt', 'ayecode-connect'),
+		'opacity-tilt'          => __('Opacity Tilt', 'ayecode-connect'),
+		'opacity-fan'           => __('Opacity Fan', 'ayecode-connect'),
+		'curve'                 => __('Curve', 'ayecode-connect'),
+		'curve-asymmetrical'    => __('Curve Asymmetrical', 'ayecode-connect'),
+		'waves'                 => __('Waves', 'ayecode-connect'),
+		'wave-brush'            => __('Wave Brush', 'ayecode-connect'),
+		'waves-pattern'         => __('Waves Pattern', 'ayecode-connect'),
+		'arrow'                 => __('Arrow', 'ayecode-connect'),
+		'split'                 => __('Split', 'ayecode-connect'),
+		'book'                  => __('Book', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
+		'title'    => __('Type', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Shape Divider', 'ayecode-connect' ),
+		'group'    => __('Shape Divider', 'ayecode-connect'),
 	);
 
-	$input[ $type ] = wp_parse_args( $overwrite, $defaults );
+	$input[$type] = wp_parse_args($overwrite, $defaults);
 
-	$input[ $type . '_notice' ] = array(
+	$input[$type . '_notice'] = array(
 		'type'            => 'notice',
-		'desc'            => __( 'Parent element must be position `relative`', 'ayecode-connect' ),
+		'desc'            => __('Parent element must be position `relative`', 'ayecode-connect'),
 		'status'          => 'warning',
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+		'group'           => __('Shape Divider', 'ayecode-connect'),
 		'element_require' => '[%' . $type . '%]!=""',
 	);
 
-	$input[ $type . '_position' ] = wp_parse_args(
+	$input[$type . '_position'] = wp_parse_args(
 		$overwrite_color,
 		array(
 			'type'            => 'select',
-			'title'           => __( 'Position', 'ayecode-connect' ),
+			'title'           => __('Position', 'ayecode-connect'),
 			'options'         => array(
-				'top'    => __( 'Top', 'ayecode-connect' ),
-				'bottom' => __( 'Bottom', 'ayecode-connect' ),
+				'top'    => __('Top', 'ayecode-connect'),
+				'bottom' => __('Bottom', 'ayecode-connect'),
 			),
 			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+			'group'           => __('Shape Divider', 'ayecode-connect'),
 			'element_require' => '[%' . $type . '%]!=""',
 		)
 	);
 
 	$options = array(
-		           ''            => __( 'None', 'ayecode-connect' ),
-		           'transparent' => __( 'Transparent', 'ayecode-connect' ),
-	           ) + sd_aui_colors(false,false,false,false,true )
+		           ''            => __('None', 'ayecode-connect'),
+		           'transparent' => __('Transparent', 'ayecode-connect'),
+	           ) + sd_aui_colors(false, false, false, false, true)
 	           + array(
-		           'custom-color' => __( 'Custom Color', 'ayecode-connect' ),
+		           'custom-color' => __('Custom Color', 'ayecode-connect'),
 	           );
 
-	$input[ $type . '_color' ] = wp_parse_args(
+	$input[$type . '_color'] = wp_parse_args(
 		$overwrite_color,
 		array(
 			'type'            => 'select',
-			'title'           => __( 'Color', 'ayecode-connect' ),
+			'title'           => __('Color', 'ayecode-connect'),
 			'options'         => $options,
 			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+			'group'           => __('Shape Divider', 'ayecode-connect'),
 			'element_require' => '[%' . $type . '%]!=""',
 		)
 	);
 
-	$input[ $type . '_custom_color' ] = wp_parse_args(
+	$input[$type . '_custom_color'] = wp_parse_args(
 		$overwrite_color,
 		array(
 			'type'            => 'color',
-			'title'           => __( 'Custom color', 'ayecode-connect' ),
+			'title'           => __('Custom color', 'ayecode-connect'),
 			'placeholder'     => '',
 			'default'         => '#0073aa',
 			'desc_tip'        => true,
-			'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+			'group'           => __('Shape Divider', 'ayecode-connect'),
 			'element_require' => '[%' . $type . '_color%]=="custom-color" && [%' . $type . '%]!=""',
 		)
 	);
 
-	$input[ $type . '_width' ] = wp_parse_args(
+	$input[$type . '_width'] = wp_parse_args(
 		$overwrite_gradient,
 		array(
 			'type'              => 'range',
-			'title'             => __( 'Width', 'ayecode-connect' ),
+			'title'             => __('Width', 'ayecode-connect'),
 			'placeholder'       => '',
 			'default'           => '200',
 			'desc_tip'          => true,
@@ -641,69 +641,69 @@ 
 				'min' => 100,
 				'max' => 300,
 			),
-			'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+			'group'             => __('Shape Divider', 'ayecode-connect'),
 			'element_require'   => '[%' . $type . '%]!=""',
 		)
 	);
 
-	$input[ $type . '_height' ] = array(
+	$input[$type . '_height'] = array(
 		'type'              => 'range',
-		'title'             => __( 'Height', 'ayecode-connect' ),
+		'title'             => __('Height', 'ayecode-connect'),
 		'default'           => '100',
 		'desc_tip'          => true,
 		'custom_attributes' => array(
 			'min' => 0,
 			'max' => 500,
 		),
-		'group'             => __( 'Shape Divider', 'ayecode-connect' ),
+		'group'             => __('Shape Divider', 'ayecode-connect'),
 		'element_require'   => '[%' . $type . '%]!=""',
 	);
 
 	$requires = array(
-		'mountains'             => array( 'flip' ),
-		'drops'                 => array( 'flip', 'invert' ),
-		'clouds'                => array( 'flip', 'invert' ),
+		'mountains'             => array('flip'),
+		'drops'                 => array('flip', 'invert'),
+		'clouds'                => array('flip', 'invert'),
 		'zigzag'                => array(),
-		'pyramids'              => array( 'flip', 'invert' ),
-		'triangle'              => array( 'invert' ),
-		'triangle-asymmetrical' => array( 'flip', 'invert' ),
-		'tilt'                  => array( 'flip' ),
-		'opacity-tilt'          => array( 'flip' ),
+		'pyramids'              => array('flip', 'invert'),
+		'triangle'              => array('invert'),
+		'triangle-asymmetrical' => array('flip', 'invert'),
+		'tilt'                  => array('flip'),
+		'opacity-tilt'          => array('flip'),
 		'opacity-fan'           => array(),
-		'curve'                 => array( 'invert' ),
-		'curve-asymmetrical'    => array( 'flip', 'invert' ),
-		'waves'                 => array( 'flip', 'invert' ),
-		'wave-brush'            => array( 'flip' ),
-		'waves-pattern'         => array( 'flip' ),
-		'arrow'                 => array( 'invert' ),
-		'split'                 => array( 'invert' ),
-		'book'                  => array( 'invert' ),
+		'curve'                 => array('invert'),
+		'curve-asymmetrical'    => array('flip', 'invert'),
+		'waves'                 => array('flip', 'invert'),
+		'wave-brush'            => array('flip'),
+		'waves-pattern'         => array('flip'),
+		'arrow'                 => array('invert'),
+		'split'                 => array('invert'),
+		'book'                  => array('invert'),
 	);
 
-	$input[ $type . '_flip' ] = array(
+	$input[$type . '_flip'] = array(
 		'type'            => 'checkbox',
-		'title'           => __( 'Flip', 'ayecode-connect' ),
+		'title'           => __('Flip', 'ayecode-connect'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'flip', 'sd' ),
+		'group'           => __('Shape Divider', 'ayecode-connect'),
+		'element_require' => sd_get_element_require_string($requires, 'flip', 'sd'),
 	);
 
-	$input[ $type . '_invert' ] = array(
+	$input[$type . '_invert'] = array(
 		'type'            => 'checkbox',
-		'title'           => __( 'Invert', 'ayecode-connect' ),
+		'title'           => __('Invert', 'ayecode-connect'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
-		'element_require' => sd_get_element_require_string( $requires, 'invert', 'sd' ),
+		'group'           => __('Shape Divider', 'ayecode-connect'),
+		'element_require' => sd_get_element_require_string($requires, 'invert', 'sd'),
 	);
 
-	$input[ $type . '_btf' ] = array(
+	$input[$type . '_btf'] = array(
 		'type'            => 'checkbox',
-		'title'           => __( 'Bring to front', 'ayecode-connect' ),
+		'title'           => __('Bring to front', 'ayecode-connect'),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Shape Divider', 'ayecode-connect' ),
+		'group'           => __('Shape Divider', 'ayecode-connect'),
 		'element_require' => '[%' . $type . '%]!=""',
 
 	);
@@ -720,19 +720,19 @@ 
  *
  * @return string
  */
-function sd_get_element_require_string( $args, $key, $type ) {
+function sd_get_element_require_string($args, $key, $type) {
 	$output   = '';
 	$requires = array();
 
-	if ( ! empty( $args ) ) {
-		foreach ( $args as $t => $k ) {
-			if ( in_array( $key, $k ) ) {
+	if (!empty($args)) {
+		foreach ($args as $t => $k) {
+			if (in_array($key, $k)) {
 				$requires[] = '[%' . $type . '%]=="' . $t . '"';
 			}
 		}
 
-		if ( ! empty( $requires ) ) {
-			$output = '(' . implode( ' || ', $requires ) . ')';
+		if (!empty($requires)) {
+			$output = '(' . implode(' || ', $requires) . ')';
 		}
 	}
 
@@ -747,39 +747,39 @@ 
  *
  * @return array
  */
-function sd_get_text_color_input( $type = 'text_color', $overwrite = array(), $has_custom = false, $emphasis = true ) {
+function sd_get_text_color_input($type = 'text_color', $overwrite = array(), $has_custom = false, $emphasis = true) {
 	$options = array(
-		           '' => __( 'None', 'ayecode-connect' ),
-	           ) + sd_aui_colors(false,false,false,false,false, true);
+		           '' => __('None', 'ayecode-connect'),
+	           ) + sd_aui_colors(false, false, false, false, false, true);
 
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom color', 'ayecode-connect' );
+	if ($has_custom) {
+		$options['custom'] = __('Custom color', 'ayecode-connect');
 	}
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Text color', 'ayecode-connect' ),
+		'title'    => __('Text color', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_text_color_input_group( $type = 'text_color', $overwrite = array(), $overwrite_custom = array() ) {
+function sd_get_text_color_input_group($type = 'text_color', $overwrite = array(), $overwrite_custom = array()) {
 	$inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_text_color_input( $type, $overwrite, true );
+	if ($overwrite !== false) {
+		$inputs[$type] = sd_get_text_color_input($type, $overwrite, true);
 	}
 
-	if ( $overwrite_custom !== false ) {
+	if ($overwrite_custom !== false) {
 		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_custom_color_input( $custom, $overwrite_custom, $type );
+		$inputs[$custom] = sd_get_custom_color_input($custom, $overwrite_custom, $type);
 	}
 
 	return $inputs;
@@ -793,22 +793,22 @@ 
  *
  * @return array
  */
-function sd_get_custom_color_input( $type = 'color_custom', $overwrite = array(), $parent_type = '' ) {
+function sd_get_custom_color_input($type = 'color_custom', $overwrite = array(), $parent_type = '') {
 
 	$defaults = array(
 		'type'        => 'color',
-		'title'       => __( 'Custom color', 'ayecode-connect' ),
+		'title'       => __('Custom color', 'ayecode-connect'),
 		'default'     => '',
 		'placeholder' => '',
 		'desc_tip'    => true,
-		'group'       => __( 'Typography', 'ayecode-connect' ),
+		'group'       => __('Typography', 'ayecode-connect'),
 	);
 
-	if ( $parent_type ) {
+	if ($parent_type) {
 		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -821,19 +821,19 @@ 
  *
  * @return array
  */
-function sd_get_col_input( $type = 'col', $overwrite = array() ) {
+function sd_get_col_input($type = 'col', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''     => __( 'Default', 'ayecode-connect' ),
-		'auto' => __( 'auto', 'ayecode-connect' ),
+		''     => __('Default', 'ayecode-connect'),
+		'auto' => __('auto', 'ayecode-connect'),
 		'1'    => '1/12',
 		'2'    => '2/12',
 		'3'    => '3/12',
@@ -850,15 +850,15 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Column width', 'ayecode-connect' ),
+		'title'           => __('Column width', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
+		'group'           => __('Container', 'ayecode-connect'),
 		'element_require' => '[%container%]=="col"',
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -871,18 +871,18 @@ 
  *
  * @return array
  */
-function sd_get_row_cols_input( $type = 'row_cols', $overwrite = array() ) {
+function sd_get_row_cols_input($type = 'row_cols', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''  => __( 'auto', 'ayecode-connect' ),
+		''  => __('auto', 'ayecode-connect'),
 		'1' => '1',
 		'2' => '2',
 		'3' => '3',
@@ -893,15 +893,15 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Row columns', 'ayecode-connect' ),
+		'title'           => __('Row columns', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Container', 'ayecode-connect' ),
+		'group'           => __('Container', 'ayecode-connect'),
 		'element_require' => '[%container%]=="row"',
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -914,33 +914,33 @@ 
  *
  * @return array
  */
-function sd_get_text_align_input( $type = 'text_align', $overwrite = array() ) {
+function sd_get_text_align_input($type = 'text_align', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                => __( 'Default', 'ayecode-connect' ),
-		'text' . $device_size . '-left'   => __( 'Left', 'ayecode-connect' ),
-		'text' . $device_size . '-right'  => __( 'Right', 'ayecode-connect' ),
-		'text' . $device_size . '-center' => __( 'Center', 'ayecode-connect' ),
+		''                                => __('Default', 'ayecode-connect'),
+		'text' . $device_size . '-left'   => __('Left', 'ayecode-connect'),
+		'text' . $device_size . '-right'  => __('Right', 'ayecode-connect'),
+		'text' . $device_size . '-center' => __('Center', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Text align', 'ayecode-connect' ),
+		'title'    => __('Text align', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -953,18 +953,18 @@ 
  *
  * @return array
  */
-function sd_get_display_input( $type = 'display', $overwrite = array() ) {
+function sd_get_display_input($type = 'display', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                   => __( 'Default', 'ayecode-connect' ),
+		''                                   => __('Default', 'ayecode-connect'),
 		'd' . $device_size . '-none'         => 'none',
 		'd' . $device_size . '-inline'       => 'inline',
 		'd' . $device_size . '-inline-block' => 'inline-block',
@@ -978,14 +978,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Display', 'ayecode-connect' ),
+		'title'    => __('Display', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -998,17 +998,17 @@ 
  *
  * @return array
  */
-function sd_get_text_justify_input( $type = 'text_justify', $overwrite = array() ) {
+function sd_get_text_justify_input($type = 'text_justify', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'checkbox',
-		'title'    => __( 'Text justify', 'ayecode-connect' ),
+		'title'    => __('Text justify', 'ayecode-connect'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1022,115 +1022,115 @@ 
  *
  * @return array
  */
-function sd_aui_colors( $include_branding = false, $include_outlines = false, $outline_button_only_text = false, $include_translucent = false, $include_subtle = false, $include_emphasis = false ) {
+function sd_aui_colors($include_branding = false, $include_outlines = false, $outline_button_only_text = false, $include_translucent = false, $include_subtle = false, $include_emphasis = false) {
 	$theme_colors = array();
 
-	$theme_colors['primary']   = __( 'Primary', 'ayecode-connect' );
-	$theme_colors['secondary'] = __( 'Secondary', 'ayecode-connect' );
-	$theme_colors['success']   = __( 'Success', 'ayecode-connect' );
-	$theme_colors['danger']    = __( 'Danger', 'ayecode-connect' );
-	$theme_colors['warning']   = __( 'Warning', 'ayecode-connect' );
-	$theme_colors['info']      = __( 'Info', 'ayecode-connect' );
-	$theme_colors['light']     = __( 'Light', 'ayecode-connect' );
-	$theme_colors['dark']      = __( 'Dark', 'ayecode-connect' );
-	$theme_colors['black']     = __( 'Black', 'ayecode-connect' );
-	$theme_colors['white']     = __( 'White', 'ayecode-connect' );
-	$theme_colors['purple']    = __( 'Purple', 'ayecode-connect' );
-	$theme_colors['salmon']    = __( 'Salmon', 'ayecode-connect' );
-	$theme_colors['cyan']      = __( 'Cyan', 'ayecode-connect' );
-	$theme_colors['gray']      = __( 'Gray', 'ayecode-connect' );
-	$theme_colors['muted']     = __( 'Muted', 'ayecode-connect' );
-	$theme_colors['gray-dark'] = __( 'Gray dark', 'ayecode-connect' );
-	$theme_colors['indigo']    = __( 'Indigo', 'ayecode-connect' );
-	$theme_colors['orange']    = __( 'Orange', 'ayecode-connect' );
-	$theme_colors['body']      = __( 'Body', 'ayecode-connect' );
+	$theme_colors['primary']   = __('Primary', 'ayecode-connect');
+	$theme_colors['secondary'] = __('Secondary', 'ayecode-connect');
+	$theme_colors['success']   = __('Success', 'ayecode-connect');
+	$theme_colors['danger']    = __('Danger', 'ayecode-connect');
+	$theme_colors['warning']   = __('Warning', 'ayecode-connect');
+	$theme_colors['info']      = __('Info', 'ayecode-connect');
+	$theme_colors['light']     = __('Light', 'ayecode-connect');
+	$theme_colors['dark']      = __('Dark', 'ayecode-connect');
+	$theme_colors['black']     = __('Black', 'ayecode-connect');
+	$theme_colors['white']     = __('White', 'ayecode-connect');
+	$theme_colors['purple']    = __('Purple', 'ayecode-connect');
+	$theme_colors['salmon']    = __('Salmon', 'ayecode-connect');
+	$theme_colors['cyan']      = __('Cyan', 'ayecode-connect');
+	$theme_colors['gray']      = __('Gray', 'ayecode-connect');
+	$theme_colors['muted']     = __('Muted', 'ayecode-connect');
+	$theme_colors['gray-dark'] = __('Gray dark', 'ayecode-connect');
+	$theme_colors['indigo']    = __('Indigo', 'ayecode-connect');
+	$theme_colors['orange']    = __('Orange', 'ayecode-connect');
+	$theme_colors['body']      = __('Body', 'ayecode-connect');
 
 
 	// for bg and borders
-	if ( $include_subtle ) {
-		$theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
-		$theme_colors['primary-subtle']   = __( 'Primary Subtle', 'ayecode-connect' );
-		$theme_colors['secondary-subtle'] = __( 'Secondary Subtle', 'ayecode-connect' );
-		$theme_colors['success-subtle']   = __( 'Success Subtle', 'ayecode-connect' );
-		$theme_colors['danger-subtle']    = __( 'Danger Subtle', 'ayecode-connect' );
-		$theme_colors['warning-subtle']   = __( 'Warning Subtle', 'ayecode-connect' );
-		$theme_colors['info-subtle']      = __( 'Info Subtle', 'ayecode-connect' );
-		$theme_colors['light-subtle']     = __( 'Light Subtle', 'ayecode-connect' );
-		$theme_colors['dark-subtle']      = __( 'Dark Subtle', 'ayecode-connect' );
-		$theme_colors['purple-subtle']    = __( 'Purple Subtle', 'ayecode-connect' );
-		$theme_colors['salmon-subtle']    = __( 'Salmon Subtle', 'ayecode-connect' );
-		$theme_colors['cyan-subtle']      = __( 'Cyan Subtle', 'ayecode-connect' );
-		$theme_colors['gray-subtle']      = __( 'Gray Subtle', 'ayecode-connect' );
-		$theme_colors['gray-dark-subtle'] = __( 'Gray dark Subtle', 'ayecode-connect' );
-		$theme_colors['indigo-subtle']    = __( 'Indigo Subtle', 'ayecode-connect' );
-		$theme_colors['orange-subtle']    = __( 'Orange Subtle', 'ayecode-connect' );
+	if ($include_subtle) {
+		$theme_colors['primary-subtle']   = __('Primary Subtle', 'ayecode-connect');
+		$theme_colors['primary-subtle']   = __('Primary Subtle', 'ayecode-connect');
+		$theme_colors['secondary-subtle'] = __('Secondary Subtle', 'ayecode-connect');
+		$theme_colors['success-subtle']   = __('Success Subtle', 'ayecode-connect');
+		$theme_colors['danger-subtle']    = __('Danger Subtle', 'ayecode-connect');
+		$theme_colors['warning-subtle']   = __('Warning Subtle', 'ayecode-connect');
+		$theme_colors['info-subtle']      = __('Info Subtle', 'ayecode-connect');
+		$theme_colors['light-subtle']     = __('Light Subtle', 'ayecode-connect');
+		$theme_colors['dark-subtle']      = __('Dark Subtle', 'ayecode-connect');
+		$theme_colors['purple-subtle']    = __('Purple Subtle', 'ayecode-connect');
+		$theme_colors['salmon-subtle']    = __('Salmon Subtle', 'ayecode-connect');
+		$theme_colors['cyan-subtle']      = __('Cyan Subtle', 'ayecode-connect');
+		$theme_colors['gray-subtle']      = __('Gray Subtle', 'ayecode-connect');
+		$theme_colors['gray-dark-subtle'] = __('Gray dark Subtle', 'ayecode-connect');
+		$theme_colors['indigo-subtle']    = __('Indigo Subtle', 'ayecode-connect');
+		$theme_colors['orange-subtle']    = __('Orange Subtle', 'ayecode-connect');
 	}
 
 	// for texts
 	if ($include_emphasis) {
-		$theme_colors['primary-emphasis']   = __( 'Primary Emphasis', 'ayecode-connect' );
-		$theme_colors['secondary-emphasis'] = __( 'Secondary Emphasis', 'ayecode-connect' );
-		$theme_colors['success-emphasis']   = __( 'Success Emphasis', 'ayecode-connect' );
-		$theme_colors['danger-emphasis']    = __( 'Danger Emphasis', 'ayecode-connect' );
-		$theme_colors['warning-emphasis']   = __( 'Warning Emphasis', 'ayecode-connect' );
-		$theme_colors['info-emphasis']      = __( 'Info Emphasis', 'ayecode-connect' );
-		$theme_colors['light-emphasis']     = __( 'Light Emphasis', 'ayecode-connect' );
-		$theme_colors['dark-emphasis']      = __( 'Dark Emphasis', 'ayecode-connect' );
-		$theme_colors['purple-emphasis']    = __( 'Purple Emphasis', 'ayecode-connect' );
-		$theme_colors['salmon-emphasis']    = __( 'Salmon Emphasis', 'ayecode-connect' );
-		$theme_colors['cyan-emphasis']      = __( 'Cyan Emphasis', 'ayecode-connect' );
-		$theme_colors['gray-emphasis']      = __( 'Gray Emphasis', 'ayecode-connect' );
-		$theme_colors['muted-emphasis']     = __( 'Muted Emphasis', 'ayecode-connect' );
-		$theme_colors['gray-dark-emphasis'] = __( 'Gray dark Emphasis', 'ayecode-connect' );
-		$theme_colors['indigo-emphasis']    = __( 'Indigo Emphasis', 'ayecode-connect' );
-		$theme_colors['orange-emphasis']    = __( 'Orange Emphasis', 'ayecode-connect' );
-	}
-
-	if ( $include_outlines ) {
-		$button_only                       = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['outline-primary']   = __( 'Primary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-secondary'] = __( 'Secondary outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-success']   = __( 'Success outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-danger']    = __( 'Danger outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-warning']   = __( 'Warning outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-info']      = __( 'Info outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-light']     = __( 'Light outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-dark']      = __( 'Dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-white']     = __( 'White outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-purple']    = __( 'Purple outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-salmon']    = __( 'Salmon outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-cyan']      = __( 'Cyan outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray']      = __( 'Gray outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-gray-dark'] = __( 'Gray dark outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-indigo']    = __( 'Indigo outline', 'ayecode-connect' ) . $button_only;
-		$theme_colors['outline-orange']    = __( 'Orange outline', 'ayecode-connect' ) . $button_only;
-	}
-
-	if ( $include_branding ) {
+		$theme_colors['primary-emphasis']   = __('Primary Emphasis', 'ayecode-connect');
+		$theme_colors['secondary-emphasis'] = __('Secondary Emphasis', 'ayecode-connect');
+		$theme_colors['success-emphasis']   = __('Success Emphasis', 'ayecode-connect');
+		$theme_colors['danger-emphasis']    = __('Danger Emphasis', 'ayecode-connect');
+		$theme_colors['warning-emphasis']   = __('Warning Emphasis', 'ayecode-connect');
+		$theme_colors['info-emphasis']      = __('Info Emphasis', 'ayecode-connect');
+		$theme_colors['light-emphasis']     = __('Light Emphasis', 'ayecode-connect');
+		$theme_colors['dark-emphasis']      = __('Dark Emphasis', 'ayecode-connect');
+		$theme_colors['purple-emphasis']    = __('Purple Emphasis', 'ayecode-connect');
+		$theme_colors['salmon-emphasis']    = __('Salmon Emphasis', 'ayecode-connect');
+		$theme_colors['cyan-emphasis']      = __('Cyan Emphasis', 'ayecode-connect');
+		$theme_colors['gray-emphasis']      = __('Gray Emphasis', 'ayecode-connect');
+		$theme_colors['muted-emphasis']     = __('Muted Emphasis', 'ayecode-connect');
+		$theme_colors['gray-dark-emphasis'] = __('Gray dark Emphasis', 'ayecode-connect');
+		$theme_colors['indigo-emphasis']    = __('Indigo Emphasis', 'ayecode-connect');
+		$theme_colors['orange-emphasis']    = __('Orange Emphasis', 'ayecode-connect');
+	}
+
+	if ($include_outlines) {
+		$button_only                       = $outline_button_only_text ? ' ' . __('(button only)', 'ayecode-connect') : '';
+		$theme_colors['outline-primary']   = __('Primary outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-secondary'] = __('Secondary outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-success']   = __('Success outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-danger']    = __('Danger outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-warning']   = __('Warning outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-info']      = __('Info outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-light']     = __('Light outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-dark']      = __('Dark outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-white']     = __('White outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-purple']    = __('Purple outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-salmon']    = __('Salmon outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-cyan']      = __('Cyan outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-gray']      = __('Gray outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-gray-dark'] = __('Gray dark outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-indigo']    = __('Indigo outline', 'ayecode-connect') . $button_only;
+		$theme_colors['outline-orange']    = __('Orange outline', 'ayecode-connect') . $button_only;
+	}
+
+	if ($include_branding) {
 		$theme_colors = $theme_colors + sd_aui_branding_colors();
 	}
 
-	if ( $include_translucent ) {
-		$button_only                           = $outline_button_only_text ? ' ' . __( '(button only)', 'ayecode-connect' ) : '';
-		$theme_colors['translucent-primary']   = __( 'Primary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-secondary'] = __( 'Secondary translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-success']   = __( 'Success translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-danger']    = __( 'Danger translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-warning']   = __( 'Warning translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-info']      = __( 'Info translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-light']     = __( 'Light translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-dark']      = __( 'Dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-white']     = __( 'White translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-purple']    = __( 'Purple translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-salmon']    = __( 'Salmon translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-cyan']      = __( 'Cyan translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray']      = __( 'Gray translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-gray-dark'] = __( 'Gray dark translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-indigo']    = __( 'Indigo translucent', 'ayecode-connect' ) . $button_only;
-		$theme_colors['translucent-orange']    = __( 'Orange translucent', 'ayecode-connect' ) . $button_only;
+	if ($include_translucent) {
+		$button_only                           = $outline_button_only_text ? ' ' . __('(button only)', 'ayecode-connect') : '';
+		$theme_colors['translucent-primary']   = __('Primary translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-secondary'] = __('Secondary translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-success']   = __('Success translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-danger']    = __('Danger translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-warning']   = __('Warning translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-info']      = __('Info translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-light']     = __('Light translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-dark']      = __('Dark translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-white']     = __('White translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-purple']    = __('Purple translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-salmon']    = __('Salmon translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-cyan']      = __('Cyan translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-gray']      = __('Gray translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-gray-dark'] = __('Gray dark translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-indigo']    = __('Indigo translucent', 'ayecode-connect') . $button_only;
+		$theme_colors['translucent-orange']    = __('Orange translucent', 'ayecode-connect') . $button_only;
 	}
 
-	return apply_filters( 'sd_aui_colors', $theme_colors, $include_outlines, $include_branding );
+	return apply_filters('sd_aui_colors', $theme_colors, $include_outlines, $include_branding);
 }
 
 /**
@@ -1140,17 +1140,17 @@ 
  */
 function sd_aui_branding_colors() {
 	return array(
-		'facebook'  => __( 'Facebook', 'ayecode-connect' ),
-		'twitter'   => __( 'Twitter', 'ayecode-connect' ),
-		'instagram' => __( 'Instagram', 'ayecode-connect' ),
-		'linkedin'  => __( 'Linkedin', 'ayecode-connect' ),
-		'flickr'    => __( 'Flickr', 'ayecode-connect' ),
-		'github'    => __( 'GitHub', 'ayecode-connect' ),
-		'youtube'   => __( 'YouTube', 'ayecode-connect' ),
-		'wordpress' => __( 'WordPress', 'ayecode-connect' ),
-		'google'    => __( 'Google', 'ayecode-connect' ),
-		'yahoo'     => __( 'Yahoo', 'ayecode-connect' ),
-		'vkontakte' => __( 'Vkontakte', 'ayecode-connect' ),
+		'facebook'  => __('Facebook', 'ayecode-connect'),
+		'twitter'   => __('Twitter', 'ayecode-connect'),
+		'instagram' => __('Instagram', 'ayecode-connect'),
+		'linkedin'  => __('Linkedin', 'ayecode-connect'),
+		'flickr'    => __('Flickr', 'ayecode-connect'),
+		'github'    => __('GitHub', 'ayecode-connect'),
+		'youtube'   => __('YouTube', 'ayecode-connect'),
+		'wordpress' => __('WordPress', 'ayecode-connect'),
+		'google'    => __('Google', 'ayecode-connect'),
+		'yahoo'     => __('Yahoo', 'ayecode-connect'),
+		'vkontakte' => __('Vkontakte', 'ayecode-connect'),
 	);
 }
 
@@ -1163,10 +1163,10 @@ 
  *
  * @return array
  */
-function sd_get_container_class_input( $type = 'container', $overwrite = array() ) {
+function sd_get_container_class_input($type = 'container', $overwrite = array()) {
 
 	$options = array(
-		'container'       => __( 'container (default)', 'ayecode-connect' ),
+		'container'       => __('container (default)', 'ayecode-connect'),
 		'container-sm'    => 'container-sm',
 		'container-md'    => 'container-md',
 		'container-lg'    => 'container-lg',
@@ -1182,19 +1182,19 @@ 
 		'card-footer'     => 'card-footer',
 		'list-group'      => 'list-group',
 		'list-group-item' => 'list-group-item',
-		''                => __( 'no container class', 'ayecode-connect' ),
+		''                => __('no container class', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Type', 'ayecode-connect' ),
+		'title'    => __('Type', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Container', 'ayecode-connect' ),
+		'group'    => __('Container', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1207,10 +1207,10 @@ 
  *
  * @return array
  */
-function sd_get_position_class_input( $type = 'position', $overwrite = array() ) {
+function sd_get_position_class_input($type = 'position', $overwrite = array()) {
 
 	$options = array(
-		''                  => __( 'Default', 'ayecode-connect' ),
+		''                  => __('Default', 'ayecode-connect'),
 		'position-static'   => 'static',
 		'position-relative' => 'relative',
 		'position-absolute' => 'absolute',
@@ -1223,14 +1223,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Position', 'ayecode-connect' ),
+		'title'    => __('Position', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1241,10 +1241,10 @@ 
  *
  * @return array
  */
-function sd_get_absolute_position_input( $type = 'absolute_position', $overwrite = array() ) {
+function sd_get_absolute_position_input($type = 'absolute_position', $overwrite = array()) {
 
 	$options = array(
-		''              => __( 'Default', 'ayecode-connect' ),
+		''              => __('Default', 'ayecode-connect'),
 		'top-left'      => 'top-left',
 		'top-center'    => 'top-center',
 		'top-right'     => 'top-right',
@@ -1258,15 +1258,15 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Absolute Position', 'ayecode-connect' ),
+		'title'           => __('Absolute Position', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => '[%position%]=="position-absolute"',
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1279,30 +1279,30 @@ 
  *
  * @return array
  */
-function sd_get_sticky_offset_input( $type = 'top', $overwrite = array() ) {
+function sd_get_sticky_offset_input($type = 'top', $overwrite = array()) {
 
 	$defaults = array(
 		'type'            => 'number',
-		'title'           => __( 'Sticky offset', 'ayecode-connect' ),
+		'title'           => __('Sticky offset', 'ayecode-connect'),
 		//'desc' =>  __( 'Sticky offset', 'ayecode-connect' ),
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => '[%position%]=="sticky" || [%position%]=="sticky-top"',
 	);
 
 	// title
-	if ( $type == 'top' ) {
-		$defaults['title'] = __( 'Top offset', 'ayecode-connect' );
+	if ($type == 'top') {
+		$defaults['title'] = __('Top offset', 'ayecode-connect');
 		$defaults['icon']  = 'box-top';
 		$defaults['row']   = array(
-			'title' => __( 'Sticky offset', 'ayecode-connect' ),
+			'title' => __('Sticky offset', 'ayecode-connect'),
 			'key'   => 'sticky-offset',
 			'open'  => true,
 			'class' => 'text-center',
 		);
-	} elseif ( $type == 'bottom' ) {
-		$defaults['title'] = __( 'Bottom offset', 'ayecode-connect' );
+	} elseif ($type == 'bottom') {
+		$defaults['title'] = __('Bottom offset', 'ayecode-connect');
 		$defaults['icon']  = 'box-bottom';
 		$defaults['row']   = array(
 			'key'   => 'sticky-offset',
@@ -1310,7 +1310,7 @@ 
 		);
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1323,11 +1323,11 @@ 
  *
  * @return array
  */
-function sd_get_font_size_input( $type = 'font_size', $overwrite = array(), $has_custom = false ) {
+function sd_get_font_size_input($type = 'font_size', $overwrite = array(), $has_custom = false) {
 	global $aui_bs5;
 
-	$options[] = __( 'Inherit from parent', 'ayecode-connect' );
-	if ( $aui_bs5 ) {
+	$options[] = __('Inherit from parent', 'ayecode-connect');
+	if ($aui_bs5) {
 		// responsive font sizes
 		$options['fs-base'] = 'fs-base (body default)';
 		$options['fs-6']    = 'fs-6';
@@ -1358,25 +1358,25 @@ 
 			'display-4' => 'display-4',
 		);
 
-	if ( $aui_bs5 ) {
+	if ($aui_bs5) {
 		$options['display-5'] = 'display-5';
 		$options['display-6'] = 'display-6';
 	}
 
-	if ( $has_custom ) {
-		$options['custom'] = __( 'Custom size', 'ayecode-connect' );
+	if ($has_custom) {
+		$options['custom'] = __('Custom size', 'ayecode-connect');
 	}
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Font size', 'ayecode-connect' ),
+		'title'    => __('Font size', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1389,11 +1389,11 @@ 
  *
  * @return array
  */
-function sd_get_font_custom_size_input( $type = 'font_size_custom', $overwrite = array(), $parent_type = '' ) {
+function sd_get_font_custom_size_input($type = 'font_size_custom', $overwrite = array(), $parent_type = '') {
 
 	$defaults = array(
 		'type'              => 'number',
-		'title'             => __( 'Font size (rem)', 'ayecode-connect' ),
+		'title'             => __('Font size (rem)', 'ayecode-connect'),
 		'default'           => '',
 		'placeholder'       => '1.25',
 		'custom_attributes' => array(
@@ -1402,14 +1402,14 @@ 
 			'max'  => '100',
 		),
 		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
+		'group'             => __('Typography', 'ayecode-connect'),
 	);
 
-	if ( $parent_type ) {
+	if ($parent_type) {
 		$defaults['element_require'] = '[%' . $parent_type . '%]=="custom"';
 	}
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1422,11 +1422,11 @@ 
  *
  * @return array
  */
-function sd_get_font_line_height_input( $type = 'font_line_height', $overwrite = array() ) {
+function sd_get_font_line_height_input($type = 'font_line_height', $overwrite = array()) {
 
 	$defaults = array(
 		'type'              => 'number',
-		'title'             => __( 'Font Line Height', 'ayecode-connect' ),
+		'title'             => __('Font Line Height', 'ayecode-connect'),
 		'default'           => '',
 		'placeholder'       => '1.75',
 		'custom_attributes' => array(
@@ -1435,10 +1435,10 @@ 
 			'max'  => '100',
 		),
 		'desc_tip'          => true,
-		'group'             => __( 'Typography', 'ayecode-connect' ),
+		'group'             => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1451,17 +1451,17 @@ 
  *
  * @return array
  */
-function sd_get_font_size_input_group( $type = 'font_size', $overwrite = array(), $overwrite_custom = array() ) {
+function sd_get_font_size_input_group($type = 'font_size', $overwrite = array(), $overwrite_custom = array()) {
 
 	$inputs = array();
 
-	if ( $overwrite !== false ) {
-		$inputs[ $type ] = sd_get_font_size_input( $type, $overwrite, true );
+	if ($overwrite !== false) {
+		$inputs[$type] = sd_get_font_size_input($type, $overwrite, true);
 	}
 
-	if ( $overwrite_custom !== false ) {
+	if ($overwrite_custom !== false) {
 		$custom            = $type . '_custom';
-		$inputs[ $custom ] = sd_get_font_custom_size_input( $custom, $overwrite_custom, $type );
+		$inputs[$custom] = sd_get_font_custom_size_input($custom, $overwrite_custom, $type);
 	}
 
 	return $inputs;
@@ -1475,10 +1475,10 @@ 
  *
  * @return array
  */
-function sd_get_font_weight_input( $type = 'font_weight', $overwrite = array() ) {
+function sd_get_font_weight_input($type = 'font_weight', $overwrite = array()) {
 
 	$options = array(
-		''                                => __( 'Inherit', 'ayecode-connect' ),
+		''                                => __('Inherit', 'ayecode-connect'),
 		'font-weight-bold'                => 'bold',
 		'font-weight-bolder'              => 'bolder',
 		'font-weight-normal'              => 'normal',
@@ -1494,14 +1494,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Appearance', 'ayecode-connect' ),
+		'title'    => __('Appearance', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1514,25 +1514,25 @@ 
  *
  * @return array
  */
-function sd_get_font_case_input( $type = 'font_weight', $overwrite = array() ) {
+function sd_get_font_case_input($type = 'font_weight', $overwrite = array()) {
 
 	$options = array(
-		''                => __( 'Default', 'ayecode-connect' ),
-		'text-lowercase'  => __( 'lowercase', 'ayecode-connect' ),
-		'text-uppercase'  => __( 'UPPERCASE', 'ayecode-connect' ),
-		'text-capitalize' => __( 'Capitalize', 'ayecode-connect' ),
+		''                => __('Default', 'ayecode-connect'),
+		'text-lowercase'  => __('lowercase', 'ayecode-connect'),
+		'text-uppercase'  => __('UPPERCASE', 'ayecode-connect'),
+		'text-capitalize' => __('Capitalize', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Letter case', 'ayecode-connect' ),
+		'title'    => __('Letter case', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1546,23 +1546,23 @@ 
  * A helper function for font size
  *
  */
-function sd_get_font_italic_input( $type = 'font_italic', $overwrite = array() ) {
+function sd_get_font_italic_input($type = 'font_italic', $overwrite = array()) {
 
 	$options = array(
-		''            => __( 'No', 'ayecode-connect' ),
-		'font-italic' => __( 'Yes', 'ayecode-connect' ),
+		''            => __('No', 'ayecode-connect'),
+		'font-italic' => __('Yes', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Font italic', 'ayecode-connect' ),
+		'title'    => __('Font italic', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Typography', 'ayecode-connect' ),
+		'group'    => __('Typography', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1575,18 +1575,18 @@ 
  *
  * @return array
  */
-function sd_get_anchor_input( $type = 'anchor', $overwrite = array() ) {
+function sd_get_anchor_input($type = 'anchor', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'text',
-		'title'    => __( 'HTML anchor', 'ayecode-connect' ),
-		'desc'     => __( 'Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect' ),
+		'title'    => __('HTML anchor', 'ayecode-connect'),
+		'desc'     => __('Enter a word or two — without spaces — to make a unique web address just for this block, called an “anchor.” Then, you’ll be able to link directly to this section of your page.', 'ayecode-connect'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
+		'group'    => __('Advanced', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1599,18 +1599,18 @@ 
  *
  * @return array
  */
-function sd_get_class_input( $type = 'css_class', $overwrite = array() ) {
+function sd_get_class_input($type = 'css_class', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'text',
-		'title'    => __( 'Additional CSS class(es)', 'ayecode-connect' ),
-		'desc'     => __( 'Separate multiple classes with spaces.', 'ayecode-connect' ),
+		'title'    => __('Additional CSS class(es)', 'ayecode-connect'),
+		'desc'     => __('Separate multiple classes with spaces.', 'ayecode-connect'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
+		'group'    => __('Advanced', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1623,18 +1623,18 @@ 
  *
  * @return array
  */
-function sd_get_custom_name_input( $type = 'metadata_name', $overwrite = array() ) {
+function sd_get_custom_name_input($type = 'metadata_name', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'text',
-		'title'    => __( 'Block Name', 'ayecode-connect' ),
-		'desc'     => __( 'Set a custom name for this block', 'ayecode-connect' ),
+		'title'    => __('Block Name', 'ayecode-connect'),
+		'desc'     => __('Set a custom name for this block', 'ayecode-connect'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Advanced', 'ayecode-connect' ),
+		'group'    => __('Advanced', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1647,45 +1647,45 @@ 
  *
  * @return array
  */
-function sd_get_hover_animations_input( $type = 'hover_animations', $overwrite = array() ) {
+function sd_get_hover_animations_input($type = 'hover_animations', $overwrite = array()) {
 
 	$options = array(
-		''                 => __( 'none', 'ayecode-connect' ),
-		'hover-zoom'       => __( 'Zoom', 'ayecode-connect' ),
-		'hover-shadow'     => __( 'Shadow', 'ayecode-connect' ),
-		'hover-move-up'    => __( 'Move up', 'ayecode-connect' ),
-		'hover-move-down'  => __( 'Move down', 'ayecode-connect' ),
-		'hover-move-left'  => __( 'Move left', 'ayecode-connect' ),
-		'hover-move-right' => __( 'Move right', 'ayecode-connect' ),
+		''                 => __('none', 'ayecode-connect'),
+		'hover-zoom'       => __('Zoom', 'ayecode-connect'),
+		'hover-shadow'     => __('Shadow', 'ayecode-connect'),
+		'hover-move-up'    => __('Move up', 'ayecode-connect'),
+		'hover-move-down'  => __('Move down', 'ayecode-connect'),
+		'hover-move-left'  => __('Move left', 'ayecode-connect'),
+		'hover-move-right' => __('Move right', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
 		'multiple' => true,
-		'title'    => __( 'Hover Animations', 'ayecode-connect' ),
+		'title'    => __('Hover Animations', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Hover Animations', 'ayecode-connect' ),
+		'group'    => __('Hover Animations', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
 
-function sd_get_flex_align_items_input( $type = 'align-items', $overwrite = array() ) {
+function sd_get_flex_align_items_input($type = 'align-items', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
+		''                                         => __('Default', 'ayecode-connect'),
 		'align-items' . $device_size . '-start'    => 'align-items-start',
 		'align-items' . $device_size . '-end'      => 'align-items-end',
 		'align-items' . $device_size . '-center'   => 'align-items-center',
@@ -1695,21 +1695,21 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Vertical Align Items', 'ayecode-connect' ),
+		'title'           => __('Vertical Align Items', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => ' ( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_align_items_input_group( $type = 'flex_align_items', $overwrite = array() ) {
+function sd_get_flex_align_items_input_group($type = 'flex_align_items', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1717,28 +1717,28 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_items_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_align_items_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_justify_content_input( $type = 'flex_justify_content', $overwrite = array() ) {
+function sd_get_flex_justify_content_input($type = 'flex_justify_content', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                            => __( 'Default', 'ayecode-connect' ),
+		''                                            => __('Default', 'ayecode-connect'),
 		'justify-content' . $device_size . '-start'   => 'justify-content-start',
 		'justify-content' . $device_size . '-end'     => 'justify-content-end',
 		'justify-content' . $device_size . '-center'  => 'justify-content-center',
@@ -1748,21 +1748,21 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Justify content', 'ayecode-connect' ),
+		'title'           => __('Justify content', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => '( ( [%container%]=="row" ) || ( [%display%]=="d-flex" || [%display_md%]=="d-md-flex" || [%display_lg%]=="d-lg-flex" ) ) ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_justify_content_input_group( $type = 'flex_justify_content', $overwrite = array() ) {
+function sd_get_flex_justify_content_input_group($type = 'flex_justify_content', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1770,11 +1770,11 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_justify_content_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_justify_content_input($type, $overwrite);
 		}
 	}
 
@@ -1782,17 +1782,17 @@ 
 }
 
 
-function sd_get_flex_align_self_input( $type = 'flex_align_self', $overwrite = array() ) {
+function sd_get_flex_align_self_input($type = 'flex_align_self', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                         => __( 'Default', 'ayecode-connect' ),
+		''                                         => __('Default', 'ayecode-connect'),
 		'align-items' . $device_size . '-start'    => 'align-items-start',
 		'align-items' . $device_size . '-end'      => 'align-items-end',
 		'align-items' . $device_size . '-center'   => 'align-items-center',
@@ -1802,21 +1802,21 @@ 
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Align Self', 'ayecode-connect' ),
+		'title'           => __('Align Self', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => ' [%container%]=="col" ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_align_self_input_group( $type = 'flex_align_self', $overwrite = array() ) {
+function sd_get_flex_align_self_input_group($type = 'flex_align_self', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1824,53 +1824,53 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_align_self_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_align_self_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_order_input( $type = 'flex_order', $overwrite = array() ) {
+function sd_get_flex_order_input($type = 'flex_order', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		'' => __( 'Default', 'ayecode-connect' ),
+		'' => __('Default', 'ayecode-connect'),
 	);
 
 	$i = 0;
-	while ( $i <= 5 ) {
-		$options[ 'order' . $device_size . '-' . $i ] = $i;
+	while ($i <= 5) {
+		$options['order' . $device_size . '-' . $i] = $i;
 		$i++;
 	}
 
 	$defaults = array(
 		'type'            => 'select',
-		'title'           => __( 'Flex Order', 'ayecode-connect' ),
+		'title'           => __('Flex Order', 'ayecode-connect'),
 		'options'         => $options,
 		'default'         => '',
 		'desc_tip'        => true,
-		'group'           => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'           => __('Wrapper Styles', 'ayecode-connect'),
 		'element_require' => ' [%container%]=="col" ',
 
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_flex_order_input_group( $type = 'flex_order', $overwrite = array() ) {
+function sd_get_flex_order_input_group($type = 'flex_order', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1878,18 +1878,18 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_order_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_order_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_wrap_group( $type = 'flex_wrap', $overwrite = array() ) {
+function sd_get_flex_wrap_group($type = 'flex_wrap', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1897,28 +1897,28 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_flex_wrap_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_flex_wrap_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
 
-function sd_get_flex_wrap_input( $type = 'flex_wrap', $overwrite = array() ) {
+function sd_get_flex_wrap_input($type = 'flex_wrap', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
+		''                                      => __('Default', 'ayecode-connect'),
 		'flex' . $device_size . '-nowrap'       => 'nowrap',
 		'flex' . $device_size . '-wrap'         => 'wrap',
 		'flex' . $device_size . '-wrap-reverse' => 'wrap-reverse',
@@ -1926,19 +1926,19 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Flex wrap', 'ayecode-connect' ),
+		'title'    => __('Flex wrap', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
 
-function sd_get_float_group( $type = 'float', $overwrite = array() ) {
+function sd_get_float_group($type = 'float', $overwrite = array()) {
 	$inputs = array();
 	$sizes  = array(
 		''    => 'Mobile',
@@ -1946,27 +1946,27 @@ 
 		'_lg' => 'Desktop',
 	);
 
-	if ( $overwrite !== false ) {
+	if ($overwrite !== false) {
 
-		foreach ( $sizes as $ds => $dt ) {
+		foreach ($sizes as $ds => $dt) {
 			$overwrite['device_type'] = $dt;
-			$inputs[ $type . $ds ]    = sd_get_float_input( $type, $overwrite );
+			$inputs[$type . $ds]    = sd_get_float_input($type, $overwrite);
 		}
 	}
 
 	return $inputs;
 }
-function sd_get_float_input( $type = 'float', $overwrite = array() ) {
+function sd_get_float_input($type = 'float', $overwrite = array()) {
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
 	$options = array(
-		''                                      => __( 'Default', 'ayecode-connect' ),
+		''                                      => __('Default', 'ayecode-connect'),
 		'float' . $device_size . '-start'       => 'left',
 		'float' . $device_size . '-end'         => 'right',
 		'float' . $device_size . '-none' => 'none',
@@ -1974,14 +1974,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Float', 'ayecode-connect' ),
+		'title'    => __('Float', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -1992,10 +1992,10 @@ 
  *
  * @return array
  */
-function sd_get_zindex_input( $type = 'zindex', $overwrite = array() ) {
+function sd_get_zindex_input($type = 'zindex', $overwrite = array()) {
 
 	$options = array(
-		''          => __( 'Default', 'ayecode-connect' ),
+		''          => __('Default', 'ayecode-connect'),
 		'zindex-0'  => '0',
 		'zindex-1'  => '1',
 		'zindex-5'  => '5',
@@ -2004,14 +2004,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Z-index', 'ayecode-connect' ),
+		'title'    => __('Z-index', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2022,26 +2022,26 @@ 
  *
  * @return array
  */
-function sd_get_overflow_input( $type = 'overflow', $overwrite = array() ) {
+function sd_get_overflow_input($type = 'overflow', $overwrite = array()) {
 
 	$options = array(
-		''                 => __( 'Default', 'ayecode-connect' ),
-		'overflow-auto'    => __( 'Auto', 'ayecode-connect' ),
-		'overflow-hidden'  => __( 'Hidden', 'ayecode-connect' ),
-		'overflow-visible' => __( 'Visible', 'ayecode-connect' ),
-		'overflow-scroll'  => __( 'Scroll', 'ayecode-connect' ),
+		''                 => __('Default', 'ayecode-connect'),
+		'overflow-auto'    => __('Auto', 'ayecode-connect'),
+		'overflow-hidden'  => __('Hidden', 'ayecode-connect'),
+		'overflow-visible' => __('Visible', 'ayecode-connect'),
+		'overflow-scroll'  => __('Scroll', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Overflow', 'ayecode-connect' ),
+		'title'    => __('Overflow', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2052,19 +2052,19 @@ 
  *
  * @return array
  */
-function sd_get_max_height_input( $type = 'max_height', $overwrite = array() ) {
+function sd_get_max_height_input($type = 'max_height', $overwrite = array()) {
 
 	$defaults = array(
 		'type'        => 'text',
-		'title'       => __( 'Max height', 'ayecode-connect' ),
+		'title'       => __('Max height', 'ayecode-connect'),
 		'value'       => '',
 		'default'     => '',
 		'placeholder' => '',
 		'desc_tip'    => true,
-		'group'       => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'       => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2075,23 +2075,23 @@ 
  *
  * @return array
  */
-function sd_get_scrollbars_input( $type = 'scrollbars', $overwrite = array() ) {
+function sd_get_scrollbars_input($type = 'scrollbars', $overwrite = array()) {
 
 	$options = array(
-		''               => __( 'Default', 'ayecode-connect' ),
-		'scrollbars-ios' => __( 'IOS Style', 'ayecode-connect' ),
+		''               => __('Default', 'ayecode-connect'),
+		'scrollbars-ios' => __('IOS Style', 'ayecode-connect'),
 	);
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Scrollbars', 'ayecode-connect' ),
+		'title'    => __('Scrollbars', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2102,17 +2102,17 @@ 
  *
  * @return array
  */
-function sd_get_new_window_input( $type = 'target', $overwrite = array() ) {
+function sd_get_new_window_input($type = 'target', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'checkbox',
-		'title'    => __( 'Open in new window', 'ayecode-connect' ),
+		'title'    => __('Open in new window', 'ayecode-connect'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Link', 'ayecode-connect' ),
+		'group'    => __('Link', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2123,17 +2123,17 @@ 
  *
  * @return array
  */
-function sd_get_nofollow_input( $type = 'nofollow', $overwrite = array() ) {
+function sd_get_nofollow_input($type = 'nofollow', $overwrite = array()) {
 
 	$defaults = array(
 		'type'     => 'checkbox',
-		'title'    => __( 'Add nofollow', 'ayecode-connect' ),
+		'title'    => __('Add nofollow', 'ayecode-connect'),
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Link', 'ayecode-connect' ),
+		'group'    => __('Link', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2146,13 +2146,13 @@ 
  *
  * @return array
  */
-function sd_get_width_input( $type = 'width', $overwrite = array() ) {
+function sd_get_width_input($type = 'width', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
@@ -2167,14 +2167,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Width', 'ayecode-connect' ),
+		'title'    => __('Width', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2187,13 +2187,13 @@ 
  *
  * @return array
  */
-function sd_get_height_input( $type = 'height', $overwrite = array() ) {
+function sd_get_height_input($type = 'height', $overwrite = array()) {
 
 	$device_size = '';
-	if ( ! empty( $overwrite['device_type'] ) ) {
-		if ( $overwrite['device_type'] == 'Tablet' ) {
+	if (!empty($overwrite['device_type'])) {
+		if ($overwrite['device_type'] == 'Tablet') {
 			$device_size = '-md';
-		} elseif ( $overwrite['device_type'] == 'Desktop' ) {
+		} elseif ($overwrite['device_type'] == 'Desktop') {
 			$device_size = '-lg';
 		}
 	}
@@ -2208,14 +2208,14 @@ 
 
 	$defaults = array(
 		'type'     => 'select',
-		'title'    => __( 'Height', 'ayecode-connect' ),
+		'title'    => __('Height', 'ayecode-connect'),
 		'options'  => $options,
 		'default'  => '',
 		'desc_tip' => true,
-		'group'    => __( 'Wrapper Styles', 'ayecode-connect' ),
+		'group'    => __('Wrapper Styles', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2226,19 +2226,19 @@ 
  *
  * @return array
  */
-function sd_get_attributes_input( $type = 'attributes', $overwrite = array() ) {
+function sd_get_attributes_input($type = 'attributes', $overwrite = array()) {
 
 	$defaults = array(
 		'type'        => 'text',
-		'title'       => __( 'Custom Attributes', 'ayecode-connect' ),
+		'title'       => __('Custom Attributes', 'ayecode-connect'),
 		'value'       => '',
 		'default'     => '',
 		'placeholder' => 'key|value,key2|value2',
 		'desc_tip'    => true,
-		'group'       => __( 'Link', 'ayecode-connect' ),
+		'group'       => __('Link', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2248,28 +2248,28 @@ 
  *
  * @return string
  */
-function sd_build_attributes_string_escaped( $args ) {
+function sd_build_attributes_string_escaped($args) {
 	global $aui_bs5;
 
 	$attributes = array();
 	$string_escaped = '';
 
-	if ( ! empty( $args['custom'] ) ) {
+	if (!empty($args['custom'])) {
 		$attributes = sd_parse_custom_attributes($args['custom']);
 	}
 
 	// new window
-	if ( ! empty( $args['new_window'] ) ) {
+	if (!empty($args['new_window'])) {
 		$attributes['target'] = '_blank';
 	}
 
 	// nofollow
-	if ( ! empty( $args['nofollow'] ) ) {
+	if (!empty($args['nofollow'])) {
 		$attributes['rel'] = isset($attributes['rel']) ? $attributes['rel'] . ' nofollow' : 'nofollow';
 	}
 
-	if(!empty($attributes )){
-		foreach ( $attributes as $key => $val ) {
+	if (!empty($attributes)) {
+		foreach ($attributes as $key => $val) {
 			$string_escaped .= esc_attr($key) . '="' . esc_attr($val) . '" ';
 		}
 	}
@@ -2285,36 +2285,36 @@ 
  *
  * @return array
  */
-function sd_parse_custom_attributes( $attributes_string, $delimiter = ',' ) {
-	$attributes = explode( $delimiter, $attributes_string );
+function sd_parse_custom_attributes($attributes_string, $delimiter = ',') {
+	$attributes = explode($delimiter, $attributes_string);
 	$result = [];
 
-	foreach ( $attributes as $attribute ) {
-		$attr_key_value = explode( '|', $attribute );
+	foreach ($attributes as $attribute) {
+		$attr_key_value = explode('|', $attribute);
 
-		$attr_key = mb_strtolower( $attr_key_value[0] );
+		$attr_key = mb_strtolower($attr_key_value[0]);
 
 		// Remove any not allowed characters.
-		preg_match( '/[-_a-z0-9]+/', $attr_key, $attr_key_matches );
+		preg_match('/[-_a-z0-9]+/', $attr_key, $attr_key_matches);
 
-		if ( empty( $attr_key_matches[0] ) ) {
+		if (empty($attr_key_matches[0])) {
 			continue;
 		}
 
 		$attr_key = $attr_key_matches[0];
 
 		// Avoid Javascript events and unescaped href.
-		if ( 'href' === $attr_key || 'on' === substr( $attr_key, 0, 2 ) ) {
+		if ('href' === $attr_key || 'on' === substr($attr_key, 0, 2)) {
 			continue;
 		}
 
-		if ( isset( $attr_key_value[1] ) ) {
-			$attr_value = trim( $attr_key_value[1] );
+		if (isset($attr_key_value[1])) {
+			$attr_value = trim($attr_key_value[1]);
 		} else {
 			$attr_value = '';
 		}
 
-		$result[ $attr_key ] = $attr_value;
+		$result[$attr_key] = $attr_value;
 	}
 
 	return $result;
@@ -2328,12 +2328,12 @@ 
  * @return string
  * @todo find best way to use px- py- or general p-
  */
-function sd_build_aui_class( $args ) {
+function sd_build_aui_class($args) {
 	global $aui_bs5;
 
 	$classes = array();
 
-	if ( $aui_bs5 ) {
+	if ($aui_bs5) {
 		$p_ml = 'ms-';
 		$p_mr = 'me-';
 
@@ -2348,254 +2348,254 @@ 
 	}
 
 	// margins.
-	if ( isset( $args['mt'] ) && $args['mt'] !== '' ) {
-		$classes[] = 'mt-' . sanitize_html_class( $args['mt'] );
+	if (isset($args['mt']) && $args['mt'] !== '') {
+		$classes[] = 'mt-' . sanitize_html_class($args['mt']);
 		$mt        = $args['mt'];
 	} else {
 		$mt = null;
 	}
-	if ( isset( $args['mr'] ) && $args['mr'] !== '' ) {
-		$classes[] = $p_mr . sanitize_html_class( $args['mr'] );
+	if (isset($args['mr']) && $args['mr'] !== '') {
+		$classes[] = $p_mr . sanitize_html_class($args['mr']);
 		$mr        = $args['mr'];
 	} else {
 		$mr = null;
 	}
-	if ( isset( $args['mb'] ) && $args['mb'] !== '' ) {
-		$classes[] = 'mb-' . sanitize_html_class( $args['mb'] );
+	if (isset($args['mb']) && $args['mb'] !== '') {
+		$classes[] = 'mb-' . sanitize_html_class($args['mb']);
 		$mb        = $args['mb'];
 	} else {
 		$mb = null;
 	}
-	if ( isset( $args['ml'] ) && $args['ml'] !== '' ) {
-		$classes[] = $p_ml . sanitize_html_class( $args['ml'] );
+	if (isset($args['ml']) && $args['ml'] !== '') {
+		$classes[] = $p_ml . sanitize_html_class($args['ml']);
 		$ml        = $args['ml'];
 	} else {
 		$ml = null;
 	}
 
 	// margins tablet.
-	if ( isset( $args['mt_md'] ) && $args['mt_md'] !== '' ) {
-		$classes[] = 'mt-md-' . sanitize_html_class( $args['mt_md'] );
+	if (isset($args['mt_md']) && $args['mt_md'] !== '') {
+		$classes[] = 'mt-md-' . sanitize_html_class($args['mt_md']);
 		$mt_md     = $args['mt_md'];
 	} else {
 		$mt_md = null;
 	}
-	if ( isset( $args['mr_md'] ) && $args['mr_md'] !== '' ) {
-		$classes[] = $p_mr . 'md-' . sanitize_html_class( $args['mr_md'] );
+	if (isset($args['mr_md']) && $args['mr_md'] !== '') {
+		$classes[] = $p_mr . 'md-' . sanitize_html_class($args['mr_md']);
 		$mt_md     = $args['mr_md'];
 	} else {
 		$mr_md = null;
 	}
-	if ( isset( $args['mb_md'] ) && $args['mb_md'] !== '' ) {
-		$classes[] = 'mb-md-' . sanitize_html_class( $args['mb_md'] );
+	if (isset($args['mb_md']) && $args['mb_md'] !== '') {
+		$classes[] = 'mb-md-' . sanitize_html_class($args['mb_md']);
 		$mt_md     = $args['mb_md'];
 	} else {
 		$mb_md = null;
 	}
-	if ( isset( $args['ml_md'] ) && $args['ml_md'] !== '' ) {
-		$classes[] = $p_ml . 'md-' . sanitize_html_class( $args['ml_md'] );
+	if (isset($args['ml_md']) && $args['ml_md'] !== '') {
+		$classes[] = $p_ml . 'md-' . sanitize_html_class($args['ml_md']);
 		$mt_md     = $args['ml_md'];
 	} else {
 		$ml_md = null;
 	}
 
 	// margins desktop.
-	if ( isset( $args['mt_lg'] ) && $args['mt_lg'] !== '' ) {
-		if ( $mt == null && $mt_md == null ) {
-			$classes[] = 'mt-' . sanitize_html_class( $args['mt_lg'] );
+	if (isset($args['mt_lg']) && $args['mt_lg'] !== '') {
+		if ($mt == null && $mt_md == null) {
+			$classes[] = 'mt-' . sanitize_html_class($args['mt_lg']);
 		} else {
-			$classes[] = 'mt-lg-' . sanitize_html_class( $args['mt_lg'] );
+			$classes[] = 'mt-lg-' . sanitize_html_class($args['mt_lg']);
 		}
 	}
-	if ( isset( $args['mr_lg'] ) && $args['mr_lg'] !== '' ) {
-		if ( $mr == null && $mr_md == null ) {
-			$classes[] = $p_mr . sanitize_html_class( $args['mr_lg'] );
+	if (isset($args['mr_lg']) && $args['mr_lg'] !== '') {
+		if ($mr == null && $mr_md == null) {
+			$classes[] = $p_mr . sanitize_html_class($args['mr_lg']);
 		} else {
-			$classes[] = $p_mr . 'lg-' . sanitize_html_class( $args['mr_lg'] );
+			$classes[] = $p_mr . 'lg-' . sanitize_html_class($args['mr_lg']);
 		}
 	}
-	if ( isset( $args['mb_lg'] ) && $args['mb_lg'] !== '' ) {
-		if ( $mb == null && $mb_md == null ) {
-			$classes[] = 'mb-' . sanitize_html_class( $args['mb_lg'] );
+	if (isset($args['mb_lg']) && $args['mb_lg'] !== '') {
+		if ($mb == null && $mb_md == null) {
+			$classes[] = 'mb-' . sanitize_html_class($args['mb_lg']);
 		} else {
-			$classes[] = 'mb-lg-' . sanitize_html_class( $args['mb_lg'] );
+			$classes[] = 'mb-lg-' . sanitize_html_class($args['mb_lg']);
 		}
 	}
-	if ( isset( $args['ml_lg'] ) && $args['ml_lg'] !== '' ) {
-		if ( $ml == null && $ml_md == null ) {
-			$classes[] = $p_ml . sanitize_html_class( $args['ml_lg'] );
+	if (isset($args['ml_lg']) && $args['ml_lg'] !== '') {
+		if ($ml == null && $ml_md == null) {
+			$classes[] = $p_ml . sanitize_html_class($args['ml_lg']);
 		} else {
-			$classes[] = $p_ml . 'lg-' . sanitize_html_class( $args['ml_lg'] );
+			$classes[] = $p_ml . 'lg-' . sanitize_html_class($args['ml_lg']);
 		}
 	}
 
 	// padding.
-	if ( isset( $args['pt'] ) && $args['pt'] !== '' ) {
-		$classes[] = 'pt-' . sanitize_html_class( $args['pt'] );
+	if (isset($args['pt']) && $args['pt'] !== '') {
+		$classes[] = 'pt-' . sanitize_html_class($args['pt']);
 		$pt        = $args['pt'];
 	} else {
 		$pt = null;
 	}
-	if ( isset( $args['pr'] ) && $args['pr'] !== '' ) {
-		$classes[] = $p_pr . sanitize_html_class( $args['pr'] );
+	if (isset($args['pr']) && $args['pr'] !== '') {
+		$classes[] = $p_pr . sanitize_html_class($args['pr']);
 		$pr        = $args['pr'];
 	} else {
 		$pr = null;
 	}
-	if ( isset( $args['pb'] ) && $args['pb'] !== '' ) {
-		$classes[] = 'pb-' . sanitize_html_class( $args['pb'] );
+	if (isset($args['pb']) && $args['pb'] !== '') {
+		$classes[] = 'pb-' . sanitize_html_class($args['pb']);
 		$pb        = $args['pb'];
 	} else {
 		$pb = null;
 	}
-	if ( isset( $args['pl'] ) && $args['pl'] !== '' ) {
-		$classes[] = $p_pl . sanitize_html_class( $args['pl'] );
+	if (isset($args['pl']) && $args['pl'] !== '') {
+		$classes[] = $p_pl . sanitize_html_class($args['pl']);
 		$pl        = $args['pl'];
 	} else {
 		$pl = null;
 	}
 
 	// padding tablet.
-	if ( isset( $args['pt_md'] ) && $args['pt_md'] !== '' ) {
-		$classes[] = 'pt-md-' . sanitize_html_class( $args['pt_md'] );
+	if (isset($args['pt_md']) && $args['pt_md'] !== '') {
+		$classes[] = 'pt-md-' . sanitize_html_class($args['pt_md']);
 		$pt_md     = $args['pt_md'];
 	} else {
 		$pt_md = null;
 	}
-	if ( isset( $args['pr_md'] ) && $args['pr_md'] !== '' ) {
-		$classes[] = $p_pr . 'md-' . sanitize_html_class( $args['pr_md'] );
+	if (isset($args['pr_md']) && $args['pr_md'] !== '') {
+		$classes[] = $p_pr . 'md-' . sanitize_html_class($args['pr_md']);
 		$pr_md     = $args['pr_md'];
 	} else {
 		$pr_md = null;
 	}
-	if ( isset( $args['pb_md'] ) && $args['pb_md'] !== '' ) {
-		$classes[] = 'pb-md-' . sanitize_html_class( $args['pb_md'] );
+	if (isset($args['pb_md']) && $args['pb_md'] !== '') {
+		$classes[] = 'pb-md-' . sanitize_html_class($args['pb_md']);
 		$pb_md     = $args['pb_md'];
 	} else {
 		$pb_md = null;
 	}
-	if ( isset( $args['pl_md'] ) && $args['pl_md'] !== '' ) {
-		$classes[] = $p_pl . 'md-' . sanitize_html_class( $args['pl_md'] );
+	if (isset($args['pl_md']) && $args['pl_md'] !== '') {
+		$classes[] = $p_pl . 'md-' . sanitize_html_class($args['pl_md']);
 		$pl_md     = $args['pl_md'];
 	} else {
 		$pl_md = null;
 	}
 
 	// padding desktop.
-	if ( isset( $args['pt_lg'] ) && $args['pt_lg'] !== '' ) {
-		if ( $pt == null && $pt_md == null ) {
-			$classes[] = 'pt-' . sanitize_html_class( $args['pt_lg'] );
+	if (isset($args['pt_lg']) && $args['pt_lg'] !== '') {
+		if ($pt == null && $pt_md == null) {
+			$classes[] = 'pt-' . sanitize_html_class($args['pt_lg']);
 		} else {
-			$classes[] = 'pt-lg-' . sanitize_html_class( $args['pt_lg'] );
+			$classes[] = 'pt-lg-' . sanitize_html_class($args['pt_lg']);
 		}
 	}
-	if ( isset( $args['pr_lg'] ) && $args['pr_lg'] !== '' ) {
-		if ( $pr == null && $pr_md == null ) {
-			$classes[] = $p_pr . sanitize_html_class( $args['pr_lg'] );
+	if (isset($args['pr_lg']) && $args['pr_lg'] !== '') {
+		if ($pr == null && $pr_md == null) {
+			$classes[] = $p_pr . sanitize_html_class($args['pr_lg']);
 		} else {
-			$classes[] = $p_pr . 'lg-' . sanitize_html_class( $args['pr_lg'] );
+			$classes[] = $p_pr . 'lg-' . sanitize_html_class($args['pr_lg']);
 		}
 	}
-	if ( isset( $args['pb_lg'] ) && $args['pb_lg'] !== '' ) {
-		if ( $pb == null && $pb_md == null ) {
-			$classes[] = 'pb-' . sanitize_html_class( $args['pb_lg'] );
+	if (isset($args['pb_lg']) && $args['pb_lg'] !== '') {
+		if ($pb == null && $pb_md == null) {
+			$classes[] = 'pb-' . sanitize_html_class($args['pb_lg']);
 		} else {
-			$classes[] = 'pb-lg-' . sanitize_html_class( $args['pb_lg'] );
+			$classes[] = 'pb-lg-' . sanitize_html_class($args['pb_lg']);
 		}
 	}
-	if ( isset( $args['pl_lg'] ) && $args['pl_lg'] !== '' ) {
-		if ( $pl == null && $pl_md == null ) {
-			$classes[] = $p_pl . sanitize_html_class( $args['pl_lg'] );
+	if (isset($args['pl_lg']) && $args['pl_lg'] !== '') {
+		if ($pl == null && $pl_md == null) {
+			$classes[] = $p_pl . sanitize_html_class($args['pl_lg']);
 		} else {
-			$classes[] = $p_pl . 'lg-' . sanitize_html_class( $args['pl_lg'] );
+			$classes[] = $p_pl . 'lg-' . sanitize_html_class($args['pl_lg']);
 		}
 	}
 
 	// row cols, mobile, tablet, desktop
-	if ( ! empty( $args['row_cols'] ) && $args['row_cols'] !== '' ) {
-		$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols'] );
+	if (!empty($args['row_cols']) && $args['row_cols'] !== '') {
+		$classes[] = sanitize_html_class('row-cols-' . $args['row_cols']);
 		$row_cols  = $args['row_cols'];
 	} else {
 		$row_cols = null;
 	}
-	if ( ! empty( $args['row_cols_md'] ) && $args['row_cols_md'] !== '' ) {
-		$classes[]   = sanitize_html_class( 'row-cols-md-' . $args['row_cols_md'] );
+	if (!empty($args['row_cols_md']) && $args['row_cols_md'] !== '') {
+		$classes[]   = sanitize_html_class('row-cols-md-' . $args['row_cols_md']);
 		$row_cols_md = $args['row_cols_md'];
 	} else {
 		$row_cols_md = null;
 	}
-	if ( ! empty( $args['row_cols_lg'] ) && $args['row_cols_lg'] !== '' ) {
-		if ( $row_cols == null && $row_cols_md == null ) {
-			$classes[] = sanitize_html_class( 'row-cols-' . $args['row_cols_lg'] );
+	if (!empty($args['row_cols_lg']) && $args['row_cols_lg'] !== '') {
+		if ($row_cols == null && $row_cols_md == null) {
+			$classes[] = sanitize_html_class('row-cols-' . $args['row_cols_lg']);
 		} else {
-			$classes[] = sanitize_html_class( 'row-cols-lg-' . $args['row_cols_lg'] );
+			$classes[] = sanitize_html_class('row-cols-lg-' . $args['row_cols_lg']);
 		}
 	}
 
 	// columns , mobile, tablet, desktop
-	if ( ! empty( $args['col'] ) && $args['col'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-' . $args['col'] );
+	if (!empty($args['col']) && $args['col'] !== '') {
+		$classes[] = sanitize_html_class('col-' . $args['col']);
 		$col       = $args['col'];
 	} else {
 		$col = null;
 	}
-	if ( ! empty( $args['col_md'] ) && $args['col_md'] !== '' ) {
-		$classes[] = sanitize_html_class( 'col-md-' . $args['col_md'] );
+	if (!empty($args['col_md']) && $args['col_md'] !== '') {
+		$classes[] = sanitize_html_class('col-md-' . $args['col_md']);
 		$col_md    = $args['col_md'];
 	} else {
 		$col_md = null;
 	}
-	if ( ! empty( $args['col_lg'] ) && $args['col_lg'] !== '' ) {
-		if ( $col == null && $col_md == null ) {
-			$classes[] = sanitize_html_class( 'col-' . $args['col_lg'] );
+	if (!empty($args['col_lg']) && $args['col_lg'] !== '') {
+		if ($col == null && $col_md == null) {
+			$classes[] = sanitize_html_class('col-' . $args['col_lg']);
 		} else {
-			$classes[] = sanitize_html_class( 'col-lg-' . $args['col_lg'] );
+			$classes[] = sanitize_html_class('col-lg-' . $args['col_lg']);
 		}
 	}
 
 	// border
-	if ( isset( $args['border'] ) && ( $args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0 ) ) {
+	if (isset($args['border']) && ($args['border'] == 'none' || $args['border'] === '0' || $args['border'] === 0)) {
 		$classes[] = 'border-0';
-	} elseif ( ! empty( $args['border'] ) ) {
+	} elseif (!empty($args['border'])) {
 		$border_class = 'border';
-		if ( ! empty( $args['border_type'] ) && strpos( $args['border_type'], '-0' ) === false ) {
+		if (!empty($args['border_type']) && strpos($args['border_type'], '-0') === false) {
 			$border_class = '';
 		}
-		$classes[] = $border_class . ' border-' . sanitize_html_class( $args['border'] );
+		$classes[] = $border_class . ' border-' . sanitize_html_class($args['border']);
 	}
 
 	// border radius type
-	if ( ! empty( $args['rounded'] ) ) {
-		$classes[] = sanitize_html_class( $args['rounded'] );
+	if (!empty($args['rounded'])) {
+		$classes[] = sanitize_html_class($args['rounded']);
 	}
 
 	// border radius size BS4
-	if ( isset( $args['rounded_size'] ) && in_array( $args['rounded_size'], array( 'sm', 'lg' ) ) ) {
-		$classes[] = 'rounded-' . sanitize_html_class( $args['rounded_size'] );
+	if (isset($args['rounded_size']) && in_array($args['rounded_size'], array('sm', 'lg'))) {
+		$classes[] = 'rounded-' . sanitize_html_class($args['rounded_size']);
 		// if we set a size then we need to remove "rounded" if set
-		if ( ( $key = array_search( 'rounded', $classes ) ) !== false ) {
-			unset( $classes[ $key ] );
+		if (($key = array_search('rounded', $classes)) !== false) {
+			unset($classes[$key]);
 		}
 	} else {
 
 		// border radius size , mobile, tablet, desktop
-		if ( isset( $args['rounded_size'] ) && $args['rounded_size'] !== '' ) {
-			$classes[]    = sanitize_html_class( 'rounded-' . $args['rounded_size'] );
+		if (isset($args['rounded_size']) && $args['rounded_size'] !== '') {
+			$classes[]    = sanitize_html_class('rounded-' . $args['rounded_size']);
 			$rounded_size = $args['rounded_size'];
 		} else {
 			$rounded_size = null;
 		}
-		if ( isset( $args['rounded_size_md'] ) && $args['rounded_size_md'] !== '' ) {
-			$classes[]       = sanitize_html_class( 'rounded-md-' . $args['rounded_size_md'] );
+		if (isset($args['rounded_size_md']) && $args['rounded_size_md'] !== '') {
+			$classes[]       = sanitize_html_class('rounded-md-' . $args['rounded_size_md']);
 			$rounded_size_md = $args['rounded_size_md'];
 		} else {
 			$rounded_size_md = null;
 		}
-		if ( isset( $args['rounded_size_lg'] ) && $args['rounded_size_lg'] !== '' ) {
-			if ( $rounded_size == null && $rounded_size_md == null ) {
-				$classes[] = sanitize_html_class( 'rounded-' . $args['rounded_size_lg'] );
+		if (isset($args['rounded_size_lg']) && $args['rounded_size_lg'] !== '') {
+			if ($rounded_size == null && $rounded_size_md == null) {
+				$classes[] = sanitize_html_class('rounded-' . $args['rounded_size_lg']);
 			} else {
-				$classes[] = sanitize_html_class( 'rounded-lg-' . $args['rounded_size_lg'] );
+				$classes[] = sanitize_html_class('rounded-lg-' . $args['rounded_size_lg']);
 			}
 		}
 	}
@@ -2604,149 +2604,149 @@ 
 	//if ( !empty( $args['shadow'] ) ) { $classes[] = sanitize_html_class($args['shadow']); }
 
 	// background
-	if ( ! empty( $args['bg'] ) ) {
-		$classes[] = 'bg-' . sanitize_html_class( $args['bg'] );
+	if (!empty($args['bg'])) {
+		$classes[] = 'bg-' . sanitize_html_class($args['bg']);
 	}
 
 	// background image fixed bg_image_fixed this helps fix a iOS bug
-	if ( ! empty( $args['bg_image_fixed'] ) ) {
+	if (!empty($args['bg_image_fixed'])) {
 		$classes[] = 'bg-image-fixed';
 	}
 
 	// text_color
-	if ( ! empty( $args['text_color'] ) ) {
-		$classes[] = 'text-' . sanitize_html_class( $args['text_color'] );
+	if (!empty($args['text_color'])) {
+		$classes[] = 'text-' . sanitize_html_class($args['text_color']);
 	}
 
 	// text_align
-	if ( ! empty( $args['text_justify'] ) ) {
+	if (!empty($args['text_justify'])) {
 		$classes[] = 'text-justify';
 	} else {
-		if ( ! empty( $args['text_align'] ) ) {
-			$classes[]  = sanitize_html_class( $args['text_align'] );
+		if (!empty($args['text_align'])) {
+			$classes[]  = sanitize_html_class($args['text_align']);
 			$text_align = $args['text_align'];
 		} else {
 			$text_align = null;
 		}
-		if ( ! empty( $args['text_align_md'] ) && $args['text_align_md'] !== '' ) {
-			$classes[]     = sanitize_html_class( $args['text_align_md'] );
+		if (!empty($args['text_align_md']) && $args['text_align_md'] !== '') {
+			$classes[]     = sanitize_html_class($args['text_align_md']);
 			$text_align_md = $args['text_align_md'];
 		} else {
 			$text_align_md = null;
 		}
-		if ( ! empty( $args['text_align_lg'] ) && $args['text_align_lg'] !== '' ) {
-			if ( $text_align == null && $text_align_md == null ) {
-				$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['text_align_lg'] ) );
+		if (!empty($args['text_align_lg']) && $args['text_align_lg'] !== '') {
+			if ($text_align == null && $text_align_md == null) {
+				$classes[] = sanitize_html_class(str_replace('-lg', '', $args['text_align_lg']));
 			} else {
-				$classes[] = sanitize_html_class( $args['text_align_lg'] );
+				$classes[] = sanitize_html_class($args['text_align_lg']);
 			}
 		}
 	}
 
 	// display
-	if ( ! empty( $args['display'] ) ) {
-		$classes[] = sanitize_html_class( $args['display'] );
+	if (!empty($args['display'])) {
+		$classes[] = sanitize_html_class($args['display']);
 		$display   = $args['display'];
 	} else {
 		$display = null;
 	}
-	if ( ! empty( $args['display_md'] ) && $args['display_md'] !== '' ) {
-		$classes[]  = sanitize_html_class( $args['display_md'] );
+	if (!empty($args['display_md']) && $args['display_md'] !== '') {
+		$classes[]  = sanitize_html_class($args['display_md']);
 		$display_md = $args['display_md'];
 	} else {
 		$display_md = null;
 	}
-	if ( ! empty( $args['display_lg'] ) && $args['display_lg'] !== '' ) {
-		if ( $display == null && $display_md == null ) {
-			$classes[] = sanitize_html_class( str_replace( '-lg', '', $args['display_lg'] ) );
+	if (!empty($args['display_lg']) && $args['display_lg'] !== '') {
+		if ($display == null && $display_md == null) {
+			$classes[] = sanitize_html_class(str_replace('-lg', '', $args['display_lg']));
 		} else {
-			$classes[] = sanitize_html_class( $args['display_lg'] );
+			$classes[] = sanitize_html_class($args['display_lg']);
 		}
 	}
 
 	// bgtus - background transparent until scroll
-	if ( ! empty( $args['bgtus'] ) ) {
-		$classes[] = sanitize_html_class( 'bg-transparent-until-scroll' );
+	if (!empty($args['bgtus'])) {
+		$classes[] = sanitize_html_class('bg-transparent-until-scroll');
 	}
 
 	// cscos - change color scheme on scroll
-	if ( ! empty( $args['bgtus'] ) && ! empty( $args['cscos'] ) ) {
-		$classes[] = sanitize_html_class( 'color-scheme-flip-on-scroll' );
+	if (!empty($args['bgtus']) && !empty($args['cscos'])) {
+		$classes[] = sanitize_html_class('color-scheme-flip-on-scroll');
 	}
 
 	// hover animations
-	if ( ! empty( $args['hover_animations'] ) ) {
-		$classes[] = sd_sanitize_html_classes( str_replace( ',', ' ', $args['hover_animations'] ) );
+	if (!empty($args['hover_animations'])) {
+		$classes[] = sd_sanitize_html_classes(str_replace(',', ' ', $args['hover_animations']));
 	}
 
 	// absolute_position
-	if ( ! empty( $args['absolute_position'] ) ) {
-		if ( 'top-left' === $args['absolute_position'] ) {
+	if (!empty($args['absolute_position'])) {
+		if ('top-left' === $args['absolute_position']) {
 			$classes[] = 'start-0 top-0';
-		} elseif ( 'top-center' === $args['absolute_position'] ) {
+		} elseif ('top-center' === $args['absolute_position']) {
 			$classes[] = 'start-50 top-0 translate-middle';
-		} elseif ( 'top-right' === $args['absolute_position'] ) {
+		} elseif ('top-right' === $args['absolute_position']) {
 			$classes[] = 'end-0 top-0';
-		} elseif ( 'center-left' === $args['absolute_position'] ) {
+		} elseif ('center-left' === $args['absolute_position']) {
 			$classes[] = 'start-0 top-50';
-		} elseif ( 'center' === $args['absolute_position'] ) {
+		} elseif ('center' === $args['absolute_position']) {
 			$classes[] = 'start-50 top-50 translate-middle';
-		} elseif ( 'center-right' === $args['absolute_position'] ) {
+		} elseif ('center-right' === $args['absolute_position']) {
 			$classes[] = 'end-0 top-50';
-		} elseif ( 'bottom-left' === $args['absolute_position'] ) {
+		} elseif ('bottom-left' === $args['absolute_position']) {
 			$classes[] = 'start-0 bottom-0';
-		} elseif ( 'bottom-center' === $args['absolute_position'] ) {
+		} elseif ('bottom-center' === $args['absolute_position']) {
 			$classes[] = 'start-50 bottom-0 translate-middle';
-		} elseif ( 'bottom-right' === $args['absolute_position'] ) {
+		} elseif ('bottom-right' === $args['absolute_position']) {
 			$classes[] = 'end-0 bottom-0';
 		}
 	}
 
 	// build classes from build keys
 	$build_keys = sd_get_class_build_keys();
-	if ( ! empty( $build_keys ) ) {
-		foreach ( $build_keys as $key ) {
+	if (!empty($build_keys)) {
+		foreach ($build_keys as $key) {
 
-			if ( substr( $key, -4 ) == '-MTD' ) {
+			if (substr($key, -4) == '-MTD') {
 
-				$k = str_replace( '-MTD', '', $key );
+				$k = str_replace('-MTD', '', $key);
 
 				// Mobile, Tablet, Desktop
-				if ( ! empty( $args[ $k ] ) && $args[ $k ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k ] );
-					$v         = $args[ $k ];
+				if (!empty($args[$k]) && $args[$k] !== '') {
+					$classes[] = sanitize_html_class($args[$k]);
+					$v         = $args[$k];
 				} else {
 					$v = null;
 				}
-				if ( ! empty( $args[ $k . '_md' ] ) && $args[ $k . '_md' ] !== '' ) {
-					$classes[] = sanitize_html_class( $args[ $k . '_md' ] );
-					$v_md      = $args[ $k . '_md' ];
+				if (!empty($args[$k . '_md']) && $args[$k . '_md'] !== '') {
+					$classes[] = sanitize_html_class($args[$k . '_md']);
+					$v_md      = $args[$k . '_md'];
 				} else {
 					$v_md = null;
 				}
-				if ( ! empty( $args[ $k . '_lg' ] ) && $args[ $k . '_lg' ] !== '' ) {
-					if ( $v == null && $v_md == null ) {
-						$classes[] = sanitize_html_class( str_replace( '-lg', '', $args[ $k . '_lg' ] ) );
+				if (!empty($args[$k . '_lg']) && $args[$k . '_lg'] !== '') {
+					if ($v == null && $v_md == null) {
+						$classes[] = sanitize_html_class(str_replace('-lg', '', $args[$k . '_lg']));
 					} else {
-						$classes[] = sanitize_html_class( $args[ $k . '_lg' ] );
+						$classes[] = sanitize_html_class($args[$k . '_lg']);
 					}
 				}
 			} else {
-				if ( $key == 'font_size' && ! empty( $args[ $key ] ) && $args[ $key ] == 'custom' ) {
+				if ($key == 'font_size' && !empty($args[$key]) && $args[$key] == 'custom') {
 					continue;
 				}
-				if ( ! empty( $args[ $key ] ) ) {
-					$classes[] = sd_sanitize_html_classes( $args[ $key ] );
+				if (!empty($args[$key])) {
+					$classes[] = sd_sanitize_html_classes($args[$key]);
 				}
 			}
 		}
 	}
 
-	if ( ! empty( $classes ) ) {
-		$classes = array_unique( array_filter( array_map( 'trim', $classes ) ) );
+	if (!empty($classes)) {
+		$classes = array_unique(array_filter(array_map('trim', $classes)));
 	}
 
-	return implode( ' ', $classes );
+	return implode(' ', $classes);
 }
 
 /**
@@ -2756,19 +2756,19 @@ 
  *
  * @return array
  */
-function sd_build_aui_styles( $args ) {
+function sd_build_aui_styles($args) {
 
 	$styles = array();
 
 	// background color
-	if ( ! empty( $args['bg'] ) && $args['bg'] !== '' ) {
-		if ( $args['bg'] == 'custom-color' ) {
+	if (!empty($args['bg']) && $args['bg'] !== '') {
+		if ($args['bg'] == 'custom-color') {
 			$styles['background-color'] = $args['bg_color'];
-		} elseif ( $args['bg'] == 'custom-gradient' ) {
+		} elseif ($args['bg'] == 'custom-gradient') {
 			$styles['background-image'] = $args['bg_gradient'];
 
 			// use background on text.
-			if ( ! empty( $args['bg_on_text'] ) && $args['bg_on_text'] ) {
+			if (!empty($args['bg_on_text']) && $args['bg_on_text']) {
 				$styles['background-clip']         = 'text';
 				$styles['-webkit-background-clip'] = 'text';
 				$styles['text-fill-color']         = 'transparent';
@@ -2777,67 +2777,67 @@ 
 		}
 	}
 
-	if ( ! empty( $args['bg_image'] ) && $args['bg_image'] !== '' ) {
+	if (!empty($args['bg_image']) && $args['bg_image'] !== '') {
 		$hasImage = true;
-		if ( ! empty( $styles['background-color'] ) && $args['bg'] == 'custom-color' ) {
+		if (!empty($styles['background-color']) && $args['bg'] == 'custom-color') {
 			$styles['background-image']      = 'url(' . $args['bg_image'] . ')';
 			$styles['background-blend-mode'] = 'overlay';
-		} elseif ( ! empty( $styles['background-image'] ) && $args['bg'] == 'custom-gradient' ) {
+		} elseif (!empty($styles['background-image']) && $args['bg'] == 'custom-gradient') {
 			$styles['background-image'] .= ',url(' . $args['bg_image'] . ')';
-		} elseif ( ! empty( $args['bg'] ) && $args['bg'] != '' && $args['bg'] != 'transparent' ) {
+		} elseif (!empty($args['bg']) && $args['bg'] != '' && $args['bg'] != 'transparent') {
 			// do nothing as we alreay have a preset
 			$hasImage = false;
 		} else {
 			$styles['background-image'] = 'url(' . $args['bg_image'] . ')';
 		}
 
-		if ( $hasImage ) {
+		if ($hasImage) {
 			$styles['background-size'] = 'cover';
 
-			if ( ! empty( $args['bg_image_fixed'] ) && $args['bg_image_fixed'] ) {
+			if (!empty($args['bg_image_fixed']) && $args['bg_image_fixed']) {
 				$styles['background-attachment'] = 'fixed';
 			}
 		}
 
-		if ( $hasImage && ! empty( $args['bg_image_xy'] ) && ! empty( $args['bg_image_xy']['x'] ) ) {
-			$styles['background-position'] = ( $args['bg_image_xy']['x'] * 100 ) . '% ' . ( $args['bg_image_xy']['y'] * 100 ) . '%';
+		if ($hasImage && !empty($args['bg_image_xy']) && !empty($args['bg_image_xy']['x'])) {
+			$styles['background-position'] = ($args['bg_image_xy']['x'] * 100) . '% ' . ($args['bg_image_xy']['y'] * 100) . '%';
 		}
 	}
 
 	// sticky offset top
-	if ( ! empty( $args['sticky_offset_top'] ) && $args['sticky_offset_top'] !== '' ) {
-		$styles['top'] = absint( $args['sticky_offset_top'] );
+	if (!empty($args['sticky_offset_top']) && $args['sticky_offset_top'] !== '') {
+		$styles['top'] = absint($args['sticky_offset_top']);
 	}
 
 	// sticky offset bottom
-	if ( ! empty( $args['sticky_offset_bottom'] ) && $args['sticky_offset_bottom'] !== '' ) {
-		$styles['bottom'] = absint( $args['sticky_offset_bottom'] );
+	if (!empty($args['sticky_offset_bottom']) && $args['sticky_offset_bottom'] !== '') {
+		$styles['bottom'] = absint($args['sticky_offset_bottom']);
 	}
 
 	// font size
-	if ( ! empty( $args['font_size_custom'] ) && $args['font_size_custom'] !== '' ) {
+	if (!empty($args['font_size_custom']) && $args['font_size_custom'] !== '') {
 		$styles['font-size'] = (float) $args['font_size_custom'] . 'rem';
 	}
 
 	// font color
-	if ( ! empty( $args['text_color_custom'] ) && $args['text_color_custom'] !== '' ) {
-		$styles['color'] = esc_attr( $args['text_color_custom'] );
+	if (!empty($args['text_color_custom']) && $args['text_color_custom'] !== '') {
+		$styles['color'] = esc_attr($args['text_color_custom']);
 	}
 
 	// font line height
-	if ( ! empty( $args['font_line_height'] ) && $args['font_line_height'] !== '' ) {
-		$styles['line-height'] = esc_attr( $args['font_line_height'] );
+	if (!empty($args['font_line_height']) && $args['font_line_height'] !== '') {
+		$styles['line-height'] = esc_attr($args['font_line_height']);
 	}
 
 	// max height
-	if ( ! empty( $args['max_height'] ) && $args['max_height'] !== '' ) {
-		$styles['max-height'] = esc_attr( $args['max_height'] );
+	if (!empty($args['max_height']) && $args['max_height'] !== '') {
+		$styles['max-height'] = esc_attr($args['max_height']);
 	}
 
 	$style_string = '';
-	if ( ! empty( $styles ) ) {
-		foreach ( $styles as $key => $val ) {
-			$style_string .= esc_attr( $key ) . ':' . esc_attr( $val ) . ';';
+	if (!empty($styles)) {
+		foreach ($styles as $key => $val) {
+			$style_string .= esc_attr($key) . ':' . esc_attr($val) . ';';
 		}
 	}
 
@@ -2853,28 +2853,28 @@ 
  *
  * @return string
  */
-function sd_build_hover_styles( $args, $is_preview = false ) {
+function sd_build_hover_styles($args, $is_preview = false) {
 	$rules = '';
 	// text color
-	if ( ! empty( $args['styleid'] ) ) {
-		$styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr( $args['styleid'] ) : 'html .' . esc_attr( $args['styleid'] );
+	if (!empty($args['styleid'])) {
+		$styleid = $is_preview ? 'html .editor-styles-wrapper .' . esc_attr($args['styleid']) : 'html .' . esc_attr($args['styleid']);
 
 		// text
-		if ( ! empty( $args['text_color_hover'] ) ) {
-			$key    = 'custom' === $args['text_color_hover'] && ! empty( $args['text_color_hover_custom'] ) ? 'text_color_hover_custom' : 'text_color_hover';
-			$color  = sd_get_color_from_var( $args[ $key ] );
+		if (!empty($args['text_color_hover'])) {
+			$key    = 'custom' === $args['text_color_hover'] && !empty($args['text_color_hover_custom']) ? 'text_color_hover_custom' : 'text_color_hover';
+			$color  = sd_get_color_from_var($args[$key]);
 			$rules .= $styleid . ':hover {color: ' . $color . ' !important;} ';
 		}
 
 		// bg
-		if ( ! empty( $args['bg_hover'] ) ) {
-			if ( 'custom-gradient' === $args['bg_hover'] ) {
+		if (!empty($args['bg_hover'])) {
+			if ('custom-gradient' === $args['bg_hover']) {
 				$color  = $args['bg_hover_gradient'];
 				$rules .= $styleid . ':hover {background-image: ' . $color . ' !important;} ';
 				$rules .= $styleid . '.btn:hover {border-color: transparent !important;} ';
 			} else {
 				$key    = 'custom-color' === $args['bg_hover'] ? 'bg_hover_color' : 'bg_hover';
-				$color  = sd_get_color_from_var( $args[ $key ] );
+				$color  = sd_get_color_from_var($args[$key]);
 				$rules .= $styleid . ':hover {background: ' . $color . ' !important;} ';
 				$rules .= $styleid . '.btn:hover {border-color: ' . $color . ' !important;} ';
 			}
@@ -2891,11 +2891,11 @@ 
  *
  * @return mixed|string
  */
-function sd_get_color_from_var( $var ) {
+function sd_get_color_from_var($var) {
 
 	//sanitize_hex_color() @todo this does not cover transparency
-	if ( strpos( $var, '#' ) === false ) {
-		$var = defined( 'BLOCKSTRAP_BLOCKS_VERSION' ) ? 'var(--wp--preset--color--' . esc_attr( $var ) . ')' : 'var(--' . esc_attr( $var ) . ')';
+	if (strpos($var, '#') === false) {
+		$var = defined('BLOCKSTRAP_BLOCKS_VERSION') ? 'var(--wp--preset--color--' . esc_attr($var) . ')' : 'var(--' . esc_attr($var) . ')';
 	}
 
 	return $var;
@@ -2909,16 +2909,16 @@ 
  *
  * @return string
  */
-function sd_sanitize_html_classes( $classes, $sep = ' ' ) {
+function sd_sanitize_html_classes($classes, $sep = ' ') {
 	$return = '';
 
-	if ( ! is_array( $classes ) ) {
-		$classes = explode( $sep, $classes );
+	if (!is_array($classes)) {
+		$classes = explode($sep, $classes);
 	}
 
-	if ( ! empty( $classes ) ) {
-		foreach ( $classes as $class ) {
-			$return .= sanitize_html_class( $class ) . ' ';
+	if (!empty($classes)) {
+		foreach ($classes as $class) {
+			$return .= sanitize_html_class($class) . ' ';
 		}
 	}
 
@@ -2965,7 +2965,7 @@ 
 		'width-MTD'
 	);
 
-	return apply_filters( 'sd_class_build_keys', $keys );
+	return apply_filters('sd_class_build_keys', $keys);
 }
 
 /**
@@ -2976,17 +2976,17 @@ 
  *
  * @return array
  */
-function sd_get_visibility_conditions_input( $type = 'visibility_conditions', $overwrite = array() ) {
+function sd_get_visibility_conditions_input($type = 'visibility_conditions', $overwrite = array()) {
 	$defaults = array(
 		'type'         => 'visibility_conditions',
-		'title'        => __( 'Block Visibility', 'ayecode-connect' ),
-		'button_title' => __( 'Set Block Visibility', 'ayecode-connect' ),
+		'title'        => __('Block Visibility', 'ayecode-connect'),
+		'button_title' => __('Set Block Visibility', 'ayecode-connect'),
 		'default'      => '',
 		'desc_tip'     => true,
-		'group'        => __( 'Visibility Conditions', 'ayecode-connect' ),
+		'group'        => __('Visibility Conditions', 'ayecode-connect'),
 	);
 
-	$input = wp_parse_args( $overwrite, $defaults );
+	$input = wp_parse_args($overwrite, $defaults);
 
 	return $input;
 }
@@ -2999,22 +2999,22 @@ 
  * @param array $exclude An array of roles to exclude from the return array.
  * @return array An array of roles.
  */
-function sd_user_roles_options( $exclude = array() ) {
+function sd_user_roles_options($exclude = array()) {
 	$user_roles = array();
 
-	if ( !function_exists('get_editable_roles') ) {
-		require_once( ABSPATH . '/wp-admin/includes/user.php' );
+	if (!function_exists('get_editable_roles')) {
+		require_once(ABSPATH . '/wp-admin/includes/user.php');
 	}
 
 	$roles = get_editable_roles();
 
-	foreach ( $roles as $role => $data ) {
-		if ( ! ( ! empty( $exclude ) && in_array( $role, $exclude ) ) ) {
-			$user_roles[ esc_attr( $role ) ] = translate_user_role( $data['name'] );
+	foreach ($roles as $role => $data) {
+		if (!(!empty($exclude) && in_array($role, $exclude))) {
+			$user_roles[esc_attr($role)] = translate_user_role($data['name']);
 		}
 	}
 
-	return apply_filters( 'sd_user_roles_options', $user_roles );
+	return apply_filters('sd_user_roles_options', $user_roles);
 }
 
 /**
@@ -3026,17 +3026,17 @@ 
  */
 function sd_visibility_rules_options() {
 	$options = array(
-		'logged_in'  => __( 'Logged In', 'ayecode-connect' ),
-		'logged_out' => __( 'Logged Out', 'ayecode-connect' ),
-		'post_author'  => __( 'Post Author', 'ayecode-connect' ),
-		'user_roles' => __( 'Specific User Roles', 'ayecode-connect' )
+		'logged_in'  => __('Logged In', 'ayecode-connect'),
+		'logged_out' => __('Logged Out', 'ayecode-connect'),
+		'post_author'  => __('Post Author', 'ayecode-connect'),
+		'user_roles' => __('Specific User Roles', 'ayecode-connect')
 	);
 
-	if ( class_exists( 'GeoDirectory' ) ) {
-		$options['gd_field'] = __( 'GD Field', 'ayecode-connect' );
+	if (class_exists('GeoDirectory')) {
+		$options['gd_field'] = __('GD Field', 'ayecode-connect');
 	}
 
-	return apply_filters( 'sd_visibility_rules_options', $options );
+	return apply_filters('sd_visibility_rules_options', $options);
 }
 
 /**
@@ -3045,22 +3045,22 @@ 
  * @return array
  */
 function sd_visibility_gd_field_options() {
-	$fields = geodir_post_custom_fields( '', 'all', 'all', 'none' );
+	$fields = geodir_post_custom_fields('', 'all', 'all', 'none');
 
 	$keys = array();
-	if ( ! empty( $fields ) ) {
-		foreach( $fields as $field ) {
-			if ( apply_filters( 'geodir_badge_field_skip_key', false, $field ) ) {
+	if (!empty($fields)) {
+		foreach ($fields as $field) {
+			if (apply_filters('geodir_badge_field_skip_key', false, $field)) {
 				continue;
 			}
 
-			$keys[ $field['htmlvar_name'] ] = $field['htmlvar_name'] . ' ( ' . __( $field['admin_title'], 'geodirectory' ) . ' )';
+			$keys[$field['htmlvar_name']] = $field['htmlvar_name'] . ' ( ' . __($field['admin_title'], 'geodirectory') . ' )';
 
 			// Extra address fields
-			if ( $field['htmlvar_name'] == 'address' && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				foreach ( $address_fields as $_field => $args ) {
-					if ( $_field != 'map_directions' && $_field != 'street' ) {
-						$keys[ $_field ] = $_field . ' ( ' . $args['frontend_title'] . ' )';
+			if ($field['htmlvar_name'] == 'address' && ($address_fields = geodir_post_meta_address_fields(''))) {
+				foreach ($address_fields as $_field => $args) {
+					if ($_field != 'map_directions' && $_field != 'street') {
+						$keys[$_field] = $_field . ' ( ' . $args['frontend_title'] . ' )';
 					}
 				}
 			}
@@ -3069,15 +3069,15 @@ 
 
 	$standard_fields = sd_visibility_gd_standard_field_options();
 
-	if ( ! empty( $standard_fields ) ) {
-		foreach ( $standard_fields as $key => $option ) {
-			$keys[ $key ] = $option;
+	if (!empty($standard_fields)) {
+		foreach ($standard_fields as $key => $option) {
+			$keys[$key] = $option;
 		}
 	}
 
-	$options = apply_filters( 'geodir_badge_field_keys', $keys );
+	$options = apply_filters('geodir_badge_field_keys', $keys);
 
-	return apply_filters( 'sd_visibility_gd_field_options', $options );
+	return apply_filters('sd_visibility_gd_field_options', $options);
 }
 
 /**
@@ -3085,18 +3085,18 @@ 
  *
  * @return array
  */
-function sd_visibility_gd_standard_field_options( $post_type = '' ) {
-	$fields = sd_visibility_gd_standard_fields( $post_type );
+function sd_visibility_gd_standard_field_options($post_type = '') {
+	$fields = sd_visibility_gd_standard_fields($post_type);
 
 	$options = array();
 
-	foreach ( $fields as $key => $field ) {
-		if ( ! empty( $field['frontend_title'] ) ) {
-			$options[ $key ] = $key . ' ( ' . $field['frontend_title'] . ' )';
+	foreach ($fields as $key => $field) {
+		if (!empty($field['frontend_title'])) {
+			$options[$key] = $key . ' ( ' . $field['frontend_title'] . ' )';
 		}
 	}
 
-	return apply_filters( 'sd_visibility_gd_standard_field_options', $options, $fields );
+	return apply_filters('sd_visibility_gd_standard_field_options', $options, $fields);
 }
 
 /**
@@ -3104,18 +3104,18 @@ 
  *
  * @return array
  */
-function sd_visibility_gd_standard_fields( $post_type = '' ) {
-	$standard_fields = geodir_post_meta_standard_fields( $post_type );
+function sd_visibility_gd_standard_fields($post_type = '') {
+	$standard_fields = geodir_post_meta_standard_fields($post_type);
 
 	$fields = array();
 
-	foreach ( $standard_fields as $key => $field ) {
-		if ( $key != 'post_link' && strpos( $key, 'event' ) === false && ! empty( $field['frontend_title'] ) ) {
-			$fields[ $key ] = $field;
+	foreach ($standard_fields as $key => $field) {
+		if ($key != 'post_link' && strpos($key, 'event') === false && !empty($field['frontend_title'])) {
+			$fields[$key] = $field;
 		}
 	}
 
-	return apply_filters( 'sd_visibility_gd_standard_fields', $fields );
+	return apply_filters('sd_visibility_gd_standard_fields', $fields);
 }
 
 /**
@@ -3123,19 +3123,19 @@ 
  *
  * @return array
  */
-function sd_visibility_field_condition_options(){
+function sd_visibility_field_condition_options() {
 	$options = array(
-		'is_empty' => __( 'is empty', 'ayecode-connect' ),
-		'is_not_empty' => __( 'is not empty', 'ayecode-connect' ),
-		'is_equal' => __( 'is equal', 'ayecode-connect' ),
-		'is_not_equal' => __( 'is not equal', 'ayecode-connect' ),
-		'is_greater_than' => __( 'is greater than', 'ayecode-connect' ),
-		'is_less_than' => __( 'is less than', 'ayecode-connect' ),
-		'is_contains' => __( 'is contains', 'ayecode-connect' ),
-		'is_not_contains' => __( 'is not contains', 'ayecode-connect' ),
+		'is_empty' => __('is empty', 'ayecode-connect'),
+		'is_not_empty' => __('is not empty', 'ayecode-connect'),
+		'is_equal' => __('is equal', 'ayecode-connect'),
+		'is_not_equal' => __('is not equal', 'ayecode-connect'),
+		'is_greater_than' => __('is greater than', 'ayecode-connect'),
+		'is_less_than' => __('is less than', 'ayecode-connect'),
+		'is_contains' => __('is contains', 'ayecode-connect'),
+		'is_not_contains' => __('is not contains', 'ayecode-connect'),
 	);
 
-	return apply_filters( 'sd_visibility_field_condition_options', $options );
+	return apply_filters('sd_visibility_field_condition_options', $options);
 }
 
 /**
@@ -3147,13 +3147,13 @@ 
  */
 function sd_visibility_output_options() {
 	$options = array(
-		'hide'          => __( 'Hide Block', 'ayecode-connect' ),
-		'message'       => __( 'Show Custom Message', 'ayecode-connect' ),
-		'page'          => __( 'Show Page Content', 'ayecode-connect' ),
-		'template_part' => __( 'Show Template Part', 'ayecode-connect' ),
+		'hide'          => __('Hide Block', 'ayecode-connect'),
+		'message'       => __('Show Custom Message', 'ayecode-connect'),
+		'page'          => __('Show Page Content', 'ayecode-connect'),
+		'template_part' => __('Show Template Part', 'ayecode-connect'),
 	);
 
-	return apply_filters( 'sd_visibility_output_options', $options );
+	return apply_filters('sd_visibility_output_options', $options);
 }
 
 /**
@@ -3164,46 +3164,46 @@ 
  * @param array $args Array of arguments.
  * @return array Template page options.
  */
-function sd_template_page_options( $args = array() ) {
+function sd_template_page_options($args = array()) {
 	global $sd_tmpl_page_options;
 
-	if ( ! empty( $sd_tmpl_page_options ) ) {
+	if (!empty($sd_tmpl_page_options)) {
 		return $sd_tmpl_page_options;
 	}
 
-	$args = wp_parse_args( $args, array(
+	$args = wp_parse_args($args, array(
 		'child_of'    => 0,
 		'sort_column' => 'post_title',
 		'sort_order'  => 'ASC'
-	) );
+	));
 
 	$exclude_pages = array();
-	if ( $page_on_front = get_option( 'page_on_front' ) ) {
+	if ($page_on_front = get_option('page_on_front')) {
 		$exclude_pages[] = $page_on_front;
 	}
 
-	if ( $page_for_posts = get_option( 'page_for_posts' ) ) {
+	if ($page_for_posts = get_option('page_for_posts')) {
 		$exclude_pages[] = $page_for_posts;
 	}
 
-	if ( ! empty( $exclude_pages ) ) {
+	if (!empty($exclude_pages)) {
 		$args['exclude'] = $exclude_pages;
 	}
 
-	$pages = get_pages( $args );
+	$pages = get_pages($args);
 
-	$options = array( '' => __( 'Select Page...', 'ayecode-connect' ) );
-	if ( ! empty( $pages ) ) {
-		foreach ( $pages as $page ) {
-			if ( ! empty( $page->ID ) && ! empty( $page->post_title ) ) {
-				$options[ $page->ID ] = $page->post_title . ' (#' . $page->ID . ')';
+	$options = array('' => __('Select Page...', 'ayecode-connect'));
+	if (!empty($pages)) {
+		foreach ($pages as $page) {
+			if (!empty($page->ID) && !empty($page->post_title)) {
+				$options[$page->ID] = $page->post_title . ' (#' . $page->ID . ')';
 			}
 		}
 	}
 
 	$sd_tmpl_page_options = $options;
 
-	return apply_filters( 'sd_template_page_options', $options );
+	return apply_filters('sd_template_page_options', $options);
 }
 
 /**
@@ -3214,26 +3214,26 @@ 
  * @param array $args Array of arguments.
  * @return array Template part options.
  */
-function sd_template_part_options( $args = array() ) {
+function sd_template_part_options($args = array()) {
 	global $sd_tmpl_part_options;
 
-	if ( ! empty( $sd_tmpl_part_options ) ) {
+	if (!empty($sd_tmpl_part_options)) {
 		return $sd_tmpl_part_options;
 	}
 
-	$options = array( '' => __( 'Select Template Part...', 'ayecode-connect' ) );
+	$options = array('' => __('Select Template Part...', 'ayecode-connect'));
 
-	$parts = get_block_templates( array(), 'wp_template_part' );
+	$parts = get_block_templates(array(), 'wp_template_part');
 
-	if ( ! empty( $parts ) ) {
-		foreach ( $parts as $part ) {
-			$options[ $part->slug ] = $part->title . ' (#' . $part->slug . ')';
+	if (!empty($parts)) {
+		foreach ($parts as $part) {
+			$options[$part->slug] = $part->title . ' (#' . $part->slug . ')';
 		}
 	}
 
 	$sd_tmpl_part_options = $options;
 
-	return apply_filters( 'sd_template_part_options', $options, $args );
+	return apply_filters('sd_template_part_options', $options, $args);
 }
 
 /**
@@ -3244,26 +3244,26 @@ 
  * @param string $slug Template slug.
  * @return array Template part object.
  */
-function sd_get_template_part_by_slug( $slug ) {
+function sd_get_template_part_by_slug($slug) {
 	global $bs_tmpl_part_by_slug;
 
-	if ( empty( $bs_tmpl_part_by_slug ) ) {
+	if (empty($bs_tmpl_part_by_slug)) {
 		$bs_tmpl_part_by_slug = array();
 	}
 
-	if ( isset( $bs_tmpl_part_by_slug[ $slug ] ) ) {
-		return $bs_tmpl_part_by_slug[ $slug ];
+	if (isset($bs_tmpl_part_by_slug[$slug])) {
+		return $bs_tmpl_part_by_slug[$slug];
 	}
 
-	$template_query = get_block_templates( array( 'slug__in' => array( $slug ) ), 'wp_template_part' );
+	$template_query = get_block_templates(array('slug__in' => array($slug)), 'wp_template_part');
 
-	$query_post = ! empty( $template_query ) ? $template_query[0] : array();
+	$query_post = !empty($template_query) ? $template_query[0] : array();
 
-	$template_part = ! empty( $query_post ) && $query_post->status == 'publish' ? $query_post : array();
+	$template_part = !empty($query_post) && $query_post->status == 'publish' ? $query_post : array();
 
-	$bs_tmpl_part_by_slug[ $slug ] = $template_part;
+	$bs_tmpl_part_by_slug[$slug] = $template_part;
 
-	return apply_filters( 'sd_get_template_part_by_slug', $template_part, $slug );
+	return apply_filters('sd_get_template_part_by_slug', $template_part, $slug);
 }
 
 /**
@@ -3275,25 +3275,25 @@ 
  * @param array    $block         The full block, including name and attributes.
  * @param WP_Block $instance      The block instance.
  */
-function sd_render_block( $block_content, $block, $instance = '' ) {
+function sd_render_block($block_content, $block, $instance = '') {
 	// No block visibility conditions set.
-	if ( empty( $block['attrs']['visibility_conditions'] ) ) {
+	if (empty($block['attrs']['visibility_conditions'])) {
 		return $block_content;
 	}
 
-	$attributes = json_decode( $block['attrs']['visibility_conditions'], true );
-	$rules = ! empty( $attributes ) ? sd_block_parse_rules( $attributes ) : array();
+	$attributes = json_decode($block['attrs']['visibility_conditions'], true);
+	$rules = !empty($attributes) ? sd_block_parse_rules($attributes) : array();
 
 	// No rules set.
-	if ( empty( $rules ) ) {
+	if (empty($rules)) {
 		return $block_content;
 	}
 
 	$_block_content = $block_content;
 
-	if ( ! empty( $rules ) && sd_block_check_rules( $rules ) ) {
-		if ( ! empty( $attributes['output']['type'] ) ) {
-			switch ( $attributes['output']['type'] ) {
+	if (!empty($rules) && sd_block_check_rules($rules)) {
+		if (!empty($attributes['output']['type'])) {
+			switch ($attributes['output']['type']) {
 				case 'hide':
 					$valid_type = true;
 					$content = '';
@@ -3302,11 +3302,11 @@ 
 				case 'message':
 					$valid_type = true;
 
-					if ( isset( $attributes['output']['message'] ) ) {
-						$content = $attributes['output']['message'] != '' ? __( stripslashes( $attributes['output']['message'] ), 'ayecode-connect' ) : $attributes['output']['message'];
+					if (isset($attributes['output']['message'])) {
+						$content = $attributes['output']['message'] != '' ? __(stripslashes($attributes['output']['message']), 'ayecode-connect') : $attributes['output']['message'];
 
-						if ( ! empty( $attributes['output']['message_type'] ) ) {
-							$content = aui()->alert( array(
+						if (!empty($attributes['output']['message_type'])) {
+							$content = aui()->alert(array(
 									'type'=> $attributes['output']['message_type'],
 									'content'=> $content
 								)
@@ -3318,15 +3318,15 @@ 
 				case 'page':
 					$valid_type = true;
 
-					$page_id = ! empty( $attributes['output']['page'] ) ? absint( $attributes['output']['page'] ) : 0;
-					$content = sd_get_page_content( $page_id );
+					$page_id = !empty($attributes['output']['page']) ? absint($attributes['output']['page']) : 0;
+					$content = sd_get_page_content($page_id);
 
 					break;
 				case 'template_part':
 					$valid_type = true;
 
-					$template_part = ! empty( $attributes['output']['template_part'] ) ? $attributes['output']['template_part'] : '';
-					$content = sd_get_template_part_content( $template_part );
+					$template_part = !empty($attributes['output']['template_part']) ? $attributes['output']['template_part'] : '';
+					$content = sd_get_template_part_content($template_part);
 
 					break;
 				default:
@@ -3334,104 +3334,104 @@ 
 					break;
 			}
 
-			if ( $valid_type ) {
-				$block_content = '<div class="' . esc_attr( wp_get_block_default_classname( $instance->name ) ) . ' sd-block-has-rule">' . $content . '</div>';
+			if ($valid_type) {
+				$block_content = '<div class="' . esc_attr(wp_get_block_default_classname($instance->name)) . ' sd-block-has-rule">' . $content . '</div>';
 			}
 		}
 	}
 
-	return apply_filters( 'sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance );
+	return apply_filters('sd_render_block_visibility_content', $block_content, $_block_content, $attributes, $block, $instance);
 }
-add_filter( 'render_block', 'sd_render_block', 9, 3 );
+add_filter('render_block', 'sd_render_block', 9, 3);
 
-function sd_get_page_content( $page_id ) {
-	$content = $page_id > 0 ? get_post_field( 'post_content', (int) $page_id ) : '';
+function sd_get_page_content($page_id) {
+	$content = $page_id > 0 ? get_post_field('post_content', (int) $page_id) : '';
 
 	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_page_content', '', $content, $page_id );
-	if ( $bypass_content ) {
+	$bypass_content = apply_filters('sd_bypass_page_content', '', $content, $page_id);
+	if ($bypass_content) {
 		return $bypass_content;
 	}
 
 	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+	$content = do_shortcode($content);
 
 	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
+	if (function_exists('do_blocks')) {
+		$content = do_blocks($content);
 	}
 
-	return apply_filters( 'sd_get_page_content', $content, $page_id );
+	return apply_filters('sd_get_page_content', $content, $page_id);
 }
 
-function sd_get_template_part_content( $template_part ) {
-	$template_part_post = $template_part ? sd_get_template_part_by_slug( $template_part ) : array();
-	$content = ! empty( $template_part_post ) ? $template_part_post->content : '';
+function sd_get_template_part_content($template_part) {
+	$template_part_post = $template_part ? sd_get_template_part_by_slug($template_part) : array();
+	$content = !empty($template_part_post) ? $template_part_post->content : '';
 
 	// Maybe bypass content
-	$bypass_content = apply_filters( 'sd_bypass_template_part_content', '', $content, $template_part );
-	if ( $bypass_content ) {
+	$bypass_content = apply_filters('sd_bypass_template_part_content', '', $content, $template_part);
+	if ($bypass_content) {
 		return $bypass_content;
 	}
 
 	// Run the shortcodes on the content.
-	$content = do_shortcode( $content );
+	$content = do_shortcode($content);
 
 	// Run block content if its available.
-	if ( function_exists( 'do_blocks' ) ) {
-		$content = do_blocks( $content );
+	if (function_exists('do_blocks')) {
+		$content = do_blocks($content);
 	}
 
-	return apply_filters( 'sd_get_template_part_content', $content, $template_part );
+	return apply_filters('sd_get_template_part_content', $content, $template_part);
 }
 
-function sd_block_parse_rules( $attrs ) {
+function sd_block_parse_rules($attrs) {
 	$rules = array();
 
-	if ( ! empty( $attrs ) && is_array( $attrs ) ) {
-		$attrs_keys = array_keys( $attrs );
+	if (!empty($attrs) && is_array($attrs)) {
+		$attrs_keys = array_keys($attrs);
 
-		for ( $i = 1; $i <= count( $attrs_keys ); $i++ ) {
-			if ( ! empty( $attrs[ 'rule' . $i ] ) && is_array( $attrs[ 'rule' . $i ] ) ) {
-				$rules[] = $attrs[ 'rule' . $i ];
+		for ($i = 1; $i <= count($attrs_keys); $i++) {
+			if (!empty($attrs['rule' . $i]) && is_array($attrs['rule' . $i])) {
+				$rules[] = $attrs['rule' . $i];
 			}
 		}
 	}
 
-	return apply_filters( 'sd_block_parse_rules', $rules, $attrs );
+	return apply_filters('sd_block_parse_rules', $rules, $attrs);
 }
 
-function sd_block_check_rules( $rules ) {
-	if ( ! ( is_array( $rules ) && ! empty( $rules ) ) ) {
+function sd_block_check_rules($rules) {
+	if (!(is_array($rules) && !empty($rules))) {
 		return true;
 	}
 
-	foreach ( $rules as $key => $rule ) {
-		$match = apply_filters( 'sd_block_check_rule', true, $rule );
+	foreach ($rules as $key => $rule) {
+		$match = apply_filters('sd_block_check_rule', true, $rule);
 
-		if ( ! $match ) {
+		if (!$match) {
 			break;
 		}
 	}
 
-	return apply_filters( 'sd_block_check_rules', $match, $rules );
+	return apply_filters('sd_block_check_rules', $match, $rules);
 }
 
-function sd_block_check_rule( $match, $rule ) {
+function sd_block_check_rule($match, $rule) {
 	global $post;
 
-	if ( $match && ! empty( $rule['type'] ) ) {
-		switch ( $rule['type'] ) {
+	if ($match && !empty($rule['type'])) {
+		switch ($rule['type']) {
 			case 'logged_in':
 				$match = (bool) is_user_logged_in();
 
 				break;
 			case 'logged_out':
-				$match = ! is_user_logged_in();
+				$match = !is_user_logged_in();
 
 				break;
 			case 'post_author':
-				if ( ! empty( $post ) && $post->post_type != 'page' && ! empty( $post->post_author ) && is_user_logged_in() ) {
+				if (!empty($post) && $post->post_type != 'page' && !empty($post->post_author) && is_user_logged_in()) {
 					$match = (int) $post->post_author === (int) get_current_user_id() ? true : false;
 				} else {
 					$match = false;
@@ -3441,18 +3441,18 @@ 
 			case 'user_roles':
 				$match = false;
 
-				if ( ! empty( $rule['user_roles'] ) ) {
-					$user_roles = is_scalar( $rule['user_roles'] ) ? explode( ",", $rule['user_roles'] ) : $rule['user_roles'];
+				if (!empty($rule['user_roles'])) {
+					$user_roles = is_scalar($rule['user_roles']) ? explode(",", $rule['user_roles']) : $rule['user_roles'];
 
-					if ( is_array( $user_roles ) ) {
-						$user_roles = array_filter( array_map( 'trim', $user_roles ) );
+					if (is_array($user_roles)) {
+						$user_roles = array_filter(array_map('trim', $user_roles));
 					}
 
-					if ( ! empty( $user_roles ) && is_array( $user_roles ) && is_user_logged_in() && ( $current_user = wp_get_current_user() ) ) {
+					if (!empty($user_roles) && is_array($user_roles) && is_user_logged_in() && ($current_user = wp_get_current_user())) {
 						$current_user_roles = $current_user->roles;
 
-						foreach ( $user_roles as $role ) {
-							if ( in_array( $role, $current_user_roles ) ) {
+						foreach ($user_roles as $role) {
+							if (in_array($role, $current_user_roles)) {
 								$match = true;
 							}
 						}
@@ -3461,7 +3461,7 @@ 
 
 				break;
 			case 'gd_field':
-				$match = sd_block_check_rule_gd_field( $rule );
+				$match = sd_block_check_rule_gd_field($rule);
 
 				break;
 		}
@@ -3469,145 +3469,145 @@ 
 
 	return $match;
 }
-add_filter( 'sd_block_check_rule', 'sd_block_check_rule', 10, 2 );
+add_filter('sd_block_check_rule', 'sd_block_check_rule', 10, 2);
 
-function sd_block_check_rule_gd_field( $rule ) {
+function sd_block_check_rule_gd_field($rule) {
 	global $gd_post;
 
 	$match_found = false;
 
-	if ( class_exists( 'GeoDirectory' ) && ! empty( $gd_post->ID ) && ! empty( $rule['field'] ) && ! empty( $rule['condition'] ) ) {
+	if (class_exists('GeoDirectory') && !empty($gd_post->ID) && !empty($rule['field']) && !empty($rule['condition'])) {
 		$args['block_visibility'] = true;
 		$args['key'] = $rule['field'];
 		$args['condition'] = $rule['condition'];
-		$args['search'] = isset( $rule['search'] ) ? $rule['search'] : '';
+		$args['search'] = isset($rule['search']) ? $rule['search'] : '';
 
-		if ( $args['key'] == 'street' ) {
+		if ($args['key'] == 'street') {
 			$args['key'] = 'address';
 		}
 
 		$match_field = $_match_field = $args['key'];
 
-		if ( $match_field == 'address' ) {
+		if ($match_field == 'address') {
 			$match_field = 'street';
-		} elseif ( $match_field == 'post_images' ) {
+		} elseif ($match_field == 'post_images') {
 			$match_field = 'featured_image';
 		}
 
 		$find_post = $gd_post;
-		$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+		$find_post_keys = !empty($find_post) ? array_keys((array) $find_post) : array();
 
-		if ( ! empty( $find_post->ID ) && ! in_array( 'post_category', $find_post_keys ) ) {
-			$find_post = geodir_get_post_info( (int) $find_post->ID );
-			$find_post_keys = ! empty( $find_post ) ? array_keys( (array) $find_post ) : array();
+		if (!empty($find_post->ID) && !in_array('post_category', $find_post_keys)) {
+			$find_post = geodir_get_post_info((int) $find_post->ID);
+			$find_post_keys = !empty($find_post) ? array_keys((array) $find_post) : array();
 		}
 
-		if ( $match_field === '' || ( ! empty( $find_post_keys ) && ( in_array( $match_field, $find_post_keys ) || in_array( $_match_field, $find_post_keys ) ) ) ) {
-			$address_fields = array( 'street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude' ); // Address fields
+		if ($match_field === '' || (!empty($find_post_keys) && (in_array($match_field, $find_post_keys) || in_array($_match_field, $find_post_keys)))) {
+			$address_fields = array('street2', 'neighbourhood', 'city', 'region', 'country', 'zip', 'latitude', 'longitude'); // Address fields
 			$field = array();
 			$empty_field = false;
 
 			$standard_fields = sd_visibility_gd_standard_fields();
 
-			if ( $match_field && ! in_array( $match_field, array_keys( $standard_fields ) ) && ! in_array( $match_field, $address_fields ) ) {
-				$package_id = geodir_get_post_package_id( $find_post->ID, $find_post->post_type );
-				$fields = geodir_post_custom_fields( $package_id, 'all', $find_post->post_type, 'none' );
+			if ($match_field && !in_array($match_field, array_keys($standard_fields)) && !in_array($match_field, $address_fields)) {
+				$package_id = geodir_get_post_package_id($find_post->ID, $find_post->post_type);
+				$fields = geodir_post_custom_fields($package_id, 'all', $find_post->post_type, 'none');
 
-				foreach ( $fields as $field_info ) {
-					if ( $match_field == $field_info['htmlvar_name'] ) {
+				foreach ($fields as $field_info) {
+					if ($match_field == $field_info['htmlvar_name']) {
 						$field = $field_info;
 						break;
-					} elseif( $_match_field == $field_info['htmlvar_name'] ) {
+					} elseif ($_match_field == $field_info['htmlvar_name']) {
 						$field = $field_info;
 						break;
 					}
 				}
 
-				if ( empty( $field ) ) {
+				if (empty($field)) {
 					$empty_field = true;
 				}
 			}
 
 			// Address fields.
-			if ( in_array( $match_field, $address_fields ) && ( $address_fields = geodir_post_meta_address_fields( '' ) ) ) {
-				if ( ! empty( $address_fields[ $match_field ] ) ) {
-					$field = $address_fields[ $match_field ];
+			if (in_array($match_field, $address_fields) && ($address_fields = geodir_post_meta_address_fields(''))) {
+				if (!empty($address_fields[$match_field])) {
+					$field = $address_fields[$match_field];
 				}
-			} else if ( in_array( $match_field, array_keys( $standard_fields ) ) ) {
-				if ( ! empty( $standard_fields[ $match_field ] ) ) {
-					$field = $standard_fields[ $match_field ];
+			} else if (in_array($match_field, array_keys($standard_fields))) {
+				if (!empty($standard_fields[$match_field])) {
+					$field = $standard_fields[$match_field];
 				}
 			}
 
 			// Parse search.
-			$search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
+			$search = sd_gd_field_rule_search($args['search'], $find_post->post_type, $rule, $field, $find_post);
 
-			$is_date = ( ! empty( $field['type'] ) && $field['type'] == 'datepicker' ) || in_array( $match_field, array( 'post_date', 'post_modified' ) ) ? true : false;
-			$is_date = apply_filters( 'geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post );
+			$is_date = (!empty($field['type']) && $field['type'] == 'datepicker') || in_array($match_field, array('post_date', 'post_modified')) ? true : false;
+			$is_date = apply_filters('geodir_post_badge_is_date', $is_date, $match_field, $field, $args, $find_post);
 
-			$match_value = isset( $find_post->{$match_field} ) && empty( $empty_field ) ? esc_attr( trim( $find_post->{$match_field} ) ) : '';
+			$match_value = isset($find_post->{$match_field} ) && empty($empty_field) ? esc_attr(trim($find_post->{$match_field} )) : '';
 			$match_found = $match_field === '' ? true : false;
 
-			if ( ! $match_found ) {
-				if ( ( $match_field == 'post_date' || $match_field == 'post_modified' ) && ( empty( $args['condition'] ) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than' ) ) {
-					if ( strpos( $search, '+' ) === false && strpos( $search, '-' ) === false ) {
+			if (!$match_found) {
+				if (($match_field == 'post_date' || $match_field == 'post_modified') && (empty($args['condition']) || $args['condition'] == 'is_greater_than' || $args['condition'] == 'is_less_than')) {
+					if (strpos($search, '+') === false && strpos($search, '-') === false) {
 						$search = '+' . $search;
 					}
-					$the_time = $match_field == 'post_modified' ? get_the_modified_date( 'Y-m-d', $find_post ) : get_the_time( 'Y-m-d', $find_post );
-					$until_time = strtotime( $the_time . ' ' . $search . ' days' );
-					$now_time   = strtotime( date_i18n( 'Y-m-d', current_time( 'timestamp' ) ) );
-					if ( ( empty( $args['condition'] ) || $args['condition'] == 'is_less_than' ) && $until_time > $now_time ) {
+					$the_time = $match_field == 'post_modified' ? get_the_modified_date('Y-m-d', $find_post) : get_the_time('Y-m-d', $find_post);
+					$until_time = strtotime($the_time . ' ' . $search . ' days');
+					$now_time   = strtotime(date_i18n('Y-m-d', current_time('timestamp')));
+					if ((empty($args['condition']) || $args['condition'] == 'is_less_than') && $until_time > $now_time) {
 						$match_found = true;
-					} elseif ( $args['condition'] == 'is_greater_than' && $until_time < $now_time ) {
+					} elseif ($args['condition'] == 'is_greater_than' && $until_time < $now_time) {
 						$match_found = true;
 					}
 				} else {
-					switch ( $args['condition'] ) {
+					switch ($args['condition']) {
 						case 'is_equal':
-							$match_found = (bool) ( $search != '' && $match_value == $search );
+							$match_found = (bool) ($search != '' && $match_value == $search);
 							break;
 						case 'is_not_equal':
-							$match_found = (bool) ( $search != '' && $match_value != $search );
+							$match_found = (bool) ($search != '' && $match_value != $search);
 							break;
 						case 'is_greater_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value > $search );
+							$match_found = (bool) ($search != '' && (is_float($search) || is_numeric($search)) && (is_float($match_value) || is_numeric($match_value)) && $match_value > $search);
 							break;
 						case 'is_less_than':
-							$match_found = (bool) ( $search != '' && ( is_float( $search ) || is_numeric( $search ) ) && ( is_float( $match_value ) || is_numeric( $match_value ) ) && $match_value < $search );
+							$match_found = (bool) ($search != '' && (is_float($search) || is_numeric($search)) && (is_float($match_value) || is_numeric($match_value)) && $match_value < $search);
 							break;
 						case 'is_empty':
-							$match_found = (bool) ( $match_value === '' || $match_value === false || $match_value === '0' || is_null( $match_value ) );
+							$match_found = (bool) ($match_value === '' || $match_value === false || $match_value === '0' || is_null($match_value));
 							break;
 						case 'is_not_empty':
-							$match_found = (bool) ( $match_value !== '' && $match_value !== false && $match_value !== '0' && ! is_null( $match_value ) );
+							$match_found = (bool) ($match_value !== '' && $match_value !== false && $match_value !== '0' && !is_null($match_value));
 							break;
 						case 'is_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) !== false );
+							$match_found = (bool) ($search != '' && stripos($match_value, $search) !== false);
 							break;
 						case 'is_not_contains':
-							$match_found = (bool) ( $search != '' && stripos( $match_value, $search ) === false );
+							$match_found = (bool) ($search != '' && stripos($match_value, $search) === false);
 							break;
 					}
 				}
 			}
 
-			$match_found = apply_filters( 'geodir_post_badge_check_match_found', $match_found, $args, $find_post );
+			$match_found = apply_filters('geodir_post_badge_check_match_found', $match_found, $args, $find_post);
 		} else {
 			$field = array();
 
 			// Parse search.
-			$search = sd_gd_field_rule_search( $args['search'], $find_post->post_type, $rule, $field, $find_post );
+			$search = sd_gd_field_rule_search($args['search'], $find_post->post_type, $rule, $field, $find_post);
 
 			$match_value = '';
 			$match_found = $match_field === '' ? true : false;
 
-			if ( ! $match_found ) {
-				switch ( $args['condition'] ) {
+			if (!$match_found) {
+				switch ($args['condition']) {
 					case 'is_equal':
-						$match_found = (bool) ( $search != '' && $match_value == $search );
+						$match_found = (bool) ($search != '' && $match_value == $search);
 						break;
 					case 'is_not_equal':
-						$match_found = (bool) ( $search != '' && $match_value != $search );
+						$match_found = (bool) ($search != '' && $match_value != $search);
 						break;
 					case 'is_greater_than':
 						$match_found = false;
@@ -3630,80 +3630,80 @@ 
 				}
 			}
 
-			$match_found = apply_filters( 'geodir_post_badge_check_match_found_empty', $match_found, $args, $find_post );
+			$match_found = apply_filters('geodir_post_badge_check_match_found_empty', $match_found, $args, $find_post);
 		}
 	}
 
 	return $match_found;
 }
 
-function sd_gd_field_rule_search( $search, $post_type, $rule, $field = array(), $gd_post = array() ) {
+function sd_gd_field_rule_search($search, $post_type, $rule, $field = array(), $gd_post = array()) {
 	global $post;
 
-	if ( ! $search ) {
+	if (!$search) {
 		return $search;
 	}
 
 	$orig_search = $search;
-	$_search = strtolower( $search );
+	$_search = strtolower($search);
 
-	if ( ! empty( $rule['field'] ) && $rule['field'] == 'post_author' ) {
-		if ( $search == 'current_user' ) {
+	if (!empty($rule['field']) && $rule['field'] == 'post_author') {
+		if ($search == 'current_user') {
 			$search = is_user_logged_in() ? (int) get_current_user_id() : - 1;
-		} else if ( $search == 'current_author' ) {
-			$search = ( ! empty( $post ) && $post->post_type != 'page' && isset( $post->post_author ) ) ? absint( $post->post_author ) : - 1;
-		}
-	} else if ( $_search == 'date_today' ) {
-		$search = date( 'Y-m-d' );
-	} else if ( $_search == 'date_tomorrow' ) {
-		$search = date( 'Y-m-d', strtotime( "+1 day" ) );
-	} else if ( $_search == 'date_yesterday' ) {
-		$search = date( 'Y-m-d', strtotime( "-1 day" ) );
-	} else if ( $_search == 'time_his' ) {
-		$search = date( 'H:i:s' );
-	} else if ( $_search == 'time_hi' ) {
-		$search = date( 'H:i' );
-	} else if ( $_search == 'datetime_now' ) {
-		$search = date( 'Y-m-d H:i:s' );
-	} else if ( strpos( $_search, 'datetime_after_' ) === 0 ) {
-		$_searches = explode( 'datetime_after_', $_search, 2 );
-
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+		} else if ($search == 'current_author') {
+			$search = (!empty($post) && $post->post_type != 'page' && isset($post->post_author)) ? absint($post->post_author) : - 1;
+		}
+	} else if ($_search == 'date_today') {
+		$search = date('Y-m-d');
+	} else if ($_search == 'date_tomorrow') {
+		$search = date('Y-m-d', strtotime("+1 day"));
+	} else if ($_search == 'date_yesterday') {
+		$search = date('Y-m-d', strtotime("-1 day"));
+	} else if ($_search == 'time_his') {
+		$search = date('H:i:s');
+	} else if ($_search == 'time_hi') {
+		$search = date('H:i');
+	} else if ($_search == 'datetime_now') {
+		$search = date('Y-m-d H:i:s');
+	} else if (strpos($_search, 'datetime_after_') === 0) {
+		$_searches = explode('datetime_after_', $_search, 2);
+
+		if (!empty($_searches[1])) {
+			$search = date('Y-m-d H:i:s', strtotime("+ " . str_replace("_", " ", $_searches[1])));
 		} else {
-			$search = date( 'Y-m-d H:i:s' );
+			$search = date('Y-m-d H:i:s');
 		}
-	} else if ( strpos( $_search, 'datetime_before_' ) === 0 ) {
-		$_searches = explode( 'datetime_before_', $_search, 2 );
+	} else if (strpos($_search, 'datetime_before_') === 0) {
+		$_searches = explode('datetime_before_', $_search, 2);
 
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d H:i:s', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+		if (!empty($_searches[1])) {
+			$search = date('Y-m-d H:i:s', strtotime("- " . str_replace("_", " ", $_searches[1])));
 		} else {
-			$search = date( 'Y-m-d H:i:s' );
+			$search = date('Y-m-d H:i:s');
 		}
-	} else if ( strpos( $_search, 'date_after_' ) === 0 ) {
-		$_searches = explode( 'date_after_', $_search, 2 );
+	} else if (strpos($_search, 'date_after_') === 0) {
+		$_searches = explode('date_after_', $_search, 2);
 
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "+ " . str_replace( "_", " ", $_searches[1] ) ) );
+		if (!empty($_searches[1])) {
+			$search = date('Y-m-d', strtotime("+ " . str_replace("_", " ", $_searches[1])));
 		} else {
-			$search = date( 'Y-m-d' );
+			$search = date('Y-m-d');
 		}
-	} else if ( strpos( $_search, 'date_before_' ) === 0 ) {
-		$_searches = explode( 'date_before_', $_search, 2 );
+	} else if (strpos($_search, 'date_before_') === 0) {
+		$_searches = explode('date_before_', $_search, 2);
 
-		if ( ! empty( $_searches[1] ) ) {
-			$search = date( 'Y-m-d', strtotime( "- " . str_replace( "_", " ", $_searches[1] ) ) );
+		if (!empty($_searches[1])) {
+			$search = date('Y-m-d', strtotime("- " . str_replace("_", " ", $_searches[1])));
 		} else {
-			$search = date( 'Y-m-d' );
+			$search = date('Y-m-d');
 		}
 	}
 
-	return apply_filters( 'sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search );
+	return apply_filters('sd_gd_field_rule_search', $search, $post_type, $rule, $orig_search);
 }
 
 
-if(!function_exists('sd_blocks_render_blocks')){
+if (!function_exists('sd_blocks_render_blocks')) {
 	/**
 	 * Add the shortcodes to the block content if set as an attribute.
 	 *
@@ -3714,21 +3714,21 @@ 
 	 * @param $thiss
 	 * @return mixed|string
 	 */
-	function sd_blocks_render_blocks($block_content, $parsed_block, $thiss = array() ){
+	function sd_blocks_render_blocks($block_content, $parsed_block, $thiss = array()) {
 
 		// Check if ita a nested block that needs to be wrapped
-		if(! empty($parsed_block['attrs']['sd_shortcode_close'])){
+		if (!empty($parsed_block['attrs']['sd_shortcode_close'])) {
 			$content = isset($parsed_block['attrs']['html']) ? $parsed_block['attrs']['html'] : $block_content;
-			$block_content = $parsed_block['attrs']['sd_shortcode'].$content.$parsed_block['attrs']['sd_shortcode_close'];
+			$block_content = $parsed_block['attrs']['sd_shortcode'] . $content . $parsed_block['attrs']['sd_shortcode_close'];
 
 			$block_content = do_shortcode($block_content);
 
-		}elseif(! empty($parsed_block['attrs']['sd_shortcode'])){
+		}elseif (!empty($parsed_block['attrs']['sd_shortcode'])) {
 			$has_warp = false;
-			if($block_content && strpos(trim($block_content), '<div class="wp-block-') === 0 ){
+			if ($block_content && strpos(trim($block_content), '<div class="wp-block-') === 0) {
 				$parts = explode('></', $block_content);
-				if(count($parts) === 2){
-					$block_content = $parts[0].'>'.$parsed_block['attrs']['sd_shortcode'].'</'.$parts[1];
+				if (count($parts) === 2) {
+					$block_content = $parts[0] . '>' . $parsed_block['attrs']['sd_shortcode'] . '</' . $parts[1];
 					$has_warp = true;
 				}
 			}
@@ -3743,5 +3743,5 @@ 
 	}
 }
 
-add_filter('render_block', 'sd_blocks_render_blocks',10,3);
+add_filter('render_block', 'sd_blocks_render_blocks', 10, 3);
 

includes/gateways/class-getpaid-bank-transfer-gateway.php

Indentation +282 added lines, -282 removed lines

@@ -13,47 +13,47 @@ 
 class GetPaid_Bank_Transfer_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'bank_transfer';
 
-	/**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
-	protected $supports = array(
-		'subscription',
-		'addons',
-		'single_subscription_group',
-		'multiple_subscription_groups',
-		'subscription_date_change',
-		'subscription_bill_times_change',
-	);
+    /**
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
+    protected $supports = array(
+        'subscription',
+        'addons',
+        'single_subscription_group',
+        'multiple_subscription_groups',
+        'subscription_date_change',
+        'subscription_bill_times_change',
+    );
+
+    /**
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 8;
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 8;
-
-	/**
-	 * Bank transfer instructions.
-	 */
-	public $instructions;
-
-	/**
-	 * Locale array.
-	 */
-	public $locale;
+     * Bank transfer instructions.
+     */
+    public $instructions;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Locale array.
+     */
+    public $locale;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title                = __( 'Direct bank transfer', 'invoicing' );
@@ -61,24 +61,24 @@ 
         $this->checkout_button_text = __( 'Proceed', 'invoicing' );
         $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
-		add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-		add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
+        add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
+        add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
+        add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
+        add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
+        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
+        add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Add a transaction id.
         $invoice->set_transaction_id( $invoice->generate_key( 'bt_' ) );
@@ -99,66 +99,66 @@ 
     }
 
     /**
-	 * Output for the order received page.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function thankyou_page( $invoice ) {
+     * Output for the order received page.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    public function thankyou_page( $invoice ) {
 
         if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
+            echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
             if ( ! empty( $this->instructions ) ) {
                 echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
-			}
+            }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
         }
 
-	}
+    }
 
     /**
-	 * Add content to the WPI emails.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param string     $email_type Email format: plain text or HTML.
-	 * @param bool     $sent_to_admin Sent to admin.
-	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+     * Add content to the WPI emails.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param string     $email_type Email format: plain text or HTML.
+     * @param bool     $sent_to_admin Sent to admin.
+     */
+    public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
+            echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+            if ( $this->instructions ) {
+                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
             }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
-		}
+        }
 
     }
 
     /**
-	 * Get bank details and place into a list format.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	protected function bank_details( $invoice ) {
+     * Get bank details and place into a list format.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    protected function bank_details( $invoice ) {
 
-		// Get the invoice country and country $locale.
-		$country = $invoice->get_country();
-		$locale  = $this->get_country_locale();
+        // Get the invoice country and country $locale.
+        $country = $invoice->get_country();
+        $locale  = $this->get_country_locale();
 
-		// Get shortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get shortcode label in the $locale array and use appropriate one.
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
         $bank_fields = array(
             'ac_name'   => __( 'Account Name', 'invoicing' ),
@@ -177,11 +177,11 @@ 
 
             if ( ! empty( $value ) ) {
                 $bank_info[ $field ] = array(
-					'label' => $label,
-					'value' => $value,
-				);
+                    'label' => $label,
+                    'value' => $value,
+                );
             }
-		}
+        }
 
         $bank_info = apply_filters( 'wpinv_bank_info', $bank_info, $invoice );
 
@@ -189,139 +189,139 @@ 
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+        echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
 
-		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+        echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
 
-		foreach ( $bank_info as $key => $data ) {
-			echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
-		}
+        foreach ( $bank_info as $key => $data ) {
+            echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
+        }
 
-		echo '</table>';
+        echo '</table>';
 
     }
 
     /**
-	 * Get country locale if localized.
-	 *
-	 * @return array
-	 */
-	public function get_country_locale() {
-
-		if ( empty( $this->locale ) ) {
-
-			// Locale information to be used - only those that are not 'Sort Code'.
-			$this->locale = apply_filters(
-				'getpaid_get_bank_transfer_locale',
-				array(
-					'AU' => array(
-						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
-						),
-					),
-					'CA' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
-						),
-					),
-					'IN' => array(
-						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
-						),
-					),
-					'IT' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
-						),
-					),
-					'NZ' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'SE' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'US' => array(
-						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
-						),
-					),
-					'ZA' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
-						),
-					),
-				)
-			);
-
-		}
-
-		return $this->locale;
-
-	}
-
-	/**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Get country locale if localized.
+     *
+     * @return array
+     */
+    public function get_country_locale() {
+
+        if ( empty( $this->locale ) ) {
+
+            // Locale information to be used - only those that are not 'Sort Code'.
+            $this->locale = apply_filters(
+                'getpaid_get_bank_transfer_locale',
+                array(
+                    'AU' => array(
+                        'sortcode' => array(
+                            'label' => __( 'BSB', 'invoicing' ),
+                        ),
+                    ),
+                    'CA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank transit number', 'invoicing' ),
+                        ),
+                    ),
+                    'IN' => array(
+                        'sortcode' => array(
+                            'label' => __( 'IFSC', 'invoicing' ),
+                        ),
+                    ),
+                    'IT' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch sort', 'invoicing' ),
+                        ),
+                    ),
+                    'NZ' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'SE' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'US' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Routing number', 'invoicing' ),
+                        ),
+                    ),
+                    'ZA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch code', 'invoicing' ),
+                        ),
+                    ),
+                )
+            );
+
+        }
+
+        return $this->locale;
+
+    }
+
+    /**
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
 
-		$locale  = $this->get_country_locale();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $country  = wpinv_default_billing_country();
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
-		$admin_settings['bank_transfer_ac_name'] = array(
+        $admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
             'name' => __( 'Account Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ac_no'] = array(
+        $admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
             'name' => __( 'Account Number', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bank_name'] = array(
+        $admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
             'name' => __( 'Bank Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ifsc'] = array(
+        $admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
             'name' => __( 'IFSC Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_iban'] = array(
+        $admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
             'name' => __( 'IBAN', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bic'] = array(
+        $admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
             'name' => __( 'BIC/Swift Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_sort_code'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_sort_code',
-			'name' => $sortcode,
-		);
+        $admin_settings['bank_transfer_sort_code'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_sort_code',
+            'name' => $sortcode,
+        );
 
-		$admin_settings['bank_transfer_info'] = array(
+        $admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
             'name' => __( 'Instructions', 'invoicing' ),
             'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
@@ -331,17 +331,17 @@ 
             'rows' => 5,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
-	/**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+    /**
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );
@@ -349,98 +349,98 @@ 
 
         $invoice->recalculate_total();
         $invoice->save();
-	}
-
-	/**
-	 * (Maybe) renews a bank transfer subscription profile.
-	 *
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
-		// Ensure its our subscription && it's active.
-		if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
-			add_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
-
-			$invoice = $subscription->create_payment();
-
-			if ( ! empty( $invoice ) ) {
-				$is_logged_in = is_user_logged_in();
-
-				// Cron run.
-				if ( ! $is_logged_in ) {
-					$note = wp_sprintf( __( 'Renewal %1$s created with the status "%2$s".', 'invoicing' ), $invoice->get_invoice_quote_type(), wpinv_status_nicename( $invoice->get_status(), $invoice ) );
-
-					$invoice->add_note( $note, false, $is_logged_in, ! $is_logged_in );
-				}
-			}
-
-			remove_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
-		}
-	}
-
-	/**
-	 * Process a bank transfer payment.
-	 *
-	 *
+    }
+
+    /**
+     * (Maybe) renews a bank transfer subscription profile.
+     *
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function maybe_renew_subscription( $subscription ) {
+        // Ensure its our subscription && it's active.
+        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
+            add_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
+
+            $invoice = $subscription->create_payment();
+
+            if ( ! empty( $invoice ) ) {
+                $is_logged_in = is_user_logged_in();
+
+                // Cron run.
+                if ( ! $is_logged_in ) {
+                    $note = wp_sprintf( __( 'Renewal %1$s created with the status "%2$s".', 'invoicing' ), $invoice->get_invoice_quote_type(), wpinv_status_nicename( $invoice->get_status(), $invoice ) );
+
+                    $invoice->add_note( $note, false, $is_logged_in, ! $is_logged_in );
+                }
+            }
+
+            remove_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
+        }
+    }
+
+    /**
+     * Process a bank transfer payment.
+     *
+     *
      * @param WPInv_Invoice $invoice
-	 */
-	public function invoice_paid( $invoice ) {
-
-		// Abort if not paid by bank transfer.
-		if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
-			return;
-		}
-
-		// Is it a parent payment?
-		if ( 0 == $invoice->get_parent_id() ) {
-
-			// (Maybe) activate subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-
-			if ( ! empty( $subscriptions ) ) {
-				$subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
-
-				foreach ( $subscriptions as $subscription ) {
-					if ( $subscription->exists() ) {
-						$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-						$expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
-
-						$subscription->set_next_renewal_date( $expiry );
-						$subscription->set_date_created( current_time( 'mysql' ) );
-						$subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
-						$subscription->activate();
-					}
-				}
-			}
-		} else {
-
-			$subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
-
-			// Renew the subscription.
-			if ( $subscription && $subscription->exists() ) {
-				$subscription->add_payment( array(), $invoice );
-				$subscription->renew( strtotime( $invoice->get_date_created() ) );
-			}
-		}
+     */
+    public function invoice_paid( $invoice ) {
+
+        // Abort if not paid by bank transfer.
+        if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
+            return;
+        }
+
+        // Is it a parent payment?
+        if ( 0 == $invoice->get_parent_id() ) {
+
+            // (Maybe) activate subscriptions.
+            $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+
+            if ( ! empty( $subscriptions ) ) {
+                $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+
+                foreach ( $subscriptions as $subscription ) {
+                    if ( $subscription->exists() ) {
+                        $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
+                        $expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+
+                        $subscription->set_next_renewal_date( $expiry );
+                        $subscription->set_date_created( current_time( 'mysql' ) );
+                        $subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
+                        $subscription->activate();
+                    }
+                }
+            }
+        } else {
+
+            $subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
+
+            // Renew the subscription.
+            if ( $subscription && $subscription->exists() ) {
+                $subscription->add_payment( array(), $invoice );
+                $subscription->renew( strtotime( $invoice->get_date_created() ) );
+            }
+        }
 
     }
 
-	/**
-	 * Force created from payment false to allow email for auto renewal generation invoice.
-	 *
-	 * @since 2.8.11
-	 *
-	 * @param bool $is_payment_form_invoice True when invoice created via payment form else false.
-	 * @param int  $invoice Invoice ID.
-	 * @return bool True when invoice created via payment form else false.
-	 */
-	public function force_is_payment_form_invoice( $is_payment_form_invoice, $invoice ) {
-		if ( $is_payment_form_invoice ) {
-			$is_payment_form_invoice = false;
-		}
-
-		return $is_payment_form_invoice;
-	}
+    /**
+     * Force created from payment false to allow email for auto renewal generation invoice.
+     *
+     * @since 2.8.11
+     *
+     * @param bool $is_payment_form_invoice True when invoice created via payment form else false.
+     * @param int  $invoice Invoice ID.
+     * @return bool True when invoice created via payment form else false.
+     */
+    public function force_is_payment_form_invoice( $is_payment_form_invoice, $invoice ) {
+        if ( $is_payment_form_invoice ) {
+            $is_payment_form_invoice = false;
+        }
+
+        return $is_payment_form_invoice;
+    }
 
 }

Spacing +97 added lines, -97 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Bank transfer Payment Gateway class.
@@ -56,17 +56,17 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title                = __( 'Direct bank transfer', 'invoicing' );
-        $this->method_title         = __( 'Bank transfer', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed', 'invoicing' );
-        $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
+        $this->title                = __('Direct bank transfer', 'invoicing');
+        $this->method_title         = __('Bank transfer', 'invoicing');
+        $this->checkout_button_text = __('Proceed', 'invoicing');
+        $this->instructions         = apply_filters('wpinv_bank_instructions', $this->get_option('info'));
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
-		add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-		add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
+		add_action('wpinv_receipt_end', array($this, 'thankyou_page'));
+		add_action('getpaid_invoice_line_items', array($this, 'thankyou_page'), 40);
+		add_action('wpinv_pdf_content_billing', array($this, 'thankyou_page'), 11);
+		add_action('wpinv_email_invoice_details', array($this, 'email_instructions'), 10, 3);
+		add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
+		add_action('getpaid_invoice_status_publish', array($this, 'invoice_paid'), 20);
 
     }
 
@@ -78,23 +78,23 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Add a transaction id.
-        $invoice->set_transaction_id( $invoice->generate_key( 'bt_' ) );
+        $invoice->set_transaction_id($invoice->generate_key('bt_'));
 
         // Set it as pending payment.
-        if ( ! $invoice->needs_payment() ) {
+        if (!$invoice->needs_payment()) {
             $invoice->mark_paid();
-        } elseif ( ! $invoice->is_paid() ) {
-            $invoice->set_status( 'wpi-onhold' );
+        } elseif (!$invoice->is_paid()) {
+            $invoice->set_status('wpi-onhold');
         }
 
         // Save it.
         $invoice->save();
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -103,17 +103,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function thankyou_page( $invoice ) {
+	public function thankyou_page($invoice) {
 
-        if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ('bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
-            if ( ! empty( $this->instructions ) ) {
-                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
+            if (!empty($this->instructions)) {
+                echo wp_kses_post(wpautop(wptexturize($this->instructions)));
 			}
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 
 			echo '</div>';
 
@@ -128,17 +128,17 @@ 
 	 * @param string     $email_type Email format: plain text or HTML.
 	 * @param bool     $sent_to_admin Sent to admin.
 	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+	public function email_instructions($invoice, $email_type, $sent_to_admin) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+		if (!$sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+			if ($this->instructions) {
+				echo wp_kses_post(wpautop(wptexturize($this->instructions)) . PHP_EOL);
             }
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 
 			echo '</div>';
 
@@ -151,50 +151,50 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	protected function bank_details( $invoice ) {
+	protected function bank_details($invoice) {
 
 		// Get the invoice country and country $locale.
 		$country = $invoice->get_country();
 		$locale  = $this->get_country_locale();
 
 		// Get shortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
         $bank_fields = array(
-            'ac_name'   => __( 'Account Name', 'invoicing' ),
-            'ac_no'     => __( 'Account Number', 'invoicing' ),
-            'bank_name' => __( 'Bank Name', 'invoicing' ),
-            'ifsc'      => __( 'IFSC code', 'invoicing' ),
-            'iban'      => __( 'IBAN', 'invoicing' ),
-            'bic'       => __( 'BIC/Swift code', 'invoicing' ),
+            'ac_name'   => __('Account Name', 'invoicing'),
+            'ac_no'     => __('Account Number', 'invoicing'),
+            'bank_name' => __('Bank Name', 'invoicing'),
+            'ifsc'      => __('IFSC code', 'invoicing'),
+            'iban'      => __('IBAN', 'invoicing'),
+            'bic'       => __('BIC/Swift code', 'invoicing'),
             'sort_code' => $sortcode,
         );
 
         $bank_info = array();
 
-        foreach ( $bank_fields as $field => $label ) {
-            $value = $this->get_option( $field );
+        foreach ($bank_fields as $field => $label) {
+            $value = $this->get_option($field);
 
-            if ( ! empty( $value ) ) {
-                $bank_info[ $field ] = array(
+            if (!empty($value)) {
+                $bank_info[$field] = array(
 					'label' => $label,
 					'value' => $value,
 				);
             }
 		}
 
-        $bank_info = apply_filters( 'wpinv_bank_info', $bank_info, $invoice );
+        $bank_info = apply_filters('wpinv_bank_info', $bank_info, $invoice);
 
-        if ( empty( $bank_info ) ) {
+        if (empty($bank_info)) {
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html(apply_filters('wpinv_receipt_bank_details_title', __('Bank Details', 'invoicing'), $invoice)) . '</h3>' . PHP_EOL;
 
 		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
 
-		foreach ( $bank_info as $key => $data ) {
-			echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
+		foreach ($bank_info as $key => $data) {
+			echo "<tr class='getpaid-bank-transfer-" . esc_attr($key) . "'><th class='font-weight-bold'>" . wp_kses_post($data['label']) . "</th><td class='w-75'>" . wp_kses_post(wptexturize($data['value'])) . '</td></tr>' . PHP_EOL;
 		}
 
 		echo '</table>';
@@ -208,7 +208,7 @@ 
 	 */
 	public function get_country_locale() {
 
-		if ( empty( $this->locale ) ) {
+		if (empty($this->locale)) {
 
 			// Locale information to be used - only those that are not 'Sort Code'.
 			$this->locale = apply_filters(
@@ -216,42 +216,42 @@ 
 				array(
 					'AU' => array(
 						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
+							'label' => __('BSB', 'invoicing'),
 						),
 					),
 					'CA' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
+							'label' => __('Bank transit number', 'invoicing'),
 						),
 					),
 					'IN' => array(
 						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
+							'label' => __('IFSC', 'invoicing'),
 						),
 					),
 					'IT' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
+							'label' => __('Branch sort', 'invoicing'),
 						),
 					),
 					'NZ' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'SE' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'US' => array(
 						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
+							'label' => __('Routing number', 'invoicing'),
 						),
 					),
 					'ZA' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
+							'label' => __('Branch code', 'invoicing'),
 						),
 					),
 				)
@@ -268,51 +268,51 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
-        $admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['bank_transfer_desc']['std'] = __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing');
+		$admin_settings['bank_transfer_active']['desc'] = __('Enable bank transfer', 'invoicing');
 
-		$locale  = $this->get_country_locale();
+		$locale = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
 		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
 		$admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
-            'name' => __( 'Account Name', 'invoicing' ),
+            'name' => __('Account Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
-            'name' => __( 'Account Number', 'invoicing' ),
+            'name' => __('Account Number', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
-            'name' => __( 'Bank Name', 'invoicing' ),
+            'name' => __('Bank Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
-            'name' => __( 'IFSC Code', 'invoicing' ),
+            'name' => __('IFSC Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
-            'name' => __( 'IBAN', 'invoicing' ),
+            'name' => __('IBAN', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
-            'name' => __( 'BIC/Swift Code', 'invoicing' ),
+            'name' => __('BIC/Swift Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_sort_code'] = array(
@@ -323,10 +323,10 @@ 
 
 		$admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
-            'name' => __( 'Instructions', 'invoicing' ),
-            'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
+            'name' => __('Instructions', 'invoicing'),
+            'desc' => __('Instructions that will be added to the thank you page and emails.', 'invoicing'),
             'type' => 'textarea',
-            'std'  => __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' ),
+            'std'  => __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing'),
             'cols' => 50,
             'rows' => 5,
         );
@@ -341,10 +341,10 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();
@@ -357,25 +357,25 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 		// Ensure its our subscription && it's active.
-		if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
-			add_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
+		if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
+			add_filter('getpaid_invoice_notifications_is_payment_form_invoice', array($this, 'force_is_payment_form_invoice'), 10, 2);
 
 			$invoice = $subscription->create_payment();
 
-			if ( ! empty( $invoice ) ) {
+			if (!empty($invoice)) {
 				$is_logged_in = is_user_logged_in();
 
 				// Cron run.
-				if ( ! $is_logged_in ) {
-					$note = wp_sprintf( __( 'Renewal %1$s created with the status "%2$s".', 'invoicing' ), $invoice->get_invoice_quote_type(), wpinv_status_nicename( $invoice->get_status(), $invoice ) );
+				if (!$is_logged_in) {
+					$note = wp_sprintf(__('Renewal %1$s created with the status "%2$s".', 'invoicing'), $invoice->get_invoice_quote_type(), wpinv_status_nicename($invoice->get_status(), $invoice));
 
-					$invoice->add_note( $note, false, $is_logged_in, ! $is_logged_in );
+					$invoice->add_note($note, false, $is_logged_in, !$is_logged_in);
 				}
 			}
 
-			remove_filter( 'getpaid_invoice_notifications_is_payment_form_invoice', array( $this, 'force_is_payment_form_invoice' ), 10, 2 );
+			remove_filter('getpaid_invoice_notifications_is_payment_form_invoice', array($this, 'force_is_payment_form_invoice'), 10, 2);
 		}
 	}
 
@@ -385,42 +385,42 @@ 
 	 *
      * @param WPInv_Invoice $invoice
 	 */
-	public function invoice_paid( $invoice ) {
+	public function invoice_paid($invoice) {
 
 		// Abort if not paid by bank transfer.
-		if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
+		if ($this->id !== $invoice->get_gateway() || !$invoice->is_recurring()) {
 			return;
 		}
 
 		// Is it a parent payment?
-		if ( 0 == $invoice->get_parent_id() ) {
+		if (0 == $invoice->get_parent_id()) {
 
 			// (Maybe) activate subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+			$subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-			if ( ! empty( $subscriptions ) ) {
-				$subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+			if (!empty($subscriptions)) {
+				$subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-				foreach ( $subscriptions as $subscription ) {
-					if ( $subscription->exists() ) {
-						$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-						$expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+				foreach ($subscriptions as $subscription) {
+					if ($subscription->exists()) {
+						$duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+						$expiry   = gmdate('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-						$subscription->set_next_renewal_date( $expiry );
-						$subscription->set_date_created( current_time( 'mysql' ) );
-						$subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
+						$subscription->set_next_renewal_date($expiry);
+						$subscription->set_date_created(current_time('mysql'));
+						$subscription->set_profile_id('bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id());
 						$subscription->activate();
 					}
 				}
 			}
 		} else {
 
-			$subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
+			$subscription = getpaid_get_subscription($invoice->get_subscription_id());
 
 			// Renew the subscription.
-			if ( $subscription && $subscription->exists() ) {
-				$subscription->add_payment( array(), $invoice );
-				$subscription->renew( strtotime( $invoice->get_date_created() ) );
+			if ($subscription && $subscription->exists()) {
+				$subscription->add_payment(array(), $invoice);
+				$subscription->renew(strtotime($invoice->get_date_created()));
 			}
 		}
 
@@ -435,8 +435,8 @@ 
 	 * @param int  $invoice Invoice ID.
 	 * @return bool True when invoice created via payment form else false.
 	 */
-	public function force_is_payment_form_invoice( $is_payment_form_invoice, $invoice ) {
-		if ( $is_payment_form_invoice ) {
+	public function force_is_payment_form_invoice($is_payment_form_invoice, $invoice) {
+		if ($is_payment_form_invoice) {
 			$is_payment_form_invoice = false;
 		}
 

includes/class-getpaid-post-types.php

Indentation +295 added lines, -295 removed lines

@@ -15,321 +15,321 @@
 class GetPaid_Post_Types {
 
     /**
-	 * Hook in methods.
-	 */
-	public function __construct() {
-		add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
-		add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
-		add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
-		add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
-	}
+     * Hook in methods.
+     */
+    public function __construct() {
+        add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
+        add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
+        add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
+        add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
+    }
 
-	/**
-	 * Register core post types.
-	 */
-	public static function register_post_types() {
+    /**
+     * Register core post types.
+     */
+    public static function register_post_types() {
 
-		if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
-			return;
-		}
+        if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
+            return;
+        }
 
-		$capabilities = wpinv_current_user_can_manage_invoicing();
+        $capabilities = wpinv_current_user_can_manage_invoicing();
 
-		// Fires before registering post types.
-		do_action( 'getpaid_register_post_types' );
+        // Fires before registering post types.
+        do_action( 'getpaid_register_post_types' );
 
-		// Register item post type.
-		register_post_type(
-			'wpi_item',
-			apply_filters(
-				'wpinv_register_post_type_invoice_item',
-				array(
-					'labels'            => array(
-						'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-						'new_item'           => __( 'New Item', 'invoicing' ),
-						'edit_item'          => __( 'Edit Item', 'invoicing' ),
-						'view_item'          => __( 'View Item', 'invoicing' ),
-						'all_items'          => __( 'Items', 'invoicing' ),
-						'search_items'       => __( 'Search items', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
-						'not_found'          => __( 'No items found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' ),
-					),
-					'description'       => __( 'This is where you can add new invoice items.', 'invoicing' ),
-					'public'            => false,
-					'has_archive'       => false,
-					'_builtin'          => false,
-					'show_ui'           => $capabilities ? true : false,
-					'show_in_menu'      => $capabilities ? 'wpinv' : false,
-					'show_in_nav_menus' => false,
-					'supports'          => array( 'title', 'excerpt', 'thumbnail' ),
-					'rewrite'           => false,
-					'query_var'         => false,
-					'map_meta_cap'      => true,
-					'show_in_admin_bar' => $capabilities ? true : false,
-					'can_export'        => $capabilities ? true : false
-				)
-			)
-		);
+        // Register item post type.
+        register_post_type(
+            'wpi_item',
+            apply_filters(
+                'wpinv_register_post_type_invoice_item',
+                array(
+                    'labels'            => array(
+                        'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
+                        'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
+                        'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
+                        'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
+                        'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
+                        'add_new_item'       => __( 'Add New Item', 'invoicing' ),
+                        'new_item'           => __( 'New Item', 'invoicing' ),
+                        'edit_item'          => __( 'Edit Item', 'invoicing' ),
+                        'view_item'          => __( 'View Item', 'invoicing' ),
+                        'all_items'          => __( 'Items', 'invoicing' ),
+                        'search_items'       => __( 'Search items', 'invoicing' ),
+                        'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
+                        'not_found'          => __( 'No items found.', 'invoicing' ),
+                        'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' ),
+                    ),
+                    'description'       => __( 'This is where you can add new invoice items.', 'invoicing' ),
+                    'public'            => false,
+                    'has_archive'       => false,
+                    '_builtin'          => false,
+                    'show_ui'           => $capabilities ? true : false,
+                    'show_in_menu'      => $capabilities ? 'wpinv' : false,
+                    'show_in_nav_menus' => false,
+                    'supports'          => array( 'title', 'excerpt', 'thumbnail' ),
+                    'rewrite'           => false,
+                    'query_var'         => false,
+                    'map_meta_cap'      => true,
+                    'show_in_admin_bar' => $capabilities ? true : false,
+                    'can_export'        => $capabilities ? true : false
+                )
+            )
+        );
 
-		// Register payment form post type.
-		register_post_type(
-			'wpi_payment_form',
-			apply_filters(
-				'wpinv_register_post_type_payment_form',
-				array(
-					'labels'            => array(
-						'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
-						'new_item'           => __( 'New Payment Form', 'invoicing' ),
-						'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
-						'view_item'          => __( 'View Payment Form', 'invoicing' ),
-						'all_items'          => __( 'Payment Forms', 'invoicing' ),
-						'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
-						'not_found'          => __( 'No payment forms found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' ),
-					),
-					'description'       => __( 'Add new payment forms.', 'invoicing' ),
-					'public'            => false,
-					'show_ui'           => $capabilities ? true : false,
-					'show_in_menu'      => $capabilities ? 'wpinv' : false,
-					'show_in_nav_menus' => false,
-					'query_var'         => false,
-					'rewrite'           => true,
-					'map_meta_cap'      => true,
-					'has_archive'       => false,
-					'hierarchical'      => false,
-					'menu_position'     => null,
-					'supports'          => array( 'title' ),
-					'menu_icon'         => 'dashicons-media-form',
-				)
-			)
-		);
+        // Register payment form post type.
+        register_post_type(
+            'wpi_payment_form',
+            apply_filters(
+                'wpinv_register_post_type_payment_form',
+                array(
+                    'labels'            => array(
+                        'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
+                        'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
+                        'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
+                        'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
+                        'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
+                        'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
+                        'new_item'           => __( 'New Payment Form', 'invoicing' ),
+                        'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
+                        'view_item'          => __( 'View Payment Form', 'invoicing' ),
+                        'all_items'          => __( 'Payment Forms', 'invoicing' ),
+                        'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
+                        'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
+                        'not_found'          => __( 'No payment forms found.', 'invoicing' ),
+                        'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' ),
+                    ),
+                    'description'       => __( 'Add new payment forms.', 'invoicing' ),
+                    'public'            => false,
+                    'show_ui'           => $capabilities ? true : false,
+                    'show_in_menu'      => $capabilities ? 'wpinv' : false,
+                    'show_in_nav_menus' => false,
+                    'query_var'         => false,
+                    'rewrite'           => true,
+                    'map_meta_cap'      => true,
+                    'has_archive'       => false,
+                    'hierarchical'      => false,
+                    'menu_position'     => null,
+                    'supports'          => array( 'title' ),
+                    'menu_icon'         => 'dashicons-media-form',
+                )
+            )
+        );
 
-		// Register invoice post type.
-		register_post_type(
-			'wpi_invoice',
-			apply_filters(
-				'wpinv_register_post_type_invoice',
-				array(
-					'labels'              => array(
-						'name'                  => __( 'Invoices', 'invoicing' ),
-						'singular_name'         => __( 'Invoice', 'invoicing' ),
-						'all_items'             => __( 'Invoices', 'invoicing' ),
-						'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit invoice', 'invoicing' ),
-						'new_item'              => __( 'New invoice', 'invoicing' ),
-						'view_item'             => __( 'View invoice', 'invoicing' ),
-						'view_items'            => __( 'View Invoices', 'invoicing' ),
-						'search_items'          => __( 'Search invoices', 'invoicing' ),
-						'not_found'             => __( 'No invoices found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent invoice', 'invoicing' ),
-						'featured_image'        => __( 'Invoice image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
-						'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
-						'items_list'            => __( 'Invoices list', 'invoicing' ),
-					),
-					'description'         => __( 'This is where invoices are stored.', 'invoicing' ),
-					'public'              => true,
-					'has_archive'         => false,
-					'publicly_queryable'  => true,
-        			'exclude_from_search' => true,
-        			'show_ui'             => $capabilities ? true : false,
-					'show_in_menu'        => $capabilities ? 'wpinv' : false,
-					'show_in_nav_menus'   => false,
-					'supports'            => array( 'title', 'author', 'excerpt' ),
-					'rewrite'             => array(
-						'slug'       => 'invoice',
-						'with_front' => false,
-					),
-					'query_var'           => false,
-					'map_meta_cap'        => true,
-					'show_in_admin_bar'   => $capabilities ? true : false,
-					'can_export'          => $capabilities ? true : false,
-					'hierarchical'        => false,
-					'menu_position'       => null,
-					'menu_icon'           => 'dashicons-media-spreadsheet',
-				)
-			)
-		);
+        // Register invoice post type.
+        register_post_type(
+            'wpi_invoice',
+            apply_filters(
+                'wpinv_register_post_type_invoice',
+                array(
+                    'labels'              => array(
+                        'name'                  => __( 'Invoices', 'invoicing' ),
+                        'singular_name'         => __( 'Invoice', 'invoicing' ),
+                        'all_items'             => __( 'Invoices', 'invoicing' ),
+                        'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
+                        'add_new'               => __( 'Add New', 'invoicing' ),
+                        'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
+                        'edit'                  => __( 'Edit', 'invoicing' ),
+                        'edit_item'             => __( 'Edit invoice', 'invoicing' ),
+                        'new_item'              => __( 'New invoice', 'invoicing' ),
+                        'view_item'             => __( 'View invoice', 'invoicing' ),
+                        'view_items'            => __( 'View Invoices', 'invoicing' ),
+                        'search_items'          => __( 'Search invoices', 'invoicing' ),
+                        'not_found'             => __( 'No invoices found', 'invoicing' ),
+                        'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
+                        'parent'                => __( 'Parent invoice', 'invoicing' ),
+                        'featured_image'        => __( 'Invoice image', 'invoicing' ),
+                        'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
+                        'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
+                        'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
+                        'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
+                        'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
+                        'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
+                        'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
+                        'items_list'            => __( 'Invoices list', 'invoicing' ),
+                    ),
+                    'description'         => __( 'This is where invoices are stored.', 'invoicing' ),
+                    'public'              => true,
+                    'has_archive'         => false,
+                    'publicly_queryable'  => true,
+                    'exclude_from_search' => true,
+                    'show_ui'             => $capabilities ? true : false,
+                    'show_in_menu'        => $capabilities ? 'wpinv' : false,
+                    'show_in_nav_menus'   => false,
+                    'supports'            => array( 'title', 'author', 'excerpt' ),
+                    'rewrite'             => array(
+                        'slug'       => 'invoice',
+                        'with_front' => false,
+                    ),
+                    'query_var'           => false,
+                    'map_meta_cap'        => true,
+                    'show_in_admin_bar'   => $capabilities ? true : false,
+                    'can_export'          => $capabilities ? true : false,
+                    'hierarchical'        => false,
+                    'menu_position'       => null,
+                    'menu_icon'           => 'dashicons-media-spreadsheet',
+                )
+            )
+        );
 
-		// Register discount post type.
-		register_post_type(
-			'wpi_discount',
-			apply_filters(
-				'wpinv_register_post_type_discount',
-				array(
-					'labels'              => array(
-						'name'                  => __( 'Discounts', 'invoicing' ),
-						'singular_name'         => __( 'Discount', 'invoicing' ),
-						'all_items'             => __( 'Discounts', 'invoicing' ),
-						'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new discount', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit discount', 'invoicing' ),
-						'new_item'              => __( 'New discount', 'invoicing' ),
-						'view_item'             => __( 'View discount', 'invoicing' ),
-						'view_items'            => __( 'View Discounts', 'invoicing' ),
-						'search_items'          => __( 'Search discounts', 'invoicing' ),
-						'not_found'             => __( 'No discounts found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent discount', 'invoicing' ),
-						'featured_image'        => __( 'Discount image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
-						'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
-						'items_list'            => __( 'Discounts list', 'invoicing' ),
-					),
-					'description'         => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
-					'public'              => false,
-					'can_export'          => $capabilities ? true : false,
-					'_builtin'            => false,
-					'publicly_queryable'  => false,
-					'exclude_from_search' => true,
-					'show_ui'             => $capabilities ? true : false,
-					'show_in_menu'        => $capabilities ? 'wpinv' : false,
-					'query_var'           => false,
-					'rewrite'             => false,
-					'map_meta_cap'        => true,
-					'has_archive'         => false,
-					'hierarchical'        => false,
-					'supports'            => array( 'title', 'excerpt' ),
-					'show_in_nav_menus'   => false,
-					'show_in_admin_bar'   => $capabilities ? true : false,
-					'menu_position'       => null,
-				)
-			)
-		);
+        // Register discount post type.
+        register_post_type(
+            'wpi_discount',
+            apply_filters(
+                'wpinv_register_post_type_discount',
+                array(
+                    'labels'              => array(
+                        'name'                  => __( 'Discounts', 'invoicing' ),
+                        'singular_name'         => __( 'Discount', 'invoicing' ),
+                        'all_items'             => __( 'Discounts', 'invoicing' ),
+                        'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
+                        'add_new'               => __( 'Add New', 'invoicing' ),
+                        'add_new_item'          => __( 'Add new discount', 'invoicing' ),
+                        'edit'                  => __( 'Edit', 'invoicing' ),
+                        'edit_item'             => __( 'Edit discount', 'invoicing' ),
+                        'new_item'              => __( 'New discount', 'invoicing' ),
+                        'view_item'             => __( 'View discount', 'invoicing' ),
+                        'view_items'            => __( 'View Discounts', 'invoicing' ),
+                        'search_items'          => __( 'Search discounts', 'invoicing' ),
+                        'not_found'             => __( 'No discounts found', 'invoicing' ),
+                        'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
+                        'parent'                => __( 'Parent discount', 'invoicing' ),
+                        'featured_image'        => __( 'Discount image', 'invoicing' ),
+                        'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
+                        'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
+                        'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
+                        'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
+                        'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
+                        'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
+                        'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
+                        'items_list'            => __( 'Discounts list', 'invoicing' ),
+                    ),
+                    'description'         => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+                    'public'              => false,
+                    'can_export'          => $capabilities ? true : false,
+                    '_builtin'            => false,
+                    'publicly_queryable'  => false,
+                    'exclude_from_search' => true,
+                    'show_ui'             => $capabilities ? true : false,
+                    'show_in_menu'        => $capabilities ? 'wpinv' : false,
+                    'query_var'           => false,
+                    'rewrite'             => false,
+                    'map_meta_cap'        => true,
+                    'has_archive'         => false,
+                    'hierarchical'        => false,
+                    'supports'            => array( 'title', 'excerpt' ),
+                    'show_in_nav_menus'   => false,
+                    'show_in_admin_bar'   => $capabilities ? true : false,
+                    'menu_position'       => null,
+                )
+            )
+        );
 
-		do_action( 'getpaid_after_register_post_types' );
-	}
+        do_action( 'getpaid_after_register_post_types' );
+    }
 
-	/**
-	 * Register our custom post statuses.
-	 */
-	public static function register_post_status() {
+    /**
+     * Register our custom post statuses.
+     */
+    public static function register_post_status() {
 
-		$invoice_statuses = apply_filters(
-			'getpaid_register_invoice_post_statuses',
-			array(
+        $invoice_statuses = apply_filters(
+            'getpaid_register_invoice_post_statuses',
+            array(
 
-				'wpi-pending'    => array(
-					'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' ),
-				),
+                'wpi-pending'    => array(
+                    'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' ),
+                ),
 
-				'wpi-processing' => array(
-					'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' ),
-				),
+                'wpi-processing' => array(
+                    'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' ),
+                ),
 
-				'wpi-onhold'     => array(
-					'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' ),
-				),
+                'wpi-onhold'     => array(
+                    'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' ),
+                ),
 
-				'wpi-cancelled'  => array(
-					'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' ),
-				),
+                'wpi-cancelled'  => array(
+                    'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' ),
+                ),
 
-				'wpi-refunded'   => array(
-					'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' ),
-				),
+                'wpi-refunded'   => array(
+                    'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' ),
+                ),
 
-				'wpi-failed'     => array(
-					'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' ),
-				),
+                'wpi-failed'     => array(
+                    'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' ),
+                ),
 
-				'wpi-renewal'    => array(
-					'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
-        			'public'                    => true,
-        			'exclude_from_search'       => true,
-        			'show_in_admin_all_list'    => true,
-					'show_in_admin_status_list' => true,
-					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' ),
-				),
-			)
-		);
+                'wpi-renewal'    => array(
+                    'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+                    'public'                    => true,
+                    'exclude_from_search'       => true,
+                    'show_in_admin_all_list'    => true,
+                    'show_in_admin_status_list' => true,
+                    /* translators: %s: number of invoices */
+                    'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' ),
+                ),
+            )
+        );
 
-		foreach ( $invoice_statuses as $invoice_statuse => $args ) {
-			register_post_status( $invoice_statuse, $args );
-		}
-	}
+        foreach ( $invoice_statuses as $invoice_statuse => $args ) {
+            register_post_status( $invoice_statuse, $args );
+        }
+    }
 
-	/**
-	 * Flush rewrite rules.
-	 */
-	public static function flush_rewrite_rules() {
-		flush_rewrite_rules();
-	}
+    /**
+     * Flush rewrite rules.
+     */
+    public static function flush_rewrite_rules() {
+        flush_rewrite_rules();
+    }
 
-	/**
-	 * Flush rules to prevent 404.
-	 *
-	 */
-	public static function maybe_flush_rewrite_rules() {
-		if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
-			update_option( 'getpaid_flushed_rewrite_rules', '1' );
-			self::flush_rewrite_rules();
-		}
-	}
+    /**
+     * Flush rules to prevent 404.
+     *
+     */
+    public static function maybe_flush_rewrite_rules() {
+        if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
+            update_option( 'getpaid_flushed_rewrite_rules', '1' );
+            self::flush_rewrite_rules();
+        }
+    }
 
 }

Spacing +110 added lines, -110 removed lines

@@ -6,7 +6,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Post types Class
@@ -18,10 +18,10 @@ 
 	 * Hook in methods.
 	 */
 	public function __construct() {
-		add_action( 'init', array( __CLASS__, 'register_post_types' ), 1 );
-		add_action( 'init', array( __CLASS__, 'register_post_status' ), 4 );
-		add_action( 'getpaid_flush_rewrite_rules', array( __CLASS__, 'flush_rewrite_rules' ) );
-		add_action( 'getpaid_after_register_post_types', array( __CLASS__, 'maybe_flush_rewrite_rules' ) );
+		add_action('init', array(__CLASS__, 'register_post_types'), 1);
+		add_action('init', array(__CLASS__, 'register_post_status'), 4);
+		add_action('getpaid_flush_rewrite_rules', array(__CLASS__, 'flush_rewrite_rules'));
+		add_action('getpaid_after_register_post_types', array(__CLASS__, 'maybe_flush_rewrite_rules'));
 	}
 
 	/**
@@ -29,14 +29,14 @@ 
 	 */
 	public static function register_post_types() {
 
-		if ( ! is_blog_installed() || post_type_exists( 'wpi_item' ) ) {
+		if (!is_blog_installed() || post_type_exists('wpi_item')) {
 			return;
 		}
 
 		$capabilities = wpinv_current_user_can_manage_invoicing();
 
 		// Fires before registering post types.
-		do_action( 'getpaid_register_post_types' );
+		do_action('getpaid_register_post_types');
 
 		// Register item post type.
 		register_post_type(
@@ -45,29 +45,29 @@ 
 				'wpinv_register_post_type_invoice_item',
 				array(
 					'labels'            => array(
-						'name'               => _x( 'Items', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Item', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Items', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Item', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Item', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Item', 'invoicing' ),
-						'new_item'           => __( 'New Item', 'invoicing' ),
-						'edit_item'          => __( 'Edit Item', 'invoicing' ),
-						'view_item'          => __( 'View Item', 'invoicing' ),
-						'all_items'          => __( 'Items', 'invoicing' ),
-						'search_items'       => __( 'Search items', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent item:', 'invoicing' ),
-						'not_found'          => __( 'No items found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No items found in trash.', 'invoicing' ),
+						'name'               => _x('Items', 'post type general name', 'invoicing'),
+						'singular_name'      => _x('Item', 'post type singular name', 'invoicing'),
+						'menu_name'          => _x('Items', 'admin menu', 'invoicing'),
+						'name_admin_bar'     => _x('Item', 'add new on admin bar', 'invoicing'),
+						'add_new'            => _x('Add New', 'Item', 'invoicing'),
+						'add_new_item'       => __('Add New Item', 'invoicing'),
+						'new_item'           => __('New Item', 'invoicing'),
+						'edit_item'          => __('Edit Item', 'invoicing'),
+						'view_item'          => __('View Item', 'invoicing'),
+						'all_items'          => __('Items', 'invoicing'),
+						'search_items'       => __('Search items', 'invoicing'),
+						'parent_item_colon'  => __('Parent item:', 'invoicing'),
+						'not_found'          => __('No items found.', 'invoicing'),
+						'not_found_in_trash' => __('No items found in trash.', 'invoicing'),
 					),
-					'description'       => __( 'This is where you can add new invoice items.', 'invoicing' ),
+					'description'       => __('This is where you can add new invoice items.', 'invoicing'),
 					'public'            => false,
 					'has_archive'       => false,
 					'_builtin'          => false,
 					'show_ui'           => $capabilities ? true : false,
 					'show_in_menu'      => $capabilities ? 'wpinv' : false,
 					'show_in_nav_menus' => false,
-					'supports'          => array( 'title', 'excerpt', 'thumbnail' ),
+					'supports'          => array('title', 'excerpt', 'thumbnail'),
 					'rewrite'           => false,
 					'query_var'         => false,
 					'map_meta_cap'      => true,
@@ -84,22 +84,22 @@ 
 				'wpinv_register_post_type_payment_form',
 				array(
 					'labels'            => array(
-						'name'               => _x( 'Payment Forms', 'post type general name', 'invoicing' ),
-						'singular_name'      => _x( 'Payment Form', 'post type singular name', 'invoicing' ),
-						'menu_name'          => _x( 'Payment Forms', 'admin menu', 'invoicing' ),
-						'name_admin_bar'     => _x( 'Payment Form', 'add new on admin bar', 'invoicing' ),
-						'add_new'            => _x( 'Add New', 'Payment Form', 'invoicing' ),
-						'add_new_item'       => __( 'Add New Payment Form', 'invoicing' ),
-						'new_item'           => __( 'New Payment Form', 'invoicing' ),
-						'edit_item'          => __( 'Edit Payment Form', 'invoicing' ),
-						'view_item'          => __( 'View Payment Form', 'invoicing' ),
-						'all_items'          => __( 'Payment Forms', 'invoicing' ),
-						'search_items'       => __( 'Search Payment Forms', 'invoicing' ),
-						'parent_item_colon'  => __( 'Parent Payment Forms:', 'invoicing' ),
-						'not_found'          => __( 'No payment forms found.', 'invoicing' ),
-						'not_found_in_trash' => __( 'No payment forms found in trash.', 'invoicing' ),
+						'name'               => _x('Payment Forms', 'post type general name', 'invoicing'),
+						'singular_name'      => _x('Payment Form', 'post type singular name', 'invoicing'),
+						'menu_name'          => _x('Payment Forms', 'admin menu', 'invoicing'),
+						'name_admin_bar'     => _x('Payment Form', 'add new on admin bar', 'invoicing'),
+						'add_new'            => _x('Add New', 'Payment Form', 'invoicing'),
+						'add_new_item'       => __('Add New Payment Form', 'invoicing'),
+						'new_item'           => __('New Payment Form', 'invoicing'),
+						'edit_item'          => __('Edit Payment Form', 'invoicing'),
+						'view_item'          => __('View Payment Form', 'invoicing'),
+						'all_items'          => __('Payment Forms', 'invoicing'),
+						'search_items'       => __('Search Payment Forms', 'invoicing'),
+						'parent_item_colon'  => __('Parent Payment Forms:', 'invoicing'),
+						'not_found'          => __('No payment forms found.', 'invoicing'),
+						'not_found_in_trash' => __('No payment forms found in trash.', 'invoicing'),
 					),
-					'description'       => __( 'Add new payment forms.', 'invoicing' ),
+					'description'       => __('Add new payment forms.', 'invoicing'),
 					'public'            => false,
 					'show_ui'           => $capabilities ? true : false,
 					'show_in_menu'      => $capabilities ? 'wpinv' : false,
@@ -110,7 +110,7 @@ 
 					'has_archive'       => false,
 					'hierarchical'      => false,
 					'menu_position'     => null,
-					'supports'          => array( 'title' ),
+					'supports'          => array('title'),
 					'menu_icon'         => 'dashicons-media-form',
 				)
 			)
@@ -123,32 +123,32 @@ 
 				'wpinv_register_post_type_invoice',
 				array(
 					'labels'              => array(
-						'name'                  => __( 'Invoices', 'invoicing' ),
-						'singular_name'         => __( 'Invoice', 'invoicing' ),
-						'all_items'             => __( 'Invoices', 'invoicing' ),
-						'menu_name'             => _x( 'Invoices', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new invoice', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit invoice', 'invoicing' ),
-						'new_item'              => __( 'New invoice', 'invoicing' ),
-						'view_item'             => __( 'View invoice', 'invoicing' ),
-						'view_items'            => __( 'View Invoices', 'invoicing' ),
-						'search_items'          => __( 'Search invoices', 'invoicing' ),
-						'not_found'             => __( 'No invoices found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No invoices found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent invoice', 'invoicing' ),
-						'featured_image'        => __( 'Invoice image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set invoice image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove invoice image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as invoice image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into invoice', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this invoice', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter invoices', 'invoicing' ),
-						'items_list_navigation' => __( 'Invoices navigation', 'invoicing' ),
-						'items_list'            => __( 'Invoices list', 'invoicing' ),
+						'name'                  => __('Invoices', 'invoicing'),
+						'singular_name'         => __('Invoice', 'invoicing'),
+						'all_items'             => __('Invoices', 'invoicing'),
+						'menu_name'             => _x('Invoices', 'Admin menu name', 'invoicing'),
+						'add_new'               => __('Add New', 'invoicing'),
+						'add_new_item'          => __('Add new invoice', 'invoicing'),
+						'edit'                  => __('Edit', 'invoicing'),
+						'edit_item'             => __('Edit invoice', 'invoicing'),
+						'new_item'              => __('New invoice', 'invoicing'),
+						'view_item'             => __('View invoice', 'invoicing'),
+						'view_items'            => __('View Invoices', 'invoicing'),
+						'search_items'          => __('Search invoices', 'invoicing'),
+						'not_found'             => __('No invoices found', 'invoicing'),
+						'not_found_in_trash'    => __('No invoices found in trash', 'invoicing'),
+						'parent'                => __('Parent invoice', 'invoicing'),
+						'featured_image'        => __('Invoice image', 'invoicing'),
+						'set_featured_image'    => __('Set invoice image', 'invoicing'),
+						'remove_featured_image' => __('Remove invoice image', 'invoicing'),
+						'use_featured_image'    => __('Use as invoice image', 'invoicing'),
+						'insert_into_item'      => __('Insert into invoice', 'invoicing'),
+						'uploaded_to_this_item' => __('Uploaded to this invoice', 'invoicing'),
+						'filter_items_list'     => __('Filter invoices', 'invoicing'),
+						'items_list_navigation' => __('Invoices navigation', 'invoicing'),
+						'items_list'            => __('Invoices list', 'invoicing'),
 					),
-					'description'         => __( 'This is where invoices are stored.', 'invoicing' ),
+					'description'         => __('This is where invoices are stored.', 'invoicing'),
 					'public'              => true,
 					'has_archive'         => false,
 					'publicly_queryable'  => true,
@@ -156,7 +156,7 @@ 
         			'show_ui'             => $capabilities ? true : false,
 					'show_in_menu'        => $capabilities ? 'wpinv' : false,
 					'show_in_nav_menus'   => false,
-					'supports'            => array( 'title', 'author', 'excerpt' ),
+					'supports'            => array('title', 'author', 'excerpt'),
 					'rewrite'             => array(
 						'slug'       => 'invoice',
 						'with_front' => false,
@@ -179,32 +179,32 @@ 
 				'wpinv_register_post_type_discount',
 				array(
 					'labels'              => array(
-						'name'                  => __( 'Discounts', 'invoicing' ),
-						'singular_name'         => __( 'Discount', 'invoicing' ),
-						'all_items'             => __( 'Discounts', 'invoicing' ),
-						'menu_name'             => _x( 'Discounts', 'Admin menu name', 'invoicing' ),
-						'add_new'               => __( 'Add New', 'invoicing' ),
-						'add_new_item'          => __( 'Add new discount', 'invoicing' ),
-						'edit'                  => __( 'Edit', 'invoicing' ),
-						'edit_item'             => __( 'Edit discount', 'invoicing' ),
-						'new_item'              => __( 'New discount', 'invoicing' ),
-						'view_item'             => __( 'View discount', 'invoicing' ),
-						'view_items'            => __( 'View Discounts', 'invoicing' ),
-						'search_items'          => __( 'Search discounts', 'invoicing' ),
-						'not_found'             => __( 'No discounts found', 'invoicing' ),
-						'not_found_in_trash'    => __( 'No discounts found in trash', 'invoicing' ),
-						'parent'                => __( 'Parent discount', 'invoicing' ),
-						'featured_image'        => __( 'Discount image', 'invoicing' ),
-						'set_featured_image'    => __( 'Set discount image', 'invoicing' ),
-						'remove_featured_image' => __( 'Remove discount image', 'invoicing' ),
-						'use_featured_image'    => __( 'Use as discount image', 'invoicing' ),
-						'insert_into_item'      => __( 'Insert into discount', 'invoicing' ),
-						'uploaded_to_this_item' => __( 'Uploaded to this discount', 'invoicing' ),
-						'filter_items_list'     => __( 'Filter discounts', 'invoicing' ),
-						'items_list_navigation' => __( 'Discount navigation', 'invoicing' ),
-						'items_list'            => __( 'Discounts list', 'invoicing' ),
+						'name'                  => __('Discounts', 'invoicing'),
+						'singular_name'         => __('Discount', 'invoicing'),
+						'all_items'             => __('Discounts', 'invoicing'),
+						'menu_name'             => _x('Discounts', 'Admin menu name', 'invoicing'),
+						'add_new'               => __('Add New', 'invoicing'),
+						'add_new_item'          => __('Add new discount', 'invoicing'),
+						'edit'                  => __('Edit', 'invoicing'),
+						'edit_item'             => __('Edit discount', 'invoicing'),
+						'new_item'              => __('New discount', 'invoicing'),
+						'view_item'             => __('View discount', 'invoicing'),
+						'view_items'            => __('View Discounts', 'invoicing'),
+						'search_items'          => __('Search discounts', 'invoicing'),
+						'not_found'             => __('No discounts found', 'invoicing'),
+						'not_found_in_trash'    => __('No discounts found in trash', 'invoicing'),
+						'parent'                => __('Parent discount', 'invoicing'),
+						'featured_image'        => __('Discount image', 'invoicing'),
+						'set_featured_image'    => __('Set discount image', 'invoicing'),
+						'remove_featured_image' => __('Remove discount image', 'invoicing'),
+						'use_featured_image'    => __('Use as discount image', 'invoicing'),
+						'insert_into_item'      => __('Insert into discount', 'invoicing'),
+						'uploaded_to_this_item' => __('Uploaded to this discount', 'invoicing'),
+						'filter_items_list'     => __('Filter discounts', 'invoicing'),
+						'items_list_navigation' => __('Discount navigation', 'invoicing'),
+						'items_list'            => __('Discounts list', 'invoicing'),
 					),
-					'description'         => __( 'This is where you can add new discounts that users can use in invoices.', 'invoicing' ),
+					'description'         => __('This is where you can add new discounts that users can use in invoices.', 'invoicing'),
 					'public'              => false,
 					'can_export'          => $capabilities ? true : false,
 					'_builtin'            => false,
@@ -217,7 +217,7 @@ 
 					'map_meta_cap'        => true,
 					'has_archive'         => false,
 					'hierarchical'        => false,
-					'supports'            => array( 'title', 'excerpt' ),
+					'supports'            => array('title', 'excerpt'),
 					'show_in_nav_menus'   => false,
 					'show_in_admin_bar'   => $capabilities ? true : false,
 					'menu_position'       => null,
@@ -225,7 +225,7 @@ 
 			)
 		);
 
-		do_action( 'getpaid_after_register_post_types' );
+		do_action('getpaid_after_register_post_types');
 	}
 
 	/**
@@ -238,79 +238,79 @@ 
 			array(
 
 				'wpi-pending'    => array(
-					'label'                     => _x( 'Pending Payment', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Pending Payment', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing' ),
+        			'label_count'               => _n_noop('Pending Payment <span class="count">(%s)</span>', 'Pending Payment <span class="count">(%s)</span>', 'invoicing'),
 				),
 
 				'wpi-processing' => array(
-					'label'                     => _x( 'Processing', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Processing', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing' ),
+        			'label_count'               => _n_noop('Processing <span class="count">(%s)</span>', 'Processing <span class="count">(%s)</span>', 'invoicing'),
 				),
 
 				'wpi-onhold'     => array(
-					'label'                     => _x( 'On Hold', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('On Hold', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing' ),
+        			'label_count'               => _n_noop('On Hold <span class="count">(%s)</span>', 'On Hold <span class="count">(%s)</span>', 'invoicing'),
 				),
 
 				'wpi-cancelled'  => array(
-					'label'                     => _x( 'Cancelled', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Cancelled', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing' ),
+        			'label_count'               => _n_noop('Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'invoicing'),
 				),
 
 				'wpi-refunded'   => array(
-					'label'                     => _x( 'Refunded', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Refunded', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing' ),
+        			'label_count'               => _n_noop('Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'invoicing'),
 				),
 
 				'wpi-failed'     => array(
-					'label'                     => _x( 'Failed', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Failed', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing' ),
+        			'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'invoicing'),
 				),
 
 				'wpi-renewal'    => array(
-					'label'                     => _x( 'Renewal', 'Invoice status', 'invoicing' ),
+					'label'                     => _x('Renewal', 'Invoice status', 'invoicing'),
         			'public'                    => true,
         			'exclude_from_search'       => true,
         			'show_in_admin_all_list'    => true,
 					'show_in_admin_status_list' => true,
 					/* translators: %s: number of invoices */
-        			'label_count'               => _n_noop( 'Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing' ),
+        			'label_count'               => _n_noop('Renewal <span class="count">(%s)</span>', 'Renewal <span class="count">(%s)</span>', 'invoicing'),
 				),
 			)
 		);
 
-		foreach ( $invoice_statuses as $invoice_statuse => $args ) {
-			register_post_status( $invoice_statuse, $args );
+		foreach ($invoice_statuses as $invoice_statuse => $args) {
+			register_post_status($invoice_statuse, $args);
 		}
 	}
 
@@ -326,8 +326,8 @@ 
 	 *
 	 */
 	public static function maybe_flush_rewrite_rules() {
-		if ( ! get_option( 'getpaid_flushed_rewrite_rules' ) ) {
-			update_option( 'getpaid_flushed_rewrite_rules', '1' );
+		if (!get_option('getpaid_flushed_rewrite_rules')) {
+			update_option('getpaid_flushed_rewrite_rules', '1');
 			self::flush_rewrite_rules();
 		}
 	}