AyeCode / invoicing

templates/frontend-footer.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -16,7 +16,7 @@ 
 		<div class="modal-dialog modal-dialog-centered modal-lg" role="checkout" style="max-width: 650px;">
 			<div class="modal-content">
 				<div class="modal-body">
-					<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="<?php esc_attr__( 'Close', 'invoicing' ); ?>">
+					<button type="button" class="close p-2 getpaid-payment-modal-close d-sm-none" data-dismiss="modal" aria-label="<?php esc_attr__('Close', 'invoicing'); ?>">
 						<i class="fa fa-times" aria-hidden="true"></i>
 					</button>
 					<div class="modal-body-wrapper"></div>

templates/invoice/company-address.php

Spacing +15 added lines, -15 removed lines

@@ -7,17 +7,17 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the company name.
-$company_name = wpinv_get_option( 'vat_company_name' );
+$company_name = wpinv_get_option('vat_company_name');
 
-if ( empty( $company_name ) ) {
+if (empty($company_name)) {
     $company_name = wpinv_get_business_name();
 }
 
 // Prepare the VAT number.
-$vat_number = wpinv_get_option( 'vat_number' );
+$vat_number = wpinv_get_option('vat_number');
 
 ?>
     <div class="getpaid-company-address form-group">
@@ -25,36 +25,36 @@ 
         <div class="row">
 
             <div class="invoice-company-address-label col-2">
-                <strong><?php _e( 'From:', 'invoicing' ) ?></strong>
+                <strong><?php _e('From:', 'invoicing') ?></strong>
             </div>
 
             <div class="invoice-company-address-value col-10">
 
-                <?php do_action( 'getpaid_company_address_top' ); ?>
+                <?php do_action('getpaid_company_address_top'); ?>
 
                 <div class="name">
-                    <a target="_blank" class="text-dark" href="<?php echo esc_url( wpinv_get_business_website() ); ?>">
-                        <?php echo esc_html( $company_name ); ?>
+                    <a target="_blank" class="text-dark" href="<?php echo esc_url(wpinv_get_business_website()); ?>">
+                        <?php echo esc_html($company_name); ?>
                     </a>
                 </div>
 
-                <?php if ( $address = wpinv_get_business_address() ) { ?>
-                    <?php echo $address;?>
+                <?php if ($address = wpinv_get_business_address()) { ?>
+                    <?php echo $address; ?>
                 <?php } ?>
 
-                <?php if ( $email_from = wpinv_mail_get_from_address() ) { ?>
+                <?php if ($email_from = wpinv_mail_get_from_address()) { ?>
                     <div class="email_from">
-                        <?php echo wp_sprintf( __( 'Email: %s', 'invoicing' ), $email_from );?>
+                        <?php echo wp_sprintf(__('Email: %s', 'invoicing'), $email_from); ?>
                     </div>
                 <?php } ?>
 
-                <?php if ( ! empty( $vat_number ) ) { ?>
+                <?php if (!empty($vat_number)) { ?>
                     <div class="email_from">
-                        <?php echo wp_sprintf( __( 'VAT Number: %s', 'invoicing' ), sanitize_text_field( $vat_number ) );?>
+                        <?php echo wp_sprintf(__('VAT Number: %s', 'invoicing'), sanitize_text_field($vat_number)); ?>
                     </div>
                 <?php } ?>
 
-                <?php do_action( 'getpaid_company_address_bottom' ); ?>
+                <?php do_action('getpaid_company_address_bottom'); ?>
 
             </div>
 

templates/invoice/billing-address.php

Spacing +13 added lines, -13 removed lines

@@ -7,10 +7,10 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$invoice     = new WPInv_Invoice( $invoice );
-$address_row = wpinv_get_invoice_address_markup( $invoice->get_user_info() );
+$invoice     = new WPInv_Invoice($invoice);
+$address_row = wpinv_get_invoice_address_markup($invoice->get_user_info());
 $phone       = $invoice->get_phone();
 $email       = $invoice->get_email();
 $vat_number  = $invoice->get_vat_number();
@@ -21,41 +21,41 @@ 
 
 
             <div class="invoice-billing-address-label col-2">
-                <strong><?php _e( 'To:', 'invoicing' ) ?></strong>
+                <strong><?php _e('To:', 'invoicing') ?></strong>
             </div>
 
 
             <div class="invoice-billing-address-value col-10">
 
-                <?php do_action( 'getpaid_billing_address_top' ); ?>
+                <?php do_action('getpaid_billing_address_top'); ?>
 
-                <?php if ( ! empty( $address_row ) ) : ?>
+                <?php if (!empty($address_row)) : ?>
                     <div class="billing-address">
                         <?php echo $address_row; ?>
                     </div>
                 <?php endif; ?>
 
 
-                <?php if ( ! empty( $phone ) ) : ?>
+                <?php if (!empty($phone)) : ?>
                     <div class="billing-phone">
-                        <?php echo wp_sprintf( __( 'Phone: %s', 'invoicing' ), esc_html( $phone ) ); ?>
+                        <?php echo wp_sprintf(__('Phone: %s', 'invoicing'), esc_html($phone)); ?>
                     </div>
                 <?php endif; ?>
 
 
-                <?php if ( ! empty( $email ) ) : ?>
+                <?php if (!empty($email)) : ?>
                     <div class="billing-email">
-                        <?php echo wp_sprintf( __( 'Email: %s', 'invoicing' ), sanitize_email( $email ) ); ?>
+                        <?php echo wp_sprintf(__('Email: %s', 'invoicing'), sanitize_email($email)); ?>
                     </div>
                 <?php endif; ?>
 
-                <?php if ( ! empty( $vat_number ) ) : ?>
+                <?php if (!empty($vat_number)) : ?>
                     <div class="vat-number">
-                        <?php echo wp_sprintf( __( 'Vat Number: %s', 'invoicing' ), sanitize_text_field( $vat_number ) ); ?>
+                        <?php echo wp_sprintf(__('Vat Number: %s', 'invoicing'), sanitize_text_field($vat_number)); ?>
                     </div>
                 <?php endif; ?>
 
-                <?php do_action( 'getpaid_billing_address_bottom' ); ?>
+                <?php do_action('getpaid_billing_address_bottom'); ?>
 
             </div>
 

templates/payment-forms/cart-item.php

Indentation +57 added lines, -57 removed lines

@@ -24,64 +24,64 @@ 
 
 				<?php
 
-					// Fires before printing a line item column.
-					do_action( "getpaid_form_cart_item_before_$key", $item, $form );
+                    // Fires before printing a line item column.
+                    do_action( "getpaid_form_cart_item_before_$key", $item, $form );
 
-					// Item name.
-					if ( 'name' == $key ) {
+                    // Item name.
+                    if ( 'name' == $key ) {
 
-						// Display the name.
-						echo '<div class="mb-1">' . sanitize_text_field( $item->get_name() ) . '</div>';
+                        // Display the name.
+                        echo '<div class="mb-1">' . sanitize_text_field( $item->get_name() ) . '</div>';
 
-						// And an optional description.
+                        // And an optional description.
                         $description = $item->get_description();
 
                         if ( ! empty( $description ) ) {
                             $description = wp_kses_post( $description );
                             echo "<small class='form-text text-muted pr-2 m-0'>$description</small>";
-						}
+                        }
 
-						// Price help text.
+                        // Price help text.
                         $description = getpaid_item_recurring_price_help_text( $item, $currency );
                         if ( $description ) {
                             echo "<small class='getpaid-form-item-price-desc form-text text-muted pr-2 m-0'>$description</small>";
-						}
+                        }
 
-					}
+                    }
 
-					// Item price.
-					if ( 'price' == $key ) {
+                    // Item price.
+                    if ( 'price' == $key ) {
 
-						// Set the currency position.
-						$position = wpinv_currency_position();
+                        // Set the currency position.
+                        $position = wpinv_currency_position();
 
-						if ( $position == 'left_space' ) {
-							$position = 'left';
-						}
+                        if ( $position == 'left_space' ) {
+                            $position = 'left';
+                        }
 
-						if ( $position == 'right_space' ) {
-							$position = 'right';
-						}
+                        if ( $position == 'right_space' ) {
+                            $position = 'right';
+                        }
 
-						if ( $item->user_can_set_their_price() ) {
-							$price            = max( (float) $item->get_price(), (float) $item->get_minimum_price() );
-							$minimum          = (float) $item->get_minimum_price();
-							$validate_minimum = '';
-							$class            = '';
-							$data_minimum     = '';
+                        if ( $item->user_can_set_their_price() ) {
+                            $price            = max( (float) $item->get_price(), (float) $item->get_minimum_price() );
+                            $minimum          = (float) $item->get_minimum_price();
+                            $validate_minimum = '';
+                            $class            = '';
+                            $data_minimum     = '';
 
-							if ( $minimum > 0 ) {
-								$validate_minimum = sprintf(
-									esc_attr__( 'The minimum allowed amount is %s', 'invoicing' ),
-									sanitize_text_field( wpinv_price( $minimum, $currency ) )
-								);
+                            if ( $minimum > 0 ) {
+                                $validate_minimum = sprintf(
+                                    esc_attr__( 'The minimum allowed amount is %s', 'invoicing' ),
+                                    sanitize_text_field( wpinv_price( $minimum, $currency ) )
+                                );
 
-								$class = 'getpaid-validate-minimum-amount';
+                                $class = 'getpaid-validate-minimum-amount';
 
-								$data_minimum     = "data-minimum-amount='$minimum'";
-							}
+                                $data_minimum     = "data-minimum-amount='$minimum'";
+                            }
 
-							?>
+                            ?>
 								<div class="input-group input-group-sm">
 									<?php if( 'left' == $position ) : ?>
 										<div class="input-group-prepend">
@@ -105,37 +105,37 @@ 
 								</div>
 
 							<?php
-						} else {
-							echo wpinv_price( $item->get_price(), $currency );
-							?>
+                        } else {
+                            echo wpinv_price( $item->get_price(), $currency );
+                            ?>
 								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][price]' type='hidden' class='getpaid-item-price-input' value='<?php echo esc_attr( $item->get_price() ); ?>'>
 							<?php
-						}
-					}
+                        }
+                    }
 
-					// Item quantity.
-					if ( 'quantity' == $key ) {
+                    // Item quantity.
+                    if ( 'quantity' == $key ) {
 
-						if ( $item->allows_quantities() ) {
-							?>
+                        if ( $item->allows_quantities() ) {
+                            ?>
 								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][quantity]' type='text' style='width: 64px; line-height: 1; min-height: 35px;' class='getpaid-item-quantity-input p-1 align-middle font-weight-normal shadow-none m-0 rounded-0 text-center border' value='<?php echo (float) $item->get_quantity(); ?>' min='1' required>
 							<?php
-						} else {
-							echo (float) $item->get_quantity();
-							echo '&nbsp;&nbsp;&nbsp;';
-							?>
+                        } else {
+                            echo (float) $item->get_quantity();
+                            echo '&nbsp;&nbsp;&nbsp;';
+                            ?>
 								<input type='hidden' name='getpaid-items[<?php echo (int) $item->get_id(); ?>][quantity]' class='getpaid-item-quantity-input' value='<?php echo (float) $item->get_quantity(); ?>'>
 							<?php
-						}
-					}
+                        }
+                    }
 
-					// Item sub total.
-					if ( 'subtotal' == $key ) {
-						echo wpinv_price( $item->get_sub_total(), $currency );
-					}
+                    // Item sub total.
+                    if ( 'subtotal' == $key ) {
+                        echo wpinv_price( $item->get_sub_total(), $currency );
+                    }
 
-					do_action( "getpaid_payment_form_cart_item_$key", $item, $form );
-				?>
+                    do_action( "getpaid_payment_form_cart_item_$key", $item, $form );
+                ?>
 
 			</div>
 

Spacing +35 added lines, -35 removed lines

@@ -7,116 +7,116 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_before_payment_form_cart_item', $form, $item );
+do_action('getpaid_before_payment_form_cart_item', $form, $item);
 
 $currency = $form->get_currency();
 
 ?>
-<div class='getpaid-payment-form-items-cart-item getpaid-<?php echo $item->is_required() ? 'required'  : 'selectable'; ?> item-<?php echo $item->get_id(); ?> border-bottom py-2 px-3'>
+<div class='getpaid-payment-form-items-cart-item getpaid-<?php echo $item->is_required() ? 'required' : 'selectable'; ?> item-<?php echo $item->get_id(); ?> border-bottom py-2 px-3'>
 
 	<div class="form-row needs-validation">
 
-		<?php foreach ( array_keys( $columns ) as $key ) : ?>
+		<?php foreach (array_keys($columns) as $key) : ?>
 
-			<div class="<?php echo 'name' == $key ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> position-relative getpaid-form-cart-item-<?php echo sanitize_html_class( $key ); ?> getpaid-form-cart-item-<?php echo sanitize_html_class( $key ); ?>-<?php echo $item->get_id(); ?>">
+			<div class="<?php echo 'name' == $key ? 'col-12 col-sm-6' : 'col-12 col-sm' ?> position-relative getpaid-form-cart-item-<?php echo sanitize_html_class($key); ?> getpaid-form-cart-item-<?php echo sanitize_html_class($key); ?>-<?php echo $item->get_id(); ?>">
 
 				<?php
 
 					// Fires before printing a line item column.
-					do_action( "getpaid_form_cart_item_before_$key", $item, $form );
+					do_action("getpaid_form_cart_item_before_$key", $item, $form);
 
 					// Item name.
-					if ( 'name' == $key ) {
+					if ('name' == $key) {
 
 						// Display the name.
-						echo '<div class="mb-1">' . sanitize_text_field( $item->get_name() ) . '</div>';
+						echo '<div class="mb-1">' . sanitize_text_field($item->get_name()) . '</div>';
 
 						// And an optional description.
                         $description = $item->get_description();
 
-                        if ( ! empty( $description ) ) {
-                            $description = wp_kses_post( $description );
+                        if (!empty($description)) {
+                            $description = wp_kses_post($description);
                             echo "<small class='form-text text-muted pr-2 m-0'>$description</small>";
 						}
 
 						// Price help text.
-                        $description = getpaid_item_recurring_price_help_text( $item, $currency );
-                        if ( $description ) {
+                        $description = getpaid_item_recurring_price_help_text($item, $currency);
+                        if ($description) {
                             echo "<small class='getpaid-form-item-price-desc form-text text-muted pr-2 m-0'>$description</small>";
 						}
 
 					}
 
 					// Item price.
-					if ( 'price' == $key ) {
+					if ('price' == $key) {
 
 						// Set the currency position.
 						$position = wpinv_currency_position();
 
-						if ( $position == 'left_space' ) {
+						if ($position == 'left_space') {
 							$position = 'left';
 						}
 
-						if ( $position == 'right_space' ) {
+						if ($position == 'right_space') {
 							$position = 'right';
 						}
 
-						if ( $item->user_can_set_their_price() ) {
-							$price            = max( (float) $item->get_price(), (float) $item->get_minimum_price() );
+						if ($item->user_can_set_their_price()) {
+							$price            = max((float) $item->get_price(), (float) $item->get_minimum_price());
 							$minimum          = (float) $item->get_minimum_price();
 							$validate_minimum = '';
 							$class            = '';
 							$data_minimum     = '';
 
-							if ( $minimum > 0 ) {
+							if ($minimum > 0) {
 								$validate_minimum = sprintf(
-									esc_attr__( 'The minimum allowed amount is %s', 'invoicing' ),
-									sanitize_text_field( wpinv_price( $minimum, $currency ) )
+									esc_attr__('The minimum allowed amount is %s', 'invoicing'),
+									sanitize_text_field(wpinv_price($minimum, $currency))
 								);
 
 								$class = 'getpaid-validate-minimum-amount';
 
-								$data_minimum     = "data-minimum-amount='$minimum'";
+								$data_minimum = "data-minimum-amount='$minimum'";
 							}
 
 							?>
 								<div class="input-group input-group-sm">
-									<?php if( 'left' == $position ) : ?>
+									<?php if ('left' == $position) : ?>
 										<div class="input-group-prepend">
-											<span class="input-group-text"><?php echo wpinv_currency_symbol( $currency ); ?></span>
+											<span class="input-group-text"><?php echo wpinv_currency_symbol($currency); ?></span>
 										</div>
 									<?php endif; ?>
 
-									<input type="text" <?php echo $data_minimum; ?> name="getpaid-items[<?php echo (int) $item->get_id(); ?>][price]" value="<?php echo $price; ?>" placeholder="<?php echo esc_attr( $item->get_minimum_price() ); ?>" class="getpaid-item-price-input p-1 align-middle font-weight-normal shadow-none m-0 rounded-0 text-center border <?php echo $class; ?>" style="width: 64px; line-height: 1; min-height: 35px;">
+									<input type="text" <?php echo $data_minimum; ?> name="getpaid-items[<?php echo (int) $item->get_id(); ?>][price]" value="<?php echo $price; ?>" placeholder="<?php echo esc_attr($item->get_minimum_price()); ?>" class="getpaid-item-price-input p-1 align-middle font-weight-normal shadow-none m-0 rounded-0 text-center border <?php echo $class; ?>" style="width: 64px; line-height: 1; min-height: 35px;">
 
-									<?php if ( ! empty( $validate_minimum ) ) : ?>
+									<?php if (!empty($validate_minimum)) : ?>
 										<div class="invalid-tooltip">
 											<?php echo $validate_minimum; ?>
 										</div>
 									<?php endif; ?>
 
-									<?php if( 'left' != $position ) : ?>
+									<?php if ('left' != $position) : ?>
 										<div class="input-group-append">
-											<span class="input-group-text"><?php echo wpinv_currency_symbol( $currency ); ?></span>
+											<span class="input-group-text"><?php echo wpinv_currency_symbol($currency); ?></span>
 										</div>
 									<?php endif; ?>
 								</div>
 
 							<?php
 						} else {
-							echo wpinv_price( $item->get_price(), $currency );
+							echo wpinv_price($item->get_price(), $currency);
 							?>
-								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][price]' type='hidden' class='getpaid-item-price-input' value='<?php echo esc_attr( $item->get_price() ); ?>'>
+								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][price]' type='hidden' class='getpaid-item-price-input' value='<?php echo esc_attr($item->get_price()); ?>'>
 							<?php
 						}
 					}
 
 					// Item quantity.
-					if ( 'quantity' == $key ) {
+					if ('quantity' == $key) {
 
-						if ( $item->allows_quantities() ) {
+						if ($item->allows_quantities()) {
 							?>
 								<input name='getpaid-items[<?php echo (int) $item->get_id(); ?>][quantity]' type='text' style='width: 64px; line-height: 1; min-height: 35px;' class='getpaid-item-quantity-input p-1 align-middle font-weight-normal shadow-none m-0 rounded-0 text-center border' value='<?php echo (float) $item->get_quantity(); ?>' min='1' required>
 							<?php
@@ -130,11 +130,11 @@ 
 					}
 
 					// Item sub total.
-					if ( 'subtotal' == $key ) {
-						echo wpinv_price( $item->get_sub_total(), $currency );
+					if ('subtotal' == $key) {
+						echo wpinv_price($item->get_sub_total(), $currency);
 					}
 
-					do_action( "getpaid_payment_form_cart_item_$key", $item, $form );
+					do_action("getpaid_payment_form_cart_item_$key", $item, $form);
 				?>
 
 			</div>
@@ -145,4 +145,4 @@ 
 
 </div>
 <?php
-do_action(  'getpaid_payment_form_cart_item', $form, $item );
+do_action('getpaid_payment_form_cart_item', $form, $item);

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

Braces +19 added lines, -20 removed lines

@@ -661,7 +661,7 @@ 
 				<?php
 				if(! empty( $insert_shortcode_function )){
 					echo $insert_shortcode_function;
-				}else{
+				} else{
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -1650,7 +1650,7 @@ 
 					var prev_attributes = [];
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
+					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";} else{echo "[]";} ?>;
 					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
 					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
 
@@ -1787,7 +1787,7 @@ 
 
 								// taxonomies
 								if( $value && 'post_type' in prev_attributes[props.id] && 'category' in prev_attributes[props.id] && run ){
-									wp.apiFetch({path: "<?php if(isset($this->arguments['post_type']['onchange_rest']['path'])){echo $this->arguments['post_type']['onchange_rest']['path'];}else{'/wp/v2/"+$value+"/categories';} ?>"}).then(terms => {
+									wp.apiFetch({path: "<?php if(isset($this->arguments['post_type']['onchange_rest']['path'])){echo $this->arguments['post_type']['onchange_rest']['path'];} else{'/wp/v2/"+$value+"/categories';} ?>"}).then(terms => {
 										while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
 										taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
 									}
@@ -1857,7 +1857,7 @@ 
 										'attributes': props.attributes,
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
 										echo $post->ID;
-									}else{echo '0';}?>,
+									} else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -1966,7 +1966,7 @@ 
 									$panel_count ++;
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings" ); ?>',
@@ -1992,7 +1992,7 @@ 
 								// If the user sets block-output array then build it
 								if ( ! empty( $this->options['block-output'] ) ) {
 								$this->block_element( $this->options['block-output'] );
-							}else{
+							} else{
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								?>
 								el('div', {
@@ -2062,7 +2062,7 @@ 
 							?>
 							return content;
 							<?php
-							}else{
+							} else{
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -2133,7 +2133,7 @@ 
 
 					<?php
 					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
+				} elseif(!empty($args['row']['close'])){
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -2142,7 +2142,7 @@ 
 							},
 					<?php
 					if(false){?></script><?php }
-				}else{
+				} else{
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -2259,8 +2259,7 @@ 
                             $key: value
                         });
                     },";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			} elseif ( $args['type'] == 'checkbox' ) {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
@@ -2271,9 +2270,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: [";
@@ -2288,7 +2287,7 @@ 
 				}
 			} elseif ( $args['type'] == 'alignment' ) {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			}elseif ( $args['type'] == 'margins' ) {
+			} elseif ( $args['type'] == 'margins' ) {
 
 			} else {
 				return;// if we have not implemented the control then don't break the JS.
@@ -2701,7 +2700,7 @@ 
 
 				if(empty($instance['widget_title_tag'])){
 					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
+				} else{
 					$title_tag = esc_attr( $instance['widget_title_tag'] );
 
 					// classes
@@ -2806,9 +2805,9 @@ 
 					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
+				} elseif(!empty($args['row']['close'])){
 					echo "<div class='col pl-0'>";
-				}else{
+				} else{
 					echo "<div class='col pl-0 pr-2'>";
 				}
 			}
@@ -3026,11 +3025,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 +1933 added lines, -1933 removed lines

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

Spacing +559 added lines, -559 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 
 
 	/**
@@ -37,27 +37,27 @@ 
 		/**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
+		public function __construct($options) {
 			global $sd_widgets;
 
-			$sd_widgets[ $options['base_id'] ] = array(
+			$sd_widgets[$options['base_id']] = array(
 				'name'       => $options['name'],
 				'class_name' => $options['class_name']
 			);
-			$this->base_id                     = $options['base_id'];
+			$this->base_id = $options['base_id'];
 			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
+			$options       = apply_filters("wp_super_duper_options", $options);
+			$options       = apply_filters("wp_super_duper_options_{$this->base_id}", $options);
+			$options       = $this->add_name_from_key($options);
 			$this->options = $options;
 
 			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+			$this->arguments = isset($options['arguments']) ? $options['arguments'] : array();
 
 			// init parent
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			parent::__construct($options['base_id'], $options['name'], $options['widget_ops']);
 
-			if ( isset( $options['class_name'] ) ) {
+			if (isset($options['class_name'])) {
 				// register widget
 				$this->class_name = $options['class_name'];
 
@@ -65,66 +65,66 @@ 
 				$this->register_shortcode();
 
 				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
+				if (function_exists('fusion_builder_map')) {
+					add_action('init', array($this, 'register_fusion_element'));
 				}
 
 				// register block
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				add_action('admin_enqueue_scripts', array($this, 'register_block'));
 			}
 
 			// add the CSS and JS we need ONCE
 			global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+			if (!$sd_widget_scripts) {
+				wp_add_inline_script('admin-widgets', $this->widget_js());
+				wp_add_inline_script('customize-controls', $this->widget_js());
+				wp_add_inline_style('widgets', $this->widget_css());
 
 				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+				add_action('elementor/editor/after_enqueue_styles', array($this, 'elementor_editor_styles'));
 
 				$sd_widget_scripts = true;
 
 				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+				add_action('media_buttons', array($this, 'shortcode_insert_button'));
 				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+				if (function_exists('generate_sections_sections_metabox')) {
+					add_action('generate_sections_metabox', array($this, 'shortcode_insert_button_script'));
 				}
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+				if ($this->is_preview()) {
+					add_action('wp_footer', array($this, 'shortcode_insert_button_script'));
 					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
+					add_action('elementor/editor/after_enqueue_scripts', array(
 						$this,
 						'shortcode_insert_button_script'
-					) ); // for elementor
+					)); // for elementor
 				}
 				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'maybe_cornerstone_builder'));
 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+				add_action('wp_ajax_super_duper_get_widget_settings', array(__CLASS__, 'get_widget_settings'));
+				add_action('wp_ajax_super_duper_get_picker', array(__CLASS__, 'get_picker'));
 
 				// add generator text to admin head
-				add_action( 'admin_head', array( $this, 'generator' ) );
+				add_action('admin_head', array($this, 'generator'));
 			}
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 		}
 
 		/**
 		 * Add our widget CSS to elementor editor.
 		 */
 		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+			wp_add_inline_style('elementor-editor', $this->widget_css(false));
 		}
 
 		public function register_fusion_element() {
 
 			$options = $this->options;
 
-			if ( $this->base_id ) {
+			if ($this->base_id) {
 
 				$params = $this->get_fusion_params();
 
@@ -135,11 +135,11 @@ 
 					'allow_generator' => true,
 				);
 
-				if ( ! empty( $params ) ) {
+				if (!empty($params)) {
 					$args['params'] = $params;
 				}
 
-				fusion_builder_map( $args );
+				fusion_builder_map($args);
 			}
 
 		}
@@ -148,8 +148,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(
@@ -171,7 +171,7 @@ 
 						$val['type'] );
 
 					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+					if ($val['type'] == 'multiselect' || (($param['type'] == 'select' || $val['type'] == 'select') && !empty($val['multiple']))) {
 						$param['type']     = 'multiple_select';
 						$param['multiple'] = true;
 					}
@@ -180,29 +180,29 @@ 
 					$param['heading'] = $val['title'];
 
 					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+					$param['description'] = isset($val['desc']) ? $val['desc'] : '';
 
 					// param_name
 					$param['param_name'] = $key;
 
 					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+					$param['default'] = isset($val['default']) ? $val['default'] : '';
 
 					// Group
-					if ( isset( $val['group'] ) ) {
+					if (isset($val['group'])) {
 						$param['group'] = $val['group'];
 					}
 
 					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
+					if ($val['type'] == 'checkbox') {
+						if (isset($val['default']) && $val['default'] == '0') {
+							unset($param['default']);
 						}
-						$param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+						$param['value'] = array('' => __("No"), '1' => __("Yes"));
+					} elseif ($param['type'] == 'select' || $param['type'] == 'multiple_select') {
+						$param['value'] = isset($val['options']) ? $val['options'] : array();
 					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+						$param['value'] = isset($val['default']) ? $val['default'] : '';
 					}
 
 					// setup the param
@@ -219,7 +219,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();
 			}
 		}
@@ -231,12 +231,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';
 			}
 
@@ -245,13 +245,13 @@ 
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
+				ksort($sd_widgets);
 				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
+				if (!empty($sd_widgets)) {
 					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 
@@ -264,37 +264,37 @@ 
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
-					<?php if ( $editor_id != '' ) { ?>
+					<?php if ($editor_id != '') { ?>
 						<button class="button sd-insert-shortcode-button"
-						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
+						        onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) {
 							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+						        } ?>)"><?php _e('Insert shortcode'); ?></button>
 					<?php } ?>
 					<button class="button"
-					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
+					        onclick="sd_copy_to_clipboard()"><?php _e('Copy shortcode'); ?></button>
 				</div>
 			</div>
 			<?php
 
 			$html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
+			if (wp_doing_ajax()) {
 				echo $html;
 				$should_die = true;
 
 				// some builder get the editor via ajax so we should not die on those ocasions
 				$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();
 				}
 
@@ -321,16 +321,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();
 			}
 
@@ -338,7 +338,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>";
@@ -356,9 +356,9 @@ 
 		 * @param string $editor_id Optional. Shortcode editor id. Default null.
 		 * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
 			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
+			if ($shortcode_insert_button_once) {
 				return;
 			}
 			add_thickbox();
@@ -368,21 +368,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;
@@ -396,12 +396,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">
@@ -417,7 +417,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));
 		}
 
 		/**
@@ -475,7 +475,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -512,10 +512,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);
 		}
 
 		/**
@@ -526,7 +526,7 @@ 
 		 * @param string $editor_id
 		 * @param string $insert_shortcode_function
 		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
 			?>
 			<style>
 				.sd-shortcode-left-wrap {
@@ -645,7 +645,7 @@ 
 					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;
 				}
@@ -653,15 +653,15 @@ 
 				<?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.
@@ -674,9 +674,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";';
@@ -761,11 +761,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) {
@@ -974,11 +974,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) {
@@ -999,9 +999,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(); ?>';
 					}
 				}
 
@@ -1016,11 +1016,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;
 				}
@@ -1062,10 +1062,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);
 		}
 
 		/**
@@ -1135,7 +1135,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -1230,7 +1230,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();
@@ -1239,10 +1239,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);
 		}
 
 
@@ -1253,14 +1253,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;
 				}
 			}
 
@@ -1273,8 +1273,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( __CLASS__, 'render_shortcode' ) );
+			add_shortcode($this->base_id, array($this, 'shortcode_output'));
+			add_action('wp_ajax_super_duper_output_shortcode', array(__CLASS__, 'render_shortcode'));
 		}
 
 		/**
@@ -1284,36 +1284,36 @@ 
 		 */
 		public static 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'] ) {
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+			if (isset($_POST['shortcode']) && $_POST['shortcode']) {
+				$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);
 						}
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
+						$attributes .= " " . sanitize_title_with_dashes($key) . "='" . wp_slash($value) . "' ";
 					}
 				}
 
 				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
 
-				echo do_shortcode( $shortcode );
+				echo do_shortcode($shortcode);
 
 			}
 			wp_die();
@@ -1327,45 +1327,45 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$args = $this->argument_values( $args );
+		public function shortcode_output($args = array(), $content = '') {
+			$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;
 			}
 
-			$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 ); //@todo this does not seem right @kiran?
+			$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+			$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this); //@todo this does not seem right @kiran?
 
 			$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;
@@ -1373,20 +1373,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);
 		}
 
 		/**
@@ -1396,8 +1396,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf(__('Placeholder for: %s'), $name) . "</div>";
 		}
 
 		/**
@@ -1407,13 +1407,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;
 				}
 			}
 
@@ -1429,26 +1429,26 @@ 
 		 *
 		 * @return array
 		 */
-		public function argument_values( $instance ) {
+		public function argument_values($instance) {
 			$argument_values = array();
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $key => $args) {
 					// set the input name from the key
 					$args['name'] = $key;
 					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
+					if ($args['type'] == 'checkbox' && $argument_values[$key] == '') {
 						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
+					} elseif ($argument_values[$key] == '' && isset($args['default'])) {
+						$argument_values[$key] = $args['default'];
 					}
 				}
 			}
@@ -1475,12 +1475,12 @@ 
 		 * @return array Get arguments.
 		 */
 		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->set_arguments();
 			}
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
 
 			return $this->arguments;
 		}
@@ -1492,7 +1492,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 = '') {
 
 		}
 
@@ -1500,9 +1500,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());
 			}
 		}
 
@@ -1516,13 +1516,13 @@ 
 			$show      = false;
 			$arguments = $this->arguments;
 
-			if ( empty( $arguments ) ) {
+			if (empty($arguments)) {
 				$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
 					}
@@ -1541,15 +1541,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;
 				}
 			}
@@ -1570,46 +1570,46 @@ 
 		 * @since 1.1.0
 		 * @return string
 		 */
-		public function get_block_icon( $icon ) {
+		public function get_block_icon($icon) {
 
 			// check if we have a Font Awesome icon
 			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+			if (substr($icon, 0, 7) === "fas fa-") {
 				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+			} elseif (substr($icon, 0, 7) === "far fa-") {
 				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+			} elseif (substr($icon, 0, 7) === "fab fa-") {
 				$fa_type = 'brands';
 			} else {
 				$icon = "'" . $icon . "'";
 			}
 
 			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+			if ($fa_type) {
+				$fa_icon = str_replace(array("fas fa-", "far fa-", "fab fa-"), "", $icon);
 				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
 			}
 
 			return $icon;
 		}
 
-		public function group_arguments( $arguments ) {
+		public function group_arguments($arguments) {
 //			echo '###';print_r($arguments);
-			if ( ! empty( $arguments ) ) {
+			if (!empty($arguments)) {
 				$temp_arguments = array();
-				$general        = __( "General" );
+				$general        = __("General");
 				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
+				foreach ($arguments as $key => $args) {
+					if (isset($args['group'])) {
+						$temp_arguments[$args['group']][$key] = $args;
 						$add_sections                             = true;
 					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
+						$temp_arguments[$general][$key] = $args;
 					}
 				}
 
 				// only add sections if more than one
-				if ( $add_sections ) {
+				if ($add_sections) {
 					$arguments = $temp_arguments;
 				}
 			}
@@ -1653,9 +1653,9 @@ 
 					var prev_attributes = [];
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
-					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
-					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
+					var post_type_rest_slugs = <?php if (!empty($this->arguments) && isset($this->arguments['post_type']['onchange_rest']['values'])) {echo "[" . json_encode($this->arguments['post_type']['onchange_rest']['values']) . "]"; } else {echo "[]"; } ?>;
+					const taxonomies_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
+					const sort_by_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
 
 					/**
 					 * Register Basic Block.
@@ -1669,30 +1669,30 @@ 
 					 * @return {?WPBlock}          The block, if it has been successfully
 					 *                             registered; otherwise `undefined`.
 					 */
-					registerBlockType('<?php echo str_replace( "_", "-", sanitize_title_with_dashes( $this->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->options['class_name'] ) );  ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
-						title: '<?php echo addslashes( $this->options['name'] ); ?>', // Block title.
-						description: '<?php echo addslashes( $this->options['widget_ops']['description'] )?>', // Block title.
-						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
+					registerBlockType('<?php echo str_replace("_", "-", sanitize_title_with_dashes($this->options['textdomain']) . '/' . sanitize_title_with_dashes($this->options['class_name'])); ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
+						title: '<?php echo addslashes($this->options['name']); ?>', // Block title.
+						description: '<?php echo addslashes($this->options['widget_ops']['description'])?>', // Block title.
+						icon: <?php echo $this->get_block_icon($this->options['block-icon']); ?>,//'<?php echo isset($this->options['block-icon']) ? esc_attr($this->options['block-icon']) : 'shield-alt'; ?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
+							if (isset($this->options['block-supports'])) {
+								echo $this->array_to_attributes($this->options['block-supports']);
 							}
 							?>
 						},
-						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
-						<?php if ( isset( $this->options['block-keywords'] ) ) {
+						category: '<?php echo isset($this->options['block-category']) ? esc_attr($this->options['block-category']) : 'common'; ?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+						<?php if (isset($this->options['block-keywords'])) {
 						echo "keywords : " . $this->options['block-keywords'] . ",";
 					}?>
 
 						<?php
 
 						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+						$no_wrap = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+						if (isset($this->arguments['no_wrap']) && $this->arguments['no_wrap']) {
 							$no_wrap = true;
 						}
-						if ( $no_wrap ) {
+						if ($no_wrap) {
 							$this->options['block-wrap'] = '';
 						}
 
@@ -1705,10 +1705,10 @@ 
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
+						if (!empty($this->arguments)) {
 							echo "attributes : {";
 
-							if ( $show_advanced ) {
+							if ($show_advanced) {
 								echo "show_advanced: {";
 								echo "	type: 'boolean',";
 								echo "  default: false,";
@@ -1716,41 +1716,41 @@ 
 							}
 
 							// block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+							if (!empty($this->options['block-wrap'])) { //@todo we should validate this?
 								echo "block_wrap: {";
 								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+								echo "  default: '" . esc_attr($this->options['block-wrap']) . "',";
 								echo "},";
 							}
 
-							foreach ( $this->arguments as $key => $args ) {
+							foreach ($this->arguments as $key => $args) {
 
 								// set if we should show alignment
-								if ( $key == 'alignment' ) {
+								if ($key == 'alignment') {
 									$show_alignment = true;
 								}
 
 								$extra = '';
 
-								if ( $args['type'] == 'checkbox' ) {
+								if ($args['type'] == 'checkbox') {
 									$type    = 'boolean';
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-								} elseif ( $args['type'] == 'number' ) {
+									$default = isset($args['default']) && $args['default'] ? 'true' : 'false';
+								} elseif ($args['type'] == 'number') {
 									$type    = 'number';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+								} elseif ($args['type'] == 'select' && !empty($args['multiple'])) {
 									$type = 'array';
-									if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-										$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+									if (isset($args['default']) && is_array($args['default'])) {
+										$default = !empty($args['default']) ? "['" . implode("','", $args['default']) . "']" : "[]";
 									} else {
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 									}
-								} elseif ( $args['type'] == 'multiselect' ) {
+								} elseif ($args['type'] == 'multiselect') {
 									$type    = 'array';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 								} else {
 									$type    = 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 								}
 								echo $key . " : {";
 								echo "type : '$type',";
@@ -1774,7 +1774,7 @@ 
 							var $value = '';
 							<?php
 							// if we have a post_type and a category then link them
-							if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+							if (isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked'])) {
 							?>
 							if(typeof(prev_attributes[props.id]) != 'undefined' ){
 								$pt = props.attributes.post_type;
@@ -1790,13 +1790,13 @@ 
 
 								// taxonomies
 								if( $value && 'post_type' in prev_attributes[props.id] && 'category' in prev_attributes[props.id] && run ){
-									wp.apiFetch({path: "<?php if(isset($this->arguments['post_type']['onchange_rest']['path'])){echo $this->arguments['post_type']['onchange_rest']['path'];}else{'/wp/v2/"+$value+"/categories';} ?>"}).then(terms => {
-										while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-										taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+									wp.apiFetch({path: "<?php if (isset($this->arguments['post_type']['onchange_rest']['path'])) {echo $this->arguments['post_type']['onchange_rest']['path']; } else {'/wp/v2/"+$value+"/categories'; } ?>"}).then(terms => {
+										while (taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+										taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 									}
-									taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: "All", value: 0});
+									taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: "All", value: 0});
 									jQuery.each( terms, function( key, val ) {
-										taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: val.name, value: val.id});
+										taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val.name, value: val.id});
 									});
 
 									// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -1804,7 +1804,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); ?>;
 								});
 								}
 
@@ -1816,12 +1816,12 @@ 
 									};
 									jQuery.post(ajaxurl, data, function(response) {
 										response = JSON.parse(response);
-										while (sort_by_<?php echo str_replace("-","_", $this->id);?>.length) {
-											sort_by_<?php echo str_replace("-","_", $this->id);?>.pop();
+										while (sort_by_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+											sort_by_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 										}
 
 										jQuery.each( response, function( key, val ) {
-											sort_by_<?php echo str_replace("-","_", $this->id);?>.push({label: val, value: key});
+											sort_by_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val, value: key});
 										});
 
 										// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -1829,7 +1829,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); ?>;
 									});
 
 								}
@@ -1856,12 +1856,12 @@ 
 									is_fetching = true;
 									var data = {
 										'action': 'super_duper_output_shortcode',
-										'shortcode': '<?php echo $this->options['base_id'];?>',
+										'shortcode': '<?php echo $this->options['base_id']; ?>',
 										'attributes': props.attributes,
-										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
+										'post_id': <?php global $post; if (isset($post->ID)) {
 										echo $post->ID;
-									}else{echo '0';}?>,
-										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+									} else {echo '0'; }?>,
+										'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 									};
 
 									jQuery.post(ajaxurl, data, function (response) {
@@ -1870,7 +1870,7 @@ 
 
 										// if the content is empty then we place some placeholder text
 										if (env == '') {
-											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e( 'Placeholder for: ' );?>" + props.name + "</div>";
+											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for: '); ?>" + props.name + "</div>";
 										}
 
 										props.setAttributes({content: env});
@@ -1894,7 +1894,7 @@ 
 
 								el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-									<?php if($show_alignment){?>
+									<?php if ($show_alignment) {?>
 									el(
 										wp.blockEditor.AlignmentToolbar,
 										{
@@ -1912,9 +1912,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'}
@@ -1935,19 +1935,19 @@ 
 
 									}
 
-									$arguments = $this->group_arguments( $this->arguments );
+									$arguments = $this->group_arguments($this->arguments);
 
 									// Do we have sections?
 									$has_sections = $arguments == $this->arguments ? false : true;
 
 
-									if($has_sections){
+									if ($has_sections) {
 									$panel_count = 0;
-									foreach($arguments as $key => $args){
+									foreach ($arguments as $key => $args) {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( $key ); ?>',
-											initialOpen: <?php if ( $panel_count ) {
+											title: '<?php esc_attr_e($key); ?>',
+											initialOpen: <?php if ($panel_count) {
 											echo "false";
 										} else {
 											echo "true";
@@ -1957,29 +1957,29 @@ 
 
 
 
-										foreach ( $args as $k => $a ) {
+										foreach ($args as $k => $a) {
 
-											$this->block_row_start( $k, $a );
-											$this->build_block_arguments( $k, $a );
-											$this->block_row_end( $k, $a );
+											$this->block_row_start($k, $a);
+											$this->build_block_arguments($k, $a);
+											$this->block_row_end($k, $a);
 										}
 										?>
 									),
 									<?php
-									$panel_count ++;
+									$panel_count++;
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( "Settings" ); ?>',
+											title: '<?php esc_attr_e("Settings"); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
+										foreach ($this->arguments as $key => $args) {
+											$this->block_row_start($key, $args);
+											$this->build_block_arguments($key, $args);
+											$this->block_row_end($key, $args);
 										}
 										?>
 									),
@@ -1993,9 +1993,9 @@ 
 
 								<?php
 								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}else{
+								if (!empty($this->options['block-output'])) {
+								$this->block_element($this->options['block-output']);
+							} else {
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								?>
 								el('div', {
@@ -2019,19 +2019,19 @@ 
 							var align = '';
 
 							// build the shortcode.
-							var content = "[<?php echo $this->options['base_id'];?>";
+							var content = "[<?php echo $this->options['base_id']; ?>";
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+							if (!empty($this->arguments)) {
 
-							foreach($this->arguments as $key => $args){
+							foreach ($this->arguments as $key => $args) {
 							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-								if ('<?php echo esc_attr( $key );?>' == 'html') {
-									$html = attr.<?php echo esc_attr( $key );?>;
+							if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+								if ('<?php echo esc_attr($key); ?>' == 'html') {
+									$html = attr.<?php echo esc_attr($key); ?>;
 								} else {
-									content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>+ "' ";
+									content += " <?php echo esc_attr($key); ?>='" + attr.<?php echo esc_attr($key); ?>+ "' ";
 								}
 							}
 							<?php
@@ -2043,7 +2043,7 @@ 
 
 							// if has html element
 							if ($html) {
-								content += $html + "[/<?php echo $this->options['base_id'];?>]";
+								content += $html + "[/<?php echo $this->options['base_id']; ?>]";
 							}
 
 
@@ -2061,11 +2061,11 @@ 
 							}
 
 							<?php
-							if(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							if (isset($this->options['block-wrap']) && $this->options['block-wrap'] == '') {
 							?>
 							return content;
 							<?php
-							}else{
+							} else {
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -2088,45 +2088,45 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
-		public function block_row_start($key, $args){
+		public function block_row_start($key, $args) {
 
 			// check for row
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 
 				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+				$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 				echo $element_require;
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
-							<?php if(!empty($args['row']['title'])){ ?>
+							<?php if (!empty($args['row']['title'])) { ?>
 							el('label', {
 									className: 'components-base-control__label',
 								},
-								'<?php echo addslashes( $args['row']['title'] ); ?>'
+								'<?php echo addslashes($args['row']['title']); ?>'
 							),
 							<?php }?>
-							<?php if(!empty($args['row']['desc'])){ ?>
+							<?php if (!empty($args['row']['desc'])) { ?>
 							el('p', {
 									className: 'components-base-control__help mb-0',
 								},
-								'<?php echo addslashes( $args['row']['desc'] ); ?>'
+								'<?php echo addslashes($args['row']['desc']); ?>'
 							),
 							<?php }?>
 							el(
 								'div',
 								{
-									className: 'row mb-n2 <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>',
+									className: 'row mb-n2 <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>',
 								},
 								el(
 									'div',
@@ -2135,36 +2135,36 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				}elseif (!empty($args['row']['close'])) {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				} else {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 pr-2',
 							},
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_row_end($key, $args){
+		public function block_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "))";
 				}
 
@@ -2172,25 +2172,25 @@ 
 			}
 		}
 
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+		public function build_block_arguments($key, $args) {
+			$custom_attributes = !empty($args['custom_attributes']) ? $this->array_to_attributes($args['custom_attributes']) : '';
 			$options           = '';
 			$extra             = '';
 			$require           = '';
 
 			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
+			if ($key == 'content') {
 				return;
 			}
 
 
 			// icon
 			$icon = '';
-			if( !empty( $args['icon'] ) ){
+			if (!empty($args['icon'])) {
 				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+									$icon .= "dangerouslySetInnerHTML: {__html: '" . self::get_widget_icon(esc_attr($args['icon'])) . "'},";
 									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
+									$icon .= "title: '" . addslashes($args['title']) . "',";
 								$icon .= "}),";
 
 				// blank title as its added to the icon.
@@ -2198,20 +2198,20 @@ 
 			}
 
 			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+			$require_advanced = !empty($args['advanced']) ? "props.attributes.show_advanced && " : "";
 
 			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+			$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 
 
 			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
+			$onchangecomplete = "";
 			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
-			if ( in_array( $args['type'], $text_type ) ) {
+			$text_type = array('text', 'password', 'number', 'email', 'tel', 'url', 'colorx');
+			if (in_array($args['type'], $text_type)) {
 				$type = 'TextControl';
 				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
+				if ($args['type'] == 'number') {
 					$onchange = "props.setAttributes({ $key: Number($key) } )";
 				}
 			}
@@ -2249,11 +2249,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) {
@@ -2263,49 +2263,49 @@ 
                         });
                     },";
 			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			elseif ($args['type'] == 'checkbox') {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
+			} elseif ($args['type'] == 'textarea') {
 				$type = 'TextareaControl';
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+			} elseif ($args['type'] == 'select' || $args['type'] == 'multiselect') {
 				$type = 'SelectControl';
 
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
+				if ($args['name'] == 'category' && !empty($args['post_type_linked'])) {
+					$options .= "options: taxonomies_" . str_replace("-", "_", $this->id) . ",";
+				}elseif ($args['name'] == 'sort_by' && !empty($args['post_type_linked'])) {
+					$options .= "options: sort_by_" . str_replace("-", "_", $this->id) . ",";
+				} else {
 
-					if ( ! empty( $args['options'] ) ) {
+					if (!empty($args['options'])) {
 						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
+						foreach ($args['options'] as $option_val => $option_label) {
+							$options .= "{ value: '" . esc_attr($option_val) . "', label: '" . addslashes($option_label) . "' },";
 						}
 						$options .= "],";
 					}
 				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+				if (isset($args['multiple']) && $args['multiple']) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
 					$extra .= ' multiple: true, ';
 				}
-			} elseif ( $args['type'] == 'alignment' ) {
+			} elseif ($args['type'] == 'alignment') {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			}elseif ( $args['type'] == 'margins' ) {
+			}elseif ($args['type'] == 'margins') {
 
 			} else {
-				return;// if we have not implemented the control then don't break the JS.
+				return; // if we have not implemented the control then don't break the JS.
 			}
 
 
 
 			// color input does not show the labels so we add them
-			if($args['type']=='color'){
+			if ($args['type'] == 'color') {
 				// add show only if advanced
 				echo $require_advanced;
 				// add setting require if defined
 				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+				echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes($args['title']) . "'),";
 			}
 
 			// add show only if advanced
@@ -2317,21 +2317,21 @@ 
 			echo $icon;
 			?>
 			el( wp.components.<?php echo $type; ?>, {
-			label: '<?php echo addslashes( $args['title'] ); ?>',
-			help: '<?php if ( isset( $args['desc'] ) ) {
-				echo addslashes( $args['desc'] );
+			label: '<?php echo addslashes($args['title']); ?>',
+			help: '<?php if (isset($args['desc'])) {
+				echo addslashes($args['desc']);
 			} ?>',
 			value: <?php echo $value; ?>,
-			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
+			<?php if ($type == 'TextControl' && $args['type'] != 'text') {
+				echo "type: '" . addslashes($args['type']) . "',";
 			} ?>
-			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
+			<?php if (!empty($args['placeholder'])) {
+				echo "placeholder: '" . addslashes($args['placeholder']) . "',";
 			} ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
-			<?php echo $onchangecomplete;?>
+			<?php echo $onchangecomplete; ?>
 			onChange: function ( <?php echo $key; ?> ) {
 			<?php echo $onchange; ?>
 			}
@@ -2350,16 +2350,16 @@ 
 		 *
 		 * @return string
 		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
+		public function array_to_attributes($custom_attributes, $html = false) {
 			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
+			if (!empty($custom_attributes)) {
 
-				if ( $html ) {
-					foreach ( $custom_attributes as $key => $val ) {
+				if ($html) {
+					foreach ($custom_attributes as $key => $val) {
 						$attributes .= " $key='$val' ";
 					}
 				} else {
-					foreach ( $custom_attributes as $key => $val ) {
+					foreach ($custom_attributes as $key => $val) {
 						$attributes .= "'$key': '$val',";
 					}
 				}
@@ -2375,86 +2375,86 @@ 
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args ) {
+		public function block_element($args) {
 
 
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+			if (!empty($args)) {
+				foreach ($args as $element => $new_args) {
 
-					if ( is_array( $new_args ) ) { // its an element
+					if (is_array($new_args)) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+						if (isset($new_args['element'])) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
+							if (isset($new_args['element_require'])) {
+								echo str_replace(array(
 										"'+",
 										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
+									), '', $this->block_props_replace($new_args['element_require'])) . " &&  ";
+								unset($new_args['element_require']);
 							}
 
 							echo "\n el( '" . $new_args['element'] . "', {";
 
 							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
+							foreach ($new_args as $new_key => $new_value) {
 
 
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+								if ($new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array($new_value)) {
 									// do nothing
 								} else {
-									echo $this->block_element( array( $new_key => $new_value ) );
+									echo $this->block_element(array($new_key => $new_value));
 								}
 							}
 
-							echo "},";// end attributes
+							echo "},"; // end attributes
 
 							// get the content
 							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
+							foreach ($new_args as $new_key => $new_value) {
+								if ($new_key === 'content' || is_array($new_value)) {
 
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+									if ($new_key === 'content') {
+										echo "'" . $this->block_props_replace(wp_slash($new_value)) . "'";
 									}
 
-									if ( is_array( $new_value ) ) {
+									if (is_array($new_value)) {
 
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
+										if (isset($new_value['element_require'])) {
+											echo str_replace(array(
 													"'+",
 													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
+												), '', $this->block_props_replace($new_value['element_require'])) . " &&  ";
+											unset($new_value['element_require']);
 										}
 
-										if ( isset( $new_value['element_repeat'] ) ) {
+										if (isset($new_value['element_repeat'])) {
 											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ) );
-												$x ++;
+											while ($x <= absint($new_value['element_repeat'])) {
+												$this->block_element(array('' => $new_value));
+												$x++;
 											}
 										} else {
-											$this->block_element( array( '' => $new_value ) );
+											$this->block_element(array('' => $new_value));
 										}
 									}
-									$first_item ++;
+									$first_item++;
 								}
 							}
 
-							echo ")";// end content
+							echo ")"; // end content
 
 							echo ", \n";
 
 						}
 					} else {
 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+						if (substr($element, 0, 3) === "if_") {
+							echo str_replace("if_", "", $element) . ": " . $this->block_props_replace($new_args, true) . ",";
+						} elseif ($element == 'style') {
+							echo $element . ": " . $this->block_props_replace($new_args) . ",";
 						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+							echo $element . ": '" . $this->block_props_replace($new_args) . "',";
 						}
 
 					}
@@ -2469,12 +2469,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
+		public function block_props_replace($string, $no_wrap = false) {
 
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+			if ($no_wrap) {
+				$string = str_replace(array("[%", "%]"), array("props.attributes.", ""), $string);
 			} else {
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+				$string = str_replace(array("[%", "%]"), array("'+props.attributes.", "+'"), $string);
 			}
 
 			return $string;
@@ -2486,55 +2486,55 @@ 
 		 * @param array $args
 		 * @param array $instance
 		 */
-		public function widget( $args, $instance ) {
+		public function widget($args, $instance) {
 
 			// get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
+			$argument_values = $this->argument_values($instance);
+			$argument_values = $this->string_to_bool($argument_values);
+			$output          = $this->output($argument_values, $args);
 
 			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+			if (isset($argument_values['no_wrap']) && $argument_values['no_wrap']) {
 				$no_wrap = true;
 			}
 
 			ob_start();
-			if ( $output && ! $no_wrap ) {
+			if ($output && !$no_wrap) {
 
 				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+				$class = $this->options['widget_ops']['classname'] . " sdel-" . $this->get_instance_hash();
 
 				// Before widget
 				$before_widget = $args['before_widget'];
-				$before_widget = str_replace($class_original,$class,$before_widget);
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+				$before_widget = str_replace($class_original, $class, $before_widget);
+				$before_widget = apply_filters('wp_super_duper_before_widget', $before_widget, $args, $instance, $this);
+				$before_widget = apply_filters('wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this);
 
 				// After widget
 				$after_widget = $args['after_widget'];
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+				$after_widget = apply_filters('wp_super_duper_after_widget', $after_widget, $args, $instance, $this);
+				$after_widget = apply_filters('wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this);
 
 				echo $before_widget;
 				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $class  ) . "'>" : '';
+				if ($this->is_elementor_widget_output()) {
+					echo !empty($this->options['widget_ops']['classname']) ? "<span class='" . esc_attr($class) . "'>" : '';
 				}
-				echo $this->output_title( $args, $instance );
+				echo $this->output_title($args, $instance);
 				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
+				if ($this->is_elementor_widget_output()) {
+					echo !empty($this->options['widget_ops']['classname']) ? "</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;
 		}
@@ -2547,7 +2547,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;
 			}
 
@@ -2562,7 +2562,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;
 			}
 
@@ -2577,7 +2577,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;
 			}
 
@@ -2592,7 +2592,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 
@@ -2607,7 +2607,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 
@@ -2622,7 +2622,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;
 			}
 
@@ -2637,7 +2637,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;
 			}
 
@@ -2652,7 +2652,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;
 			}
 
@@ -2667,21 +2667,21 @@ 
 		 */
 		public function is_preview() {
 			$preview = false;
-			if ( $this->is_divi_preview() ) {
+			if ($this->is_divi_preview()) {
 				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
+			} elseif ($this->is_elementor_preview()) {
 				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
+			} elseif ($this->is_beaver_preview()) {
 				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
+			} elseif ($this->is_siteorigin_preview()) {
 				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
+			} elseif ($this->is_cornerstone_preview()) {
 				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
+			} elseif ($this->is_fusion_preview()) {
 				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
+			} elseif ($this->is_oxygen_preview()) {
 				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
+			} elseif ($this->is_block_content_call()) {
 				$preview = true;
 			}
 
@@ -2696,34 +2696,34 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
+		public function output_title($args, $instance = array()) {
 			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
+			if (!empty($instance['title'])) {
 				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+				$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
 
-				if(empty($instance['widget_title_tag'])){
+				if (empty($instance['widget_title_tag'])) {
 					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
-					$title_tag = esc_attr( $instance['widget_title_tag'] );
+				} else {
+					$title_tag = esc_attr($instance['widget_title_tag']);
 
 					// classes
 					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+					$title_classes[] = !empty($instance['widget_title_size_class']) ? sanitize_html_class($instance['widget_title_size_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_align_class']) ? sanitize_html_class($instance['widget_title_align_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_color_class']) ? "text-" . sanitize_html_class($instance['widget_title_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_class']) ? sanitize_html_class($instance['widget_title_border_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_color_class']) ? "border-" . sanitize_html_class($instance['widget_title_border_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mt_class']) ? "mt-" . absint($instance['widget_title_mt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mr_class']) ? "mr-" . absint($instance['widget_title_mr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mb_class']) ? "mb-" . absint($instance['widget_title_mb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_ml_class']) ? "ml-" . absint($instance['widget_title_ml_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pt_class']) ? "pt-" . absint($instance['widget_title_pt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pr_class']) ? "pr-" . absint($instance['widget_title_pr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pb_class']) ? "pb-" . absint($instance['widget_title_pb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pl_class']) ? "pl-" . absint($instance['widget_title_pl_class']) : '';
+
+					$class = !empty($title_classes) ? implode(" ", $title_classes) : '';
 					$output = "<$title_tag class='$class' >$title</$title_tag>";
 				}
 
@@ -2737,7 +2737,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 
 			// set widget instance
 			$this->instance = $instance;
@@ -2745,20 +2745,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>
@@ -2768,26 +2768,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);
 					}
 				}
@@ -2795,33 +2795,33 @@ 
 			}
 		}
 
-		public function widget_inputs_row_start($key, $args){
-			if(!empty($args['row'])){
+		public function widget_inputs_row_start($key, $args) {
+			if (!empty($args['row'])) {
 				// maybe open
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 					?>
-					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php if ( !empty($args['row']['element_require'])) {
-						echo $this->convert_element_require( $args['row']['element_require'] );
+					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr($args['row']['key']); ?>' data-element_require='<?php if (!empty($args['row']['element_require'])) {
+						echo $this->convert_element_require($args['row']['element_require']);
 					} ?>'>
-					<?php if(!empty($args['row']['title'])){ ?>
-					<label class="mb-0 "><?php echo esc_attr( $args['row']['title'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+					<?php if (!empty($args['row']['title'])) { ?>
+					<label class="mb-0 "><?php echo esc_attr($args['row']['title']); ?><?php echo $this->widget_field_desc($args['row']); ?></label>
 					<?php }?>
-					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
+					<div class='row <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
+				}elseif (!empty($args['row']['close'])) {
 					echo "<div class='col pl-0'>";
-				}else{
+				} else {
 					echo "<div class='col pl-0 pr-2'>";
 				}
 			}
 		}
 
-		public function widget_inputs_row_end($key, $args){
+		public function widget_inputs_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "</div></div>";
 				}
 
@@ -2837,7 +2837,7 @@ 
 		public function widget_advanced_toggle() {
 
 			$output = '';
-			if ( $this->block_show_advanced() ) {
+			if ($this->block_show_advanced()) {
 				$val = 1;
 			} else {
 				$val = 0;
@@ -2857,14 +2857,14 @@ 
 		 *
 		 * @return string $output
 		 */
-		public function convert_element_require( $input ) {
+		public function convert_element_require($input) {
 
-			$input = str_replace( "'", '"', $input );// we only want double quotes
+			$input = str_replace("'", '"', $input); // we only want double quotes
 
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
+			$output = esc_attr(str_replace(array("[%", "%]"), array(
 				"jQuery(form).find('[data-argument=\"",
 				"\"]').find('input,select,textarea').val()"
-			), $input ) );
+			), $input));
 
 			return $output;
 		}
@@ -2875,56 +2875,56 @@ 
 		 * @param $args
 		 * @param $instance
 		 */
-		public function widget_inputs( $args, $instance ) {
+		public function widget_inputs($args, $instance) {
 
 			$class             = "";
 			$element_require   = "";
 			$custom_attributes = "";
 
 			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+			if (isset($instance[$args['name']])) {
+				$value = $instance[$args['name']];
+			} elseif (!isset($instance[$args['name']]) && !empty($args['default'])) {
+				$value = is_array($args['default']) ? array_map("esc_html", $args['default']) : esc_html($args['default']);
 			} else {
 				$value = '';
 			}
 
 			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			if (!empty($args['placeholder'])) {
+				$placeholder = "placeholder='" . esc_html($args['placeholder']) . "'";
 			} else {
 				$placeholder = '';
 			}
 
 			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+			if (isset($args['advanced']) && $args['advanced']) {
 				$class .= " sd-advanced-setting ";
 			}
 
 			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+			if (isset($args['element_require']) && $args['element_require']) {
 				$element_require = $args['element_require'];
 			}
 
 			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+			if (isset($args['custom_attributes']) && $args['custom_attributes']) {
+				$custom_attributes = $this->array_to_attributes($args['custom_attributes'], true);
 			}
 
 
 			// before wrapper
 			?>
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
-			data-argument='<?php echo esc_attr( $args['name'] ); ?>'
-			data-element_require='<?php if ( $element_require ) {
-				echo $this->convert_element_require( $element_require );
+			<p class="sd-argument <?php echo esc_attr($class); ?>"
+			data-argument='<?php echo esc_attr($args['name']); ?>'
+			data-element_require='<?php if ($element_require) {
+				echo $this->convert_element_require($element_require);
 			} ?>'
 			>
 			<?php
 
 
-			switch ( $args['type'] ) {
+			switch ($args['type']) {
 				//array('text','password','number','email','tel','url','color')
 				case "text":
 				case "password":
@@ -2935,46 +2935,46 @@ 
 				case "color":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                               id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                               name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-						                               type="<?php echo esc_attr( $args['type'] ); ?>"
-						                               value="<?php echo esc_attr( $value ); ?>">
+						                               id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                               name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+						                               type="<?php echo esc_attr($args['type']); ?>"
+						                               value="<?php echo esc_attr($value); ?>">
 					<?php
 
 					break;
 				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
+					$multiple = isset($args['multiple']) && $args['multiple'] ? true : false;
+					if ($multiple) {
+						if (empty($value)) {
 							$value = array();
 						}
 					}
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-						                                if ( $multiple ) {
+						                                id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                                name="<?php echo esc_attr($this->get_field_name($args['name']));
+						                                if ($multiple) {
 							                                echo "[]";
 						                                } ?>"
-						<?php if ( $multiple ) {
+						<?php if ($multiple) {
 							echo "multiple";
 						} //@todo not implemented yet due to gutenberg not supporting it
 						?>
 					>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+						if (!empty($args['options'])) {
+							foreach ($args['options'] as $val => $label) {
+								if ($multiple) {
+									$selected = in_array($val, $value) ? 'selected="selected"' : '';
 								} else {
-									$selected = selected( $value, $val, false );
+									$selected = selected($value, $val, false);
 								}
 								echo "<option value='$val' " . $selected . ">$label</option>";
 							}
@@ -2986,32 +2986,32 @@ 
 				case "checkbox":
 					?>
 					<input <?php echo $placeholder; ?>
-						<?php checked( 1, $value, true ) ?>
+						<?php checked(1, $value, true) ?>
 						<?php echo $custom_attributes; ?>
-						class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox"
+						class="widefat" id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="checkbox"
 						value="1">
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<?php
 					break;
 				case "textarea":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-						                                  id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						                                  name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-					><?php echo esc_attr( $value ); ?></textarea>
+						                                  id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						                                  name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+					><?php echo esc_attr($value); ?></textarea>
 					<?php
 
 					break;
 				case "hidden":
 					?>
-					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-					       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
-					       value="<?php echo esc_attr( $value ); ?>">
+					<input id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+					       name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="hidden"
+					       value="<?php echo esc_attr($value); ?>">
 					<?php
 					break;
 				default:
@@ -3026,15 +3026,15 @@ 
 
 		}
 
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+		public function get_widget_icon($icon = 'box-top', $title = '') {
+			if ($icon == 'box-top') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-right') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-bottom') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+			}elseif ($icon == 'box-left') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
 			}
 		}
 
@@ -3046,14 +3046,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>';
 				}
 			}
 
@@ -3067,12 +3067,12 @@ 
 		 *
 		 * @return string
 		 */
-		public function widget_field_title( $args ) {
+		public function widget_field_title($args) {
 
 			$title = '';
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
+			if (isset($args['title']) && $args['title']) {
+				if (isset($args['icon']) && $args['icon']) {
+					$title = self::get_widget_icon($args['icon'], $args['title']);
 				} else {
 					$title = esc_attr($args['title']);
 				}
@@ -3089,11 +3089,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>';
@@ -3106,8 +3106,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(),
@@ -3117,7 +3117,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 
 		/**
@@ -3129,23 +3129,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';
 					}
 				}
 			}
@@ -3163,7 +3163,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;
 			}
 
@@ -3176,9 +3176,9 @@ 
 		 * @since 1.0.20
 		 * @return string
 		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
+		public function get_instance_hash() {
+			$instance_string = $this->base_id . serialize($this->instance);
+			return hash('crc32b', $instance_string);
 		}
 
 		/**
@@ -3189,14 +3189,14 @@ 
 		 * @since 1.0.20
 		 * @return string
 		 */
-		public function get_instance_style($rules = array()){
+		public function get_instance_style($rules = array()) {
 			$css = '';
 
-			if(!empty($rules)){
+			if (!empty($rules)) {
 				$rules = array_unique($rules);
 				$instance_hash = $this->get_instance_hash();
 				$css .= "<style>";
-				foreach($rules as $rule){
+				foreach ($rules as $rule) {
 					$css .= ".sdel-$instance_hash $rule";
 				}
 				$css .= "</style>";

includes/data/tax-rates.php

Spacing +29 added lines, -29 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 return array(
 
@@ -18,7 +18,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 13,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -27,7 +27,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 12,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -36,7 +36,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -45,7 +45,7 @@ 
         'global'       => true,
         'rate'         => 19,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -54,7 +54,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 15,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -63,7 +63,7 @@ 
         'global'       => true,
         'rate'         => 25,
         'reduced_rate' => 25,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -72,7 +72,7 @@ 
         'global'       => true,
         'rate'         => 16,
         'reduced_rate' => 5,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -81,7 +81,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -90,7 +90,7 @@ 
         'global'       => true,
         'rate'         => 24,
         'reduced_rate' => 13,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -99,7 +99,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 10,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -108,7 +108,7 @@ 
         'global'       => true,
         'rate'         => 24,
         'reduced_rate' => 14,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -117,7 +117,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 10,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -126,7 +126,7 @@ 
         'global'       => true,
         'rate'         => 25,
         'reduced_rate' => 13,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -135,7 +135,7 @@ 
         'global'       => true,
         'rate'         => 22,
         'reduced_rate' => 10,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -144,7 +144,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 12,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -153,7 +153,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -162,7 +162,7 @@ 
         'global'       => true,
         'rate'         => 17,
         'reduced_rate' => 14,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -171,7 +171,7 @@ 
         'global'       => true,
         'rate'         => 27,
         'reduced_rate' => 18,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -180,7 +180,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 13.5,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -189,7 +189,7 @@ 
         'global'       => true,
         'rate'         => 18,
         'reduced_rate' => 7,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -198,7 +198,7 @@ 
         'global'       => true,
         'rate'         => 21,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -207,7 +207,7 @@ 
         'global'       => true,
         'rate'         => 23,
         'reduced_rate' => 8,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -216,7 +216,7 @@ 
         'global'       => true,
         'rate'         => 23,
         'reduced_rate' => 13,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -225,7 +225,7 @@ 
         'global'       => true,
         'rate'         => 19,
         'reduced_rate' => 9,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -234,7 +234,7 @@ 
         'global'       => true,
         'rate'         => 22,
         'reduced_rate' => 9.5,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -243,7 +243,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 10,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -252,7 +252,7 @@ 
         'global'       => true,
         'rate'         => 25,
         'reduced_rate' => 12,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     ),
 
     array(
@@ -261,7 +261,7 @@ 
         'global'       => true,
         'rate'         => 20,
         'reduced_rate' => 5,
-        'name'         => __( 'VAT', 'invoicing' ),
+        'name'         => __('VAT', 'invoicing'),
     )
 
 );

includes/class-bp-getpaid-component.php

Indentation +129 added lines, -129 removed lines

@@ -17,45 +17,45 @@ 
  */
 class BP_GetPaid_Component extends BP_Component {
 
-	/**
-	 * Start the component setup process.
-	 *
-	 * @since 2.1.5
-	 */
-	public function __construct() {
-		parent::start(
-			'getpaid',
-			'GetPaid',
-			buddypress()->plugin_dir,
-			array(
-				'adminbar_myaccount_order' => 30,
-			)
-		);
-	}
+    /**
+     * Start the component setup process.
+     *
+     * @since 2.1.5
+     */
+    public function __construct() {
+        parent::start(
+            'getpaid',
+            'GetPaid',
+            buddypress()->plugin_dir,
+            array(
+                'adminbar_myaccount_order' => 30,
+            )
+        );
+    }
 
     /**
-	 * Set up component global variables.
-	 *
-	 * @since 2.1.5
-	 *
-	 *
-	 * @param array $args {
-	 *     All values are optional.
-	 *     @type string   $slug                  The component slug. Used to construct certain URLs, such as 'friends' in
-	 *                                           http://example.com/members/joe/friends/. Default: the value of $this->id.
-	 *     @type string   $root_slug             The component root slug. Note that this value is generally unused if the
-	 *                                           component has a root directory (the slug will be overridden by the
-	 *                                           post_name of the directory page). Default: the slug of the directory page
-	 *                                           if one is found, otherwise an empty string.
-	 *     @type bool     $has_directory         Set to true if the component requires an associated WordPress page.
-	 *     @type callable $notification_callback Optional. The callable function that formats the component's notifications.
-	 *     @type string   $search_term           Optional. The placeholder text in the component directory search box. Eg,
-	 *                                           'Search Groups...'.
-	 *     @type array    $global_tables         Optional. An array of database table names.
-	 *     @type array    $meta_tables           Optional. An array of metadata table names.
-	 * }
-	 */
-	public function setup_globals( $args = array() ) {
+     * Set up component global variables.
+     *
+     * @since 2.1.5
+     *
+     *
+     * @param array $args {
+     *     All values are optional.
+     *     @type string   $slug                  The component slug. Used to construct certain URLs, such as 'friends' in
+     *                                           http://example.com/members/joe/friends/. Default: the value of $this->id.
+     *     @type string   $root_slug             The component root slug. Note that this value is generally unused if the
+     *                                           component has a root directory (the slug will be overridden by the
+     *                                           post_name of the directory page). Default: the slug of the directory page
+     *                                           if one is found, otherwise an empty string.
+     *     @type bool     $has_directory         Set to true if the component requires an associated WordPress page.
+     *     @type callable $notification_callback Optional. The callable function that formats the component's notifications.
+     *     @type string   $search_term           Optional. The placeholder text in the component directory search box. Eg,
+     *                                           'Search Groups...'.
+     *     @type array    $global_tables         Optional. An array of database table names.
+     *     @type array    $meta_tables           Optional. An array of metadata table names.
+     * }
+     */
+    public function setup_globals( $args = array() ) {
         parent::setup_globals(
             array(
                 'id'            => 'getpaid',
@@ -64,21 +64,21 @@ 
                 'has_directory' => false
             )
         );
-	}
-
-	/**
-	 * Set up component navigation.
-	 *
-	 * @since 2.1.5
-	 *
-	 * @see BP_Component::setup_nav() for a description of arguments.
-	 *
-	 * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
-	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
-	 */
-	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Abort if the integration is inactive.
+    }
+
+    /**
+     * Set up component navigation.
+     *
+     * @since 2.1.5
+     *
+     * @see BP_Component::setup_nav() for a description of arguments.
+     *
+     * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
+     * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
+     */
+    public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+
+        // Abort if the integration is inactive.
         if ( ! getpaid_is_buddypress_integration_active() || ! is_user_logged_in() ) {
             return;
         }
@@ -88,25 +88,25 @@ 
             return;
         }
 
-		// Determine user to use.
-		$user_domain   = bp_loggedin_user_domain();
-		$slug          = 'getpaid';
-		$payments_link = trailingslashit( $user_domain . $slug );
-
-		// Add 'Payments' to the main navigation.
-		$main_nav = array(
-			'name'                => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
-			'slug'                => $slug,
-			'position'            => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
-			'screen_function'     => array( $this, 'display_current_tab' ),
-			'default_subnav_slug' => 'gp-edit-address',
+        // Determine user to use.
+        $user_domain   = bp_loggedin_user_domain();
+        $slug          = 'getpaid';
+        $payments_link = trailingslashit( $user_domain . $slug );
+
+        // Add 'Payments' to the main navigation.
+        $main_nav = array(
+            'name'                => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
+            'slug'                => $slug,
+            'position'            => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
+            'screen_function'     => array( $this, 'display_current_tab' ),
+            'default_subnav_slug' => 'gp-edit-address',
             'show_for_displayed_user' => false,
-			'item_css_id'         => $this->id,
-			'parent_url'          => $user_domain,
-			'parent_slug'         => buddypress()->slug,
-		);
+            'item_css_id'         => $this->id,
+            'parent_url'          => $user_domain,
+            'parent_slug'         => buddypress()->slug,
+        );
 
-		// Add the subnav items to the payments nav item if we are using a theme that supports this.
+        // Add the subnav items to the payments nav item if we are using a theme that supports this.
         foreach ( getpaid_get_user_content_tabs() as $_slug => $tab ) {
 
             $sub_nav[] = array(
@@ -116,8 +116,8 @@ 
                 'parent_slug'     => $slug,
                 'position' => 10,
                 'screen_function'        => function() use ( $tab ) {
-					$GLOBALS['getpaid_bp_current_tab'] = $tab;
-					$this->display_current_tab();
+                    $GLOBALS['getpaid_bp_current_tab'] = $tab;
+                    $this->display_current_tab();
                 },
                 'show_for_displayed_user' => false,
                 'item_css_id'             => "getpaid-bp-$_slug",
@@ -125,27 +125,27 @@ 
 
         }
 
-		parent::setup_nav( $main_nav, $sub_nav );
-	}
-
-	/**
-	 * Set up the component entries in the WordPress Admin Bar.
-	 *
-	 * @since 2.1.5
-	 *
-	 * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
-	 *      parameter array.
-	 *
-	 * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
-	 *                            description.
-	 */
-	public function setup_admin_bar( $wp_admin_nav = array() ) {
-
-		// Menus for logged in user.
-		if ( is_user_logged_in() ) {
+        parent::setup_nav( $main_nav, $sub_nav );
+    }
 
-			// Setup the logged in user variables.
-			$payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
+    /**
+     * Set up the component entries in the WordPress Admin Bar.
+     *
+     * @since 2.1.5
+     *
+     * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
+     *      parameter array.
+     *
+     * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
+     *                            description.
+     */
+    public function setup_admin_bar( $wp_admin_nav = array() ) {
+
+        // Menus for logged in user.
+        if ( is_user_logged_in() ) {
+
+            // Setup the logged in user variables.
+            $payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
 
             // Add the "Payments" sub menu.
             $wp_admin_nav[] = array(
@@ -167,50 +167,50 @@ 
 
             }
 
-		}
-
-		parent::setup_admin_bar( $wp_admin_nav );
-	}
+        }
 
-	/**
-	 * Retrieves the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function get_current_tab() {
-		global $getpaid_bp_current_tab;
+        parent::setup_admin_bar( $wp_admin_nav );
+    }
 
-		if ( empty( $getpaid_bp_current_tab ) ) {
-			return array(
-				'label'     => __( 'Invoices', 'invoicing' ),
-				'content'   => '[wpinv_history]',
-				'icon'      => 'fas fa-file-invoice',
-			);
-		}
+    /**
+     * Retrieves the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function get_current_tab() {
+        global $getpaid_bp_current_tab;
+
+        if ( empty( $getpaid_bp_current_tab ) ) {
+            return array(
+                'label'     => __( 'Invoices', 'invoicing' ),
+                'content'   => '[wpinv_history]',
+                'icon'      => 'fas fa-file-invoice',
+            );
+        }
 
-		return $getpaid_bp_current_tab;
-	}
+        return $getpaid_bp_current_tab;
+    }
 
-	/**
-	 * Displays the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function display_current_tab() {
+    /**
+     * Displays the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function display_current_tab() {
 
-		add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
-		$template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+        add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
+        $template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
 
         bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
-	}
-
-	/**
-	 * Handles the actual display of the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function handle_display_current_tab() {
-		echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
-	}
+    }
+
+    /**
+     * Handles the actual display of the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function handle_display_current_tab() {
+        echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main GetPaid Class.
@@ -55,7 +55,7 @@ 
 	 *     @type array    $meta_tables           Optional. An array of metadata table names.
 	 * }
 	 */
-	public function setup_globals( $args = array() ) {
+	public function setup_globals($args = array()) {
         parent::setup_globals(
             array(
                 'id'            => 'getpaid',
@@ -76,29 +76,29 @@ 
 	 * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
 	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
 	 */
-	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+	public function setup_nav($main_nav = array(), $sub_nav = array()) {
 
 		// Abort if the integration is inactive.
-        if ( ! getpaid_is_buddypress_integration_active() || ! is_user_logged_in() ) {
+        if (!getpaid_is_buddypress_integration_active() || !is_user_logged_in()) {
             return;
         }
     
         // Or a user is not viewing their profile.
-        if ( bp_displayed_user_id() != bp_loggedin_user_id() ) {
+        if (bp_displayed_user_id() != bp_loggedin_user_id()) {
             return;
         }
 
 		// Determine user to use.
 		$user_domain   = bp_loggedin_user_domain();
 		$slug          = 'getpaid';
-		$payments_link = trailingslashit( $user_domain . $slug );
+		$payments_link = trailingslashit($user_domain . $slug);
 
 		// Add 'Payments' to the main navigation.
 		$main_nav = array(
-			'name'                => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
+			'name'                => _x('Billing', 'BuddyPress profile payments screen nav', 'invoicing'),
 			'slug'                => $slug,
-			'position'            => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
-			'screen_function'     => array( $this, 'display_current_tab' ),
+			'position'            => apply_filters('wpinv_bp_nav_position', wpinv_get_option('wpinv_menu_position', 91), $slug),
+			'screen_function'     => array($this, 'display_current_tab'),
 			'default_subnav_slug' => 'gp-edit-address',
             'show_for_displayed_user' => false,
 			'item_css_id'         => $this->id,
@@ -107,15 +107,15 @@ 
 		);
 
 		// Add the subnav items to the payments nav item if we are using a theme that supports this.
-        foreach ( getpaid_get_user_content_tabs() as $_slug => $tab ) {
+        foreach (getpaid_get_user_content_tabs() as $_slug => $tab) {
 
             $sub_nav[] = array(
-                'name'            => $tab[ 'label'],
+                'name'            => $tab['label'],
                 'slug'            => $_slug,
                 'parent_url'      => $payments_link,
                 'parent_slug'     => $slug,
                 'position' => 10,
-                'screen_function'        => function() use ( $tab ) {
+                'screen_function'        => function() use ($tab) {
 					$GLOBALS['getpaid_bp_current_tab'] = $tab;
 					$this->display_current_tab();
                 },
@@ -125,7 +125,7 @@ 
 
         }
 
-		parent::setup_nav( $main_nav, $sub_nav );
+		parent::setup_nav($main_nav, $sub_nav);
 	}
 
 	/**
@@ -139,29 +139,29 @@ 
 	 * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
 	 *                            description.
 	 */
-	public function setup_admin_bar( $wp_admin_nav = array() ) {
+	public function setup_admin_bar($wp_admin_nav = array()) {
 
 		// Menus for logged in user.
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 
 			// Setup the logged in user variables.
-			$payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
+			$payments_link = trailingslashit(bp_loggedin_user_domain() . 'getpaid/');
 
             // Add the "Payments" sub menu.
             $wp_admin_nav[] = array(
                 'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-getpaid',
-                'title'  => _x( 'Billing', 'BuddyPress my account payments sub nav', 'invoicing' ),
+                'title'  => _x('Billing', 'BuddyPress my account payments sub nav', 'invoicing'),
                 'href'   => $payments_link . 'gp-edit-address'
             );
 
-            foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+            foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
                 $wp_admin_nav[] = array(
                     'parent'   => 'my-account-getpaid',
                     'id'       => 'my-account-getpaid' . $slug,
-                    'title'    => $tab[ 'label'],
-                    'href'     => trailingslashit( $payments_link . $slug ),
+                    'title'    => $tab['label'],
+                    'href'     => trailingslashit($payments_link . $slug),
                     'position' => 20
                 );
 
@@ -169,7 +169,7 @@ 
 
 		}
 
-		parent::setup_admin_bar( $wp_admin_nav );
+		parent::setup_admin_bar($wp_admin_nav);
 	}
 
 	/**
@@ -180,9 +180,9 @@ 
 	public function get_current_tab() {
 		global $getpaid_bp_current_tab;
 
-		if ( empty( $getpaid_bp_current_tab ) ) {
+		if (empty($getpaid_bp_current_tab)) {
 			return array(
-				'label'     => __( 'Invoices', 'invoicing' ),
+				'label'     => __('Invoices', 'invoicing'),
 				'content'   => '[wpinv_history]',
 				'icon'      => 'fas fa-file-invoice',
 			);
@@ -198,10 +198,10 @@ 
 	 */
 	public function display_current_tab() {
 
-		add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
-		$template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+		add_action('bp_template_content', array($this, 'handle_display_current_tab'));
+		$template = apply_filters('bp_core_template_plugin', 'members/single/plugins');
 
-        bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
+        bp_core_load_template(apply_filters('wpinv_bp_core_template_plugin', $template));
 	}
 
 	/**
@@ -210,7 +210,7 @@ 
 	 * @since 2.1.5
 	 */
 	public function handle_display_current_tab() {
-		echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
+		echo getpaid_prepare_user_content_tab($this->get_current_tab());
 	}
 
 }

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

Indentation +14 added lines, -14 removed lines

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

Spacing +86 added lines, -86 removed lines

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

templates/payment-forms/elements/price_select.php

Spacing +33 added lines, -33 removed lines

@@ -7,35 +7,35 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Ensure that we have options.
-if ( empty( $options ) ) {
+if (empty($options)) {
     return;
 }
 
 // Prepare price options.
-$options = getpaid_convert_price_string_to_options( $options );
-$keys    = array_keys( $options );
-$value   = empty( $options ) ? '' : $keys[0];
+$options = getpaid_convert_price_string_to_options($options);
+$keys    = array_keys($options);
+$value   = empty($options) ? '' : $keys[0];
 
 // Prepare id.
-$id = esc_attr( $id );
+$id = esc_attr($id);
 
-$select_type = empty( $select_type ) ? 'select' : $select_type;
+$select_type = empty($select_type) ? 'select' : $select_type;
 
 // Item select;
-if ( $select_type == 'select' ) {
+if ($select_type == 'select') {
     echo aui()->select(
         array(
             'name'       => $id,
-            'id'         => $id . uniqid( '_' ),
-            'placeholder'=> empty( $placeholder ) ? '' : esc_attr( $placeholder ),
+            'id'         => $id . uniqid('_'),
+            'placeholder'=> empty($placeholder) ? '' : esc_attr($placeholder),
             'value'      => $value,
-            'label'      => empty( $label ) ? '' : sanitize_text_field( $label ),
+            'label'      => empty($label) ? '' : sanitize_text_field($label),
             'label_type' => 'vertical',
             'class'      => 'getpaid-price-select-dropdown getpaid-refresh-on-change',
-            'help_text'  => empty( $description ) ? '' : wp_kses_post( $description ),
+            'help_text'  => empty($description) ? '' : wp_kses_post($description),
             'options'    => $options,
         )
     );
@@ -43,18 +43,18 @@ 
 }
 
 // Item radios;
-if ( $select_type == 'radios' ) {
+if ($select_type == 'radios') {
     echo aui()->radio(
         array(
-            'name'       => esc_attr( $id ),
-            'id'         => esc_attr( $id ) . uniqid( '_' ),
-            'label'      => empty( $label ) ? '' : sanitize_text_field( $label ),
+            'name'       => esc_attr($id),
+            'id'         => esc_attr($id) . uniqid('_'),
+            'label'      => empty($label) ? '' : sanitize_text_field($label),
             'label_type' => 'vertical',
             'class'      => 'getpaid-price-select-radio getpaid-refresh-on-change w-100',
             'value'      => $value,
             'inline'     => false,
             'options'    => $options,
-            'help_text'  => empty( $description ) ? '' : wp_kses_post( $description ),
+            'help_text'  => empty($description) ? '' : wp_kses_post($description),
         )
     );
     return;
@@ -62,30 +62,30 @@ 
 
 
 // Display the label.
-if ( ! empty( $label ) ) {
-    $label = sanitize_text_field( $label );
+if (!empty($label)) {
+    $label = sanitize_text_field($label);
     echo "<label>$label</label>";
 }
 
 // Item buttons;
-if ( $select_type == 'buttons' || $select_type == 'circles' ) {
+if ($select_type == 'buttons' || $select_type == 'circles') {
 
     $class = 'getpaid-price-buttons';
 
-    if ( $select_type == 'circles' ) {
+    if ($select_type == 'circles') {
         $class .= ' getpaid-price-circles';
     }
     echo "<div class='$class'>";
 
-    foreach ( $options as $price => $label ) {
-        $label   = sanitize_text_field( $label );
-        $price   = esc_attr( $price );
-        $_id     = $id . uniqid( '_' );
-        $checked = checked( $price, $value, false );
+    foreach ($options as $price => $label) {
+        $label   = sanitize_text_field($label);
+        $price   = esc_attr($price);
+        $_id     = $id . uniqid('_');
+        $checked = checked($price, $value, false);
 
         $class = 'rounded';
 
-        if ( $select_type == 'circles' ) {
+        if ($select_type == 'circles') {
             $class = '';
         }
         echo "
@@ -101,13 +101,13 @@ 
 }
 
 // Item checkboxes;
-if ( $select_type == 'checkboxes' ) {
+if ($select_type == 'checkboxes') {
     echo '<div class="form-group">';
 
-    foreach ( $options as $price => $label ) {
-        $label   = sanitize_text_field( $label );
-        $price   = esc_attr( $price );
-        $checked = checked( $price, $value, false );
+    foreach ($options as $price => $label) {
+        $label   = sanitize_text_field($label);
+        $price   = esc_attr($price);
+        $checked = checked($price, $value, false);
         echo "
             <label class='d-block'>
                 <input type='checkbox' class='getpaid-price-select-checkbox getpaid-refresh-on-change w-auto' name='{$id}[]' value='$price' $checked />
@@ -120,6 +120,6 @@ 
 
 }
 
-if ( ! empty( $description ) ) {
+if (!empty($description)) {
     echo "<small class='form-text text-muted'>$description</small>";
 }