AyeCode / invoicing

includes/admin/class-getpaid-admin.php

Indentation +619 added lines, -619 removed lines

@@ -14,94 +14,94 @@ 
 class GetPaid_Admin {
 
     /**
-	 * Local path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
-	public $admin_path;
-
-	/**
-	 * Web path to this plugins admin directory
-	 *
-	 * @var         string
-	 */
-	public $admin_url;
-
-	/**
-	 * Reports components.
-	 *
-	 * @var GetPaid_Reports
-	 */
+     * Local path to this plugins admin directory
+     *
+     * @var         string
+     */
+    public $admin_path;
+
+    /**
+     * Web path to this plugins admin directory
+     *
+     * @var         string
+     */
+    public $admin_url;
+
+    /**
+     * Reports components.
+     *
+     * @var GetPaid_Reports
+     */
     public $reports;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
 
         $this->admin_path  = plugin_dir_path( __FILE__ );
-		$this->admin_url   = plugins_url( '/', __FILE__ );
-		$this->reports     = new GetPaid_Reports();
+        $this->admin_url   = plugins_url( '/', __FILE__ );
+        $this->reports     = new GetPaid_Reports();
 
         if ( is_admin() ) {
-			$this->init_admin_hooks();
+            $this->init_admin_hooks();
         }
 
     }
 
     /**
-	 * Init action and filter hooks
-	 *
-	 */
-	private function init_admin_hooks() {
+     * Init action and filter hooks
+     *
+     */
+    private function init_admin_hooks() {
         add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ), 9 );
         add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
         add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
         add_action( 'admin_init', array( $this, 'activation_redirect' ) );
         add_action( 'admin_init', array( $this, 'maybe_do_admin_action' ) );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
-		add_action( 'getpaid_authenticated_admin_action_duplicate_form', array( $this, 'duplicate_payment_form' ) );
-		add_action( 'getpaid_authenticated_admin_action_reset_form_stats', array( $this, 'reset_form_stats' ) );
-		add_action( 'getpaid_authenticated_admin_action_duplicate_invoice', array( $this, 'duplicate_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_refund_invoice', array( $this, 'refund_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
+        add_action( 'admin_notices', array( $this, 'show_notices' ) );
+        add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
+        add_action( 'getpaid_authenticated_admin_action_duplicate_form', array( $this, 'duplicate_payment_form' ) );
+        add_action( 'getpaid_authenticated_admin_action_reset_form_stats', array( $this, 'reset_form_stats' ) );
+        add_action( 'getpaid_authenticated_admin_action_duplicate_invoice', array( $this, 'duplicate_invoice' ) );
+        add_action( 'getpaid_authenticated_admin_action_refund_invoice', array( $this, 'refund_invoice' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
+        add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
         add_action( 'getpaid_authenticated_admin_action_reset_tax_rates', array( $this, 'admin_reset_tax_rates' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
-		add_action( 'getpaid_authenticated_admin_action_refresh_permalinks', array( $this, 'admin_refresh_permalinks' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
-		add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_customers', array( $this, 'admin_download_customers' ) );
-		add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
-		add_action( 'getpaid_authenticated_admin_action_install_plugin', array( $this, 'admin_install_plugin' ) );
-		add_action( 'getpaid_authenticated_admin_action_connect_gateway', array( $this, 'admin_connect_gateway' ) );
-		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
-
-		// Setup/welcome
-		if ( ! empty( $_GET['page'] ) ) {
-			switch ( sanitize_text_field( $_GET['page'] ) ) {
-				case 'gp-setup':
-					include_once dirname( __FILE__ ) . '/class-getpaid-admin-setup-wizard.php';
-					break;
-			}
-		}
-
-    }
-
-    /**
-	 * Register admin scripts
-	 *
-	 */
-	public function enqeue_scripts() {
+        add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
+        add_action( 'getpaid_authenticated_admin_action_refresh_permalinks', array( $this, 'admin_refresh_permalinks' ) );
+        add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
+        add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
+        add_action( 'getpaid_authenticated_admin_action_download_customers', array( $this, 'admin_download_customers' ) );
+        add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
+        add_action( 'getpaid_authenticated_admin_action_install_plugin', array( $this, 'admin_install_plugin' ) );
+        add_action( 'getpaid_authenticated_admin_action_connect_gateway', array( $this, 'admin_connect_gateway' ) );
+        add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
+        do_action( 'getpaid_init_admin_hooks', $this );
+
+        // Setup/welcome
+        if ( ! empty( $_GET['page'] ) ) {
+            switch ( sanitize_text_field( $_GET['page'] ) ) {
+                case 'gp-setup':
+                    include_once dirname( __FILE__ ) . '/class-getpaid-admin-setup-wizard.php';
+                    break;
+            }
+        }
+
+    }
+
+    /**
+     * Register admin scripts
+     *
+     */
+    public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
-		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
+        $page    = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+        $editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         // General styles.
@@ -122,53 +122,53 @@ 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+        if ( 'wpi_payment_form' == $page && $editing ) {
             $this->load_payment_form_scripts();
         }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
-		}
+        if ( $page == 'wpinv-subscriptions' ) {
+            wp_enqueue_script( 'postbox' );
+        }
 
     }
 
     /**
-	 * Returns admin js translations.
-	 *
-	 */
-	protected function get_admin_i18() {
+     * Returns admin js translations.
+     *
+     */
+    protected function get_admin_i18() {
         global $post;
 
-		$date_range = array(
-			'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days',
-		);
+        $date_range = array(
+            'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days',
+        );
 
-		if ( $date_range['period'] == 'custom' ) {
+        if ( $date_range['period'] == 'custom' ) {
 
-			if ( isset( $_GET['from'] ) ) {
-				$date_range['after'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
-			}
+            if ( isset( $_GET['from'] ) ) {
+                $date_range['after'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
+            }
 
-			if ( isset( $_GET['to'] ) ) {
-				$date_range['before'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
-			}
+            if ( isset( $_GET['to'] ) ) {
+                $date_range['before'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
+            }
 }
 
         $i18n = array(
             'ajax_url'                  => admin_url( 'admin-ajax.php' ),
             'post_ID'                   => isset( $post->ID ) ? $post->ID : '',
-			'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
-			'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
-			'rest_root'                 => esc_url_raw( rest_url() ),
-			'date_range'                => $date_range,
+            'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
+            'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
+            'rest_root'                 => esc_url_raw( rest_url() ),
+            'date_range'                => $date_range,
             'add_invoice_note_nonce'    => wp_create_nonce( 'add-invoice-note' ),
             'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ),
             'invoice_item_nonce'        => wp_create_nonce( 'invoice-item' ),
             'billing_details_nonce'     => wp_create_nonce( 'get-billing-details' ),
             'tax'                       => wpinv_tax_amount(),
             'discount'                  => 0,
-			'currency_symbol'           => wpinv_currency_symbol(),
-			'currency'                  => wpinv_get_currency(),
+            'currency_symbol'           => wpinv_currency_symbol(),
+            'currency'                  => wpinv_get_currency(),
             'currency_pos'              => wpinv_currency_position(),
             'thousand_sep'              => wpinv_thousands_separator(),
             'decimal_sep'               => wpinv_decimal_separator(),
@@ -188,117 +188,117 @@ 
             'item_description'          => __( 'Item Description', 'invoicing' ),
             'invoice_description'       => __( 'Invoice Description', 'invoicing' ),
             'discount_description'      => __( 'Discount Description', 'invoicing' ),
-			'searching'                 => __( 'Searching', 'invoicing' ),
-			'loading'                   => __( 'Loading...', 'invoicing' ),
-			'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
-			'search_items'              => __( 'Enter item name', 'invoicing' ),
-			'graphs'                    => array_merge( array( 'refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax' ), array_keys( wpinv_get_report_graphs() ) ),
+            'searching'                 => __( 'Searching', 'invoicing' ),
+            'loading'                   => __( 'Loading...', 'invoicing' ),
+            'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
+            'search_items'              => __( 'Enter item name', 'invoicing' ),
+            'graphs'                    => array_merge( array( 'refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax' ), array_keys( wpinv_get_report_graphs() ) ),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+        if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
 
-			$invoice              = new WPInv_Invoice( $post );
-			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
-			);
+            $invoice              = new WPInv_Invoice( $post );
+            $i18n['save_invoice'] = sprintf(
+                __( 'Save %s', 'invoicing' ),
+                ucfirst( $invoice->get_invoice_quote_type() )
+            );
 
-			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
-			);
+            $i18n['invoice_description'] = sprintf(
+                __( '%s Description', 'invoicing' ),
+                ucfirst( $invoice->get_invoice_quote_type() )
+            );
 
-		}
-		return $i18n;
-	}
+        }
+        return $i18n;
+    }
 
-	/**
-	 * Change the admin footer text on GetPaid admin pages.
-	 *
-	 * @since  2.0.0
-	 * @param  string $footer_text
-	 * @return string
-	 */
-	public function admin_footer_text( $footer_text ) {
-		global $current_screen;
+    /**
+     * Change the admin footer text on GetPaid admin pages.
+     *
+     * @since  2.0.0
+     * @param  string $footer_text
+     * @return string
+     */
+    public function admin_footer_text( $footer_text ) {
+        global $current_screen;
 
-		$page    = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+        $page    = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         // General styles.
         if ( apply_filters( 'getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing() ) && false !== stripos( $page, 'wpi' ) ) {
 
-			// Change the footer text
-			if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
+            // Change the footer text
+            if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
 
-				$rating_url  = esc_url(
-					wp_nonce_url(
-						admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
-						'getpaid-nonce',
-						'getpaid-nonce'
+                $rating_url  = esc_url(
+                    wp_nonce_url(
+                        admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
                     )
-				);
+                );
 
-				$footer_text = sprintf(
-					/* translators: %s: five stars */
-					__( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
-					"<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
-				);
+                $footer_text = sprintf(
+                    /* translators: %s: five stars */
+                    __( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
+                    "<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
+                );
 
-			} else {
+            } else {
 
-				$footer_text = sprintf(
-					/* translators: %s: GetPaid */
-					__( 'Thank you for using %s!', 'invoicing' ),
-					"<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
-				);
+                $footer_text = sprintf(
+                    /* translators: %s: GetPaid */
+                    __( 'Thank you for using %s!', 'invoicing' ),
+                    "<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
+                );
 
-			}
+            }
 }
 
-		return $footer_text;
-	}
-
-	/**
-	 * Redirects to wp.org to rate the plugin.
-	 *
-	 * @since  2.0.0
-	 */
-	public function redirect_to_wordpress_rating_page() {
-		update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
-		wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
-		exit;
-	}
-
-    /**
-	 * Loads payment form js.
-	 *
-	 */
-	protected function load_payment_form_scripts() {
+        return $footer_text;
+    }
+
+    /**
+     * Redirects to wp.org to rate the plugin.
+     *
+     * @since  2.0.0
+     */
+    public function redirect_to_wordpress_rating_page() {
+        update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
+        wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
+        exit;
+    }
+
+    /**
+     * Loads payment form js.
+     *
+     */
+    protected function load_payment_form_scripts() {
         global $post;
 
         wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
+        wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
 
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.min.js', array( 'wpinv-admin-script', 'vue_draggable', 'wp-hooks' ), WPINV_VERSION );
+        wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.min.js', array( 'wpinv-admin-script', 'vue_draggable', 'wp-hooks' ), WPINV_VERSION );
 
-		wp_localize_script(
+        wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
-				'currency'      => wpinv_currency_symbol(),
-				'position'      => wpinv_currency_position(),
-				'decimals'      => (int) wpinv_decimals(),
-				'thousands_sep' => wpinv_thousands_separator(),
-				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
-				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
+                'elements'      => wpinv_get_data( 'payment-form-elements' ),
+                'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+                'currency'      => wpinv_currency_symbol(),
+                'position'      => wpinv_currency_position(),
+                'decimals'      => (int) wpinv_decimals(),
+                'thousands_sep' => wpinv_thousands_separator(),
+                'decimals_sep'  => wpinv_decimal_separator(),
+                'form_items'    => gepaid_get_form_items( $post->ID ),
+                'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
@@ -307,19 +307,19 @@ 
     }
 
     /**
-	 * Add our classes to admin pages.
+     * Add our classes to admin pages.
      *
      * @param string $classes
      * @return string
-	 *
-	 */
+     *
+     */
     public function admin_body_class( $classes ) {
-		global $pagenow, $post, $current_screen;
+        global $pagenow, $post, $current_screen;
 
         $page = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
 
         if ( ! empty( $current_screen->post_type ) ) {
-			$page = $current_screen->post_type;
+            $page = $current_screen->post_type;
         }
 
         if ( false !== stripos( $page, 'wpi' ) ) {
@@ -328,70 +328,70 @@ 
 
         if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
             $classes .= ' wpinv-cpt wpinv';
-		}
+        }
 
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+        if ( getpaid_is_invoice_post_type( $page ) ) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
-		return $classes;
+        return $classes;
     }
 
     /**
-	 * Maybe show the AyeCode Connect Notice.
-	 */
-	public function init_ayecode_connect_helper() {
+     * Maybe show the AyeCode Connect Notice.
+     */
+    public function init_ayecode_connect_helper() {
 
-		// Register with the deactivation survey class.
-		AyeCode_Deactivation_Survey::instance(
+        // Register with the deactivation survey class.
+        AyeCode_Deactivation_Survey::instance(
             array(
-				'slug'              => 'invoicing',
-				'version'           => WPINV_VERSION,
-				'support_url'       => 'https://wpgetpaid.com/support/',
-				'documentation_url' => 'https://docs.wpgetpaid.com/',
-				'activated'         => (int) get_option( 'gepaid_installed_on' ),
+                'slug'              => 'invoicing',
+                'version'           => WPINV_VERSION,
+                'support_url'       => 'https://wpgetpaid.com/support/',
+                'documentation_url' => 'https://docs.wpgetpaid.com/',
+                'activated'         => (int) get_option( 'gepaid_installed_on' ),
             )
         );
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title'     => __( 'WP Invoicing - an AyeCode product!', 'invoicing' ),
-				'connect_external'  => __( 'Please confirm you wish to connect your site?', 'invoicing' ),
-				'connect'           => sprintf( __( '<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %1$slearn more%2$s', 'invoicing' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", '</a>' ),
-				'connect_button'    => __( 'Connect Site', 'invoicing' ),
-				'connecting_button' => __( 'Connecting...', 'invoicing' ),
-				'error_localhost'   => __( 'This service will only work with a live domain, not a localhost.', 'invoicing' ),
-				'error'             => __( 'Something went wrong, please refresh and try again.', 'invoicing' ),
+                'connect_title'     => __( 'WP Invoicing - an AyeCode product!', 'invoicing' ),
+                'connect_external'  => __( 'Please confirm you wish to connect your site?', 'invoicing' ),
+                'connect'           => sprintf( __( '<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %1$slearn more%2$s', 'invoicing' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", '</a>' ),
+                'connect_button'    => __( 'Connect Site', 'invoicing' ),
+                'connecting_button' => __( 'Connecting...', 'invoicing' ),
+                'error_localhost'   => __( 'This service will only work with a live domain, not a localhost.', 'invoicing' ),
+                'error'             => __( 'Something went wrong, please refresh and try again.', 'invoicing' ),
             ),
             array( 'wpi-addons' )
         );
 
     }
 
-	/**
-	 * Redirect users to settings on activation.
-	 *
-	 * @return void
-	 */
-	public function activation_redirect() {
+    /**
+     * Redirect users to settings on activation.
+     *
+     * @return void
+     */
+    public function activation_redirect() {
 
-		$redirected = get_option( 'wpinv_redirected_to_settings' );
+        $redirected = get_option( 'wpinv_redirected_to_settings' );
 
-		if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
-			return;
-		}
+        if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
+            return;
+        }
 
-		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-			return;
-		}
+        // Bail if activating from network, or bulk
+        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+            return;
+        }
 
-	    update_option( 'wpinv_redirected_to_settings', 1 );
+        update_option( 'wpinv_redirected_to_settings', 1 );
 
         wp_safe_redirect( admin_url( 'index.php?page=gp-setup' ) );
         exit;
 
-	}
+    }
 
     /**
      * Fires an admin action after verifying that a user can fire them.
@@ -404,555 +404,555 @@ 
         }
     }
 
-	/**
+    /**
      * Duplicate invoice.
-	 *
-	 * @param array $args
+     *
+     * @param array $args
      */
     public function duplicate_invoice( $args ) {
 
-		if ( empty( $args['invoice_id'] ) ) {
-			return;
-		}
+        if ( empty( $args['invoice_id'] ) ) {
+            return;
+        }
 
-		$invoice = new WPInv_Invoice( (int) $args['invoice_id'] );
+        $invoice = new WPInv_Invoice( (int) $args['invoice_id'] );
 
-		if ( ! $invoice->exists() ) {
-			return;
-		}
+        if ( ! $invoice->exists() ) {
+            return;
+        }
 
-		$new_invoice = getpaid_duplicate_invoice( $invoice );
-		$new_invoice->save();
+        $new_invoice = getpaid_duplicate_invoice( $invoice );
+        $new_invoice->save();
 
-		if ( $new_invoice->exists() ) {
+        if ( $new_invoice->exists() ) {
 
-			getpaid_admin()->show_success( __( 'Invoice duplicated successfully.', 'invoicing' ) );
+            getpaid_admin()->show_success( __( 'Invoice duplicated successfully.', 'invoicing' ) );
 
-			wp_safe_redirect(
-				add_query_arg(
-					array(
-						'action' => 'edit',
-						'post'   => $new_invoice->get_id(),
-					),
-					admin_url( 'post.php' )
-				)
-			);
-			exit;
+            wp_safe_redirect(
+                add_query_arg(
+                    array(
+                        'action' => 'edit',
+                        'post'   => $new_invoice->get_id(),
+                    ),
+                    admin_url( 'post.php' )
+                )
+            );
+            exit;
 
-		}
+        }
 
-		getpaid_admin()->show_error( __( 'There was an error duplicating this invoice. Please try again.', 'invoicing' ) );
+        getpaid_admin()->show_error( __( 'There was an error duplicating this invoice. Please try again.', 'invoicing' ) );
 
-	}
+    }
 
-	/**
+    /**
      * Refund an invoice.
-	 *
-	 * @param array $args
+     *
+     * @param array $args
      */
     public function refund_invoice( $args ) {
 
-		if ( empty( $args['invoice_id'] ) ) {
-			return;
-		}
-
-		$invoice = new WPInv_Invoice( (int) $args['invoice_id'] );
-
-		if ( ! $invoice->exists() || $invoice->is_refunded() ) {
-			return;
-		}
-
-		$invoice->refund();
-
-		// Refund remotely.
-		if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) && ! empty( $args['getpaid_refund_remote'] ) ) {
-			do_action( 'getpaid_refund_invoice_remotely', $invoice );
-		}
-
-		// Cancel subscriptions.
-		if ( ! empty( $args['getpaid_cancel_subscription'] ) ) {
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-
-			if ( ! empty( $subscriptions ) ) {
-				if ( ! is_array( $subscriptions ) ) {
-					$subscriptions = array( $subscriptions );
-				}
-
-				foreach ( $subscriptions as $subscription ) {
-					$subscription->cancel();
-					$invoice->add_system_note(
-						sprintf(
-							// translators: %s: subscription ID.
-							__( 'Subscription #%s cancelled', 'invoicing' ),
-							$subscription->get_id()
-						)
-					);
-				}
-			}
-		}
-
-		// Add notice.
-		$this->show_success( __( 'Invoice refunded successfully.', 'invoicing' ) );
-
-		// Redirect.
-		wp_safe_redirect(
-			remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id', 'getpaid_cancel_subscription', 'getpaid_refund_remote' ) )
-		);
-	}
-
-	/**
+        if ( empty( $args['invoice_id'] ) ) {
+            return;
+        }
+
+        $invoice = new WPInv_Invoice( (int) $args['invoice_id'] );
+
+        if ( ! $invoice->exists() || $invoice->is_refunded() ) {
+            return;
+        }
+
+        $invoice->refund();
+
+        // Refund remotely.
+        if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) && ! empty( $args['getpaid_refund_remote'] ) ) {
+            do_action( 'getpaid_refund_invoice_remotely', $invoice );
+        }
+
+        // Cancel subscriptions.
+        if ( ! empty( $args['getpaid_cancel_subscription'] ) ) {
+            $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+
+            if ( ! empty( $subscriptions ) ) {
+                if ( ! is_array( $subscriptions ) ) {
+                    $subscriptions = array( $subscriptions );
+                }
+
+                foreach ( $subscriptions as $subscription ) {
+                    $subscription->cancel();
+                    $invoice->add_system_note(
+                        sprintf(
+                            // translators: %s: subscription ID.
+                            __( 'Subscription #%s cancelled', 'invoicing' ),
+                            $subscription->get_id()
+                        )
+                    );
+                }
+            }
+        }
+
+        // Add notice.
+        $this->show_success( __( 'Invoice refunded successfully.', 'invoicing' ) );
+
+        // Redirect.
+        wp_safe_redirect(
+            remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id', 'getpaid_cancel_subscription', 'getpaid_refund_remote' ) )
+        );
+    }
+
+    /**
      * Sends a payment reminder to a customer.
-	 *
-	 * @param array $args
+     *
+     * @param array $args
      */
     public function duplicate_payment_form( $args ) {
 
-		if ( empty( $args['form_id'] ) ) {
-			return;
-		}
-
-		$form = new GetPaid_Payment_Form( (int) $args['form_id'] );
+        if ( empty( $args['form_id'] ) ) {
+            return;
+        }
 
-		if ( ! $form->exists() ) {
-			return;
-		}
+        $form = new GetPaid_Payment_Form( (int) $args['form_id'] );
 
-		$new_form = new GetPaid_Payment_Form();
-		$new_form->set_author( $form->get_author( 'edit' ) );
-		$new_form->set_name( $form->get_name( 'edit' ) . __( '(copy)', 'invoicing' ) );
-		$new_form->set_elements( $form->get_elements( 'edit' ) );
-		$new_form->set_items( $form->get_items( 'edit' ) );
-		$new_form->save();
+        if ( ! $form->exists() ) {
+            return;
+        }
 
-		if ( $new_form->exists() ) {
-			$this->show_success( __( 'Form duplicated successfully', 'invoicing' ) );
-			$url = get_edit_post_link( $new_form->get_id(), 'edit' );
-		} else {
-			$this->show_error( __( 'Unable to duplicate form', 'invoicing' ) );
-			$url = remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) );
-		}
+        $new_form = new GetPaid_Payment_Form();
+        $new_form->set_author( $form->get_author( 'edit' ) );
+        $new_form->set_name( $form->get_name( 'edit' ) . __( '(copy)', 'invoicing' ) );
+        $new_form->set_elements( $form->get_elements( 'edit' ) );
+        $new_form->set_items( $form->get_items( 'edit' ) );
+        $new_form->save();
+
+        if ( $new_form->exists() ) {
+            $this->show_success( __( 'Form duplicated successfully', 'invoicing' ) );
+            $url = get_edit_post_link( $new_form->get_id(), 'edit' );
+        } else {
+            $this->show_error( __( 'Unable to duplicate form', 'invoicing' ) );
+            $url = remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) );
+        }
 
-		wp_redirect( $url );
-		exit;
-	}
+        wp_redirect( $url );
+        exit;
+    }
 
-	/**
+    /**
      * Resets form stats.
-	 *
-	 * @param array $args
+     *
+     * @param array $args
      */
     public function reset_form_stats( $args ) {
 
-		if ( empty( $args['form_id'] ) ) {
-			return;
-		}
+        if ( empty( $args['form_id'] ) ) {
+            return;
+        }
 
-		$form = new GetPaid_Payment_Form( (int) $args['form_id'] );
+        $form = new GetPaid_Payment_Form( (int) $args['form_id'] );
 
-		if ( ! $form->exists() ) {
-			return;
-		}
+        if ( ! $form->exists() ) {
+            return;
+        }
 
-		$form->set_earned( 0 );
-		$form->set_refunded( 0 );
-		$form->set_cancelled( 0 );
-		$form->set_failed( 0 );
-		$form->save();
+        $form->set_earned( 0 );
+        $form->set_refunded( 0 );
+        $form->set_cancelled( 0 );
+        $form->set_failed( 0 );
+        $form->save();
 
-		$this->show_success( __( 'Form stats reset successfully', 'invoicing' ) );
+        $this->show_success( __( 'Form stats reset successfully', 'invoicing' ) );
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 *
-	 * @param array $args
+     *
+     * @param array $args
      */
     public function send_customer_invoice( $args ) {
-		getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Sends a payment reminder to a customer.
-	 *
-	 * @param array $args
+     *
+     * @param array $args
      */
     public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+        $sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
-		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
-		}
+        if ( $sent ) {
+            $this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+        } else {
+            $this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Resets tax rates.
-	 *
+     *
      */
     public function admin_reset_tax_rates() {
 
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
+        update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Resets admin pages.
-	 *
+     *
      */
     public function admin_create_missing_pages() {
-		$installer = new GetPaid_Installer();
-		$installer->create_pages();
-		$this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
-	}
-
-	/**
-	 * Refreshes the permalinks.
-	 */
-	public function admin_refresh_permalinks() {
-		flush_rewrite_rules();
-		$this->show_success( __( 'Permalinks refreshed.', 'invoicing' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
-	}
-
-	/**
+        $installer = new GetPaid_Installer();
+        $installer->create_pages();
+        $this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
+    }
+
+    /**
+     * Refreshes the permalinks.
+     */
+    public function admin_refresh_permalinks() {
+        flush_rewrite_rules();
+        $this->show_success( __( 'Permalinks refreshed.', 'invoicing' ) );
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
+    }
+
+    /**
      * Creates missing admin tables.
-	 *
+     *
      */
     public function admin_create_missing_tables() {
-		global $wpdb;
+        global $wpdb;
 
-		GetPaid_Installer::create_db_tables();
-		GetPaid_Installer::migrate_old_customers();
+        GetPaid_Installer::create_db_tables();
+        GetPaid_Installer::migrate_old_customers();
 
-		if ( '' !== $wpdb->last_error ) {
-			$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
-		} else {
-			$this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
-		}
+        if ( '' !== $wpdb->last_error ) {
+            $this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+        } else {
+            $this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
+        }
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
-	}
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
+    }
 
-	/**
+    /**
      * Migrates old invoices to the new database tables.
-	 *
+     *
      */
     public function admin_migrate_old_invoices() {
 
-		// Migrate the invoices.
-		$installer = new GetPaid_Installer();
-		$installer->migrate_old_invoices();
+        // Migrate the invoices.
+        $installer = new GetPaid_Installer();
+        $installer->migrate_old_invoices();
 
-		// Show an admin message.
-		$this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
+        // Show an admin message.
+        $this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
 
-		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
+        // Redirect the admin.
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Download customers.
-	 *
+     *
      */
     public function admin_download_customers() {
 
-		$output = fopen( 'php://output', 'w' );
+        $output = fopen( 'php://output', 'w' );
 
-		if ( false === $output ) {
-			wp_die( esc_html__( 'Unsupported server', 'invoicing' ), 500 );
-		}
+        if ( false === $output ) {
+            wp_die( esc_html__( 'Unsupported server', 'invoicing' ), 500 );
+        }
 
-		header( 'Content-Type:text/csv' );
-		header( 'Content-Disposition:attachment;filename=customers.csv' );
+        header( 'Content-Type:text/csv' );
+        header( 'Content-Disposition:attachment;filename=customers.csv' );
 
-		/** @var GetPaid_Customer[] $customers */
-		$customers = getpaid_get_customers( array( 'number' => -1 ) );
-		$columns   = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
+        /** @var GetPaid_Customer[] $customers */
+        $customers = getpaid_get_customers( array( 'number' => -1 ) );
+        $columns   = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
 
-		// Output the csv column headers.
-		fputcsv( $output, $columns );
+        // Output the csv column headers.
+        fputcsv( $output, $columns );
 
-		// Loop through
-		foreach ( $customers as $customer ) {
+        // Loop through
+        foreach ( $customers as $customer ) {
 
-			$row  = array();
+            $row  = array();
 
-			foreach ( $columns as $column ) {
-				$row[]  = (string) maybe_serialize( $customer->get( $column, 'edit' ) );
-			}
+            foreach ( $columns as $column ) {
+                $row[]  = (string) maybe_serialize( $customer->get( $column, 'edit' ) );
+            }
 
-			fputcsv( $output, $row );
-		}
+            fputcsv( $output, $row );
+        }
 
-		fclose( $output );
-		exit;
+        fclose( $output );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Installs a plugin.
-	 *
-	 * @param array $data
+     *
+     * @param array $data
      */
     public function admin_install_plugin( $data ) {
 
-		if ( ! empty( $data['plugins'] ) ) {
-			include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-			wp_cache_flush();
+        if ( ! empty( $data['plugins'] ) ) {
+            include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+            wp_cache_flush();
 
-			foreach ( $data['plugins'] as $slug => $file ) {
-				$plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip' );
-				$upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
-				$installed  = $upgrader->install( $plugin_zip );
+            foreach ( $data['plugins'] as $slug => $file ) {
+                $plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip' );
+                $upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
+                $installed  = $upgrader->install( $plugin_zip );
 
-				if ( ! is_wp_error( $installed ) && $installed ) {
-					activate_plugin( $file, '', false, true );
-				} else {
-					wpinv_error_log( $upgrader->skin->get_upgrade_messages(), false );
-				}
+                if ( ! is_wp_error( $installed ) && $installed ) {
+                    activate_plugin( $file, '', false, true );
+                } else {
+                    wpinv_error_log( $upgrader->skin->get_upgrade_messages(), false );
+                }
 }
 }
 
-		$redirect = isset( $data['redirect'] ) ? esc_url_raw( $data['redirect'] ) : admin_url( 'plugins.php' );
-		wp_safe_redirect( $redirect );
-		exit;
+        $redirect = isset( $data['redirect'] ) ? esc_url_raw( $data['redirect'] ) : admin_url( 'plugins.php' );
+        wp_safe_redirect( $redirect );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Connects a gateway.
-	 *
-	 * @param array $data
+     *
+     * @param array $data
      */
     public function admin_connect_gateway( $data ) {
 
-		if ( ! empty( $data['plugin'] ) ) {
+        if ( ! empty( $data['plugin'] ) ) {
 
-			$gateway     = sanitize_key( $data['plugin'] );
-			$connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
+            $gateway     = sanitize_key( $data['plugin'] );
+            $connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
 
-			if ( ! empty( $connect_url ) ) {
-				wp_redirect( $connect_url );
-				exit;
-			}
+            if ( ! empty( $connect_url ) ) {
+                wp_redirect( $connect_url );
+                exit;
+            }
 
-			if ( 'stripe' == $data['plugin'] ) {
-				require_once ABSPATH . 'wp-admin/includes/plugin.php';
-				include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-				wp_cache_flush();
+            if ( 'stripe' == $data['plugin'] ) {
+                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+                include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+                wp_cache_flush();
 
-				if ( ! array_key_exists( 'getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins() ) ) {
-					$plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip' );
-					$upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
-					$upgrader->install( $plugin_zip );
-				}
+                if ( ! array_key_exists( 'getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins() ) ) {
+                    $plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip' );
+                    $upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
+                    $upgrader->install( $plugin_zip );
+                }
 
-				activate_plugin( 'getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true );
-			}
+                activate_plugin( 'getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true );
+            }
 
-			$connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
-			if ( ! empty( $connect_url ) ) {
-				wp_redirect( $connect_url );
-				exit;
-			}
+            $connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
+            if ( ! empty( $connect_url ) ) {
+                wp_redirect( $connect_url );
+                exit;
+            }
 }
 
-		$redirect = isset( $data['redirect'] ) ? esc_url_raw( urldecode( $data['redirect'] ) ) : admin_url( 'admin.php?page=wpinv-settings&tab=gateways' );
-		wp_safe_redirect( $redirect );
-		exit;
+        $redirect = isset( $data['redirect'] ) ? esc_url_raw( urldecode( $data['redirect'] ) ) : admin_url( 'admin.php?page=wpinv-settings&tab=gateways' );
+        wp_safe_redirect( $redirect );
+        exit;
 
-	}
+    }
 
-	/**
+    /**
      * Recalculates discounts.
-	 *
+     *
      */
     public function admin_recalculate_discounts() {
-		global $wpdb;
+        global $wpdb;
 
-		// Fetch all invoices that have discount codes.
-		$table    = $wpdb->prefix . 'getpaid_invoices';
-		$invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
+        // Fetch all invoices that have discount codes.
+        $table    = $wpdb->prefix . 'getpaid_invoices';
+        $invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
 
-		foreach ( $invoices as $invoice ) {
+        foreach ( $invoices as $invoice ) {
 
-			$invoice = new WPInv_Invoice( $invoice );
+            $invoice = new WPInv_Invoice( $invoice );
 
-			if ( ! $invoice->exists() ) {
-				continue;
-			}
+            if ( ! $invoice->exists() ) {
+                continue;
+            }
 
-			// Abort if the discount does not exist or does not apply here.
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( ! $discount->exists() ) {
-				continue;
-			}
+            // Abort if the discount does not exist or does not apply here.
+            $discount = new WPInv_Discount( $invoice->get_discount_code() );
+            if ( ! $discount->exists() ) {
+                continue;
+            }
 
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
-			$invoice->recalculate_total();
+            $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+            $invoice->recalculate_total();
 
-			if ( $invoice->get_total_discount() > 0 ) {
-				$invoice->save();
-			}
+            if ( $invoice->get_total_discount() > 0 ) {
+                $invoice->save();
+            }
 }
 
-		// Show an admin message.
-		$this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
+        // Show an admin message.
+        $this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
 
-		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
-		exit;
+        // Redirect the admin.
+        wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+        exit;
 
-	}
+    }
 
     /**
-	 * Returns an array of admin notices.
-	 *
-	 * @since       1.0.19
+     * Returns an array of admin notices.
+     *
+     * @since       1.0.19
      * @return array
-	 */
-	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
+     */
+    public function get_notices() {
+        $notices = get_option( 'wpinv_admin_notices' );
         return is_array( $notices ) ? $notices : array();
-	}
+    }
 
-	/**
-	 * Checks if we have any admin notices.
-	 *
-	 * @since       2.0.4
+    /**
+     * Checks if we have any admin notices.
+     *
+     * @since       2.0.4
      * @return array
-	 */
-	public function has_notices() {
-		return count( $this->get_notices() ) > 0;
-	}
-
-	/**
-	 * Clears all admin notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
-	}
-
-	/**
-	 * Saves a new admin notice
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function save_notice( $type, $message ) {
-		$notices = $this->get_notices();
-
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ] ) ) {
-			$notices[ $type ] = array();
-		}
-
-		$notices[ $type ][] = $message;
-
-		update_option( 'wpinv_admin_notices', $notices );
-	}
-
-	/**
-	 * Displays a success notice
-	 *
-	 * @param       string $msg The message to qeue.
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
-	}
-
-	/**
-	 * Displays a error notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
-	}
-
-	/**
-	 * Displays a warning notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
-	}
-
-	/**
-	 * Displays a info notice
-	 *
-	 * @access      public
-	 * @param       string $msg The message to qeue.
-	 * @since       1.0.19
-	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
-	}
-
-	/**
-	 * Show notices
-	 *
-	 * @access      public
-	 * @since       1.0.19
-	 */
-	public function show_notices() {
+     */
+    public function has_notices() {
+        return count( $this->get_notices() ) > 0;
+    }
+
+    /**
+     * Clears all admin notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function clear_notices() {
+        delete_option( 'wpinv_admin_notices' );
+    }
+
+    /**
+     * Saves a new admin notice
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function save_notice( $type, $message ) {
+        $notices = $this->get_notices();
+
+        if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ] ) ) {
+            $notices[ $type ] = array();
+        }
+
+        $notices[ $type ][] = $message;
+
+        update_option( 'wpinv_admin_notices', $notices );
+    }
+
+    /**
+     * Displays a success notice
+     *
+     * @param       string $msg The message to qeue.
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_success( $msg ) {
+        $this->save_notice( 'success', $msg );
+    }
+
+    /**
+     * Displays a error notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_error( $msg ) {
+        $this->save_notice( 'error', $msg );
+    }
+
+    /**
+     * Displays a warning notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_warning( $msg ) {
+        $this->save_notice( 'warning', $msg );
+    }
+
+    /**
+     * Displays a info notice
+     *
+     * @access      public
+     * @param       string $msg The message to qeue.
+     * @since       1.0.19
+     */
+    public function show_info( $msg ) {
+        $this->save_notice( 'info', $msg );
+    }
+
+    /**
+     * Show notices
+     *
+     * @access      public
+     * @since       1.0.19
+     */
+    public function show_notices() {
 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+        foreach ( $notices as $type => $messages ) {
 
-			if ( ! is_array( $messages ) ) {
-				continue;
-			}
+            if ( ! is_array( $messages ) ) {
+                continue;
+            }
 
             $type  = esc_attr( $type );
-			foreach ( $messages as $message ) {
-				echo wp_kses_post( "<div class='notice notice-$type is-dismissible'><p>$message</p></div>" );
+            foreach ( $messages as $message ) {
+                echo wp_kses_post( "<div class='notice notice-$type is-dismissible'><p>$message</p></div>" );
             }
 }
 
-		foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
-
-			if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
-				$url     = wp_nonce_url(
-					add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-					'getpaid-nonce',
-					'getpaid-nonce'
-				);
-				$message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
-				$message2 = __( 'Generate Pages', 'invoicing' );
-				echo wp_kses_post( "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>" );
-				break;
-			}
+        foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
+
+            if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
+                $url     = wp_nonce_url(
+                    add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                    'getpaid-nonce',
+                    'getpaid-nonce'
+                );
+                $message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
+                $message2 = __( 'Generate Pages', 'invoicing' );
+                echo wp_kses_post( "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>" );
+                break;
+            }
 }
 
-	}
+    }
 
 }

Spacing +278 added lines, -278 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main admin class.
@@ -39,11 +39,11 @@ 
 	 */
 	public function __construct() {
 
-        $this->admin_path  = plugin_dir_path( __FILE__ );
-		$this->admin_url   = plugins_url( '/', __FILE__ );
+        $this->admin_path = plugin_dir_path(__FILE__);
+		$this->admin_url   = plugins_url('/', __FILE__);
 		$this->reports     = new GetPaid_Reports();
 
-        if ( is_admin() ) {
+        if (is_admin()) {
 			$this->init_admin_hooks();
         }
 
@@ -54,36 +54,36 @@ 
 	 *
 	 */
 	private function init_admin_hooks() {
-        add_action( 'admin_enqueue_scripts', array( $this, 'enqeue_scripts' ), 9 );
-        add_filter( 'admin_body_class', array( $this, 'admin_body_class' ) );
-        add_action( 'admin_init', array( $this, 'init_ayecode_connect_helper' ) );
-        add_action( 'admin_init', array( $this, 'activation_redirect' ) );
-        add_action( 'admin_init', array( $this, 'maybe_do_admin_action' ) );
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'getpaid_authenticated_admin_action_rate_plugin', array( $this, 'redirect_to_wordpress_rating_page' ) );
-		add_action( 'getpaid_authenticated_admin_action_duplicate_form', array( $this, 'duplicate_payment_form' ) );
-		add_action( 'getpaid_authenticated_admin_action_reset_form_stats', array( $this, 'reset_form_stats' ) );
-		add_action( 'getpaid_authenticated_admin_action_duplicate_invoice', array( $this, 'duplicate_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_refund_invoice', array( $this, 'refund_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice', array( $this, 'send_customer_invoice' ) );
-		add_action( 'getpaid_authenticated_admin_action_send_invoice_reminder', array( $this, 'send_customer_payment_reminder' ) );
-        add_action( 'getpaid_authenticated_admin_action_reset_tax_rates', array( $this, 'admin_reset_tax_rates' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_pages', array( $this, 'admin_create_missing_pages' ) );
-		add_action( 'getpaid_authenticated_admin_action_refresh_permalinks', array( $this, 'admin_refresh_permalinks' ) );
-		add_action( 'getpaid_authenticated_admin_action_create_missing_tables', array( $this, 'admin_create_missing_tables' ) );
-		add_action( 'getpaid_authenticated_admin_action_migrate_old_invoices', array( $this, 'admin_migrate_old_invoices' ) );
-		add_action( 'getpaid_authenticated_admin_action_download_customers', array( $this, 'admin_download_customers' ) );
-		add_action( 'getpaid_authenticated_admin_action_recalculate_discounts', array( $this, 'admin_recalculate_discounts' ) );
-		add_action( 'getpaid_authenticated_admin_action_install_plugin', array( $this, 'admin_install_plugin' ) );
-		add_action( 'getpaid_authenticated_admin_action_connect_gateway', array( $this, 'admin_connect_gateway' ) );
-		add_filter( 'admin_footer_text', array( $this, 'admin_footer_text' ) );
-		do_action( 'getpaid_init_admin_hooks', $this );
+        add_action('admin_enqueue_scripts', array($this, 'enqeue_scripts'), 9);
+        add_filter('admin_body_class', array($this, 'admin_body_class'));
+        add_action('admin_init', array($this, 'init_ayecode_connect_helper'));
+        add_action('admin_init', array($this, 'activation_redirect'));
+        add_action('admin_init', array($this, 'maybe_do_admin_action'));
+		add_action('admin_notices', array($this, 'show_notices'));
+		add_action('getpaid_authenticated_admin_action_rate_plugin', array($this, 'redirect_to_wordpress_rating_page'));
+		add_action('getpaid_authenticated_admin_action_duplicate_form', array($this, 'duplicate_payment_form'));
+		add_action('getpaid_authenticated_admin_action_reset_form_stats', array($this, 'reset_form_stats'));
+		add_action('getpaid_authenticated_admin_action_duplicate_invoice', array($this, 'duplicate_invoice'));
+		add_action('getpaid_authenticated_admin_action_refund_invoice', array($this, 'refund_invoice'));
+		add_action('getpaid_authenticated_admin_action_send_invoice', array($this, 'send_customer_invoice'));
+		add_action('getpaid_authenticated_admin_action_send_invoice_reminder', array($this, 'send_customer_payment_reminder'));
+        add_action('getpaid_authenticated_admin_action_reset_tax_rates', array($this, 'admin_reset_tax_rates'));
+		add_action('getpaid_authenticated_admin_action_create_missing_pages', array($this, 'admin_create_missing_pages'));
+		add_action('getpaid_authenticated_admin_action_refresh_permalinks', array($this, 'admin_refresh_permalinks'));
+		add_action('getpaid_authenticated_admin_action_create_missing_tables', array($this, 'admin_create_missing_tables'));
+		add_action('getpaid_authenticated_admin_action_migrate_old_invoices', array($this, 'admin_migrate_old_invoices'));
+		add_action('getpaid_authenticated_admin_action_download_customers', array($this, 'admin_download_customers'));
+		add_action('getpaid_authenticated_admin_action_recalculate_discounts', array($this, 'admin_recalculate_discounts'));
+		add_action('getpaid_authenticated_admin_action_install_plugin', array($this, 'admin_install_plugin'));
+		add_action('getpaid_authenticated_admin_action_connect_gateway', array($this, 'admin_connect_gateway'));
+		add_filter('admin_footer_text', array($this, 'admin_footer_text'));
+		do_action('getpaid_init_admin_hooks', $this);
 
 		// Setup/welcome
-		if ( ! empty( $_GET['page'] ) ) {
-			switch ( sanitize_text_field( $_GET['page'] ) ) {
+		if (!empty($_GET['page'])) {
+			switch (sanitize_text_field($_GET['page'])) {
 				case 'gp-setup':
-					include_once dirname( __FILE__ ) . '/class-getpaid-admin-setup-wizard.php';
+					include_once dirname(__FILE__) . '/class-getpaid-admin-setup-wizard.php';
 					break;
 			}
 		}
@@ -97,37 +97,37 @@ 
 	public function enqeue_scripts() {
         global $current_screen, $pagenow;
 
-		$page    = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+		$page    = isset($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
 		$editing = $pagenow == 'post.php' || $pagenow == 'post-new.php';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( false !== stripos( $page, 'wpi' ) || false !== stripos( $page, 'getpaid' ) || 'gp-setup' == $page || false !== stripos( $page, 'geodir-tickets' ) ) {
+        if (false !== stripos($page, 'wpi') || false !== stripos($page, 'getpaid') || 'gp-setup' == $page || false !== stripos($page, 'geodir-tickets')) {
 
             // Styles.
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/css/admin.css' );
-            wp_enqueue_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array( 'wp-color-picker' ), $version );
-            wp_enqueue_style( 'select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all' );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/css/admin.css');
+            wp_enqueue_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array('wp-color-picker'), $version);
+            wp_enqueue_style('select2', WPINV_PLUGIN_URL . 'assets/css/select2/select2.min.css', array(), '4.0.13', 'all');
 
             // Scripts.
-            wp_enqueue_script( 'select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array( 'jquery' ), WPINV_VERSION );
+            wp_enqueue_script('select2', WPINV_PLUGIN_URL . 'assets/js/select2/select2.full.min.js', array('jquery'), WPINV_VERSION);
 
-            $version = filemtime( WPINV_PLUGIN_DIR . 'assets/js/admin.js' );
-            wp_enqueue_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array( 'jquery', 'wp-color-picker', 'jquery-ui-tooltip' ), $version );
-            wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', apply_filters( 'wpinv_admin_js_localize', $this->get_admin_i18() ) );
+            $version = filemtime(WPINV_PLUGIN_DIR . 'assets/js/admin.js');
+            wp_enqueue_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin.js', array('jquery', 'wp-color-picker', 'jquery-ui-tooltip'), $version);
+            wp_localize_script('wpinv-admin-script', 'WPInv_Admin', apply_filters('wpinv_admin_js_localize', $this->get_admin_i18()));
 
         }
 
         // Payment form scripts.
-		if ( 'wpi_payment_form' == $page && $editing ) {
+		if ('wpi_payment_form' == $page && $editing) {
             $this->load_payment_form_scripts();
         }
 
-		if ( $page == 'wpinv-subscriptions' ) {
-			wp_enqueue_script( 'postbox' );
+		if ($page == 'wpinv-subscriptions') {
+			wp_enqueue_script('postbox');
 		}
 
     }
@@ -140,31 +140,31 @@ 
         global $post;
 
 		$date_range = array(
-			'period' => isset( $_GET['date_range'] ) ? sanitize_text_field( $_GET['date_range'] ) : '7_days',
+			'period' => isset($_GET['date_range']) ? sanitize_text_field($_GET['date_range']) : '7_days',
 		);
 
-		if ( $date_range['period'] == 'custom' ) {
+		if ($date_range['period'] == 'custom') {
 
-			if ( isset( $_GET['from'] ) ) {
-				$date_range['after'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['from'] ), current_time( 'timestamp' ) ) - DAY_IN_SECONDS );
+			if (isset($_GET['from'])) {
+				$date_range['after'] = date('Y-m-d', strtotime(sanitize_text_field($_GET['from']), current_time('timestamp')) - DAY_IN_SECONDS);
 			}
 
-			if ( isset( $_GET['to'] ) ) {
-				$date_range['before'] = date( 'Y-m-d', strtotime( sanitize_text_field( $_GET['to'] ), current_time( 'timestamp' ) ) + DAY_IN_SECONDS );
+			if (isset($_GET['to'])) {
+				$date_range['before'] = date('Y-m-d', strtotime(sanitize_text_field($_GET['to']), current_time('timestamp')) + DAY_IN_SECONDS);
 			}
 }
 
         $i18n = array(
-            'ajax_url'                  => admin_url( 'admin-ajax.php' ),
-            'post_ID'                   => isset( $post->ID ) ? $post->ID : '',
-			'wpinv_nonce'               => wp_create_nonce( 'wpinv-nonce' ),
-			'rest_nonce'                => wp_create_nonce( 'wp_rest' ),
-			'rest_root'                 => esc_url_raw( rest_url() ),
+            'ajax_url'                  => admin_url('admin-ajax.php'),
+            'post_ID'                   => isset($post->ID) ? $post->ID : '',
+			'wpinv_nonce'               => wp_create_nonce('wpinv-nonce'),
+			'rest_nonce'                => wp_create_nonce('wp_rest'),
+			'rest_root'                 => esc_url_raw(rest_url()),
 			'date_range'                => $date_range,
-            'add_invoice_note_nonce'    => wp_create_nonce( 'add-invoice-note' ),
-            'delete_invoice_note_nonce' => wp_create_nonce( 'delete-invoice-note' ),
-            'invoice_item_nonce'        => wp_create_nonce( 'invoice-item' ),
-            'billing_details_nonce'     => wp_create_nonce( 'get-billing-details' ),
+            'add_invoice_note_nonce'    => wp_create_nonce('add-invoice-note'),
+            'delete_invoice_note_nonce' => wp_create_nonce('delete-invoice-note'),
+            'invoice_item_nonce'        => wp_create_nonce('invoice-item'),
+            'billing_details_nonce'     => wp_create_nonce('get-billing-details'),
             'tax'                       => wpinv_tax_amount(),
             'discount'                  => 0,
 			'currency_symbol'           => wpinv_currency_symbol(),
@@ -173,39 +173,39 @@ 
             'thousand_sep'              => wpinv_thousands_separator(),
             'decimal_sep'               => wpinv_decimal_separator(),
             'decimals'                  => wpinv_decimals(),
-            'save_invoice'              => __( 'Save Invoice', 'invoicing' ),
-            'status_publish'            => wpinv_status_nicename( 'publish' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'delete_tax_rate'           => __( 'Are you sure you wish to delete this tax rate?', 'invoicing' ),
-            'status_pending'            => wpinv_status_nicename( 'wpi-pending' ),
-            'FillBillingDetails'        => __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' ),
-            'confirmCalcTotals'         => __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' ),
-            'AreYouSure'                => __( 'Are you sure?', 'invoicing' ),
-            'errDeleteItem'             => __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' ),
-            'delete_subscription'       => __( 'Are you sure you want to delete this subscription?', 'invoicing' ),
-            'action_edit'               => __( 'Edit', 'invoicing' ),
-            'action_cancel'             => __( 'Cancel', 'invoicing' ),
-            'item_description'          => __( 'Item Description', 'invoicing' ),
-            'invoice_description'       => __( 'Invoice Description', 'invoicing' ),
-            'discount_description'      => __( 'Discount Description', 'invoicing' ),
-			'searching'                 => __( 'Searching', 'invoicing' ),
-			'loading'                   => __( 'Loading...', 'invoicing' ),
-			'search_customers'          => __( 'Enter customer name or email', 'invoicing' ),
-			'search_items'              => __( 'Enter item name', 'invoicing' ),
-			'graphs'                    => array_merge( array( 'refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax' ), array_keys( wpinv_get_report_graphs() ) ),
+            'save_invoice'              => __('Save Invoice', 'invoicing'),
+            'status_publish'            => wpinv_status_nicename('publish'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'delete_tax_rate'           => __('Are you sure you wish to delete this tax rate?', 'invoicing'),
+            'status_pending'            => wpinv_status_nicename('wpi-pending'),
+            'FillBillingDetails'        => __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing'),
+            'confirmCalcTotals'         => __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing'),
+            'AreYouSure'                => __('Are you sure?', 'invoicing'),
+            'errDeleteItem'             => __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing'),
+            'delete_subscription'       => __('Are you sure you want to delete this subscription?', 'invoicing'),
+            'action_edit'               => __('Edit', 'invoicing'),
+            'action_cancel'             => __('Cancel', 'invoicing'),
+            'item_description'          => __('Item Description', 'invoicing'),
+            'invoice_description'       => __('Invoice Description', 'invoicing'),
+            'discount_description'      => __('Discount Description', 'invoicing'),
+			'searching'                 => __('Searching', 'invoicing'),
+			'loading'                   => __('Loading...', 'invoicing'),
+			'search_customers'          => __('Enter customer name or email', 'invoicing'),
+			'search_items'              => __('Enter item name', 'invoicing'),
+			'graphs'                    => array_merge(array('refunded_fees', 'refunded_items', 'refunded_subtotal', 'refunded_tax'), array_keys(wpinv_get_report_graphs())),
         );
 
-		if ( ! empty( $post ) && getpaid_is_invoice_post_type( $post->post_type ) ) {
+		if (!empty($post) && getpaid_is_invoice_post_type($post->post_type)) {
 
-			$invoice              = new WPInv_Invoice( $post );
+			$invoice              = new WPInv_Invoice($post);
 			$i18n['save_invoice'] = sprintf(
-				__( 'Save %s', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
+				__('Save %s', 'invoicing'),
+				ucfirst($invoice->get_invoice_quote_type())
 			);
 
 			$i18n['invoice_description'] = sprintf(
-				__( '%s Description', 'invoicing' ),
-				ucfirst( $invoice->get_invoice_quote_type() )
+				__('%s Description', 'invoicing'),
+				ucfirst($invoice->get_invoice_quote_type())
 			);
 
 		}
@@ -219,24 +219,24 @@ 
 	 * @param  string $footer_text
 	 * @return string
 	 */
-	public function admin_footer_text( $footer_text ) {
+	public function admin_footer_text($footer_text) {
 		global $current_screen;
 
-		$page    = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+		$page = isset($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
         // General styles.
-        if ( apply_filters( 'getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing() ) && false !== stripos( $page, 'wpi' ) ) {
+        if (apply_filters('getpaid_display_admin_footer_text', wpinv_current_user_can_manage_invoicing()) && false !== stripos($page, 'wpi')) {
 
 			// Change the footer text
-			if ( ! get_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', true ) ) {
+			if (!get_user_meta(get_current_user_id(), 'getpaid_admin_footer_text_rated', true)) {
 
-				$rating_url  = esc_url(
+				$rating_url = esc_url(
 					wp_nonce_url(
-						admin_url( 'admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin' ),
+						admin_url('admin.php?page=wpinv-reports&getpaid-admin-action=rate_plugin'),
 						'getpaid-nonce',
 						'getpaid-nonce'
                     )
@@ -244,7 +244,7 @@ 
 
 				$footer_text = sprintf(
 					/* translators: %s: five stars */
-					__( 'If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing' ),
+					__('If you like <strong>GetPaid</strong>, please leave us a %s rating. A huge thanks in advance!', 'invoicing'),
 					"<a href='$rating_url'>&#9733;&#9733;&#9733;&#9733;&#9733;</a>"
 				);
 
@@ -252,7 +252,7 @@ 
 
 				$footer_text = sprintf(
 					/* translators: %s: GetPaid */
-					__( 'Thank you for using %s!', 'invoicing' ),
+					__('Thank you for using %s!', 'invoicing'),
 					"<a href='https://wpgetpaid.com/' target='_blank'><strong>GetPaid</strong></a>"
 				);
 
@@ -268,8 +268,8 @@ 
 	 * @since  2.0.0
 	 */
 	public function redirect_to_wordpress_rating_page() {
-		update_user_meta( get_current_user_id(), 'getpaid_admin_footer_text_rated', 1 );
-		wp_redirect( 'https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post' );
+		update_user_meta(get_current_user_id(), 'getpaid_admin_footer_text_rated', 1);
+		wp_redirect('https://wordpress.org/support/plugin/invoicing/reviews?rate=5#new-post');
 		exit;
 	}
 
@@ -280,29 +280,29 @@ 
 	protected function load_payment_form_scripts() {
         global $post;
 
-        wp_enqueue_script( 'vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION );
-		wp_enqueue_script( 'vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array( 'sortable', 'vue' ), WPINV_VERSION );
+        wp_enqueue_script('vue', WPINV_PLUGIN_URL . 'assets/js/vue/vue.min.js', array(), WPINV_VERSION);
+		wp_enqueue_script('sortable', WPINV_PLUGIN_URL . 'assets/js/sortable.min.js', array(), WPINV_VERSION);
+		wp_enqueue_script('vue_draggable', WPINV_PLUGIN_URL . 'assets/js/vue/vuedraggable.min.js', array('sortable', 'vue'), WPINV_VERSION);
 
-		wp_register_script( 'wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.min.js', array( 'wpinv-admin-script', 'vue_draggable', 'wp-hooks' ), WPINV_VERSION );
+		wp_register_script('wpinv-admin-payment-form-script', WPINV_PLUGIN_URL . 'assets/js/admin-payment-forms.min.js', array('wpinv-admin-script', 'vue_draggable', 'wp-hooks'), WPINV_VERSION);
 
 		wp_localize_script(
             'wpinv-admin-payment-form-script',
             'wpinvPaymentFormAdmin',
             array(
-				'elements'      => wpinv_get_data( 'payment-form-elements' ),
-				'form_elements' => getpaid_get_payment_form_elements( $post->ID ),
+				'elements'      => wpinv_get_data('payment-form-elements'),
+				'form_elements' => getpaid_get_payment_form_elements($post->ID),
 				'currency'      => wpinv_currency_symbol(),
 				'position'      => wpinv_currency_position(),
 				'decimals'      => (int) wpinv_decimals(),
 				'thousands_sep' => wpinv_thousands_separator(),
 				'decimals_sep'  => wpinv_decimal_separator(),
-				'form_items'    => gepaid_get_form_items( $post->ID ),
+				'form_items'    => gepaid_get_form_items($post->ID),
 				'is_default'    => $post->ID == wpinv_get_default_payment_form(),
             )
         );
 
-        wp_enqueue_script( 'wpinv-admin-payment-form-script' );
+        wp_enqueue_script('wpinv-admin-payment-form-script');
 
     }
 
@@ -313,24 +313,24 @@ 
      * @return string
 	 *
 	 */
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
 		global $pagenow, $post, $current_screen;
 
-        $page = isset( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+        $page = isset($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
 
-        if ( ! empty( $current_screen->post_type ) ) {
+        if (!empty($current_screen->post_type)) {
 			$page = $current_screen->post_type;
         }
 
-        if ( false !== stripos( $page, 'wpi' ) ) {
-            $classes .= ' wpi-' . sanitize_key( $page );
+        if (false !== stripos($page, 'wpi')) {
+            $classes .= ' wpi-' . sanitize_key($page);
         }
 
-        if ( in_array( $page, wpinv_parse_list( 'wpi_invoice wpi_payment_form wpi_quote' ) ) ) {
+        if (in_array($page, wpinv_parse_list('wpi_invoice wpi_payment_form wpi_quote'))) {
             $classes .= ' wpinv-cpt wpinv';
 		}
 
-		if ( getpaid_is_invoice_post_type( $page ) ) {
+		if (getpaid_is_invoice_post_type($page)) {
             $classes .= ' getpaid-is-invoice-cpt';
         }
 
@@ -349,21 +349,21 @@ 
 				'version'           => WPINV_VERSION,
 				'support_url'       => 'https://wpgetpaid.com/support/',
 				'documentation_url' => 'https://docs.wpgetpaid.com/',
-				'activated'         => (int) get_option( 'gepaid_installed_on' ),
+				'activated'         => (int) get_option('gepaid_installed_on'),
             )
         );
 
         new AyeCode_Connect_Helper(
             array(
-				'connect_title'     => __( 'WP Invoicing - an AyeCode product!', 'invoicing' ),
-				'connect_external'  => __( 'Please confirm you wish to connect your site?', 'invoicing' ),
-				'connect'           => sprintf( __( '<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %1$slearn more%2$s', 'invoicing' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", '</a>' ),
-				'connect_button'    => __( 'Connect Site', 'invoicing' ),
-				'connecting_button' => __( 'Connecting...', 'invoicing' ),
-				'error_localhost'   => __( 'This service will only work with a live domain, not a localhost.', 'invoicing' ),
-				'error'             => __( 'Something went wrong, please refresh and try again.', 'invoicing' ),
+				'connect_title'     => __('WP Invoicing - an AyeCode product!', 'invoicing'),
+				'connect_external'  => __('Please confirm you wish to connect your site?', 'invoicing'),
+				'connect'           => sprintf(__('<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %1$slearn more%2$s', 'invoicing'), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", '</a>'),
+				'connect_button'    => __('Connect Site', 'invoicing'),
+				'connecting_button' => __('Connecting...', 'invoicing'),
+				'error_localhost'   => __('This service will only work with a live domain, not a localhost.', 'invoicing'),
+				'error'             => __('Something went wrong, please refresh and try again.', 'invoicing'),
             ),
-            array( 'wpi-addons' )
+            array('wpi-addons')
         );
 
     }
@@ -375,20 +375,20 @@ 
 	 */
 	public function activation_redirect() {
 
-		$redirected = get_option( 'wpinv_redirected_to_settings' );
+		$redirected = get_option('wpinv_redirected_to_settings');
 
-		if ( ! empty( $redirected ) || wp_doing_ajax() || ! current_user_can( 'manage_options' ) ) {
+		if (!empty($redirected) || wp_doing_ajax() || !current_user_can('manage_options')) {
 			return;
 		}
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-	    update_option( 'wpinv_redirected_to_settings', 1 );
+	    update_option('wpinv_redirected_to_settings', 1);
 
-        wp_safe_redirect( admin_url( 'index.php?page=gp-setup' ) );
+        wp_safe_redirect(admin_url('index.php?page=gp-setup'));
         exit;
 
 	}
@@ -397,10 +397,10 @@ 
      * Fires an admin action after verifying that a user can fire them.
      */
     public function maybe_do_admin_action() {
-        if ( isset( $_REQUEST['getpaid-admin-action'] ) && isset( $_REQUEST['getpaid-nonce'] ) && wp_verify_nonce( $_REQUEST['getpaid-nonce'], 'getpaid-nonce' ) && wpinv_current_user_can( sanitize_text_field( $_REQUEST['getpaid-admin-action'] ), $_REQUEST ) ) {
-            $key = sanitize_key( $_REQUEST['getpaid-admin-action'] );
+        if (isset($_REQUEST['getpaid-admin-action']) && isset($_REQUEST['getpaid-nonce']) && wp_verify_nonce($_REQUEST['getpaid-nonce'], 'getpaid-nonce') && wpinv_current_user_can(sanitize_text_field($_REQUEST['getpaid-admin-action']), $_REQUEST)) {
+            $key = sanitize_key($_REQUEST['getpaid-admin-action']);
 
-            do_action( "getpaid_authenticated_admin_action_$key", $_REQUEST );
+            do_action("getpaid_authenticated_admin_action_$key", $_REQUEST);
         }
     }
 
@@ -409,24 +409,24 @@ 
 	 *
 	 * @param array $args
      */
-    public function duplicate_invoice( $args ) {
+    public function duplicate_invoice($args) {
 
-		if ( empty( $args['invoice_id'] ) ) {
+		if (empty($args['invoice_id'])) {
 			return;
 		}
 
-		$invoice = new WPInv_Invoice( (int) $args['invoice_id'] );
+		$invoice = new WPInv_Invoice((int) $args['invoice_id']);
 
-		if ( ! $invoice->exists() ) {
+		if (!$invoice->exists()) {
 			return;
 		}
 
-		$new_invoice = getpaid_duplicate_invoice( $invoice );
+		$new_invoice = getpaid_duplicate_invoice($invoice);
 		$new_invoice->save();
 
-		if ( $new_invoice->exists() ) {
+		if ($new_invoice->exists()) {
 
-			getpaid_admin()->show_success( __( 'Invoice duplicated successfully.', 'invoicing' ) );
+			getpaid_admin()->show_success(__('Invoice duplicated successfully.', 'invoicing'));
 
 			wp_safe_redirect(
 				add_query_arg(
@@ -434,14 +434,14 @@ 
 						'action' => 'edit',
 						'post'   => $new_invoice->get_id(),
 					),
-					admin_url( 'post.php' )
+					admin_url('post.php')
 				)
 			);
 			exit;
 
 		}
 
-		getpaid_admin()->show_error( __( 'There was an error duplicating this invoice. Please try again.', 'invoicing' ) );
+		getpaid_admin()->show_error(__('There was an error duplicating this invoice. Please try again.', 'invoicing'));
 
 	}
 
@@ -450,40 +450,40 @@ 
 	 *
 	 * @param array $args
      */
-    public function refund_invoice( $args ) {
+    public function refund_invoice($args) {
 
-		if ( empty( $args['invoice_id'] ) ) {
+		if (empty($args['invoice_id'])) {
 			return;
 		}
 
-		$invoice = new WPInv_Invoice( (int) $args['invoice_id'] );
+		$invoice = new WPInv_Invoice((int) $args['invoice_id']);
 
-		if ( ! $invoice->exists() || $invoice->is_refunded() ) {
+		if (!$invoice->exists() || $invoice->is_refunded()) {
 			return;
 		}
 
 		$invoice->refund();
 
 		// Refund remotely.
-		if ( getpaid_payment_gateway_supports( $invoice->get_gateway(), 'refunds' ) && ! empty( $args['getpaid_refund_remote'] ) ) {
-			do_action( 'getpaid_refund_invoice_remotely', $invoice );
+		if (getpaid_payment_gateway_supports($invoice->get_gateway(), 'refunds') && !empty($args['getpaid_refund_remote'])) {
+			do_action('getpaid_refund_invoice_remotely', $invoice);
 		}
 
 		// Cancel subscriptions.
-		if ( ! empty( $args['getpaid_cancel_subscription'] ) ) {
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+		if (!empty($args['getpaid_cancel_subscription'])) {
+			$subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-			if ( ! empty( $subscriptions ) ) {
-				if ( ! is_array( $subscriptions ) ) {
-					$subscriptions = array( $subscriptions );
+			if (!empty($subscriptions)) {
+				if (!is_array($subscriptions)) {
+					$subscriptions = array($subscriptions);
 				}
 
-				foreach ( $subscriptions as $subscription ) {
+				foreach ($subscriptions as $subscription) {
 					$subscription->cancel();
 					$invoice->add_system_note(
 						sprintf(
 							// translators: %s: subscription ID.
-							__( 'Subscription #%s cancelled', 'invoicing' ),
+							__('Subscription #%s cancelled', 'invoicing'),
 							$subscription->get_id()
 						)
 					);
@@ -492,11 +492,11 @@ 
 		}
 
 		// Add notice.
-		$this->show_success( __( 'Invoice refunded successfully.', 'invoicing' ) );
+		$this->show_success(__('Invoice refunded successfully.', 'invoicing'));
 
 		// Redirect.
 		wp_safe_redirect(
-			remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id', 'getpaid_cancel_subscription', 'getpaid_refund_remote' ) )
+			remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id', 'getpaid_cancel_subscription', 'getpaid_refund_remote'))
 		);
 	}
 
@@ -505,34 +505,34 @@ 
 	 *
 	 * @param array $args
      */
-    public function duplicate_payment_form( $args ) {
+    public function duplicate_payment_form($args) {
 
-		if ( empty( $args['form_id'] ) ) {
+		if (empty($args['form_id'])) {
 			return;
 		}
 
-		$form = new GetPaid_Payment_Form( (int) $args['form_id'] );
+		$form = new GetPaid_Payment_Form((int) $args['form_id']);
 
-		if ( ! $form->exists() ) {
+		if (!$form->exists()) {
 			return;
 		}
 
 		$new_form = new GetPaid_Payment_Form();
-		$new_form->set_author( $form->get_author( 'edit' ) );
-		$new_form->set_name( $form->get_name( 'edit' ) . __( '(copy)', 'invoicing' ) );
-		$new_form->set_elements( $form->get_elements( 'edit' ) );
-		$new_form->set_items( $form->get_items( 'edit' ) );
+		$new_form->set_author($form->get_author('edit'));
+		$new_form->set_name($form->get_name('edit') . __('(copy)', 'invoicing'));
+		$new_form->set_elements($form->get_elements('edit'));
+		$new_form->set_items($form->get_items('edit'));
 		$new_form->save();
 
-		if ( $new_form->exists() ) {
-			$this->show_success( __( 'Form duplicated successfully', 'invoicing' ) );
-			$url = get_edit_post_link( $new_form->get_id(), 'edit' );
+		if ($new_form->exists()) {
+			$this->show_success(__('Form duplicated successfully', 'invoicing'));
+			$url = get_edit_post_link($new_form->get_id(), 'edit');
 		} else {
-			$this->show_error( __( 'Unable to duplicate form', 'invoicing' ) );
-			$url = remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) );
+			$this->show_error(__('Unable to duplicate form', 'invoicing'));
+			$url = remove_query_arg(array('getpaid-admin-action', 'form_id', 'getpaid-nonce'));
 		}
 
-		wp_redirect( $url );
+		wp_redirect($url);
 		exit;
 	}
 
@@ -541,27 +541,27 @@ 
 	 *
 	 * @param array $args
      */
-    public function reset_form_stats( $args ) {
+    public function reset_form_stats($args) {
 
-		if ( empty( $args['form_id'] ) ) {
+		if (empty($args['form_id'])) {
 			return;
 		}
 
-		$form = new GetPaid_Payment_Form( (int) $args['form_id'] );
+		$form = new GetPaid_Payment_Form((int) $args['form_id']);
 
-		if ( ! $form->exists() ) {
+		if (!$form->exists()) {
 			return;
 		}
 
-		$form->set_earned( 0 );
-		$form->set_refunded( 0 );
-		$form->set_cancelled( 0 );
-		$form->set_failed( 0 );
+		$form->set_earned(0);
+		$form->set_refunded(0);
+		$form->set_cancelled(0);
+		$form->set_failed(0);
 		$form->save();
 
-		$this->show_success( __( 'Form stats reset successfully', 'invoicing' ) );
+		$this->show_success(__('Form stats reset successfully', 'invoicing'));
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'form_id', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'form_id', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -570,9 +570,9 @@ 
 	 *
 	 * @param array $args
      */
-    public function send_customer_invoice( $args ) {
-		getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $args['invoice_id'] ), true );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+    public function send_customer_invoice($args) {
+		getpaid()->get('invoice_emails')->user_invoice(new WPInv_Invoice($args['invoice_id']), true);
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -581,16 +581,16 @@ 
 	 *
 	 * @param array $args
      */
-    public function send_customer_payment_reminder( $args ) {
-		$sent = getpaid()->get( 'invoice_emails' )->force_send_overdue_notice( new WPInv_Invoice( $args['invoice_id'] ) );
+    public function send_customer_payment_reminder($args) {
+		$sent = getpaid()->get('invoice_emails')->force_send_overdue_notice(new WPInv_Invoice($args['invoice_id']));
 
-		if ( $sent ) {
-			$this->show_success( __( 'Payment reminder was successfully sent to the customer', 'invoicing' ) );
+		if ($sent) {
+			$this->show_success(__('Payment reminder was successfully sent to the customer', 'invoicing'));
 		} else {
-			$this->show_error( __( 'Could not sent payment reminder to the customer', 'invoicing' ) );
+			$this->show_error(__('Could not sent payment reminder to the customer', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce', 'invoice_id' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce', 'invoice_id')));
 		exit;
 	}
 
@@ -600,8 +600,8 @@ 
      */
     public function admin_reset_tax_rates() {
 
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		update_option('wpinv_tax_rates', wpinv_get_data('tax-rates'));
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -613,8 +613,8 @@ 
     public function admin_create_missing_pages() {
 		$installer = new GetPaid_Installer();
 		$installer->create_pages();
-		$this->show_success( __( 'GetPaid pages updated.', 'invoicing' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		$this->show_success(__('GetPaid pages updated.', 'invoicing'));
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -623,8 +623,8 @@ 
 	 */
 	public function admin_refresh_permalinks() {
 		flush_rewrite_rules();
-		$this->show_success( __( 'Permalinks refreshed.', 'invoicing' ) );
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		$this->show_success(__('Permalinks refreshed.', 'invoicing'));
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -638,13 +638,13 @@ 
 		GetPaid_Installer::create_db_tables();
 		GetPaid_Installer::migrate_old_customers();
 
-		if ( '' !== $wpdb->last_error ) {
-			$this->show_error( __( 'Your GetPaid tables have been updated:', 'invoicing' ) . ' ' . $wpdb->last_error );
+		if ('' !== $wpdb->last_error) {
+			$this->show_error(__('Your GetPaid tables have been updated:', 'invoicing') . ' ' . $wpdb->last_error);
 		} else {
-			$this->show_success( __( 'Your GetPaid tables have been updated.', 'invoicing' ) );
+			$this->show_success(__('Your GetPaid tables have been updated.', 'invoicing'));
 		}
 
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 	}
 
@@ -659,10 +659,10 @@ 
 		$installer->migrate_old_invoices();
 
 		// Show an admin message.
-		$this->show_success( __( 'Your invoices have been migrated.', 'invoicing' ) );
+		$this->show_success(__('Your invoices have been migrated.', 'invoicing'));
 
 		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -673,35 +673,35 @@ 
      */
     public function admin_download_customers() {
 
-		$output = fopen( 'php://output', 'w' );
+		$output = fopen('php://output', 'w');
 
-		if ( false === $output ) {
-			wp_die( esc_html__( 'Unsupported server', 'invoicing' ), 500 );
+		if (false === $output) {
+			wp_die(esc_html__('Unsupported server', 'invoicing'), 500);
 		}
 
-		header( 'Content-Type:text/csv' );
-		header( 'Content-Disposition:attachment;filename=customers.csv' );
+		header('Content-Type:text/csv');
+		header('Content-Disposition:attachment;filename=customers.csv');
 
 		/** @var GetPaid_Customer[] $customers */
-		$customers = getpaid_get_customers( array( 'number' => -1 ) );
-		$columns   = array_keys( GetPaid_Customer_Data_Store::get_database_fields() );
+		$customers = getpaid_get_customers(array('number' => -1));
+		$columns   = array_keys(GetPaid_Customer_Data_Store::get_database_fields());
 
 		// Output the csv column headers.
-		fputcsv( $output, $columns );
+		fputcsv($output, $columns);
 
 		// Loop through
-		foreach ( $customers as $customer ) {
+		foreach ($customers as $customer) {
 
-			$row  = array();
+			$row = array();
 
-			foreach ( $columns as $column ) {
-				$row[]  = (string) maybe_serialize( $customer->get( $column, 'edit' ) );
+			foreach ($columns as $column) {
+				$row[] = (string) maybe_serialize($customer->get($column, 'edit'));
 			}
 
-			fputcsv( $output, $row );
+			fputcsv($output, $row);
 		}
 
-		fclose( $output );
+		fclose($output);
 		exit;
 
 	}
@@ -711,27 +711,27 @@ 
 	 *
 	 * @param array $data
      */
-    public function admin_install_plugin( $data ) {
+    public function admin_install_plugin($data) {
 
-		if ( ! empty( $data['plugins'] ) ) {
+		if (!empty($data['plugins'])) {
 			include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 			wp_cache_flush();
 
-			foreach ( $data['plugins'] as $slug => $file ) {
-				$plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip' );
-				$upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
-				$installed  = $upgrader->install( $plugin_zip );
+			foreach ($data['plugins'] as $slug => $file) {
+				$plugin_zip = esc_url('https://downloads.wordpress.org/plugin/' . $slug . '.latest-stable.zip');
+				$upgrader   = new Plugin_Upgrader(new Automatic_Upgrader_Skin());
+				$installed  = $upgrader->install($plugin_zip);
 
-				if ( ! is_wp_error( $installed ) && $installed ) {
-					activate_plugin( $file, '', false, true );
+				if (!is_wp_error($installed) && $installed) {
+					activate_plugin($file, '', false, true);
 				} else {
-					wpinv_error_log( $upgrader->skin->get_upgrade_messages(), false );
+					wpinv_error_log($upgrader->skin->get_upgrade_messages(), false);
 				}
 }
 }
 
-		$redirect = isset( $data['redirect'] ) ? esc_url_raw( $data['redirect'] ) : admin_url( 'plugins.php' );
-		wp_safe_redirect( $redirect );
+		$redirect = isset($data['redirect']) ? esc_url_raw($data['redirect']) : admin_url('plugins.php');
+		wp_safe_redirect($redirect);
 		exit;
 
 	}
@@ -741,41 +741,41 @@ 
 	 *
 	 * @param array $data
      */
-    public function admin_connect_gateway( $data ) {
+    public function admin_connect_gateway($data) {
 
-		if ( ! empty( $data['plugin'] ) ) {
+		if (!empty($data['plugin'])) {
 
-			$gateway     = sanitize_key( $data['plugin'] );
-			$connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
+			$gateway     = sanitize_key($data['plugin']);
+			$connect_url = apply_filters("getpaid_get_{$gateway}_connect_url", false, $data);
 
-			if ( ! empty( $connect_url ) ) {
-				wp_redirect( $connect_url );
+			if (!empty($connect_url)) {
+				wp_redirect($connect_url);
 				exit;
 			}
 
-			if ( 'stripe' == $data['plugin'] ) {
+			if ('stripe' == $data['plugin']) {
 				require_once ABSPATH . 'wp-admin/includes/plugin.php';
 				include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 				wp_cache_flush();
 
-				if ( ! array_key_exists( 'getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins() ) ) {
-					$plugin_zip = esc_url( 'https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip' );
-					$upgrader   = new Plugin_Upgrader( new Automatic_Upgrader_Skin() );
-					$upgrader->install( $plugin_zip );
+				if (!array_key_exists('getpaid-stripe-payments/getpaid-stripe-payments.php', get_plugins())) {
+					$plugin_zip = esc_url('https://downloads.wordpress.org/plugin/getpaid-stripe-payments.latest-stable.zip');
+					$upgrader   = new Plugin_Upgrader(new Automatic_Upgrader_Skin());
+					$upgrader->install($plugin_zip);
 				}
 
-				activate_plugin( 'getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true );
+				activate_plugin('getpaid-stripe-payments/getpaid-stripe-payments.php', '', false, true);
 			}
 
-			$connect_url = apply_filters( "getpaid_get_{$gateway}_connect_url", false, $data );
-			if ( ! empty( $connect_url ) ) {
-				wp_redirect( $connect_url );
+			$connect_url = apply_filters("getpaid_get_{$gateway}_connect_url", false, $data);
+			if (!empty($connect_url)) {
+				wp_redirect($connect_url);
 				exit;
 			}
 }
 
-		$redirect = isset( $data['redirect'] ) ? esc_url_raw( urldecode( $data['redirect'] ) ) : admin_url( 'admin.php?page=wpinv-settings&tab=gateways' );
-		wp_safe_redirect( $redirect );
+		$redirect = isset($data['redirect']) ? esc_url_raw(urldecode($data['redirect'])) : admin_url('admin.php?page=wpinv-settings&tab=gateways');
+		wp_safe_redirect($redirect);
 		exit;
 
 	}
@@ -789,35 +789,35 @@ 
 
 		// Fetch all invoices that have discount codes.
 		$table    = $wpdb->prefix . 'getpaid_invoices';
-		$invoices = $wpdb->get_col( "SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''" );
+		$invoices = $wpdb->get_col("SELECT `post_id` FROM `$table` WHERE `discount` = 0 && `discount_code` <> ''");
 
-		foreach ( $invoices as $invoice ) {
+		foreach ($invoices as $invoice) {
 
-			$invoice = new WPInv_Invoice( $invoice );
+			$invoice = new WPInv_Invoice($invoice);
 
-			if ( ! $invoice->exists() ) {
+			if (!$invoice->exists()) {
 				continue;
 			}
 
 			// Abort if the discount does not exist or does not apply here.
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( ! $discount->exists() ) {
+			$discount = new WPInv_Discount($invoice->get_discount_code());
+			if (!$discount->exists()) {
 				continue;
 			}
 
-			$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+			$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 			$invoice->recalculate_total();
 
-			if ( $invoice->get_total_discount() > 0 ) {
+			if ($invoice->get_total_discount() > 0) {
 				$invoice->save();
 			}
 }
 
 		// Show an admin message.
-		$this->show_success( __( 'Discounts have been recalculated.', 'invoicing' ) );
+		$this->show_success(__('Discounts have been recalculated.', 'invoicing'));
 
 		// Redirect the admin.
-		wp_safe_redirect( remove_query_arg( array( 'getpaid-admin-action', 'getpaid-nonce' ) ) );
+		wp_safe_redirect(remove_query_arg(array('getpaid-admin-action', 'getpaid-nonce')));
 		exit;
 
 	}
@@ -829,8 +829,8 @@ 
      * @return array
 	 */
 	public function get_notices() {
-		$notices = get_option( 'wpinv_admin_notices' );
-        return is_array( $notices ) ? $notices : array();
+		$notices = get_option('wpinv_admin_notices');
+        return is_array($notices) ? $notices : array();
 	}
 
 	/**
@@ -840,7 +840,7 @@ 
      * @return array
 	 */
 	public function has_notices() {
-		return count( $this->get_notices() ) > 0;
+		return count($this->get_notices()) > 0;
 	}
 
 	/**
@@ -850,7 +850,7 @@ 
 	 * @since       1.0.19
 	 */
 	public function clear_notices() {
-		delete_option( 'wpinv_admin_notices' );
+		delete_option('wpinv_admin_notices');
 	}
 
 	/**
@@ -859,16 +859,16 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function save_notice( $type, $message ) {
+	public function save_notice($type, $message) {
 		$notices = $this->get_notices();
 
-		if ( empty( $notices[ $type ] ) || ! is_array( $notices[ $type ] ) ) {
-			$notices[ $type ] = array();
+		if (empty($notices[$type]) || !is_array($notices[$type])) {
+			$notices[$type] = array();
 		}
 
-		$notices[ $type ][] = $message;
+		$notices[$type][] = $message;
 
-		update_option( 'wpinv_admin_notices', $notices );
+		update_option('wpinv_admin_notices', $notices);
 	}
 
 	/**
@@ -878,8 +878,8 @@ 
 	 * @access      public
 	 * @since       1.0.19
 	 */
-	public function show_success( $msg ) {
-		$this->save_notice( 'success', $msg );
+	public function show_success($msg) {
+		$this->save_notice('success', $msg);
 	}
 
 	/**
@@ -889,8 +889,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_error( $msg ) {
-		$this->save_notice( 'error', $msg );
+	public function show_error($msg) {
+		$this->save_notice('error', $msg);
 	}
 
 	/**
@@ -900,8 +900,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_warning( $msg ) {
-		$this->save_notice( 'warning', $msg );
+	public function show_warning($msg) {
+		$this->save_notice('warning', $msg);
 	}
 
 	/**
@@ -911,8 +911,8 @@ 
 	 * @param       string $msg The message to qeue.
 	 * @since       1.0.19
 	 */
-	public function show_info( $msg ) {
-		$this->save_notice( 'info', $msg );
+	public function show_info($msg) {
+		$this->save_notice('info', $msg);
 	}
 
 	/**
@@ -926,29 +926,29 @@ 
         $notices = $this->get_notices();
         $this->clear_notices();
 
-		foreach ( $notices as $type => $messages ) {
+		foreach ($notices as $type => $messages) {
 
-			if ( ! is_array( $messages ) ) {
+			if (!is_array($messages)) {
 				continue;
 			}
 
-            $type  = esc_attr( $type );
-			foreach ( $messages as $message ) {
-				echo wp_kses_post( "<div class='notice notice-$type is-dismissible'><p>$message</p></div>" );
+            $type = esc_attr($type);
+			foreach ($messages as $message) {
+				echo wp_kses_post("<div class='notice notice-$type is-dismissible'><p>$message</p></div>");
             }
 }
 
-		foreach ( array( 'checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page' ) as $page ) {
+		foreach (array('checkout_page', 'invoice_history_page', 'success_page', 'failure_page', 'invoice_subscription_page') as $page) {
 
-			if ( ! is_numeric( wpinv_get_option( $page, false ) ) ) {
-				$url     = wp_nonce_url(
-					add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+			if (!is_numeric(wpinv_get_option($page, false))) {
+				$url = wp_nonce_url(
+					add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 					'getpaid-nonce',
 					'getpaid-nonce'
 				);
-				$message  = __( 'Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing' );
-				$message2 = __( 'Generate Pages', 'invoicing' );
-				echo wp_kses_post( "<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>" );
+				$message  = __('Some GetPaid pages are missing. To use GetPaid without any issues, click the button below to generate the missing pages.', 'invoicing');
+				$message2 = __('Generate Pages', 'invoicing');
+				echo wp_kses_post("<div class='notice notice-warning is-dismissible'><p>$message<br><br><a href='$url' class='button button-primary'>$message2</a></p></div>");
 				break;
 			}
 }

includes/class-wpinv.php

Indentation +615 added lines, -615 removed lines

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

Spacing +140 added lines, -140 removed lines

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

vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php

Indentation +2390 added lines, -2390 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,472 +21,472 @@ 
  */
 if ( ! class_exists( 'AyeCode_UI_Settings' ) ) {
 
-	/**
-	 * A Class to be able to change settings for Font Awesome.
-	 *
-	 * Class AyeCode_UI_Settings
-	 * @ver 1.0.0
-	 * @todo decide how to implement textdomain
-	 */
-	class AyeCode_UI_Settings {
-
-		/**
-		 * Class version version.
-		 *
-		 * @var string
-		 */
-		public $version = '0.2.30';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'aui';
-
-		/**
-		 * Latest version of Bootstrap at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "5.2.2";
-
-		/**
-		 * Current version of select2 being used.
-		 *
-		 * @var string
-		 */
-		public $select2_version = "4.0.11";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'AyeCode UI';
-
-		/**
-		 * The relative url to the assets.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		private $settings;
-
-		/**
-		 * AyeCode_UI_Settings instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    AyeCode_UI_Settings There can be only one!
-		 */
-		private static $instance = null;
-
-
-		/**
-		 * Main AyeCode_UI_Settings Instance.
-		 *
-		 * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return AyeCode_UI_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
-
-				self::$instance = new AyeCode_UI_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-
-					// Maybe show example page
-					add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
-
-					if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
-						add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
-					}
-				}
+    /**
+     * A Class to be able to change settings for Font Awesome.
+     *
+     * Class AyeCode_UI_Settings
+     * @ver 1.0.0
+     * @todo decide how to implement textdomain
+     */
+    class AyeCode_UI_Settings {
+
+        /**
+         * Class version version.
+         *
+         * @var string
+         */
+        public $version = '0.2.30';
 
-				add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'aui';
 
-				do_action( 'ayecode_ui_settings_loaded' );
-			}
+        /**
+         * Latest version of Bootstrap at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "5.2.2";
 
-			return self::$instance;
-		}
+        /**
+         * Current version of select2 being used.
+         *
+         * @var string
+         */
+        public $select2_version = "4.0.11";
 
-		/**
-		 * Add custom colors to the color selector.
-		 *
-		 * @param $theme_colors
-		 * @param $include_outlines
-		 * @param $include_branding
-		 *
-		 * @return mixed
-		 */
-		public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'AyeCode UI';
 
+        /**
+         * The relative url to the assets.
+         *
+         * @var string
+         */
+        public $url = '';
 
-			$setting = wp_get_global_settings();
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
 
-			if(!empty($setting['color']['palette']['custom'])){
-				foreach($setting['color']['palette']['custom'] as $color){
-					$theme_colors[$color['slug']] = esc_attr($color['name']);
-				}
-			}
-
-			return $theme_colors;
-		}
-
-		/**
-		 * Setup some constants.
-		 */
-		public function constants(){
-			define( 'AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be" );
-			define( 'AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d' );
-			define( 'AUI_INFO_COLOR_ORIGINAL', '#17a2b8' );
-			define( 'AUI_WARNING_COLOR_ORIGINAL', '#ffc107' );
-			define( 'AUI_DANGER_COLOR_ORIGINAL', '#dc3545' );
-			define( 'AUI_SUCCESS_COLOR_ORIGINAL', '#44c553' );
-			define( 'AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa' );
-			define( 'AUI_DARK_COLOR_ORIGINAL', '#343a40' );
-			define( 'AUI_WHITE_COLOR_ORIGINAL', '#fff' );
-			define( 'AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd' );
-			define( 'AUI_SALMON_COLOR_ORIGINAL', '#ff977a' );
-			define( 'AUI_CYAN_COLOR_ORIGINAL', '#35bdff' );
-			define( 'AUI_GRAY_COLOR_ORIGINAL', '#ced4da' );
-			define( 'AUI_INDIGO_COLOR_ORIGINAL', '#502c6c' );
-			define( 'AUI_ORANGE_COLOR_ORIGINAL', '#orange' );
-			define( 'AUI_BLACK_COLOR_ORIGINAL', '#000' );
-
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
-				define( 'AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SECONDARY_COLOR' ) ) {
-				define( 'AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_INFO_COLOR' ) ) {
-				define( 'AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_WARNING_COLOR' ) ) {
-				define( 'AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_DANGER_COLOR' ) ) {
-				define( 'AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SUCCESS_COLOR' ) ) {
-				define( 'AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_LIGHT_COLOR' ) ) {
-				define( 'AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_DARK_COLOR' ) ) {
-				define( 'AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_WHITE_COLOR' ) ) {
-				define( 'AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_PURPLE_COLOR' ) ) {
-				define( 'AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SALMON_COLOR' ) ) {
-				define( 'AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_CYAN_COLOR' ) ) {
-				define( 'AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_GRAY_COLOR' ) ) {
-				define( 'AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_INDIGO_COLOR' ) ) {
-				define( 'AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_ORANGE_COLOR' ) ) {
-				define( 'AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
-				define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
-			}
-
-		}
-
-		public static function get_colors( $original = false){
-
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
-				return array();
-			}
-			if ( $original ) {
-				return array(
-					'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
-					'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
-					'info'      => AUI_INFO_COLOR_ORIGINAL,
-					'warning'   => AUI_WARNING_COLOR_ORIGINAL,
-					'danger'    => AUI_DANGER_COLOR_ORIGINAL,
-					'success'   => AUI_SUCCESS_COLOR_ORIGINAL,
-					'light'     => AUI_LIGHT_COLOR_ORIGINAL,
-					'dark'      => AUI_DARK_COLOR_ORIGINAL,
-					'white'     => AUI_WHITE_COLOR_ORIGINAL,
-					'purple'    => AUI_PURPLE_COLOR_ORIGINAL,
-					'salmon'    => AUI_SALMON_COLOR_ORIGINAL,
-					'cyan'      => AUI_CYAN_COLOR_ORIGINAL,
-					'gray'      => AUI_GRAY_COLOR_ORIGINAL,
-					'indigo'    => AUI_INDIGO_COLOR_ORIGINAL,
-					'orange'    => AUI_ORANGE_COLOR_ORIGINAL,
-					'black'     => AUI_BLACK_COLOR_ORIGINAL,
-				);
-			}
-
-			return array(
-				'primary'   => AUI_PRIMARY_COLOR,
-				'secondary' => AUI_SECONDARY_COLOR,
-				'info'      => AUI_INFO_COLOR,
-				'warning'   => AUI_WARNING_COLOR,
-				'danger'    => AUI_DANGER_COLOR,
-				'success'   => AUI_SUCCESS_COLOR,
-				'light'     => AUI_LIGHT_COLOR,
-				'dark'      => AUI_DARK_COLOR,
-				'white'     => AUI_WHITE_COLOR,
-				'purple'    => AUI_PURPLE_COLOR,
-				'salmon'    => AUI_SALMON_COLOR,
-				'cyan'      => AUI_CYAN_COLOR,
-				'gray'      => AUI_GRAY_COLOR,
-				'indigo'    => AUI_INDIGO_COLOR,
-				'orange'    => AUI_ORANGE_COLOR,
-				'black'     => AUI_BLACK_COLOR,
-			);
-		}
-
-		/**
-		 * Add admin body class to show when BS5 is active.
-		 *
-		 * @param $classes
-		 *
-		 * @return mixed
-		 */
-		public function add_bs5_admin_body_class( $classes = '' ) {
-			$classes .= ' aui_bs5';
-
-			return $classes;
-		}
-
-		/**
-		 * Add a body class to show when BS5 is active.
-		 *
-		 * @param $classes
-		 *
-		 * @return mixed
-		 */
-		public function add_bs5_body_class( $classes ) {
-			$classes[] = 'aui_bs5';
-
-			return $classes;
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 */
-		public function init() {
+        /**
+         * AyeCode_UI_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    AyeCode_UI_Settings There can be only one!
+         */
+        private static $instance = null;
+
+
+        /**
+         * Main AyeCode_UI_Settings Instance.
+         *
+         * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return AyeCode_UI_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
+
+                self::$instance = new AyeCode_UI_Settings;
+
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+
+                if ( is_admin() ) {
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+
+                    // Maybe show example page
+                    add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
+
+                    if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+                        add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
+                    }
+                }
+
+                add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+
+                do_action( 'ayecode_ui_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
+         * Add custom colors to the color selector.
+         *
+         * @param $theme_colors
+         * @param $include_outlines
+         * @param $include_branding
+         *
+         * @return mixed
+         */
+        public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+
+
+            $setting = wp_get_global_settings();
+
+            if(!empty($setting['color']['palette']['custom'])){
+                foreach($setting['color']['palette']['custom'] as $color){
+                    $theme_colors[$color['slug']] = esc_attr($color['name']);
+                }
+            }
+
+            return $theme_colors;
+        }
+
+        /**
+         * Setup some constants.
+         */
+        public function constants(){
+            define( 'AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be" );
+            define( 'AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d' );
+            define( 'AUI_INFO_COLOR_ORIGINAL', '#17a2b8' );
+            define( 'AUI_WARNING_COLOR_ORIGINAL', '#ffc107' );
+            define( 'AUI_DANGER_COLOR_ORIGINAL', '#dc3545' );
+            define( 'AUI_SUCCESS_COLOR_ORIGINAL', '#44c553' );
+            define( 'AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa' );
+            define( 'AUI_DARK_COLOR_ORIGINAL', '#343a40' );
+            define( 'AUI_WHITE_COLOR_ORIGINAL', '#fff' );
+            define( 'AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd' );
+            define( 'AUI_SALMON_COLOR_ORIGINAL', '#ff977a' );
+            define( 'AUI_CYAN_COLOR_ORIGINAL', '#35bdff' );
+            define( 'AUI_GRAY_COLOR_ORIGINAL', '#ced4da' );
+            define( 'AUI_INDIGO_COLOR_ORIGINAL', '#502c6c' );
+            define( 'AUI_ORANGE_COLOR_ORIGINAL', '#orange' );
+            define( 'AUI_BLACK_COLOR_ORIGINAL', '#000' );
+
+            if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+                define( 'AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_SECONDARY_COLOR' ) ) {
+                define( 'AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_INFO_COLOR' ) ) {
+                define( 'AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_WARNING_COLOR' ) ) {
+                define( 'AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_DANGER_COLOR' ) ) {
+                define( 'AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_SUCCESS_COLOR' ) ) {
+                define( 'AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_LIGHT_COLOR' ) ) {
+                define( 'AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_DARK_COLOR' ) ) {
+                define( 'AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_WHITE_COLOR' ) ) {
+                define( 'AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_PURPLE_COLOR' ) ) {
+                define( 'AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_SALMON_COLOR' ) ) {
+                define( 'AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_CYAN_COLOR' ) ) {
+                define( 'AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_GRAY_COLOR' ) ) {
+                define( 'AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_INDIGO_COLOR' ) ) {
+                define( 'AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_ORANGE_COLOR' ) ) {
+                define( 'AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
+                define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
+            }
+
+        }
+
+        public static function get_colors( $original = false){
+
+            if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+                return array();
+            }
+            if ( $original ) {
+                return array(
+                    'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
+                    'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
+                    'info'      => AUI_INFO_COLOR_ORIGINAL,
+                    'warning'   => AUI_WARNING_COLOR_ORIGINAL,
+                    'danger'    => AUI_DANGER_COLOR_ORIGINAL,
+                    'success'   => AUI_SUCCESS_COLOR_ORIGINAL,
+                    'light'     => AUI_LIGHT_COLOR_ORIGINAL,
+                    'dark'      => AUI_DARK_COLOR_ORIGINAL,
+                    'white'     => AUI_WHITE_COLOR_ORIGINAL,
+                    'purple'    => AUI_PURPLE_COLOR_ORIGINAL,
+                    'salmon'    => AUI_SALMON_COLOR_ORIGINAL,
+                    'cyan'      => AUI_CYAN_COLOR_ORIGINAL,
+                    'gray'      => AUI_GRAY_COLOR_ORIGINAL,
+                    'indigo'    => AUI_INDIGO_COLOR_ORIGINAL,
+                    'orange'    => AUI_ORANGE_COLOR_ORIGINAL,
+                    'black'     => AUI_BLACK_COLOR_ORIGINAL,
+                );
+            }
+
+            return array(
+                'primary'   => AUI_PRIMARY_COLOR,
+                'secondary' => AUI_SECONDARY_COLOR,
+                'info'      => AUI_INFO_COLOR,
+                'warning'   => AUI_WARNING_COLOR,
+                'danger'    => AUI_DANGER_COLOR,
+                'success'   => AUI_SUCCESS_COLOR,
+                'light'     => AUI_LIGHT_COLOR,
+                'dark'      => AUI_DARK_COLOR,
+                'white'     => AUI_WHITE_COLOR,
+                'purple'    => AUI_PURPLE_COLOR,
+                'salmon'    => AUI_SALMON_COLOR,
+                'cyan'      => AUI_CYAN_COLOR,
+                'gray'      => AUI_GRAY_COLOR,
+                'indigo'    => AUI_INDIGO_COLOR,
+                'orange'    => AUI_ORANGE_COLOR,
+                'black'     => AUI_BLACK_COLOR,
+            );
+        }
+
+        /**
+         * Add admin body class to show when BS5 is active.
+         *
+         * @param $classes
+         *
+         * @return mixed
+         */
+        public function add_bs5_admin_body_class( $classes = '' ) {
+            $classes .= ' aui_bs5';
+
+            return $classes;
+        }
+
+        /**
+         * Add a body class to show when BS5 is active.
+         *
+         * @param $classes
+         *
+         * @return mixed
+         */
+        public function add_bs5_body_class( $classes ) {
+            $classes[] = 'aui_bs5';
+
+            return $classes;
+        }
+
+        /**
+         * Initiate the settings and add the required action hooks.
+         */
+        public function init() {
             global $aui_bs5;
 
-			// Maybe fix settings
-			if ( ! empty( $_REQUEST['aui-fix-admin'] ) && !empty($_REQUEST['nonce']) && wp_verify_nonce( $_REQUEST['nonce'], "aui-fix-admin" ) ) {
-				$db_settings = get_option( 'ayecode-ui-settings' );
-				if ( ! empty( $db_settings ) ) {
-					$db_settings['css_backend'] = 'compatibility';
-					$db_settings['js_backend'] = 'core-popper';
-					update_option( 'ayecode-ui-settings', $db_settings );
-					wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
-				}
-			}
+            // Maybe fix settings
+            if ( ! empty( $_REQUEST['aui-fix-admin'] ) && !empty($_REQUEST['nonce']) && wp_verify_nonce( $_REQUEST['nonce'], "aui-fix-admin" ) ) {
+                $db_settings = get_option( 'ayecode-ui-settings' );
+                if ( ! empty( $db_settings ) ) {
+                    $db_settings['css_backend'] = 'compatibility';
+                    $db_settings['js_backend'] = 'core-popper';
+                    update_option( 'ayecode-ui-settings', $db_settings );
+                    wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
+                }
+            }
 
-			$this->constants();
-			$this->settings = $this->get_settings();
-			$this->url = $this->get_url();
+            $this->constants();
+            $this->settings = $this->get_settings();
+            $this->url = $this->get_url();
 
             // define the version
-			$aui_bs5 = $this->settings['bs_ver'] === '5';
-
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs-conversion.php' );
-				add_filter( 'admin_body_class', array( $this, 'add_bs5_admin_body_class' ), 99, 1 );
-				add_filter( 'body_class', array( $this, 'add_bs5_body_class' ) );
-			}
-
-			/**
-			 * Maybe load CSS
-			 *
-			 * We load super early in case there is a theme version that might change the colors
-			 */
-			if ( $this->settings['css'] ) {
-				$priority = $this->is_bs3_compat() ? 100 : 1;
+            $aui_bs5 = $this->settings['bs_ver'] === '5';
+
+            if ( $aui_bs5 ) {
+                include_once( dirname( __FILE__ ) . '/inc/bs-conversion.php' );
+                add_filter( 'admin_body_class', array( $this, 'add_bs5_admin_body_class' ), 99, 1 );
+                add_filter( 'body_class', array( $this, 'add_bs5_body_class' ) );
+            }
+
+            /**
+             * Maybe load CSS
+             *
+             * We load super early in case there is a theme version that might change the colors
+             */
+            if ( $this->settings['css'] ) {
+                $priority = $this->is_bs3_compat() ? 100 : 1;
                 $priority = $aui_bs5 ? 10 : $priority;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), $priority );
-			}
-			if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
-			}
-
-			// maybe load JS
-			if ( $this->settings['js'] ) {
-				$priority = $this->is_bs3_compat() ? 100 : 1;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
-			}
-			if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
-			}
-
-			// Maybe set the HTML font size
-			if ( $this->settings['html_font_size'] ) {
-				add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
-			}
-
-			// Maybe show backend style error
-			if( $this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper' ){
-				add_action( 'admin_notices', array( $this, 'show_admin_style_notice' ) );
-			}
-
-		}
-
-		/**
-		 * Show admin notice if backend scripts not loaded.
-		 */
-		public function show_admin_style_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=".wp_create_nonce('aui-fix-admin'));
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">Fix Now</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI is disable or set wrong.')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
-		}
-
-		/**
-		 * Check if we should load the admin scripts or not.
-		 *
-		 * @return bool
-		 */
-		public function load_admin_scripts(){
-			$result = true;
-
-			// check if specifically disabled
-			if(!empty($this->settings['disable_admin'])){
-				$url_parts = explode("\n",$this->settings['disable_admin']);
-				foreach($url_parts as $part){
-					if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
-						return false; // return early, no point checking further
-					}
-				}
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Add a html font size to the footer.
-		 */
-		public function html_font_size(){
-			$this->settings = $this->get_settings();
-			echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
-		}
-
-		/**
-		 * Check if the current admin screen should load scripts.
-		 *
-		 * @return bool
-		 */
-		public function is_aui_screen(){
+                add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), $priority );
+            }
+            if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
+                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
+            }
+
+            // maybe load JS
+            if ( $this->settings['js'] ) {
+                $priority = $this->is_bs3_compat() ? 100 : 1;
+                add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
+            }
+            if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
+                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
+            }
+
+            // Maybe set the HTML font size
+            if ( $this->settings['html_font_size'] ) {
+                add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
+            }
+
+            // Maybe show backend style error
+            if( $this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper' ){
+                add_action( 'admin_notices', array( $this, 'show_admin_style_notice' ) );
+            }
+
+        }
+
+        /**
+         * Show admin notice if backend scripts not loaded.
+         */
+        public function show_admin_style_notice(){
+            $fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=".wp_create_nonce('aui-fix-admin'));
+            $button = '<a href="'.esc_url($fix_url).'" class="button-primary">Fix Now</a>';
+            $message = __( '<b>Style Issue:</b> AyeCode UI is disable or set wrong.')." " .$button;
+            echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
+        }
+
+        /**
+         * Check if we should load the admin scripts or not.
+         *
+         * @return bool
+         */
+        public function load_admin_scripts(){
+            $result = true;
+
+            // check if specifically disabled
+            if(!empty($this->settings['disable_admin'])){
+                $url_parts = explode("\n",$this->settings['disable_admin']);
+                foreach($url_parts as $part){
+                    if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
+                        return false; // return early, no point checking further
+                    }
+                }
+            }
+
+            return $result;
+        }
+
+        /**
+         * Add a html font size to the footer.
+         */
+        public function html_font_size(){
+            $this->settings = $this->get_settings();
+            echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
+        }
+
+        /**
+         * Check if the current admin screen should load scripts.
+         *
+         * @return bool
+         */
+        public function is_aui_screen(){
 //			echo '###';exit;
-			$load = false;
-			// check if we should load or not
-			if ( is_admin() ) {
-				// Only enable on set pages
-				$aui_screens = array(
-					'page',
+            $load = false;
+            // check if we should load or not
+            if ( is_admin() ) {
+                // Only enable on set pages
+                $aui_screens = array(
+                    'page',
                     //'docs',
-					'post',
-					'settings_page_ayecode-ui-settings',
-					'appearance_page_gutenberg-widgets',
-					'widgets',
-					'ayecode-ui-settings',
-					'site-editor'
-				);
-				$screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
+                    'post',
+                    'settings_page_ayecode-ui-settings',
+                    'appearance_page_gutenberg-widgets',
+                    'widgets',
+                    'ayecode-ui-settings',
+                    'site-editor'
+                );
+                $screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
 
-				$screen = get_current_screen();
+                $screen = get_current_screen();
 
 //				echo '###'.$screen->id;
 
-				// check if we are on a AUI screen
-				if ( $screen && in_array( $screen->id, $screen_ids ) ) {
-					$load = true;
-				}
+                // check if we are on a AUI screen
+                if ( $screen && in_array( $screen->id, $screen_ids ) ) {
+                    $load = true;
+                }
 
-				//load for widget previews in WP 5.8
-				if( !empty($_REQUEST['legacy-widget-preview'])){
-					$load = true;
-				}
-			}
+                //load for widget previews in WP 5.8
+                if( !empty($_REQUEST['legacy-widget-preview'])){
+                    $load = true;
+                }
+            }
 
 
 
-			return apply_filters( 'aui_load_on_admin' , $load );
-		}
+            return apply_filters( 'aui_load_on_admin' , $load );
+        }
 
-		/**
-		 * Check if the current theme is a block theme.
-		 *
-		 * @return bool
-		 */
-		public static function is_block_theme() {
-			if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
-				return true;
-			}
+        /**
+         * Check if the current theme is a block theme.
+         *
+         * @return bool
+         */
+        public static function is_block_theme() {
+            if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
+                return true;
+            }
 
-			return false;
-		}
+            return false;
+        }
 
-		/**
-		 * Adds the styles.
-		 */
-		public function enqueue_style() {
+        /**
+         * Adds the styles.
+         */
+        public function enqueue_style() {
             global $aui_bs5;
 
             $load_fse = false;
 
-			if ( is_admin() && ! $this->is_aui_screen() ) {
-				// Don't add wp-admin scripts if not requested to.
-			} else {
-				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
-				$rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
+            if ( is_admin() && ! $this->is_aui_screen() ) {
+                // Don't add wp-admin scripts if not requested to.
+            } else {
+                $css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
+                $rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
                 $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				if ( $this->settings[ $css_setting ] ) {
-					$compatibility = $this->settings[$css_setting]=='core' ? false : true;
-					$url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
+                if ( $this->settings[ $css_setting ] ) {
+                    $compatibility = $this->settings[$css_setting]=='core' ? false : true;
+                    $url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
 
-					wp_register_style( 'ayecode-ui', $url, array(), $this->version );
-					wp_enqueue_style( 'ayecode-ui' );
+                    wp_register_style( 'ayecode-ui', $url, array(), $this->version );
+                    wp_enqueue_style( 'ayecode-ui' );
 
-					if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
-						$url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
-						wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
-						wp_enqueue_style( 'ayecode-ui-fse' );
-						$load_fse = true;
-					}
+                    if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+                        $url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
+                        wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
+                        wp_enqueue_style( 'ayecode-ui-fse' );
+                        $load_fse = true;
+                    }
 
-					// flatpickr
-					wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
+                    // flatpickr
+                    wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
 
-					// fix some wp-admin issues
-					if(is_admin()){
-						$custom_css = "
+                    // fix some wp-admin issues
+                    if(is_admin()){
+                        $custom_css = "
                 body{
                     background-color: #f1f1f1;
                     font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;
@@ -526,63 +526,63 @@ 
 				}
                 ";
 
-						// @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
-						$custom_css .= "
+                        // @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
+                        $custom_css .= "
 						.edit-post-sidebar input[type=color].components-text-control__input{
 						    padding: 0;
 						}
 					";
-						wp_add_inline_style( 'ayecode-ui', $custom_css );
-					}
-
-					// custom changes
-					if ( $load_fse ) {
-						wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility, true) );
-					}else{
-						wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Get inline script used if bootstrap enqueued
-		 *
-		 * If this remains small then its best to use this than to add another JS file.
-		 */
-		public function inline_script() {
-            global $aui_bs5;
-			// Flatpickr calendar locale
-			$flatpickr_locale = self::flatpickr_locale();
+                        wp_add_inline_style( 'ayecode-ui', $custom_css );
+                    }
 
-			ob_start();
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
-			}else{
-				include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
+                    // custom changes
+                    if ( $load_fse ) {
+                        wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility, true) );
+                    }else{
+                        wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
+                    }
+                }
             }
+        }
 
-			$output = ob_get_clean();
+        /**
+         * Get inline script used if bootstrap enqueued
+         *
+         * If this remains small then its best to use this than to add another JS file.
+         */
+        public function inline_script() {
+            global $aui_bs5;
+            // Flatpickr calendar locale
+            $flatpickr_locale = self::flatpickr_locale();
+
+            ob_start();
+            if ( $aui_bs5 ) {
+                include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
+            }else{
+                include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
+            }
 
-			/*
+            $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>'
-			), '', self::minify_js($output) );
-		}
-
-
-		/**
-		 * JS to help with conflict issues with other plugins and themes using bootstrap v3.
-		 *
-		 * @TODO we may need this when other conflicts arrise.
-		 * @return mixed
-		 */
-		public static function bs3_compat_js() {
-			ob_start();
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', self::minify_js($output) );
+        }
+
+
+        /**
+         * JS to help with conflict issues with other plugins and themes using bootstrap v3.
+         *
+         * @TODO we may need this when other conflicts arrise.
+         * @return mixed
+         */
+        public static function bs3_compat_js() {
+            ob_start();
+            ?>
             <script>
 				<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
                 /* With Avada builder */
@@ -590,20 +590,20 @@ 
 				<?php } ?>
             </script>
 			<?php
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', ob_get_clean());
-		}
-
-		/**
-		 * Get inline script used if bootstrap file browser enqueued.
-		 *
-		 * If this remains small then its best to use this than to add another JS file.
-		 */
-		public function inline_script_file_browser(){
-			ob_start();
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', ob_get_clean());
+        }
+
+        /**
+         * Get inline script used if bootstrap file browser enqueued.
+         *
+         * If this remains small then its best to use this than to add another JS file.
+         */
+        public function inline_script_file_browser(){
+            ob_start();
+            ?>
             <script>
                 // run on doc ready
                 jQuery(document).ready(function () {
@@ -611,314 +611,314 @@ 
                 });
             </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 );
-		}
-
-		/**
-		 * Adds the Font Awesome JS.
-		 */
-		public function enqueue_scripts() {
-			if( is_admin() && !$this->is_aui_screen()){
-				// Don't add wp-admin scripts if not requested to.
-			} else {
-				$js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
-
-				$bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
-
-				// select2
-				wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
-
-				// flatpickr
-				wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
-
-				// iconpicker
-				if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
-					wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
-				}else{
-					wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
-				}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
-				// Bootstrap file browser
-				wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
-				wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
+        /**
+         * Adds the Font Awesome JS.
+         */
+        public function enqueue_scripts() {
+            if( is_admin() && !$this->is_aui_screen()){
+                // Don't add wp-admin scripts if not requested to.
+            } else {
+                $js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
 
-				$load_inline = false;
+                $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				// Load select2 only when required.
-				if ( $this->force_load_select2() ) {
-					$dependency = array( 'select2', 'jquery' );
-				} else {
-					$dependency = array( 'jquery' );
-				}
+                // select2
+                wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
 
-				if ( $this->settings[ $js_setting ] == 'core-popper' ) {
-					// Bootstrap bundle
-					$url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
-					wp_register_script( 'bootstrap-js-bundle', $url, $dependency, $this->version, $this->is_bs3_compat() );
-
-					// If in admin then add to footer for compatibility.
-					is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
-
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-js-bundle', $script );
-				} elseif ( $this->settings[ $js_setting ] == 'popper' ) {
-					$url = $this->url . 'assets/js/popper.min.js'; // @todo we need to update this to bs5
-					wp_register_script( 'bootstrap-js-popper', $url, $dependency, $this->version );
-					wp_enqueue_script( 'bootstrap-js-popper' );
-					$load_inline = true;
-				} else {
-					$load_inline = true;
-				}
+                // flatpickr
+                wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
+
+                // iconpicker
+                if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+                    wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
+                }else{
+                    wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
+                }
 
-				// Load needed inline scripts by faking the loading of a script if the main script is not being loaded
-				if ( $load_inline ) {
-					wp_register_script( 'bootstrap-dummy', '', $dependency );
-					wp_enqueue_script( 'bootstrap-dummy' );
+                // Bootstrap file browser
+                wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
+                wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
 
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-dummy', $script );
-				}
-			}
-		}
-
-		/**
-		 * Enqueue select2 if called.
-		 *
-		 * @since 0.2.29
-		 */
-		public function force_load_select2() {
-			global $aui_select2_enqueued;
-
-			$conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
-
-			if ( $conditional_select2 !== true ) {
-				return true;
-			}
-
-			$load = is_admin() && ! $aui_select2_enqueued;
-
-			return apply_filters( 'aui_force_load_select2', $load );
-		}
-
-		/**
-		 * Enqueue select2 if called.
-		 *
-		 * @since 0.2.29
-		 */
-		public function enqueue_select2() {
-			wp_enqueue_script( 'select2' );
-		}
-
-		/**
-		 * Enqueue flatpickr if called.
-		 */
-		public function enqueue_flatpickr(){
-			wp_enqueue_style( 'flatpickr' );
-			wp_enqueue_script( 'flatpickr' );
-		}
-
-		/**
-		 * Enqueue iconpicker if called.
-		 */
-		public function enqueue_iconpicker(){
-			wp_enqueue_style( 'iconpicker' );
-			wp_enqueue_script( 'iconpicker' );
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
-
-			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
-			}
-
-			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
-
-			return trailingslashit( $url );
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url_old() {
-
-			$url = '';
-			// check if we are inside a plugin
-			$file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
-
-			// add check in-case user has changed wp-content dir name.
-			$wp_content_folder_name = basename(WP_CONTENT_DIR);
-			$dir_parts = explode("/$wp_content_folder_name/",$file_dir);
-			$url_parts = explode("/$wp_content_folder_name/",plugins_url());
-
-			if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-				$url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		public function register_settings() {
-			register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
-		}
-
-		/**
-		 * Add the WordPress settings menu item.
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
-		 */
-		public function menu_item() {
-			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
-
-		/**
-		 * Get a list of themes and their default JS settings.
-		 *
-		 * @return array
-		 */
-		public function theme_js_settings(){
-			return array(
-				'ayetheme' => 'popper',
-				'listimia' => 'required',
-				'listimia_backend' => 'core-popper',
-				//'avada'    => 'required', // removed as we now add compatibility
-			);
-		}
-
-		/**
+                $load_inline = false;
+
+                // Load select2 only when required.
+                if ( $this->force_load_select2() ) {
+                    $dependency = array( 'select2', 'jquery' );
+                } else {
+                    $dependency = array( 'jquery' );
+                }
+
+                if ( $this->settings[ $js_setting ] == 'core-popper' ) {
+                    // Bootstrap bundle
+                    $url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
+                    wp_register_script( 'bootstrap-js-bundle', $url, $dependency, $this->version, $this->is_bs3_compat() );
+
+                    // If in admin then add to footer for compatibility.
+                    is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
+
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-js-bundle', $script );
+                } elseif ( $this->settings[ $js_setting ] == 'popper' ) {
+                    $url = $this->url . 'assets/js/popper.min.js'; // @todo we need to update this to bs5
+                    wp_register_script( 'bootstrap-js-popper', $url, $dependency, $this->version );
+                    wp_enqueue_script( 'bootstrap-js-popper' );
+                    $load_inline = true;
+                } else {
+                    $load_inline = true;
+                }
+
+                // Load needed inline scripts by faking the loading of a script if the main script is not being loaded
+                if ( $load_inline ) {
+                    wp_register_script( 'bootstrap-dummy', '', $dependency );
+                    wp_enqueue_script( 'bootstrap-dummy' );
+
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-dummy', $script );
+                }
+            }
+        }
+
+        /**
+         * Enqueue select2 if called.
+         *
+         * @since 0.2.29
+         */
+        public function force_load_select2() {
+            global $aui_select2_enqueued;
+
+            $conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
+
+            if ( $conditional_select2 !== true ) {
+                return true;
+            }
+
+            $load = is_admin() && ! $aui_select2_enqueued;
+
+            return apply_filters( 'aui_force_load_select2', $load );
+        }
+
+        /**
+         * Enqueue select2 if called.
+         *
+         * @since 0.2.29
+         */
+        public function enqueue_select2() {
+            wp_enqueue_script( 'select2' );
+        }
+
+        /**
+         * Enqueue flatpickr if called.
+         */
+        public function enqueue_flatpickr(){
+            wp_enqueue_style( 'flatpickr' );
+            wp_enqueue_script( 'flatpickr' );
+        }
+
+        /**
+         * Enqueue iconpicker if called.
+         */
+        public function enqueue_iconpicker(){
+            wp_enqueue_style( 'iconpicker' );
+            wp_enqueue_script( 'iconpicker' );
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+            $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+            $content_url = untrailingslashit( WP_CONTENT_URL );
+
+            // Replace http:// to https://.
+            if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                $content_url = str_replace( 'http://', 'https://', $content_url );
+            }
+
+            // Check if we are inside a plugin
+            $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+            $url = str_replace( $content_dir, $content_url, $file_dir );
+
+            return trailingslashit( $url );
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url_old() {
+
+            $url = '';
+            // check if we are inside a plugin
+            $file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
+
+            // add check in-case user has changed wp-content dir name.
+            $wp_content_folder_name = basename(WP_CONTENT_DIR);
+            $dir_parts = explode("/$wp_content_folder_name/",$file_dir);
+            $url_parts = explode("/$wp_content_folder_name/",plugins_url());
+
+            if(!empty($url_parts[0]) && !empty($dir_parts[1])){
+                $url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        public function register_settings() {
+            register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
+        }
+
+        /**
+         * Add the WordPress settings menu item.
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
+         */
+        public function menu_item() {
+            $menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
+            call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
+                $this,
+                'settings_page'
+            ) );
+        }
+
+        /**
+         * Get a list of themes and their default JS settings.
+         *
+         * @return array
+         */
+        public function theme_js_settings(){
+            return array(
+                'ayetheme' => 'popper',
+                'listimia' => 'required',
+                'listimia_backend' => 'core-popper',
+                //'avada'    => 'required', // removed as we now add compatibility
+            );
+        }
+
+        /**
          * Get the date the site was installed.
          *
-		 * @return false|string
-		 */
+         * @return false|string
+         */
         public function get_site_install_date() {
-	        global $wpdb; // This gives you access to the WordPress database object
+            global $wpdb; // This gives you access to the WordPress database object
+
+            // Prepare the SQL query to get the oldest registration date
+            $query = "SELECT MIN(user_registered) AS oldest_registration_date FROM {$wpdb->users}";
 
-	        // Prepare the SQL query to get the oldest registration date
-	        $query = "SELECT MIN(user_registered) AS oldest_registration_date FROM {$wpdb->users}";
+            // Execute the query
+            $date = $wpdb->get_var( $query ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 
-	        // Execute the query
-	        $date = $wpdb->get_var( $query ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
+            return $date ? $date : false;
+        }
 
-	        return $date ? $date : false;
+        /**
+         * Show admin notice if backend scripts not loaded.
+         */
+        public function show_admin_version_notice(){
+            $fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
+            $button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
+            $message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
+            echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
         }
 
-		/**
-		 * Show admin notice if backend scripts not loaded.
-		 */
-		public function show_admin_version_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'. wp_kses_post( $message ).'</p></div>';
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-
-			$db_settings = get_option( 'ayecode-ui-settings' );
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+
+            $db_settings = get_option( 'ayecode-ui-settings' );
 
             // Maybe show default version notice
-			$site_install_date = new DateTime( self::get_site_install_date() );
-			$switch_over_date = new DateTime("2024-02-01");
-			if ( empty( $db_settings ) && $site_install_date < $switch_over_date ) {
-				add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
-			}
-
-			$js_default = 'core-popper';
-			$js_default_backend = $js_default;
-
-			// maybe set defaults (if no settings set)
-			if(empty($db_settings)){
-				$active_theme = strtolower( get_template() ); // active parent theme.
-				$theme_js_settings = self::theme_js_settings();
-				if(isset($theme_js_settings[$active_theme])){
-					$js_default = $theme_js_settings[$active_theme];
-					$js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
-				}
-			}
+            $site_install_date = new DateTime( self::get_site_install_date() );
+            $switch_over_date = new DateTime("2024-02-01");
+            if ( empty( $db_settings ) && $site_install_date < $switch_over_date ) {
+                add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
+            }
 
-			/**
-			 * Filter the default settings.
-			 */
-			$defaults = apply_filters( 'ayecode-ui-default-settings', array(
-				'css'            => 'compatibility', // core, compatibility
-				'js'             => $js_default, // js to load, core-popper, popper
-				'html_font_size' => '16', // js to load, core-popper, popper
-				'css_backend'    => 'compatibility', // core, compatibility
-				'js_backend'     => $js_default_backend, // js to load, core-popper, popper
-				'disable_admin'  => '', // URL snippets to disable loading on admin
+            $js_default = 'core-popper';
+            $js_default_backend = $js_default;
+
+            // maybe set defaults (if no settings set)
+            if(empty($db_settings)){
+                $active_theme = strtolower( get_template() ); // active parent theme.
+                $theme_js_settings = self::theme_js_settings();
+                if(isset($theme_js_settings[$active_theme])){
+                    $js_default = $theme_js_settings[$active_theme];
+                    $js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
+                }
+            }
+
+            /**
+             * Filter the default settings.
+             */
+            $defaults = apply_filters( 'ayecode-ui-default-settings', array(
+                'css'            => 'compatibility', // core, compatibility
+                'js'             => $js_default, // js to load, core-popper, popper
+                'html_font_size' => '16', // js to load, core-popper, popper
+                'css_backend'    => 'compatibility', // core, compatibility
+                'js_backend'     => $js_default_backend, // js to load, core-popper, popper
+                'disable_admin'  => '', // URL snippets to disable loading on admin
                 'bs_ver'         => '5', // The default bootstrap version to sue by default
-			), $db_settings );
+            ), $db_settings );
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+            $settings = wp_parse_args( $db_settings, $defaults );
 
-			/**
-			 * Filter the Bootstrap settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeats the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
-		}
+            /**
+             * Filter the Bootstrap settings.
+             *
+             * @todo if we add this filer people might use it and then it defeats the purpose of this class :/
+             */
+            return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
+        }
 
 
-		/**
-		 * The settings page html output.
-		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( esc_attr__( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
-			}
+        /**
+         * The settings page html output.
+         */
+        public function settings_page() {
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( esc_attr__( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+            }
             $overrides = apply_filters( 'ayecode-ui-settings', array(), array(), array() );
 
-			?>
+            ?>
             <div class="wrap">
                 <h1><?php echo esc_attr( $this->name ); ?></h1>
                 <p><?php echo esc_html( apply_filters( 'ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'ayecode-connect' ) ) );?></p>
                 <form method="post" action="options.php">
 					<?php
-					settings_fields( 'ayecode-ui-settings' );
-					do_settings_sections( 'ayecode-ui-settings' );
-					?>
+                    settings_fields( 'ayecode-ui-settings' );
+                    do_settings_sections( 'ayecode-ui-settings' );
+                    ?>
 
                     <h2><?php esc_html_e( 'BootStrap Version', 'ayecode-connect' ); ?></h2>
                     <p><?php echo esc_html( apply_filters( 'ayecode-ui-version-settings-message', __("V5 is recommended, however if you have another plugin installed using v4, you may need to use v4 also.", 'ayecode-connect' ) ) );?></p>
 	                <div class="bsui"><?php
-	                if ( ! empty( $overrides ) ) {
-		                echo aui()->alert(array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			                'type'=> 'info',
-			                'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
-		                ));
-	                }
-	                ?>
+                    if ( ! empty( $overrides ) ) {
+                        echo aui()->alert(array( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                            'type'=> 'info',
+                            'content'=> esc_attr__("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
+                        ));
+                    }
+                    ?>
                     </div>
                     <table class="form-table wpbs-table-version-settings">
                         <tr valign="top">
@@ -1002,77 +1002,77 @@ 
                     </table>
 
 					<?php
-					submit_button();
-					?>
+                    submit_button();
+                    ?>
                 </form>
                 <div id="wpbs-version" data-aui-source="<?php echo esc_attr( $this->get_load_source() ); ?>"><?php echo esc_html( $this->version ); ?></div>
             </div>
 			<?php
-		}
+        }
 
         public function get_load_source(){
-	        $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-	        $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-	        // Find source plugin/theme of SD
-	        $source = array();
-	        if ( strpos( $file, $plugins_dir ) !== false ) {
-		        $source = explode( "/", plugin_basename( $file ) );
-	        } else if ( function_exists( 'get_theme_root' ) ) {
-		        $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-		        if ( strpos( $file, $themes_dir ) !== false ) {
-			        $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-		        }
-	        }
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme of SD
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
 
             return isset($source[0]) ? esc_attr($source[0]) : '';
         }
 
-		public function customizer_settings($wp_customize){
-			$wp_customize->add_section('aui_settings', array(
-				'title'    => __('AyeCode UI', 'ayecode-connect' ),
-				'priority' => 120,
-			));
-
-			//  =============================
-			//  = Color Picker              =
-			//  =============================
-			$wp_customize->add_setting('aui_options[color_primary]', array(
-				'default'           => AUI_PRIMARY_COLOR,
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
-				'label'    => __('Primary Color', 'ayecode-connect' ),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_primary]',
-			)));
-
-			$wp_customize->add_setting('aui_options[color_secondary]', array(
-				'default'           => '#6c757d',
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
-				'label'    => __('Secondary Color', 'ayecode-connect' ),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_secondary]',
-			)));
-		}
-
-		/**
-		 * CSS to help with conflict issues with other plugins and themes using bootstrap v3.
-		 *
-		 * @return mixed
-		 */
-		public static function bs3_compat_css() {
-			ob_start();
-			?>
+        public function customizer_settings($wp_customize){
+            $wp_customize->add_section('aui_settings', array(
+                'title'    => __('AyeCode UI', 'ayecode-connect' ),
+                'priority' => 120,
+            ));
+
+            //  =============================
+            //  = Color Picker              =
+            //  =============================
+            $wp_customize->add_setting('aui_options[color_primary]', array(
+                'default'           => AUI_PRIMARY_COLOR,
+                'sanitize_callback' => 'sanitize_hex_color',
+                'capability'        => 'edit_theme_options',
+                'type'              => 'option',
+                'transport'         => 'refresh',
+            ));
+            $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
+                'label'    => __('Primary Color', 'ayecode-connect' ),
+                'section'  => 'aui_settings',
+                'settings' => 'aui_options[color_primary]',
+            )));
+
+            $wp_customize->add_setting('aui_options[color_secondary]', array(
+                'default'           => '#6c757d',
+                'sanitize_callback' => 'sanitize_hex_color',
+                'capability'        => 'edit_theme_options',
+                'type'              => 'option',
+                'transport'         => 'refresh',
+            ));
+            $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
+                'label'    => __('Secondary Color', 'ayecode-connect' ),
+                'section'  => 'aui_settings',
+                'settings' => 'aui_options[color_secondary]',
+            )));
+        }
+
+        /**
+         * CSS to help with conflict issues with other plugins and themes using bootstrap v3.
+         *
+         * @return mixed
+         */
+        public static function bs3_compat_css() {
+            ob_start();
+            ?>
             <style>
                 /* Bootstrap 3 compatibility */
                 body.modal-open .modal-backdrop.show:not(.in) {opacity:0.5;}
@@ -1101,368 +1101,368 @@ 
                 <?php } ?>
             </style>
 			<?php
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
-		}
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', self::minify_css( ob_get_clean() ) );
+        }
 
-		public static function custom_css( $compatibility = true, $is_fse = false ) {
-			global $aui_bs5;
+        public static function custom_css( $compatibility = true, $is_fse = false ) {
+            global $aui_bs5;
 
-			$colors = array();
+            $colors = array();
 
-			if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
-				$setting = wp_get_global_settings();
+            if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+                $setting = wp_get_global_settings();
 
-				if ( ! empty( $setting['color']['palette']['theme'] ) ) {
-					foreach ( $setting['color']['palette']['theme'] as $color ) {
-						$colors[$color['slug']] = esc_attr( $color['color'] );
-					}
-				}
+                if ( ! empty( $setting['color']['palette']['theme'] ) ) {
+                    foreach ( $setting['color']['palette']['theme'] as $color ) {
+                        $colors[$color['slug']] = esc_attr( $color['color'] );
+                    }
+                }
 
-				if ( ! empty( $setting['color']['palette']['custom'] ) ) {
-					foreach ( $setting['color']['palette']['custom'] as $color ) {
-						$colors[$color['slug']] = esc_attr( $color['color'] );
-					}
-				}
-			} else {
-				$settings = get_option( 'aui_options' );
-
-				$colors = array(
-					'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
-					'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
-				);
-			}
-
-			ob_start();
-			?><style><?php
-			// BS v3 compat
-			if( self::is_bs3_compat() ){
-				echo self::bs3_compat_css(); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
-
-			//$is_fse = false;
-			//if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
-				//$is_fse = true;
-			//}
-
-			$custom_front = ! is_admin() ? true : apply_filters('ayecode_ui_custom_front', false );
-			$custom_admin = $is_fse || self::is_preview() ? true : apply_filters('ayecode_ui_custom_admin', false );
+                if ( ! empty( $setting['color']['palette']['custom'] ) ) {
+                    foreach ( $setting['color']['palette']['custom'] as $color ) {
+                        $colors[$color['slug']] = esc_attr( $color['color'] );
+                    }
+                }
+            } else {
+                $settings = get_option( 'aui_options' );
+
+                $colors = array(
+                    'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
+                    'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
+                );
+            }
+
+            ob_start();
+            ?><style><?php
+            // BS v3 compat
+            if( self::is_bs3_compat() ){
+                echo self::bs3_compat_css(); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
+
+            //$is_fse = false;
+            //if ( is_admin() && ( !empty($_REQUEST['postType']) || self::is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+                //$is_fse = true;
+            //}
+
+            $custom_front = ! is_admin() ? true : apply_filters('ayecode_ui_custom_front', false );
+            $custom_admin = $is_fse || self::is_preview() ? true : apply_filters('ayecode_ui_custom_admin', false );
             $bs_custom_css = apply_filters( 'ayecode_ui_bs_custom_css', $custom_admin || $custom_front );
-			//$bs_custom_css = true; // Force true to fix any color issue.
+            //$bs_custom_css = true; // Force true to fix any color issue.
 
-			$colors_css = '';
-			if ( ! empty( $colors ) && $bs_custom_css ) {
-				$d_colors = self::get_colors(true);
+            $colors_css = '';
+            if ( ! empty( $colors ) && $bs_custom_css ) {
+                $d_colors = self::get_colors(true);
 
-				foreach ( $colors as $key => $color ) {
-					if ( ( empty( $d_colors[$key]) || $d_colors[$key] != $color) || $is_fse ) {
-						$var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
-						$compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
+                foreach ( $colors as $key => $color ) {
+                    if ( ( empty( $d_colors[$key]) || $d_colors[$key] != $color) || $is_fse ) {
+                        $var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
+                        $compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
 
-						$colors_css .= $aui_bs5 ? self::css_overwrite_bs5( $key,$var, $compat, $color ) : self::css_overwrite( $key, $var, $compat, $color );
-					}
-				}
-			}
+                        $colors_css .= $aui_bs5 ? self::css_overwrite_bs5( $key,$var, $compat, $color ) : self::css_overwrite( $key, $var, $compat, $color );
+                    }
+                }
+            }
 
-			if ( $colors_css ) {
-				echo $colors_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+            if ( $colors_css ) {
+                echo $colors_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
 
-			// Set admin bar z-index lower when modal is open.
-			echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
+            // Set admin bar z-index lower when modal is open.
+            echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
 
-			if ( is_admin() ) {
-				echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
-			}
+            if ( is_admin() ) {
+                echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
+            }
 
-			$custom_css = '';
+            $custom_css = '';
 
-			if ( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) && $bs_custom_css ) {
-				$css = '';
-				$theme_settings = wp_get_global_styles();
+            if ( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' ) && $bs_custom_css ) {
+                $css = '';
+                $theme_settings = wp_get_global_styles();
 
-				// Font face
-				if( !empty( $theme_settings['typography']['fontFamily'] ) ){
-					$t_fontface = str_replace( array('var:preset|','font-family|'), array('--wp--preset--','font-family--'), $theme_settings['typography']['fontFamily']  ); //var(--wp--preset--font-family--poppins)
-					$css .= '--bs-body-font-family: ' . esc_attr($t_fontface) . ';';
-				}
+                // Font face
+                if( !empty( $theme_settings['typography']['fontFamily'] ) ){
+                    $t_fontface = str_replace( array('var:preset|','font-family|'), array('--wp--preset--','font-family--'), $theme_settings['typography']['fontFamily']  ); //var(--wp--preset--font-family--poppins)
+                    $css .= '--bs-body-font-family: ' . esc_attr($t_fontface) . ';';
+                }
 
-				// font size
-				if( !empty( $theme_settings['typography']['fontSize'] ) ){
-					$css .= '--bs-body-font-size: ' . esc_attr( $theme_settings['typography']['fontSize'] ) . ' ;';
-				}
+                // font size
+                if( !empty( $theme_settings['typography']['fontSize'] ) ){
+                    $css .= '--bs-body-font-size: ' . esc_attr( $theme_settings['typography']['fontSize'] ) . ' ;';
+                }
 
-				// line height
-				 if( !empty( $theme_settings['typography']['lineHeight'] ) ){
-					$css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
-				}
+                // line height
+                    if( !empty( $theme_settings['typography']['lineHeight'] ) ){
+                    $css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
+                }
 
 
-				   // font weight
-				 if( !empty( $theme_settings['typography']['fontWeight'] ) ){
-					$css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
-				}
+                    // font weight
+                    if( !empty( $theme_settings['typography']['fontWeight'] ) ){
+                    $css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
+                }
 
-				// Background
-				 if( !empty( $theme_settings['color']['background'] ) ){
-					$css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
-				}
+                // Background
+                    if( !empty( $theme_settings['color']['background'] ) ){
+                    $css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
+                }
 
-				 // Background Gradient
-				 if( !empty( $theme_settings['color']['gradient'] ) ){
-					$css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
-				}
+                    // Background Gradient
+                    if( !empty( $theme_settings['color']['gradient'] ) ){
+                    $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
+                }
 
-				   // Background Gradient
-				 if( !empty( $theme_settings['color']['gradient'] ) ){
-					$css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
-				}
+                    // Background Gradient
+                    if( !empty( $theme_settings['color']['gradient'] ) ){
+                    $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
+                }
 
-				// text color
-				if( !empty( $theme_settings['color']['text'] ) ){
-					$css .= '--bs-body-color: ' . esc_attr( $theme_settings['color']['text'] ) . ';';
-				}
+                // text color
+                if( !empty( $theme_settings['color']['text'] ) ){
+                    $css .= '--bs-body-color: ' . esc_attr( $theme_settings['color']['text'] ) . ';';
+                }
 
 
-				// link colors
-				if( !empty( $theme_settings['elements']['link']['color']['text'] ) ){
-					$css .= '--bs-link-color: ' . esc_attr( $theme_settings['elements']['link']['color']['text'] ) . ';';
-				}
-				if( !empty( $theme_settings['elements']['link'][':hover']['color']['text'] ) ){
-					$css .= '--bs-link-hover-color: ' . esc_attr( $theme_settings['elements']['link'][':hover']['color']['text'] ) . ';';
-				}
+                // link colors
+                if( !empty( $theme_settings['elements']['link']['color']['text'] ) ){
+                    $css .= '--bs-link-color: ' . esc_attr( $theme_settings['elements']['link']['color']['text'] ) . ';';
+                }
+                if( !empty( $theme_settings['elements']['link'][':hover']['color']['text'] ) ){
+                    $css .= '--bs-link-hover-color: ' . esc_attr( $theme_settings['elements']['link'][':hover']['color']['text'] ) . ';';
+                }
 
-				if($css){
-					$custom_css .= $is_fse ? 'body.editor-styles-wrapper{' . esc_attr( $css ) . '}' : 'body{' . esc_attr( $css ) . '}';
-				}
+                if($css){
+                    $custom_css .= $is_fse ? 'body.editor-styles-wrapper{' . esc_attr( $css ) . '}' : 'body{' . esc_attr( $css ) . '}';
+                }
 
-				$bep = $is_fse ? 'body.editor-styles-wrapper ' : '';
+                $bep = $is_fse ? 'body.editor-styles-wrapper ' : '';
 
-				// Headings
-				$headings_css = '';
-				if( !empty( $theme_settings['elements']['heading']['color']['text'] ) ){
-					$headings_css .= "color: " . esc_attr( $theme_settings['elements']['heading']['color']['text'] ) . ";";
-				}
+                // Headings
+                $headings_css = '';
+                if( !empty( $theme_settings['elements']['heading']['color']['text'] ) ){
+                    $headings_css .= "color: " . esc_attr( $theme_settings['elements']['heading']['color']['text'] ) . ";";
+                }
 
-				// heading background
-				if( !empty( $theme_settings['elements']['heading']['color']['background'] ) ){
-					$headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
-				}
+                // heading background
+                if( !empty( $theme_settings['elements']['heading']['color']['background'] ) ){
+                    $headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
+                }
 
-				 // heading font family
-				if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
-					$headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
-				}
+                    // heading font family
+                if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
+                    $headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
+                }
 
-				if( $headings_css ){
-					$custom_css .= "$bep h1,$bep h2,$bep h3, $bep h4,$bep h5,$bep h6{ " . esc_attr( $headings_css ) . "}";
-				}
+                if( $headings_css ){
+                    $custom_css .= "$bep h1,$bep h2,$bep h3, $bep h4,$bep h5,$bep h6{ " . esc_attr( $headings_css ) . "}";
+                }
 
-				$hs = array('h1','h2','h3','h4','h5','h6');
+                $hs = array('h1','h2','h3','h4','h5','h6');
 
-				foreach($hs as $hn){
-					$h_css = '';
-					 if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
-						$h_css .= 'color: ' . esc_attr( $theme_settings['elements'][$hn]['color']['text'] ) . ';';
-					 }
+                foreach($hs as $hn){
+                    $h_css = '';
+                        if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
+                        $h_css .= 'color: ' . esc_attr( $theme_settings['elements'][$hn]['color']['text'] ) . ';';
+                        }
 
-					  if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
-						$h_css .= 'font-size: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontSize']  ) . ';';
-					 }
+                        if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
+                        $h_css .= 'font-size: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontSize']  ) . ';';
+                        }
 
-					  if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
-						$h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
-					 }
+                        if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
+                        $h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
+                        }
 
-					 if($h_css){
-						$custom_css .= esc_attr( $bep  . $hn ) . '{'.esc_attr( $h_css ).'}';
-					 }
-				}
-			}
+                        if($h_css){
+                        $custom_css .= esc_attr( $bep  . $hn ) . '{'.esc_attr( $h_css ).'}';
+                        }
+                }
+            }
 			
-			if ( $custom_css ) {
-				echo $custom_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
-
-			// Pagination on Hello Elementor theme.
-			if ( function_exists( 'hello_elementor_setup' ) ) {
-				echo '.aui-nav-links .pagination{justify-content:inherit}';
-			}
-			?></style><?php
-			$custom_css = ob_get_clean();
-
-			/*
+            if ( $custom_css ) {
+                echo $custom_css; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
+
+            // Pagination on Hello Elementor theme.
+            if ( function_exists( 'hello_elementor_setup' ) ) {
+                echo '.aui-nav-links .pagination{justify-content:inherit}';
+            }
+            ?></style><?php
+            $custom_css = 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>'
-			), '', self::minify_css( $custom_css ) );
-		}
-
-		/**
-		 * Check if we should add booststrap 3 compatibility changes.
-		 *
-		 * @return bool
-		 */
-		public static function is_bs3_compat(){
-			return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
-		}
-
-		public static function hex_to_rgb( $hex ) {
-			// Remove '#' if present
-			$hex = str_replace( '#', '', $hex );
-
-			// Check if input is RGB
-			if ( strpos( $hex, 'rgba(' ) === 0 || strpos( $hex, 'rgb(' ) === 0 ) {
-				$_rgb = explode( ',', str_replace( array( 'rgba(', 'rgb(', ')' ), '', $hex ) );
-
-				$rgb = ( isset( $_rgb[0] ) ? (int) trim( $_rgb[0] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[1] ) ? (int) trim( $_rgb[1] ) : '0' ) . ',';
-				$rgb .= ( isset( $_rgb[2] ) ? (int) trim( $_rgb[2] ) : '0' );
-
-				return $rgb;
-			}
-
-			// Convert 3-digit hex to 6-digit hex
-			if ( strlen( $hex ) == 3 ) {
-				$hex = str_repeat( substr( $hex, 0, 1 ), 2 ) . str_repeat( substr( $hex, 1, 1 ), 2 ) . str_repeat( substr( $hex, 2, 1 ), 2 );
-			}
-
-			// Convert hex to RGB
-			$r = hexdec( substr( $hex, 0, 2 ) );
-			$g = hexdec( substr( $hex, 2, 2 ) );
-			$b = hexdec( substr( $hex, 4, 2 ) );
-
-			// Return RGB values as an array
-			return $r . ',' . $g . ',' . $b;
-		}
-
-		/**
-		 * Build the CSS to overwrite a bootstrap color variable.
-		 *
-		 * @param $type
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
-			global $aui_bs5;
-
-			$is_var = false;
-			$is_custom = strpos($type, 'custom-') !== false ? true : false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
-				//if(!sanitize_hex_color($color_code)){
-				$color_code = esc_attr($color_code);
-				$is_var = true;
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', self::minify_css( $custom_css ) );
+        }
+
+        /**
+         * Check if we should add booststrap 3 compatibility changes.
+         *
+         * @return bool
+         */
+        public static function is_bs3_compat(){
+            return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
+        }
+
+        public static function hex_to_rgb( $hex ) {
+            // Remove '#' if present
+            $hex = str_replace( '#', '', $hex );
+
+            // Check if input is RGB
+            if ( strpos( $hex, 'rgba(' ) === 0 || strpos( $hex, 'rgb(' ) === 0 ) {
+                $_rgb = explode( ',', str_replace( array( 'rgba(', 'rgb(', ')' ), '', $hex ) );
+
+                $rgb = ( isset( $_rgb[0] ) ? (int) trim( $_rgb[0] ) : '0' ) . ',';
+                $rgb .= ( isset( $_rgb[1] ) ? (int) trim( $_rgb[1] ) : '0' ) . ',';
+                $rgb .= ( isset( $_rgb[2] ) ? (int) trim( $_rgb[2] ) : '0' );
+
+                return $rgb;
+            }
+
+            // Convert 3-digit hex to 6-digit hex
+            if ( strlen( $hex ) == 3 ) {
+                $hex = str_repeat( substr( $hex, 0, 1 ), 2 ) . str_repeat( substr( $hex, 1, 1 ), 2 ) . str_repeat( substr( $hex, 2, 1 ), 2 );
+            }
+
+            // Convert hex to RGB
+            $r = hexdec( substr( $hex, 0, 2 ) );
+            $g = hexdec( substr( $hex, 2, 2 ) );
+            $b = hexdec( substr( $hex, 4, 2 ) );
+
+            // Return RGB values as an array
+            return $r . ',' . $g . ',' . $b;
+        }
+
+        /**
+         * Build the CSS to overwrite a bootstrap color variable.
+         *
+         * @param $type
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
+            global $aui_bs5;
+
+            $is_var = false;
+            $is_custom = strpos($type, 'custom-') !== false ? true : false;
+            if(!$color_code){return '';}
+            if(strpos($color_code, 'var') !== false){
+                //if(!sanitize_hex_color($color_code)){
+                $color_code = esc_attr($color_code);
+                $is_var = true;
 //				$color_code = "rgba($color_code, 0.5)";
 //                echo '###1'.$color_code.'###';//exit;
-			}
+            }
 
 //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+            if(!$color_code){return '';}
 
-			$rgb = self::hex_to_rgb($hex);
+            $rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
-				$compatibility = '.bsui';
-			}elseif(!$compatibility){
-				$compatibility = '';
-			}else{
-				$compatibility = esc_attr($compatibility);
-			}
+            if($compatibility===true || $compatibility===1){
+                $compatibility = '.bsui';
+            }elseif(!$compatibility){
+                $compatibility = '';
+            }else{
+                $compatibility = esc_attr($compatibility);
+            }
 
-			$prefix = $compatibility ? $compatibility . " " : "";
+            $prefix = $compatibility ? $compatibility . " " : "";
 
 
             $output = '';
 
 //            echo '####'.$color_code;exit;
 
-			$type = sanitize_html_class($type);
+            $type = sanitize_html_class($type);
+
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                ".btn-{$type}"                                              => array( 'b', 'o' ),
+                ".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
+                ".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
+                ".btn-outline-{$type}"                                      => array( 'c', 'o' ),
+                ".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
+                ".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
+                ".badge-{$type}"                                            => array( 'b' ),
+                ".alert-{$type}"                                            => array( 'b', 'o' ),
+                ".bg-{$type}"                                               => array( 'b', 'f' ),
+                ".btn-link.btn-{$type}"                                     => array( 'c' ),
+                ".text-{$type}"                                     => array( 'c' ),
+            );
+
+            if ( $aui_bs5 ) {
+                unset($selectors[".alert-{$type}" ]);
+            }
 
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-				".text-{$type}"                                     => array( 'c' ),
-			);
-
-			if ( $aui_bs5 ) {
-				unset($selectors[".alert-{$type}" ]);
-			}
-
-			if ( $type == 'primary' ) {
-				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
-						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
-							'b',
-							'o'
-						),
-						'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
-							'b',
-							'o'
-						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
-						'.page-item.active .page-link'                                                                         => array(
-							'b',
-							'o'
-						),
-						'.progress-bar'                                                                                        => array( 'b' ),
-						'.list-group-item.active'                                                                              => array(
-							'b',
-							'o'
-						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
-					);
-			}
+            if ( $type == 'primary' ) {
+                $selectors = $selectors + array(
+                        'a'                                                                                                    => array( 'c' ),
+                        '.btn-link'                                                                                            => array( 'c' ),
+                        '.dropdown-item.active'                                                                                => array( 'b' ),
+                        '.custom-control-input:checked~.custom-control-label::before'                                          => array(
+                            'b',
+                            'o'
+                        ),
+                        '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
+                            'b',
+                            'o'
+                        ),
+                        '.nav-pills .nav-link.active'                                                                          => array( 'b' ),
+                        '.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
+                        '.page-link'                                                                                           => array( 'c' ),
+                        '.page-item.active .page-link'                                                                         => array(
+                            'b',
+                            'o'
+                        ),
+                        '.progress-bar'                                                                                        => array( 'b' ),
+                        '.list-group-item.active'                                                                              => array(
+                            'b',
+                            'o'
+                        ),
+                        '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+                    );
+            }
 
 
 
             // link
-			if ( $type === 'primary' ) {
-				$output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
-				$output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
-				$output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
+            if ( $type === 'primary' ) {
+                $output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
+                $output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
+                $output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
 
-				$output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
-				$output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
+                $output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
 
                 // dropdown
-				$output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
 
                 // pagination
-				$output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
 
-			}
+            }
 
-			$output .= $prefix . ' .link-'.esc_attr($type).' {color: var(--bs-'.esc_attr($type).'-rgb) !important;}';
-			$output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
+            $output .= $prefix . ' .link-'.esc_attr($type).' {color: var(--bs-'.esc_attr($type).'-rgb) !important;}';
+            $output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
 
-			//  buttons
-			$output .= $prefix . ' .btn-'.esc_attr($type).'{';
-			$output .= ' 
+            //  buttons
+            $output .= $prefix . ' .btn-'.esc_attr($type).'{';
+            $output .= ' 
             --bs-btn-bg: '.esc_attr($color_code).';
             --bs-btn-border-color: '.esc_attr($color_code).';
             --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
@@ -1480,917 +1480,917 @@ 
 //			--bs-btn-active-color: #fff;
 //			--bs-btn-disabled-color: #fff;
 //            ';
-			$output .= '}';
+            $output .= '}';
+
+            //  buttons outline
+            $output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
+            $output .= ' 
+			--bs-btn-color: '.esc_attr($color_code).';
+            --bs-btn-border-color: '.esc_attr($color_code).';
+            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
+            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
+            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type).'-rgb;
+            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
+            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
+            --bs-btn-active-shadow: unset;
+            --bs-btn-disabled-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .5);
+            --bs-btn-disabled-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .1);
+            ';
+//			$output .= '
+//		    --bs-btn-color: #fff;
+//			--bs-btn-hover-color: #fff;
+//			--bs-btn-active-color: #fff;
+//			--bs-btn-disabled-color: #fff;
+//            ';
+            $output .= '}';
+
+
+            // button hover
+            $output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
+            $output .= ' 
+            box-shadow: 0 0.25rem 0.25rem 0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb), .1), 0 0.375rem 0.75rem -0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb) , .4);
+            }
+            ';
+
+
+            if ( $aui_bs5 ) {
+//				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
+                $output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
+                $output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+            }
+
+
+            if ( $is_custom ) {
+
+//				echo '###'.$type;exit;
+
+                // build rules into each type
+                foreach($selectors as $selector => $types){
+                    $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+                    $types = array_combine($types,$types);
+                    if(isset($types['c'])){$color[] = $selector;}
+                    if(isset($types['b'])){$background[] = $selector;}
+                    if(isset($types['o'])){$border[] = $selector;}
+                    if(isset($types['f'])){$fill[] = $selector;}
+                }
+
+//				// build rules into each type
+//				foreach($important_selectors as $selector => $types){
+//					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
+//					$types = array_combine($types,$types);
+//					if(isset($types['c'])){$color_i[] = $selector;}
+//					if(isset($types['b'])){$background_i[] = $selector;}
+//					if(isset($types['o'])){$border_i[] = $selector;}
+//					if(isset($types['f'])){$fill_i[] = $selector;}
+//				}
+
+                // add any color rules
+                if(!empty($color)){
+                    $output .= implode(",",$color) . "{color: $color_code;} ";
+                }
+                if(!empty($color_i)){
+                    $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+                }
+
+                // add any background color rules
+                if(!empty($background)){
+                    $output .= implode(",",$background) . "{background-color: $color_code;} ";
+                }
+                if(!empty($background_i)){
+                    $output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+//				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
+                }
+
+                // add any border color rules
+                if(!empty($border)){
+                    $output .= implode(",",$border) . "{border-color: $color_code;} ";
+                }
+                if(!empty($border_i)){
+                    $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+                }
+
+                // add any fill color rules
+                if(!empty($fill)){
+                    $output .= implode(",",$fill) . "{fill: $color_code;} ";
+                }
+                if(!empty($fill_i)){
+                    $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+                }
+
+            }
+
+
+
+
+            $transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
+            // darken
+            $darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
+            $darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+
+            // lighten
+            $lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
+
+
+            // button states
+            $output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
+            $output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+//			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
+            $output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled):focus {box-shadow: 0 0.25rem 0.25rem 0.125rem rgba(var(--bs-{$type}-rgb), 0.1), 0 0.375rem 0.75rem -0.125rem rgba(var(--bs-{$type}-rgb), 0.4);} ";
+
+            // text
+//			$output .= $prefix .".xxx, .text-{$type} {color: var(--bs-".esc_attr($type).");} ";
+
+
+//			if ( $type == 'primary' ) {
+//				// dropdown's
+//				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+//
+//				// input states
+//				$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
+//
+//				// page link
+//				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+//			}
+
+            // alerts
+            if ( $aui_bs5 ) {
+//				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
+                $output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+            }
+
+            return $output;
+        }
+
+        /**
+         * Build the CSS to overwrite a bootstrap color variable.
+         *
+         * @param $type
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
+            global $aui_bs5;
+
+            $is_var = false;
+            if(!$color_code){return '';}
+            if(strpos($color_code, 'var') !== false){
+                //if(!sanitize_hex_color($color_code)){
+                $color_code = esc_attr($color_code);
+                $is_var = true;
+//				$color_code = "rgba($color_code, 0.5)";
+//                echo '###1'.$color_code.'###';//exit;
+            }
+
+//            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
+
+            if(!$color_code){return '';}
+
+            $rgb = self::hex_to_rgb($hex);
+
+            if($compatibility===true || $compatibility===1){
+                $compatibility = '.bsui';
+            }elseif(!$compatibility){
+                $compatibility = '';
+            }else{
+                $compatibility = esc_attr($compatibility);
+            }
+
+
+
+//            echo '####'.$color_code;exit;
+
+            $type = sanitize_html_class($type);
+
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                ".btn-{$type}"                                              => array( 'b', 'o' ),
+                ".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
+                ".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
+                ".btn-outline-{$type}"                                      => array( 'c', 'o' ),
+                ".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
+                ".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
+                ".badge-{$type}"                                            => array( 'b' ),
+                ".alert-{$type}"                                            => array( 'b', 'o' ),
+                ".bg-{$type}"                                               => array( 'b', 'f' ),
+                ".btn-link.btn-{$type}"                                     => array( 'c' ),
+            );
+
+            if ( $aui_bs5 ) {
+                unset($selectors[".alert-{$type}" ]);
+            }
+
+            if ( $type == 'primary' ) {
+                $selectors = $selectors + array(
+                        'a'                                                                                                    => array( 'c' ),
+                        '.btn-link'                                                                                            => array( 'c' ),
+                        '.dropdown-item.active'                                                                                => array( 'b' ),
+                        '.custom-control-input:checked~.custom-control-label::before'                                          => array(
+                            'b',
+                            'o'
+                        ),
+                        '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
+                            'b',
+                            'o'
+                        ),
+                        '.nav-pills .nav-link.active'                                                                          => array( 'b' ),
+                        '.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
+                        '.page-link'                                                                                           => array( 'c' ),
+                        '.page-item.active .page-link'                                                                         => array(
+                            'b',
+                            'o'
+                        ),
+                        '.progress-bar'                                                                                        => array( 'b' ),
+                        '.list-group-item.active'                                                                              => array(
+                            'b',
+                            'o'
+                        ),
+                        '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+//				    '.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
+//				    '.custom-range::-moz-range-thumb' => array('b'),
+//				    '.custom-range::-ms-thumb' => array('b'),
+                    );
+            }
+
+            $important_selectors = array(
+                ".bg-{$type}" => array('b','f'),
+                ".border-{$type}" => array('o'),
+                ".text-{$type}" => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
+
+            $output = '';
+
+            if ( $aui_bs5 ) {
+//				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
+                $output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+            }
+
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
+
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
+
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
+
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+//				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
+            }
+
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
+
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
+
+
+            $prefix = $compatibility ? $compatibility . " " : "";
+
+            $transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
+            // darken
+            $darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
+            $darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+
+            // lighten
+            $lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
+
+
+            // button states
+            $output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
+            $output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+//			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
+            $output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+            if ( $type == 'primary' ) {
+                // dropdown's
+                $output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+
+                // input states
+                $output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+                // page link
+                $output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            }
+
+            // alerts
+            if ( $aui_bs5 ) {
+//				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
+                $output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+            }
 
-			//  buttons outline
-			$output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
-			$output .= ' 
-			--bs-btn-color: '.esc_attr($color_code).';
-            --bs-btn-border-color: '.esc_attr($color_code).';
-            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type).'-rgb;
-            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-active-shadow: unset;
-            --bs-btn-disabled-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .5);
-            --bs-btn-disabled-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .1);
-            ';
-//			$output .= '
-//		    --bs-btn-color: #fff;
-//			--bs-btn-hover-color: #fff;
-//			--bs-btn-active-color: #fff;
-//			--bs-btn-disabled-color: #fff;
-//            ';
-			$output .= '}';
+            return $output;
+        }
 
+        /**
+         *
+         * @deprecated 0.1.76 Use css_overwrite()
+         *
+         * @param $color_code
+         * @param $compatibility
+         * @param $use_variable
+         *
+         * @return string
+         */
+        public static function css_primary($color_code,$compatibility, $use_variable = false){
 
-            // button hover
-			$output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
-			$output .= ' 
-            box-shadow: 0 0.25rem 0.25rem 0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb), .1), 0 0.375rem 0.75rem -0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb) , .4);
+            if(!$use_variable){
+                $color_code = sanitize_hex_color($color_code);
+                if(!$color_code){return '';}
             }
-            ';
 
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                'a' => array('c'),
+                '.btn-primary' => array('b','o'),
+                '.btn-primary.disabled' => array('b','o'),
+                '.btn-primary:disabled' => array('b','o'),
+                '.btn-outline-primary' => array('c','o'),
+                '.btn-outline-primary:hover' => array('b','o'),
+                '.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
+                '.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
+                '.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
+                '.btn-link' => array('c'),
+                '.dropdown-item.active' => array('b'),
+                '.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
+                '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
+//				'.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
+//				'.custom-range::-moz-range-thumb' => array('b'),
+//				'.custom-range::-ms-thumb' => array('b'),
+                '.nav-pills .nav-link.active' => array('b'),
+                '.nav-pills .show>.nav-link' => array('b'),
+                '.page-link' => array('c'),
+                '.page-item.active .page-link' => array('b','o'),
+                '.badge-primary' => array('b'),
+                '.alert-primary' => array('b','o'),
+                '.progress-bar' => array('b'),
+                '.list-group-item.active' => array('b','o'),
+                '.bg-primary' => array('b','f'),
+                '.btn-link.btn-primary' => array('c'),
+                '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
+            );
+
+            $important_selectors = array(
+                '.bg-primary' => array('b','f'),
+                '.border-primary' => array('o'),
+                '.text-primary' => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
 
-			if ( $aui_bs5 ) {
-//				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
-			}
+            $output = '';
 
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
 
-			if ( $is_custom ) {
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
 
-//				echo '###'.$type;exit;
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
 
-				// build rules into each type
-				foreach($selectors as $selector => $types){
-					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-					$types = array_combine($types,$types);
-					if(isset($types['c'])){$color[] = $selector;}
-					if(isset($types['b'])){$background[] = $selector;}
-					if(isset($types['o'])){$border[] = $selector;}
-					if(isset($types['f'])){$fill[] = $selector;}
-				}
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+            }
 
-//				// build rules into each type
-//				foreach($important_selectors as $selector => $types){
-//					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-//					$types = array_combine($types,$types);
-//					if(isset($types['c'])){$color_i[] = $selector;}
-//					if(isset($types['b'])){$background_i[] = $selector;}
-//					if(isset($types['o'])){$border_i[] = $selector;}
-//					if(isset($types['f'])){$fill_i[] = $selector;}
-//				}
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
 
-				// add any color rules
-				if(!empty($color)){
-					$output .= implode(",",$color) . "{color: $color_code;} ";
-				}
-				if(!empty($color_i)){
-					$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-				}
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
 
-				// add any background color rules
-				if(!empty($background)){
-					$output .= implode(",",$background) . "{background-color: $color_code;} ";
-				}
-				if(!empty($background_i)){
-					$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
-//				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
-				}
 
-				// add any border color rules
-				if(!empty($border)){
-					$output .= implode(",",$border) . "{border-color: $color_code;} ";
-				}
-				if(!empty($border_i)){
-					$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-				}
+            $prefix = $compatibility ? ".bsui " : "";
 
-				// add any fill color rules
-				if(!empty($fill)){
-					$output .= implode(",",$fill) . "{fill: $color_code;} ";
-				}
-				if(!empty($fill_i)){
-					$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-				}
+            // darken
+            $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
 
-			}
+            // lighten
+            $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
 
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
 
 
+            // button states
+            $output .= $prefix ." .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            $output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
-			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
 
-			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+            // dropdown's
+            $output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
 
+            // input states
+            $output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-//			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled):focus {box-shadow: 0 0.25rem 0.25rem 0.125rem rgba(var(--bs-{$type}-rgb), 0.1), 0 0.375rem 0.75rem -0.125rem rgba(var(--bs-{$type}-rgb), 0.4);} ";
+            // page link
+            $output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			// text
-//			$output .= $prefix .".xxx, .text-{$type} {color: var(--bs-".esc_attr($type).");} ";
+            return $output;
+        }
 
+        /**
+         *
+         * @deprecated 0.1.76 Use css_overwrite()
+         *
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        public static function css_secondary($color_code,$compatibility){;
+            $color_code = sanitize_hex_color($color_code);
+            if(!$color_code){return '';}
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                '.btn-secondary' => array('b','o'),
+                '.btn-secondary.disabled' => array('b','o'),
+                '.btn-secondary:disabled' => array('b','o'),
+                '.btn-outline-secondary' => array('c','o'),
+                '.btn-outline-secondary:hover' => array('b','o'),
+                '.btn-outline-secondary.disabled' => array('c'),
+                '.btn-outline-secondary:disabled' => array('c'),
+                '.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
+                '.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
+                '.btn-outline-secondary.dropdown-toggle' => array('b','o'),
+                '.badge-secondary' => array('b'),
+                '.alert-secondary' => array('b','o'),
+                '.btn-link.btn-secondary' => array('c'),
+            );
+
+            $important_selectors = array(
+                '.bg-secondary' => array('b','f'),
+                '.border-secondary' => array('o'),
+                '.text-secondary' => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
 
-//			if ( $type == 'primary' ) {
-//				// dropdown's
-//				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
-//
-//				// input states
-//				$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
-//
-//				// page link
-//				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-//			}
+            $output = '';
 
-			// alerts
-			if ( $aui_bs5 ) {
-//				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Build the CSS to overwrite a bootstrap color variable.
-		 *
-		 * @param $type
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
-            global $aui_bs5;
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
 
-			$is_var = false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
-				//if(!sanitize_hex_color($color_code)){
-				$color_code = esc_attr($color_code);
-				$is_var = true;
-//				$color_code = "rgba($color_code, 0.5)";
-//                echo '###1'.$color_code.'###';//exit;
-			}
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
 
-//            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
 
-			if(!$color_code){return '';}
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+            }
 
-            $rgb = self::hex_to_rgb($hex);
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
 
-			if($compatibility===true || $compatibility===1){
-				$compatibility = '.bsui';
-			}elseif(!$compatibility){
-				$compatibility = '';
-			}else{
-				$compatibility = esc_attr($compatibility);
-			}
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
 
 
+            $prefix = $compatibility ? ".bsui " : "";
 
-//            echo '####'.$color_code;exit;
+            // darken
+            $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
 
-			$type = sanitize_html_class($type);
+            // lighten
+            $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
 
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-			);
-
-			if ( $aui_bs5 ) {
-                unset($selectors[".alert-{$type}" ]);
-			}
-
-			if ( $type == 'primary' ) {
-				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
-						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
-							'b',
-							'o'
-						),
-						'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
-							'b',
-							'o'
-						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
-						'.page-item.active .page-link'                                                                         => array(
-							'b',
-							'o'
-						),
-						'.progress-bar'                                                                                        => array( 'b' ),
-						'.list-group-item.active'                                                                              => array(
-							'b',
-							'o'
-						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
-//				    '.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
-//				    '.custom-range::-moz-range-thumb' => array('b'),
-//				    '.custom-range::-ms-thumb' => array('b'),
-					);
-			}
-
-			$important_selectors = array(
-				".bg-{$type}" => array('b','f'),
-				".border-{$type}" => array('o'),
-				".text-{$type}" => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			if ( $aui_bs5 ) {
-//				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
-			}
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
-//				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
-			}
 
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
+            // button states
+            $output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            $output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
 
+            return $output;
+        }
+
+        /**
+         * Increases or decreases the brightness of a color by a percentage of the current brightness.
+         *
+         * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
+         * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
+         *
+         * @return  string
+         */
+        public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
+            $hexCode = ltrim($hexCode, '#');
 
-			$prefix = $compatibility ? $compatibility . " " : "";
+            if ( strpos( $hexCode, 'rgba(' ) !== false || strpos( $hexCode, 'rgb(' ) !== false ) {
+                return $hexCode;
+            }
 
-			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
-			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+            if (strlen($hexCode) == 3) {
+                $hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
+            }
 
-			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+            $hexCode = array_map('hexdec', str_split($hexCode, 2));
 
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+            foreach ($hexCode as & $color) {
+                $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
+                $adjustAmount = ceil($adjustableLimit * $adjustPercent);
 
+                $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
+            }
 
-			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-//			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+            return '#' . implode($hexCode);
+        }
 
-			if ( $type == 'primary' ) {
-				// dropdown's
-				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+        /**
+         * Check if we should display examples.
+         */
+        public function maybe_show_examples(){
+            if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
+                echo "<head>";
+                wp_head();
+                echo "</head>";
+                echo "<body>";
+                echo $this->get_examples(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                echo "</body>";
+                exit;
+            }
+        }
 
-				// input states
-				$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
+        /**
+         * Get developer examples.
+         *
+         * @return string
+         */
+        public function get_examples(){
+            $output = '';
 
-				// page link
-				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			}
 
-            // alerts
-			if ( $aui_bs5 ) {
-//				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
-			}
-
-			return $output;
-		}
-
-		/**
-		 *
-		 * @deprecated 0.1.76 Use css_overwrite()
-		 *
-		 * @param $color_code
-		 * @param $compatibility
-		 * @param $use_variable
-		 *
-		 * @return string
-		 */
-		public static function css_primary($color_code,$compatibility, $use_variable = false){
-
-			if(!$use_variable){
-				$color_code = sanitize_hex_color($color_code);
-				if(!$color_code){return '';}
-			}
-
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				'a' => array('c'),
-				'.btn-primary' => array('b','o'),
-				'.btn-primary.disabled' => array('b','o'),
-				'.btn-primary:disabled' => array('b','o'),
-				'.btn-outline-primary' => array('c','o'),
-				'.btn-outline-primary:hover' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
-				'.btn-link' => array('c'),
-				'.dropdown-item.active' => array('b'),
-				'.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
-				'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
-//				'.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
-//				'.custom-range::-moz-range-thumb' => array('b'),
-//				'.custom-range::-ms-thumb' => array('b'),
-				'.nav-pills .nav-link.active' => array('b'),
-				'.nav-pills .show>.nav-link' => array('b'),
-				'.page-link' => array('c'),
-				'.page-item.active .page-link' => array('b','o'),
-				'.badge-primary' => array('b'),
-				'.alert-primary' => array('b','o'),
-				'.progress-bar' => array('b'),
-				'.list-group-item.active' => array('b','o'),
-				'.bg-primary' => array('b','f'),
-				'.btn-link.btn-primary' => array('c'),
-				'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
-			);
-
-			$important_selectors = array(
-				'.bg-primary' => array('b','f'),
-				'.border-primary' => array('o'),
-				'.text-primary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			// dropdown's
-			$output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
-
-
-			// input states
-			$output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			// page link
-			$output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			return $output;
-		}
-
-		/**
-		 *
-		 * @deprecated 0.1.76 Use css_overwrite()
-		 *
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_secondary($color_code,$compatibility){;
-			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				'.btn-secondary' => array('b','o'),
-				'.btn-secondary.disabled' => array('b','o'),
-				'.btn-secondary:disabled' => array('b','o'),
-				'.btn-outline-secondary' => array('c','o'),
-				'.btn-outline-secondary:hover' => array('b','o'),
-				'.btn-outline-secondary.disabled' => array('c'),
-				'.btn-outline-secondary:disabled' => array('c'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-secondary.dropdown-toggle' => array('b','o'),
-				'.badge-secondary' => array('b'),
-				'.alert-secondary' => array('b','o'),
-				'.btn-link.btn-secondary' => array('c'),
-			);
-
-			$important_selectors = array(
-				'.bg-secondary' => array('b','f'),
-				'.border-secondary' => array('o'),
-				'.text-secondary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			return $output;
-		}
-
-		/**
-		 * Increases or decreases the brightness of a color by a percentage of the current brightness.
-		 *
-		 * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
-		 * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
-		 *
-		 * @return  string
-		 */
-		public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
-			$hexCode = ltrim($hexCode, '#');
-
-			if ( strpos( $hexCode, 'rgba(' ) !== false || strpos( $hexCode, 'rgb(' ) !== false ) {
-				return $hexCode;
-			}
-
-			if (strlen($hexCode) == 3) {
-				$hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
-			}
-
-			$hexCode = array_map('hexdec', str_split($hexCode, 2));
-
-			foreach ($hexCode as & $color) {
-				$adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
-				$adjustAmount = ceil($adjustableLimit * $adjustPercent);
-
-				$color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
-			}
-
-			return '#' . implode($hexCode);
-		}
-
-		/**
-		 * Check if we should display examples.
-		 */
-		public function maybe_show_examples(){
-			if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
-				echo "<head>";
-				wp_head();
-				echo "</head>";
-				echo "<body>";
-				echo $this->get_examples(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				echo "</body>";
-				exit;
-			}
-		}
-
-		/**
-		 * Get developer examples.
-		 *
-		 * @return string
-		 */
-		public function get_examples(){
-			$output = '';
-
-
-			// open form
-			$output .= "<form class='p-5 m-5 border rounded'>";
-
-			// input example
-			$output .= aui()->input(array(
-				'type'  =>  'text',
-				'id'    =>  'text-example',
-				'name'    =>  'text-example',
-				'placeholder'   => 'text placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			));
-
-			// input example
-			$output .= aui()->input(array(
-				'type'  =>  'url',
-				'id'    =>  'text-example2',
-				'name'    =>  'text-example',
-				'placeholder'   => 'url placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			));
-
-			// checkbox example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example',
-				'name'    =>  'checkbox-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox checked'
-			));
-
-			// checkbox example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example2',
-				'name'    =>  'checkbox-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => false,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox un-checked'
-			));
-
-			// switch example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example',
-				'name'    =>  'switch-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => true,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch on'
-			));
-
-			// switch example
-			$output .= aui()->input(array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example2',
-				'name'    =>  'switch-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => false,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch off'
-			));
-
-			// close form
-			$output .= "</form>";
-
-			return $output;
-		}
-
-		/**
-		 * Calendar params.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return array Calendar params.
-		 */
-		public static function calendar_params() {
-			$params = array(
-				'month_long_1' => __( 'January', 'ayecode-connect' ),
-				'month_long_2' => __( 'February', 'ayecode-connect' ),
-				'month_long_3' => __( 'March', 'ayecode-connect' ),
-				'month_long_4' => __( 'April', 'ayecode-connect' ),
-				'month_long_5' => __( 'May', 'ayecode-connect' ),
-				'month_long_6' => __( 'June', 'ayecode-connect' ),
-				'month_long_7' => __( 'July', 'ayecode-connect' ),
-				'month_long_8' => __( 'August', 'ayecode-connect' ),
-				'month_long_9' => __( 'September', 'ayecode-connect' ),
-				'month_long_10' => __( 'October', 'ayecode-connect' ),
-				'month_long_11' => __( 'November', 'ayecode-connect' ),
-				'month_long_12' => __( 'December', 'ayecode-connect' ),
-				'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
-				'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
-				'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
-				'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
-				'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
-				'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
-				'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
-				'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
-				'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
-				'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
-				'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
-				'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
-				'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
-				'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
-				'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
-				'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
-				'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
-				'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
-				'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
-				'day_s2_1' => __( 'Su', 'ayecode-connect' ),
-				'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
-				'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
-				'day_s2_4' => __( 'We', 'ayecode-connect' ),
-				'day_s2_5' => __( 'Th', 'ayecode-connect' ),
-				'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
-				'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
-				'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
-				'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
-				'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
-				'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
-				'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
-				'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
-				'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
-				'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
-				'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
-				'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
-				'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
-				'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
-				'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
-				'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
-				'am_lower' => __( 'am', 'ayecode-connect' ),
-				'pm_lower' => __( 'pm', 'ayecode-connect' ),
-				'am_upper' => __( 'AM', 'ayecode-connect' ),
-				'pm_upper' => __( 'PM', 'ayecode-connect' ),
-				'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
-				'time_24hr' => false,
-				'year' => __( 'Year', 'ayecode-connect' ),
-				'hour' => __( 'Hour', 'ayecode-connect' ),
-				'minute' => __( 'Minute', 'ayecode-connect' ),
-				'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
-				'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
-				'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
-				'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
-			);
-
-			return apply_filters( 'ayecode_ui_calendar_params', $params );
-		}
-
-		/**
-		 * Flatpickr calendar localize.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return string Calendar locale.
-		 */
-		public static function flatpickr_locale() {
-			$params = self::calendar_params();
-
-			if ( is_string( $params ) ) {
-				$params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
-			} else {
-				foreach ( (array) $params as $key => $value ) {
-					if ( ! is_scalar( $value ) ) {
-						continue;
-					}
-
-					$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-				}
-			}
+            // open form
+            $output .= "<form class='p-5 m-5 border rounded'>";
+
+            // input example
+            $output .= aui()->input(array(
+                'type'  =>  'text',
+                'id'    =>  'text-example',
+                'name'    =>  'text-example',
+                'placeholder'   => 'text placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label'
+            ));
+
+            // input example
+            $output .= aui()->input(array(
+                'type'  =>  'url',
+                'id'    =>  'text-example2',
+                'name'    =>  'text-example',
+                'placeholder'   => 'url placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label'
+            ));
+
+            // checkbox example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'checkbox-example',
+                'name'    =>  'checkbox-example',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Checkbox example',
+                'value' =>  '1',
+                'checked'   => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Checkbox checked'
+            ));
+
+            // checkbox example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'checkbox-example2',
+                'name'    =>  'checkbox-example2',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Checkbox example',
+                'value' =>  '1',
+                'checked'   => false,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Checkbox un-checked'
+            ));
+
+            // switch example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'switch-example',
+                'name'    =>  'switch-example',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Switch example',
+                'value' =>  '1',
+                'checked'   => true,
+                'switch'    => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Switch on'
+            ));
+
+            // switch example
+            $output .= aui()->input(array(
+                'type'  =>  'checkbox',
+                'id'    =>  'switch-example2',
+                'name'    =>  'switch-example2',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Switch example',
+                'value' =>  '1',
+                'checked'   => false,
+                'switch'    => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Switch off'
+            ));
+
+            // close form
+            $output .= "</form>";
+
+            return $output;
+        }
+
+        /**
+         * Calendar params.
+         *
+         * @since 0.1.44
+         *
+         * @return array Calendar params.
+         */
+        public static function calendar_params() {
+            $params = array(
+                'month_long_1' => __( 'January', 'ayecode-connect' ),
+                'month_long_2' => __( 'February', 'ayecode-connect' ),
+                'month_long_3' => __( 'March', 'ayecode-connect' ),
+                'month_long_4' => __( 'April', 'ayecode-connect' ),
+                'month_long_5' => __( 'May', 'ayecode-connect' ),
+                'month_long_6' => __( 'June', 'ayecode-connect' ),
+                'month_long_7' => __( 'July', 'ayecode-connect' ),
+                'month_long_8' => __( 'August', 'ayecode-connect' ),
+                'month_long_9' => __( 'September', 'ayecode-connect' ),
+                'month_long_10' => __( 'October', 'ayecode-connect' ),
+                'month_long_11' => __( 'November', 'ayecode-connect' ),
+                'month_long_12' => __( 'December', 'ayecode-connect' ),
+                'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
+                'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
+                'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
+                'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
+                'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
+                'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
+                'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
+                'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
+                'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
+                'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
+                'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
+                'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
+                'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
+                'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
+                'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
+                'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
+                'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
+                'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
+                'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
+                'day_s2_1' => __( 'Su', 'ayecode-connect' ),
+                'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
+                'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
+                'day_s2_4' => __( 'We', 'ayecode-connect' ),
+                'day_s2_5' => __( 'Th', 'ayecode-connect' ),
+                'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
+                'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
+                'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
+                'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
+                'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
+                'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
+                'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
+                'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
+                'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
+                'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
+                'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
+                'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
+                'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
+                'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
+                'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
+                'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
+                'am_lower' => __( 'am', 'ayecode-connect' ),
+                'pm_lower' => __( 'pm', 'ayecode-connect' ),
+                'am_upper' => __( 'AM', 'ayecode-connect' ),
+                'pm_upper' => __( 'PM', 'ayecode-connect' ),
+                'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
+                'time_24hr' => false,
+                'year' => __( 'Year', 'ayecode-connect' ),
+                'hour' => __( 'Hour', 'ayecode-connect' ),
+                'minute' => __( 'Minute', 'ayecode-connect' ),
+                'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
+                'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
+                'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
+                'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
+            );
+
+            return apply_filters( 'ayecode_ui_calendar_params', $params );
+        }
+
+        /**
+         * Flatpickr calendar localize.
+         *
+         * @since 0.1.44
+         *
+         * @return string Calendar locale.
+         */
+        public static function flatpickr_locale() {
+            $params = self::calendar_params();
+
+            if ( is_string( $params ) ) {
+                $params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
+            } else {
+                foreach ( (array) $params as $key => $value ) {
+                    if ( ! is_scalar( $value ) ) {
+                        continue;
+                    }
+
+                    $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+                }
+            }
 
-			$day_s3 = array();
-			$day_s5 = array();
+            $day_s3 = array();
+            $day_s5 = array();
 
-			for ( $i = 1; $i <= 7; $i ++ ) {
-				$day_s3[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				$day_s5[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+            for ( $i = 1; $i <= 7; $i ++ ) {
+                $day_s3[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                $day_s5[] = addslashes( $params[ 'day_s3_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
 
-			$month_s = array();
-			$month_long = array();
+            $month_s = array();
+            $month_long = array();
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-			}
+            for ( $i = 1; $i <= 12; $i ++ ) {
+                $month_s[] = addslashes( $params[ 'month_s_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                $month_long[] = addslashes( $params[ 'month_long_' . $i ] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            }
 
-			ob_start();
-		if ( 0 ) { ?><script><?php } ?>
+            ob_start();
+        if ( 0 ) { ?><script><?php } ?>
                 {
                     weekdays: {
                         shorthand: ['<?php echo implode( "','", $day_s3 ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>'],
@@ -2429,189 +2429,189 @@ 
                 }
 				<?php if ( 0 ) { ?></script><?php } ?>
 			<?php
-			$locale = ob_get_clean();
-
-			return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
-		}
-
-		/**
-		 * Select2 JS params.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return array Select2 JS params.
-		 */
-		public static function select2_params() {
-			$params = array(
-				'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
-				'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
-				'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
-				'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
-				'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
-			);
-
-			return apply_filters( 'ayecode_ui_select2_params', $params );
-		}
-
-		/**
-		 * Select2 JS localize.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return string Select2 JS locale.
-		 */
-		public static function select2_locale() {
-			$params = self::select2_params();
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
+            $locale = ob_get_clean();
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
-		}
-
-		/**
-		 * Time ago JS localize.
-		 *
-		 * @since 0.1.47
-		 *
-		 * @return string Time ago JS locale.
-		 */
-		public static function timeago_locale() {
-			$params = array(
-				'prefix_ago' => '',
-				'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
-				'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
-				'suffix_after' => '',
-				'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
-				'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
-				'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
-				'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
-				'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
-				'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
-				'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
-				'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
-				'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
-				'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
-				'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
-			);
-
-			$params = apply_filters( 'ayecode_ui_timeago_params', $params );
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
+            return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
+        }
+
+        /**
+         * Select2 JS params.
+         *
+         * @since 0.1.44
+         *
+         * @return array Select2 JS params.
+         */
+        public static function select2_params() {
+            $params = array(
+                'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
+                'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
+                'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
+                'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
+                'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
+                'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
+                'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
+            );
+
+            return apply_filters( 'ayecode_ui_select2_params', $params );
+        }
+
+        /**
+         * Select2 JS localize.
+         *
+         * @since 0.1.44
+         *
+         * @return string Select2 JS locale.
+         */
+        public static function select2_locale() {
+            $params = self::select2_params();
+
+            foreach ( (array) $params as $key => $value ) {
+                if ( ! is_scalar( $value ) ) {
+                    continue;
+                }
+
+                $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+            }
+
+            $locale = json_encode( $params );
+
+            return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
+        }
+
+        /**
+         * Time ago JS localize.
+         *
+         * @since 0.1.47
+         *
+         * @return string Time ago JS locale.
+         */
+        public static function timeago_locale() {
+            $params = array(
+                'prefix_ago' => '',
+                'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
+                'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
+                'suffix_after' => '',
+                'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
+                'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
+                'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
+                'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
+                'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
+                'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
+                'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
+                'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
+                'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
+                'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
+                'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
+            );
+
+            $params = apply_filters( 'ayecode_ui_timeago_params', $params );
+
+            foreach ( (array) $params as $key => $value ) {
+                if ( ! is_scalar( $value ) ) {
+                    continue;
+                }
+
+                $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+            }
+
+            $locale = json_encode( $params );
+
+            return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
+        }
+
+        /**
+         * JavaScript Minifier
+         *
+         * @param $input
+         *
+         * @return mixed
+         */
+        public static function minify_js($input) {
+            if(trim($input) === "") return $input;
+            return preg_replace(
+                array(
+                    // Remove comment(s)
+                    '#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
+                    // Remove white-space(s) outside the string and regex
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
+                    // Remove the last semicolon
+                    '#;+\}#',
+                    // Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
+                    '#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
+                    // --ibid. From `foo['bar']` to `foo.bar`
+                    '#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
+                ),
+                array(
+                    '$1',
+                    '$1$2',
+                    '}',
+                    '$1$3',
+                    '$1.$3'
+                ),
+                $input);
+        }
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
-		}
-
-		/**
-		 * JavaScript Minifier
-		 *
-		 * @param $input
-		 *
-		 * @return mixed
-		 */
-		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
-					// Remove white-space(s) outside the string and regex
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
-					// Remove the last semicolon
-					'#;+\}#',
-					// Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
-					'#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
-					// --ibid. From `foo['bar']` to `foo.bar`
-					'#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
-				),
-				array(
-					'$1',
-					'$1$2',
-					'}',
-					'$1$3',
-					'$1.$3'
-				),
-				$input);
-		}
-
-		/**
-		 * Minify CSS
-		 *
-		 * @param $input
-		 *
-		 * @return mixed
-		 */
-		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
-					// Remove unused white-space(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
-					// Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
-					'#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
-					// Replace `:0 0 0 0` with `:0`
-					'#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
-					// Replace `background-position:0` with `background-position:0 0`
-					'#(background-position):0(?=[;\}])#si',
-					// Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
-					'#(?<=[\s:,\-])0+\.(\d+)#s',
-					// Minify string value
-					'#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
-					'#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
-					// Minify HEX color code
-					'#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
-					// Replace `(border|outline):none` with `(border|outline):0`
-					'#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
-					// Remove empty selector(s)
-					'#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
-				),
-				array(
-					'$1',
-					'$1$2$3$4$5$6$7',
-					'$1',
-					':0',
-					'$1:0 0',
-					'.$1',
-					'$1$3',
-					'$1$2$4$5',
-					'$1$2$3',
-					'$1:0',
-					'$1$2'
-				),
-				$input);
-		}
-
-		/**
-		 * Get the conditional fields JavaScript.
-		 *
-		 * @return mixed
-		 */
-		public function conditional_fields_js() {
-			ob_start();
-			?>
+        /**
+         * Minify CSS
+         *
+         * @param $input
+         *
+         * @return mixed
+         */
+        public static function minify_css($input) {
+            if(trim($input) === "") return $input;
+            return preg_replace(
+                array(
+                    // Remove comment(s)
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
+                    // Remove unused white-space(s)
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
+                    // Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
+                    '#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
+                    // Replace `:0 0 0 0` with `:0`
+                    '#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
+                    // Replace `background-position:0` with `background-position:0 0`
+                    '#(background-position):0(?=[;\}])#si',
+                    // Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
+                    '#(?<=[\s:,\-])0+\.(\d+)#s',
+                    // Minify string value
+                    '#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
+                    '#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
+                    // Minify HEX color code
+                    '#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
+                    // Replace `(border|outline):none` with `(border|outline):0`
+                    '#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
+                    // Remove empty selector(s)
+                    '#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
+                ),
+                array(
+                    '$1',
+                    '$1$2$3$4$5$6$7',
+                    '$1',
+                    ':0',
+                    '$1:0 0',
+                    '.$1',
+                    '$1$3',
+                    '$1$2$4$5',
+                    '$1$2$3',
+                    '$1:0',
+                    '$1$2'
+                ),
+                $input);
+        }
+
+        /**
+         * Get the conditional fields JavaScript.
+         *
+         * @return mixed
+         */
+        public function conditional_fields_js() {
+            ob_start();
+            ?>
             <script>
                 /**
                  * Conditional Fields
@@ -3146,237 +3146,237 @@ 
 				<?php do_action( 'aui_conditional_fields_js', $this ); ?>
             </script>
 			<?php
-			$output = ob_get_clean();
-
-			return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
-		}
-
-		/**
-		 * Check if block editor page.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_block_editor() {
-			if ( is_admin() ) {
-				$current_screen = function_exists('get_current_screen' ) ? get_current_screen() : array();
-
-				if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/**
-		 * 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 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Divi preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static 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 elementor preview.
-		 *
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static 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 Beaver builder preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static 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 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static 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 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a fusion builder preview.
-		 *
-		 * @return bool
-		 *@since 1.1.0
-		 */
-		public static function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Tests if the current output is inside a Oxygen builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.18
-		 */
-		public static function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Check for Kallyas theme Zion builder preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_kallyas_zion_preview() {
-			$result = false;
-
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Check for Bricks theme builder preview.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_bricks_preview() {
-			$result = false;
-
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$result = true;
-			}
-
-			return $result;
-		}
-
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @since 0.2.27
-		 *
-		 * @return bool
-		 */
-		public static function is_preview() {
-			$preview = false;
-
-			if ( self::is_block_editor() ) {
-				return true;
-			}
-
-			if( self::is_block_content_call() ) {
-				$preview = true;
-			} elseif ( self::is_divi_preview() ) {
-				$preview = true;
-			} elseif ( self::is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( self::is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( self::is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( self::is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( self::is_fusion_preview() ) {
-				$preview = true;
-			} elseif ( self::is_oxygen_preview() ) {
-				$preview = true;
-			} elseif( self::is_kallyas_zion_preview() ) {
-				$preview = true;
-			} elseif( self::is_bricks_preview() ) {
-				$preview = true;
-			}
-
-			return $preview;
-		}
-	}
-
-	global $ayecode_ui_settings;
-
-	/**
-	 * Run the class if found.
-	 */
-	$ayecode_ui_settings = AyeCode_UI_Settings::instance();
+            $output = ob_get_clean();
+
+            return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
+        }
+
+        /**
+         * Check if block editor page.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_block_editor() {
+            if ( is_admin() ) {
+                $current_screen = function_exists('get_current_screen' ) ? get_current_screen() : array();
+
+                if ( ! empty( $current_screen ) && $current_screen->is_block_editor() ) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        /**
+         * 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 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Divi preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static 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 elementor preview.
+         *
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static 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 Beaver builder preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static 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 0.2.27
+         *
+         * @return bool
+         */
+        public static 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 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_cornerstone_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a fusion builder preview.
+         *
+         * @return bool
+         *@since 1.1.0
+         */
+        public static function is_fusion_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Tests if the current output is inside a Oxygen builder preview.
+         *
+         * @return bool
+         *@since 1.0.18
+         */
+        public static function is_oxygen_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Check for Kallyas theme Zion builder preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_kallyas_zion_preview() {
+            $result = false;
+
+            if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * Check for Bricks theme builder preview.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_bricks_preview() {
+            $result = false;
+
+            if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+                $result = true;
+            }
+
+            return $result;
+        }
+
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @since 0.2.27
+         *
+         * @return bool
+         */
+        public static function is_preview() {
+            $preview = false;
+
+            if ( self::is_block_editor() ) {
+                return true;
+            }
+
+            if( self::is_block_content_call() ) {
+                $preview = true;
+            } elseif ( self::is_divi_preview() ) {
+                $preview = true;
+            } elseif ( self::is_elementor_preview() ) {
+                $preview = true;
+            } elseif ( self::is_beaver_preview() ) {
+                $preview = true;
+            } elseif ( self::is_siteorigin_preview() ) {
+                $preview = true;
+            } elseif ( self::is_cornerstone_preview() ) {
+                $preview = true;
+            } elseif ( self::is_fusion_preview() ) {
+                $preview = true;
+            } elseif ( self::is_oxygen_preview() ) {
+                $preview = true;
+            } elseif( self::is_kallyas_zion_preview() ) {
+                $preview = true;
+            } elseif( self::is_bricks_preview() ) {
+                $preview = true;
+            }
+
+            return $preview;
+        }
+    }
+
+    global $ayecode_ui_settings;
+
+    /**
+     * Run the class if found.
+     */
+    $ayecode_ui_settings = AyeCode_UI_Settings::instance();
 }
\ No newline at end of file

vendor/ayecode/wp-ayecode-ui/ayecode-ui-loader.php

Indentation +18 added lines, -18 removed lines

@@ -7,40 +7,40 @@
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
-	$this_version = "0.2.30";
-	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
-	}
+    global $ayecode_ui_version,$ayecode_ui_file_key;
+    $this_version = "0.2.30";
+    if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
+        $ayecode_ui_version = $this_version ;
+        $ayecode_ui_file_key = wp_hash( __FILE__ );
+    }
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
 add_action('after_setup_theme', function () {
-	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
-	}
+    global $ayecode_ui_file_key;
+    if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
+        include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
+        include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+    }
 },1);
 
 /**
  * Add the function that calls the class.
  */
 if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
-			return false;
-		}
-		return AUI::instance();
-	}
+    function aui(){
+        if(!class_exists("AUI",false)){
+            return false;
+        }
+        return AUI::instance();
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -6,39 +6,39 @@
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Set the version only if its the current newest while loading.
  */
-add_action('after_setup_theme', function () {
-	global $ayecode_ui_version,$ayecode_ui_file_key;
+add_action('after_setup_theme', function() {
+	global $ayecode_ui_version, $ayecode_ui_file_key;
 	$this_version = "0.2.30";
-	if(empty($ayecode_ui_version) || version_compare($this_version , $ayecode_ui_version, '>')){
-		$ayecode_ui_version = $this_version ;
-		$ayecode_ui_file_key = wp_hash( __FILE__ );
+	if (empty($ayecode_ui_version) || version_compare($this_version, $ayecode_ui_version, '>')) {
+		$ayecode_ui_version = $this_version;
+		$ayecode_ui_file_key = wp_hash(__FILE__);
 	}
 },0);
 
 /**
  * Load this version of WP Bootstrap Settings only if the file hash is the current one.
  */
-add_action('after_setup_theme', function () {
+add_action('after_setup_theme', function() {
 	global $ayecode_ui_file_key;
-	if($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash( __FILE__ )){
-		include_once( dirname( __FILE__ ) . '/includes/class-aui.php' );
-		include_once( dirname( __FILE__ ) . '/includes/ayecode-ui-settings.php' );
+	if ($ayecode_ui_file_key && $ayecode_ui_file_key == wp_hash(__FILE__)) {
+		include_once(dirname(__FILE__) . '/includes/class-aui.php');
+		include_once(dirname(__FILE__) . '/includes/ayecode-ui-settings.php');
 	}
 },1);
 
 /**
  * Add the function that calls the class.
  */
-if(!function_exists('aui')){
-	function aui(){
-		if(!class_exists("AUI",false)){
+if (!function_exists('aui')) {
+	function aui() {
+		if (!class_exists("AUI", false)) {
 			return false;
 		}
 		return AUI::instance();

vendor/ayecode/wp-super-duper/includes/class-super-duper-bricks-element.php

Indentation +248 added lines, -248 removed lines

@@ -6,246 +6,246 @@ 
 
 class Super_Duper_Bricks_Element extends \Bricks\Element {
 
-	public $widget;
-
-	public function __construct( $element = null ) {
-
-
-		$block_icon = !empty($this->widget->options['block-icon']) ? $this->widget->options['block-icon'] : '';
-
-
-		$this->category = !empty($this->widget->options['textdomain']) ? esc_attr( $this->widget->options['textdomain'] ) : 'Super Duper';
-		$this->name     = $this->widget->id_base;
-		$this->icon     = (strpos($block_icon, 'fa') === 0) ? esc_attr($this->widget->options['block-icon']) : 'fas fa-globe-americas';
-
-		parent::__construct($element);
-	}
-
-	/**
-	 * Set the element name.
-	 *
-	 * @return array|string|string[]|null
-	 */
-	public function get_label() {
-		$escaped_text = esc_attr( $this->widget->name );
-		return str_replace( ' > ', ' > ', $escaped_text ); // keep our > but have it safe
-	}
-
-	/**
-	 * Bricks function to set the controls
-	 *
-	 * @return void
-	 */
-	public function set_controls() {
-		$args = $this->sd_convert_arguments($this->widget);
-
-		if (!empty($args)) {
-			$this->controls = $this->controls + $args;
-		}
-
-	}
-
-	/**
-	 * Set the bricks control groups from the GD ones.
-	 *
-	 * @return void
-	 */
-	public function set_control_groups() {
-		$args = $this->sd_get_arguments();
-
-		$groups = array();
-		if(!empty($args)) {
-			foreach ($args as $k => $v) {
-				$g_slug = !empty($v['group']) ? sanitize_title( $v['group'] ) : '';
-				if($g_slug && empty($groups[$g_slug])) {
-					$groups[$g_slug] = array(
-						'title' => esc_html( $v['group'] ),
-						'tab' => 'content',
-					);
-				}
-			}
-		}
-
-		if(!empty($groups)) {
-			$this->control_groups = $this->control_groups + $groups;
-		}
-
-	}
-
-	/**
-	 * Get the setting input arguments.
-	 *
-	 * @return mixed
-	 */
-	public function sd_get_arguments() {
-		$args = $this->widget->set_arguments();
-		$arg_keys_subtract = $this->sd_remove_arguments();
-
-		if ( ! empty( $arg_keys_subtract ) ) {
-			foreach($arg_keys_subtract as $key ){
-				unset($args[$key]);
-			}
-		}
-
-		return $args;
-	}
-
-
-	/**
-	 * Simply use our own render function for the output.
-	 *
-	 * @return void
-	 */
-	public function render() {
-		$settings   = $this->sd_maybe_convert_values( $this->settings );
-
-
-		// set the AyeCode UI calss on the wrapper
-		$this->set_attribute( '_root', 'class', 'bsui' );
-
-		// we might need to add a placeholder here for previews.
-
-		// add the bricks attributes to wrapper
-		echo "<div {$this->render_attributes( '_root' )}>";
-		echo $this->widget->output($settings);
-		echo '</div>';
-	}
-
-	/**
-	 * Values can never be arrays so convert if bricks setting make it an array.
-	 *
-	 * @param $settings
-	 * @return mixed
-	 */
-	public function sd_maybe_convert_values( $settings ) {
-
-
-		if (!empty($settings)) {
-			foreach( $settings as $k => $v ) {
-				if(is_array($v)) {
-					$value = '';
-					// is color
-					if (isset($v['hex'])) {
-						$value = $v['hex'];
-					} elseif (isset($v['icon'])) {
-						$value = $v['icon'];
-					}
-
-
-					// set the value
-					$settings[$k] = $value;
-				}
-
-			}
-		}
-
-		return $settings;
-	}
-
-	/**
-	 * Convert SD arguments to Bricks arguments.
-	 *
-	 * @param $widget
-	 *
-	 * @return array
-	 */
-	public function sd_convert_arguments()
-	{
-		$bricks_args = array();
-
-		$args = $this->sd_get_arguments();
-
-		if (!empty($args)) {
-			foreach ($args as $key => $arg) {
-
-				// convert title
-				if (!empty($arg['title'])) {
-					$arg['label'] = $arg['title'];
-					unset($arg['title']);
-				}
-
-				// set fields not to use dynamic data
-				$arg['hasDynamicData'] = false;
-
-				if (!empty($arg['group'])) {
-					$arg['group'] =  sanitize_title($arg['group']);
-				}
-
-				$arg['rerender'] = true;
-
-				// required
-				if(!empty($arg['element_require'])) {
-					$arg['required'] = $this->sd_convert_required($arg['element_require']);
-					unset($arg['element_require']);
-				}
-
-				// icons
-				if ('icon' === $key) {
-					$arg['type'] = 'icon';
-				}
-
-				$bricks_args[$key] = $arg;
-
-			}
-
-		}
-
-		return $bricks_args;
-
-	}
-
-	/**
-	 * Convert the SD element_required to the Bricks required syntax.
-	 *
-	 * @param $element_require
-	 * @return array
-	 */
-	public function sd_convert_required($element_require) {
-		$bricks_required = [];
-
-		// Handle logical OR (||) for multiple values
-		if (strpos($element_require, '||') !== false) {
-			preg_match('/\[%(.+?)%\] *== *"(.*?)"/', $element_require, $matches);
-			if ($matches) {
-				$control_id = $matches[1];
-				preg_match_all('/\[%.*?%\] *== *"(.*?)"/', $element_require, $value_matches);
-				$values = $value_matches[1];
-				$bricks_required[] = [$control_id, '=', $values];
-			}
-			return $bricks_required;
-		}
-
-		// Match individual conditions
-		preg_match_all('/(!)?\[%(.*?)%\](?:\s*([!=<>]=?)\s*(".*?"|\'.*?\'|\d+))?/', $element_require, $matches, PREG_SET_ORDER);
-
-		foreach ($matches as $match) {
-			$is_negation = isset($match[1]) && $match[1] === '!';
-			$control_id = $match[2];
-			$operator = isset($match[3]) ? str_replace('==', '=', $match[3]) : ($is_negation ? '=' : '!=');
-			$value = isset($match[4]) ? trim($match[4], '"\'') : ($is_negation ? '' : '');
-
-			// Adjust for negation without explicit operator
-			if ($is_negation && !isset($match[3])) {
-				$operator = '=';
-				$value = '';
-			}
-
-			$bricks_required[] = [$control_id, $operator, $value];
-		}
-
-		return $bricks_required;
-	}
-
-
-	/**
-	 * A way to remove some settings by keys.
-	 *
-	 * @return array
-	 */
-	public function sd_remove_arguments()
-	{
-		return array();
-	}
+    public $widget;
+
+    public function __construct( $element = null ) {
+
+
+        $block_icon = !empty($this->widget->options['block-icon']) ? $this->widget->options['block-icon'] : '';
+
+
+        $this->category = !empty($this->widget->options['textdomain']) ? esc_attr( $this->widget->options['textdomain'] ) : 'Super Duper';
+        $this->name     = $this->widget->id_base;
+        $this->icon     = (strpos($block_icon, 'fa') === 0) ? esc_attr($this->widget->options['block-icon']) : 'fas fa-globe-americas';
+
+        parent::__construct($element);
+    }
+
+    /**
+     * Set the element name.
+     *
+     * @return array|string|string[]|null
+     */
+    public function get_label() {
+        $escaped_text = esc_attr( $this->widget->name );
+        return str_replace( ' &gt; ', ' > ', $escaped_text ); // keep our > but have it safe
+    }
+
+    /**
+     * Bricks function to set the controls
+     *
+     * @return void
+     */
+    public function set_controls() {
+        $args = $this->sd_convert_arguments($this->widget);
+
+        if (!empty($args)) {
+            $this->controls = $this->controls + $args;
+        }
+
+    }
+
+    /**
+     * Set the bricks control groups from the GD ones.
+     *
+     * @return void
+     */
+    public function set_control_groups() {
+        $args = $this->sd_get_arguments();
+
+        $groups = array();
+        if(!empty($args)) {
+            foreach ($args as $k => $v) {
+                $g_slug = !empty($v['group']) ? sanitize_title( $v['group'] ) : '';
+                if($g_slug && empty($groups[$g_slug])) {
+                    $groups[$g_slug] = array(
+                        'title' => esc_html( $v['group'] ),
+                        'tab' => 'content',
+                    );
+                }
+            }
+        }
+
+        if(!empty($groups)) {
+            $this->control_groups = $this->control_groups + $groups;
+        }
+
+    }
+
+    /**
+     * Get the setting input arguments.
+     *
+     * @return mixed
+     */
+    public function sd_get_arguments() {
+        $args = $this->widget->set_arguments();
+        $arg_keys_subtract = $this->sd_remove_arguments();
+
+        if ( ! empty( $arg_keys_subtract ) ) {
+            foreach($arg_keys_subtract as $key ){
+                unset($args[$key]);
+            }
+        }
+
+        return $args;
+    }
+
+
+    /**
+     * Simply use our own render function for the output.
+     *
+     * @return void
+     */
+    public function render() {
+        $settings   = $this->sd_maybe_convert_values( $this->settings );
+
+
+        // set the AyeCode UI calss on the wrapper
+        $this->set_attribute( '_root', 'class', 'bsui' );
+
+        // we might need to add a placeholder here for previews.
+
+        // add the bricks attributes to wrapper
+        echo "<div {$this->render_attributes( '_root' )}>";
+        echo $this->widget->output($settings);
+        echo '</div>';
+    }
+
+    /**
+     * Values can never be arrays so convert if bricks setting make it an array.
+     *
+     * @param $settings
+     * @return mixed
+     */
+    public function sd_maybe_convert_values( $settings ) {
+
+
+        if (!empty($settings)) {
+            foreach( $settings as $k => $v ) {
+                if(is_array($v)) {
+                    $value = '';
+                    // is color
+                    if (isset($v['hex'])) {
+                        $value = $v['hex'];
+                    } elseif (isset($v['icon'])) {
+                        $value = $v['icon'];
+                    }
+
+
+                    // set the value
+                    $settings[$k] = $value;
+                }
+
+            }
+        }
+
+        return $settings;
+    }
+
+    /**
+     * Convert SD arguments to Bricks arguments.
+     *
+     * @param $widget
+     *
+     * @return array
+     */
+    public function sd_convert_arguments()
+    {
+        $bricks_args = array();
+
+        $args = $this->sd_get_arguments();
+
+        if (!empty($args)) {
+            foreach ($args as $key => $arg) {
+
+                // convert title
+                if (!empty($arg['title'])) {
+                    $arg['label'] = $arg['title'];
+                    unset($arg['title']);
+                }
+
+                // set fields not to use dynamic data
+                $arg['hasDynamicData'] = false;
+
+                if (!empty($arg['group'])) {
+                    $arg['group'] =  sanitize_title($arg['group']);
+                }
+
+                $arg['rerender'] = true;
+
+                // required
+                if(!empty($arg['element_require'])) {
+                    $arg['required'] = $this->sd_convert_required($arg['element_require']);
+                    unset($arg['element_require']);
+                }
+
+                // icons
+                if ('icon' === $key) {
+                    $arg['type'] = 'icon';
+                }
+
+                $bricks_args[$key] = $arg;
+
+            }
+
+        }
+
+        return $bricks_args;
+
+    }
+
+    /**
+     * Convert the SD element_required to the Bricks required syntax.
+     *
+     * @param $element_require
+     * @return array
+     */
+    public function sd_convert_required($element_require) {
+        $bricks_required = [];
+
+        // Handle logical OR (||) for multiple values
+        if (strpos($element_require, '||') !== false) {
+            preg_match('/\[%(.+?)%\] *== *"(.*?)"/', $element_require, $matches);
+            if ($matches) {
+                $control_id = $matches[1];
+                preg_match_all('/\[%.*?%\] *== *"(.*?)"/', $element_require, $value_matches);
+                $values = $value_matches[1];
+                $bricks_required[] = [$control_id, '=', $values];
+            }
+            return $bricks_required;
+        }
+
+        // Match individual conditions
+        preg_match_all('/(!)?\[%(.*?)%\](?:\s*([!=<>]=?)\s*(".*?"|\'.*?\'|\d+))?/', $element_require, $matches, PREG_SET_ORDER);
+
+        foreach ($matches as $match) {
+            $is_negation = isset($match[1]) && $match[1] === '!';
+            $control_id = $match[2];
+            $operator = isset($match[3]) ? str_replace('==', '=', $match[3]) : ($is_negation ? '=' : '!=');
+            $value = isset($match[4]) ? trim($match[4], '"\'') : ($is_negation ? '' : '');
+
+            // Adjust for negation without explicit operator
+            if ($is_negation && !isset($match[3])) {
+                $operator = '=';
+                $value = '';
+            }
+
+            $bricks_required[] = [$control_id, $operator, $value];
+        }
+
+        return $bricks_required;
+    }
+
+
+    /**
+     * A way to remove some settings by keys.
+     *
+     * @return array
+     */
+    public function sd_remove_arguments()
+    {
+        return array();
+    }
 
 }
 
@@ -255,12 +255,12 @@ 
  */
 add_action( 'wp_enqueue_scripts', function() {
 
-	// Check if we're in the Bricks Editor
-	if ( isset( $_GET['bricks'] ) && $_GET['bricks'] && bricks_is_builder_main() ) {
-		// Add inline script to the 'bricks-builder' script
-		wp_add_inline_script(
-			'bricks-builder',
-			"
+    // Check if we're in the Bricks Editor
+    if ( isset( $_GET['bricks'] ) && $_GET['bricks'] && bricks_is_builder_main() ) {
+        // Add inline script to the 'bricks-builder' script
+        wp_add_inline_script(
+            'bricks-builder',
+            "
 
 (function () {
     // Function to get the current breakpoint from the #bricks-preview class
@@ -467,6 +467,6 @@ 
     addIconsToLabels();
 })();
 "
-		);
-	}
+        );
+    }
 });

Spacing +22 added lines, -22 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 
 class Super_Duper_Bricks_Element extends \Bricks\Element {
 
 	public $widget;
 
-	public function __construct( $element = null ) {
+	public function __construct($element = null) {
 
 
 		$block_icon = !empty($this->widget->options['block-icon']) ? $this->widget->options['block-icon'] : '';
 
 
-		$this->category = !empty($this->widget->options['textdomain']) ? esc_attr( $this->widget->options['textdomain'] ) : 'Super Duper';
+		$this->category = !empty($this->widget->options['textdomain']) ? esc_attr($this->widget->options['textdomain']) : 'Super Duper';
 		$this->name     = $this->widget->id_base;
 		$this->icon     = (strpos($block_icon, 'fa') === 0) ? esc_attr($this->widget->options['block-icon']) : 'fas fa-globe-americas';
 
@@ -27,8 +27,8 @@ 
 	 * @return array|string|string[]|null
 	 */
 	public function get_label() {
-		$escaped_text = esc_attr( $this->widget->name );
-		return str_replace( ' &gt; ', ' > ', $escaped_text ); // keep our > but have it safe
+		$escaped_text = esc_attr($this->widget->name);
+		return str_replace(' &gt; ', ' > ', $escaped_text); // keep our > but have it safe
 	}
 
 	/**
@@ -54,19 +54,19 @@ 
 		$args = $this->sd_get_arguments();
 
 		$groups = array();
-		if(!empty($args)) {
+		if (!empty($args)) {
 			foreach ($args as $k => $v) {
-				$g_slug = !empty($v['group']) ? sanitize_title( $v['group'] ) : '';
-				if($g_slug && empty($groups[$g_slug])) {
+				$g_slug = !empty($v['group']) ? sanitize_title($v['group']) : '';
+				if ($g_slug && empty($groups[$g_slug])) {
 					$groups[$g_slug] = array(
-						'title' => esc_html( $v['group'] ),
+						'title' => esc_html($v['group']),
 						'tab' => 'content',
 					);
 				}
 			}
 		}
 
-		if(!empty($groups)) {
+		if (!empty($groups)) {
 			$this->control_groups = $this->control_groups + $groups;
 		}
 
@@ -81,8 +81,8 @@ 
 		$args = $this->widget->set_arguments();
 		$arg_keys_subtract = $this->sd_remove_arguments();
 
-		if ( ! empty( $arg_keys_subtract ) ) {
-			foreach($arg_keys_subtract as $key ){
+		if (!empty($arg_keys_subtract)) {
+			foreach ($arg_keys_subtract as $key) {
 				unset($args[$key]);
 			}
 		}
@@ -97,16 +97,16 @@ 
 	 * @return void
 	 */
 	public function render() {
-		$settings   = $this->sd_maybe_convert_values( $this->settings );
+		$settings = $this->sd_maybe_convert_values($this->settings);
 
 
 		// set the AyeCode UI calss on the wrapper
-		$this->set_attribute( '_root', 'class', 'bsui' );
+		$this->set_attribute('_root', 'class', 'bsui');
 
 		// we might need to add a placeholder here for previews.
 
 		// add the bricks attributes to wrapper
-		echo "<div {$this->render_attributes( '_root' )}>";
+		echo "<div {$this->render_attributes('_root')}>";
 		echo $this->widget->output($settings);
 		echo '</div>';
 	}
@@ -117,12 +117,12 @@ 
 	 * @param $settings
 	 * @return mixed
 	 */
-	public function sd_maybe_convert_values( $settings ) {
+	public function sd_maybe_convert_values($settings) {
 
 
 		if (!empty($settings)) {
-			foreach( $settings as $k => $v ) {
-				if(is_array($v)) {
+			foreach ($settings as $k => $v) {
+				if (is_array($v)) {
 					$value = '';
 					// is color
 					if (isset($v['hex'])) {
@@ -168,13 +168,13 @@ 
 				$arg['hasDynamicData'] = false;
 
 				if (!empty($arg['group'])) {
-					$arg['group'] =  sanitize_title($arg['group']);
+					$arg['group'] = sanitize_title($arg['group']);
 				}
 
 				$arg['rerender'] = true;
 
 				// required
-				if(!empty($arg['element_require'])) {
+				if (!empty($arg['element_require'])) {
 					$arg['required'] = $this->sd_convert_required($arg['element_require']);
 					unset($arg['element_require']);
 				}
@@ -253,10 +253,10 @@ 
 /**
  * This implements the desktop, tablet and mobile breakpoints views with our fields that are hidden on these types and adda the icon after the label to show which it applies to.
  */
-add_action( 'wp_enqueue_scripts', function() {
+add_action('wp_enqueue_scripts', function() {
 
 	// Check if we're in the Bricks Editor
-	if ( isset( $_GET['bricks'] ) && $_GET['bricks'] && bricks_is_builder_main() ) {
+	if (isset($_GET['bricks']) && $_GET['bricks'] && bricks_is_builder_main()) {
 		// Add inline script to the 'bricks-builder' script
 		wp_add_inline_script(
 			'bricks-builder',

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

Spacing +7 added lines, -7 removed lines

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

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

Indentation +2637 added lines, -2637 removed lines

@@ -1,147 +1,147 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
-	define( 'SUPER_DUPER_VER', '1.2.16' );
-
-	/**
-	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
-	 *
-	 * Should not be called direct but extended instead.
-	 *
-	 * Class WP_Super_Duper
-	 * @since 1.0.16 change log moved to file change-log.txt - CHANGED
-	 * @ver 1.1.1
-	 */
-	class WP_Super_Duper extends WP_Widget {
-
-		public $version = SUPER_DUPER_VER;
-		public $font_awesome_icon_version = "5.11.2";
-		public $block_code;
-		public $options;
-		public $base_id;
-		public $settings_hash;
-		public $arguments = array();
-		public $instance = array();
-		private $class_name;
-
-		/**
-		 * The relative url to the current folder.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Take the array options and use them to build.
-		 */
-		public function __construct( $options ) {
-			global $sd_widgets;
-
-			$sd_widgets[ $options['base_id'] ] = array(
-				'name'       => $options['name'],
-				'class_name' => $options['class_name'],
-				'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
-			);
-			$this->base_id                     = $options['base_id'];
-			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
-			$this->options = $options;
-
-			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
-
-			// nested blocks can't work as a widget
-			if(!empty($this->options['nested-block'])){
-				if(empty($this->options['output_types'])){
-					$this->options['output_types'] = array('shortcode','block');
-				}elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
-					unset($this->options['output_types'][$key]);
-				}
-			}
+    define( 'SUPER_DUPER_VER', '1.2.16' );
+
+    /**
+     * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
+     *
+     * Should not be called direct but extended instead.
+     *
+     * Class WP_Super_Duper
+     * @since 1.0.16 change log moved to file change-log.txt - CHANGED
+     * @ver 1.1.1
+     */
+    class WP_Super_Duper extends WP_Widget {
+
+        public $version = SUPER_DUPER_VER;
+        public $font_awesome_icon_version = "5.11.2";
+        public $block_code;
+        public $options;
+        public $base_id;
+        public $settings_hash;
+        public $arguments = array();
+        public $instance = array();
+        private $class_name;
 
-			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
-			}
+        /**
+         * The relative url to the current folder.
+         *
+         * @var string
+         */
+        public $url = '';
+
+        /**
+         * Take the array options and use them to build.
+         */
+        public function __construct( $options ) {
+            global $sd_widgets;
+
+            $sd_widgets[ $options['base_id'] ] = array(
+                'name'       => $options['name'],
+                'class_name' => $options['class_name'],
+                'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
+            );
+            $this->base_id                     = $options['base_id'];
+            // lets filter the options before we do anything
+            $options       = apply_filters( "wp_super_duper_options", $options );
+            $options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
+            $options       = $this->add_name_from_key( $options );
+            $this->options = $options;
+
+            $this->base_id   = $options['base_id'];
+            $this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+
+            // nested blocks can't work as a widget
+            if(!empty($this->options['nested-block'])){
+                if(empty($this->options['output_types'])){
+                    $this->options['output_types'] = array('shortcode','block');
+                }elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
+                    unset($this->options['output_types'][$key]);
+                }
+            }
 
+            // init parent
+            if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+                parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+            }
 
-			if ( isset( $options['class_name'] ) ) {
-				// register widget
-				$this->class_name = $options['class_name'];
 
-				// register shortcode, this needs to be done even for blocks and widgets
-				$this->register_shortcode();
+            if ( isset( $options['class_name'] ) ) {
+                // register widget
+                $this->class_name = $options['class_name'];
 
+                // register shortcode, this needs to be done even for blocks and widgets
+                $this->register_shortcode();
 
-				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
-				}
+
+                // Fusion Builder (avada) support
+                if ( function_exists( 'fusion_builder_map' ) ) {
+                    add_action( 'init', array( $this, 'register_fusion_element' ) );
+                }
 
                 // maybe load the Bricks transformer class
                 if( class_exists('\Bricks\Elements', false) ){
-					add_action( 'init', array( $this, 'load_bricks_element_class' ) );
+                    add_action( 'init', array( $this, 'load_bricks_element_class' ) );
                 }
 
-				// register block
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-					add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-				}
-			}
+                // register block
+                if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
+                    add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+                }
+            }
 
-			// add the CSS and JS we need ONCE
-			global $sd_widget_scripts;
+            // 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' ) );
+                // maybe add elementor editor styles
+                add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
 
-				$sd_widget_scripts = true;
+                $sd_widget_scripts = true;
 
-				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'wp_media_buttons' ), 1 );
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
-				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
-				}
-				/* Load script on Divi theme builder page */
-				if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) {
-					add_thickbox();
-					add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
-				}
+                // add shortcode insert button once
+                add_action( 'media_buttons', array( $this, 'wp_media_buttons' ), 1 );
+                add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+                // generatepress theme sections compatibility
+                if ( function_exists( 'generate_sections_sections_metabox' ) ) {
+                    add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+                }
+                /* Load script on Divi theme builder page */
+                if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) {
+                    add_thickbox();
+                    add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
+                }
 
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
-					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
-						$this,
-						'shortcode_insert_button_script'
-					) ); // for elementor
-				}
-				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+                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_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
+                add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
 
-				// add generator text to head
-				add_action( 'admin_head', array( $this, 'generator' ), 99 );
-				add_action( 'wp_head', array( $this, 'generator' ), 99 );
-			}
+                // add generator text to head
+                add_action( 'admin_head', array( $this, 'generator' ), 99 );
+                add_action( 'wp_head', array( $this, 'generator' ), 99 );
+            }
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
-		}
+            do_action( 'wp_super_duper_widget_init', $options, $this );
+        }
 
         /**
          * Load the Bricks conversion class if we are running Bricks.
@@ -151,163 +151,163 @@ 
                     include_once __DIR__ . '/includes/class-super-duper-bricks-element.php';
         }
 
-		/**
-		 * The register widget function
-		 * @return void
-		 */
-		public function _register() {
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::_register();
-			}
-		}
-
-		/**
-		 * Add our widget CSS to elementor editor.
-		 */
-		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
-		}
-
-		public function register_fusion_element() {
-
-			$options = $this->options;
-
-			if ( $this->base_id ) {
-
-				$params = $this->get_fusion_params();
-
-				$args = array(
-					'name'            => $options['name'],
-					'shortcode'       => $this->base_id,
-					'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
-					'allow_generator' => true,
-				);
-
-				if ( ! empty( $params ) ) {
-					$args['params'] = $params;
-				}
-
-				fusion_builder_map( $args );
-			}
+        /**
+         * The register widget function
+         * @return void
+         */
+        public function _register() {
+            if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+                parent::_register();
+            }
+        }
 
-		}
+        /**
+         * Add our widget CSS to elementor editor.
+         */
+        public function elementor_editor_styles() {
+            wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+        }
 
-		public function 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",
+        public function register_fusion_element() {
 
-						),
-						$val['type'] );
+            $options = $this->options;
 
-					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
-						$param['type']     = 'multiple_select';
-						$param['multiple'] = true;
-					}
+            if ( $this->base_id ) {
 
-					// heading
-					$param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+                $params = $this->get_fusion_params();
 
-					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+                $args = array(
+                    'name'            => $options['name'],
+                    'shortcode'       => $this->base_id,
+                    'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
+                    'allow_generator' => true,
+                );
 
-					// param_name
-					$param['param_name'] = $key;
+                if ( ! empty( $params ) ) {
+                    $args['params'] = $params;
+                }
 
-					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+                fusion_builder_map( $args );
+            }
 
-					// Group
-					if ( isset( $val['group'] ) ) {
-						$param['group'] = $val['group'];
-					}
+        }
 
-					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
-						}
-						$param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
-					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
-					}
+        public function get_fusion_params() {
+            $params    = array();
+            $arguments = $this->get_arguments();
+
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $key => $val ) {
+                    $param = array();
+                    // type
+                    $param['type'] = str_replace(
+                        array(
+                            "text",
+                            "number",
+                            "email",
+                            "color",
+                            "checkbox"
+                        ),
+                        array(
+                            "textfield",
+                            "textfield",
+                            "textfield",
+                            "colorpicker",
+                            "select",
+
+                        ),
+                        $val['type'] );
+
+                    // multiselect
+                    if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+                        $param['type']     = 'multiple_select';
+                        $param['multiple'] = true;
+                    }
+
+                    // heading
+                    $param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+
+                    // description
+                    $param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+
+                    // param_name
+                    $param['param_name'] = $key;
+
+                    // Default
+                    $param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+
+                    // Group
+                    if ( isset( $val['group'] ) ) {
+                        $param['group'] = $val['group'];
+                    }
+
+                    // value
+                    if ( $val['type'] == 'checkbox' ) {
+                        if ( isset( $val['default'] ) && $val['default'] == '0' ) {
+                            unset( $param['default'] );
+                        }
+                        $param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
+                    } elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
+                        $param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+                    } else {
+                        $param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+                    }
+
+                    // setup the param
+                    $params[] = $param;
 
-					// setup the param
-					$params[] = $param;
+                }
+            }
 
-				}
-			}
 
+            return $params;
+        }
 
-			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();
+            }
+        }
 
-		/**
-		 * 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 = '' ) {
 
-		/**
-		 * 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';
-			}
+            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;
+            global $sd_widgets;
 
 //			print_r($sd_widgets);exit;
-			?>
+            ?>
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
-				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
-					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
-					}
-					echo "</select>";
+                ksort( $sd_widgets );
+                //				print_r($sd_widgets);exit;
+                if ( ! empty( $sd_widgets ) ) {
+                    echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
+                    echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
+                    foreach ( $sd_widgets as $shortcode => $class ) {
+                        if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
+                        echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+                    }
+                    echo "</select>";
 
-				}
-				?>
+                }
+                ?>
 				<div class="sd-shortcode-settings"></div>
 
 			</div>
@@ -318,8 +318,8 @@ 
 					<?php if ( $editor_id != '' ) { ?>
 						<button class="button sd-insert-shortcode-button"
 								onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
-									echo "'" . $editor_id . "'";
-								} ?>)"><?php _e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
+                                    echo "'" . $editor_id . "'";
+                                } ?>)"><?php _e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
 					<?php } ?>
 					<button class="button"
 							onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
@@ -327,150 +327,150 @@ 
 			</div>
 			<?php
 
-			$html = ob_get_clean();
-
-			if ( wp_doing_ajax() ) {
-				echo $html;
-				$should_die = true;
+            $html = ob_get_clean();
 
-				// some builder get the editor via ajax so we should not die on those occasions
-				$dont_die = array(
-					'parent_tag',// WP Bakery
-					'avia_request' // enfold
-				);
-
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
-						$should_die = false;
-					}
-				}
+            if ( wp_doing_ajax() ) {
+                echo $html;
+                $should_die = true;
 
-				if ( $should_die ) {
-					wp_die();
-				}
+                // some builder get the editor via ajax so we should not die on those occasions
+                $dont_die = array(
+                    'parent_tag',// WP Bakery
+                    'avia_request' // enfold
+                );
 
-			} else {
-				return $html;
-			}
+                foreach ( $dont_die as $request ) {
+                    if ( isset( $_REQUEST[ $request ] ) ) {
+                        $should_die = false;
+                    }
+                }
 
-			return '';
+                if ( $should_die ) {
+                    wp_die();
+                }
 
-		}
+            } else {
+                return $html;
+            }
 
-		/**
-		 * Output the version in the header.
-		 */
-		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-			// Find source plugin/theme of SD
-			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-				}
-			}
+            return '';
 
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
-		}
+        }
 
-		/**
-		 * Get widget settings.
-		 *
-		 * @since 1.0.0
-		 */
-		public static function get_widget_settings() {
-			global $sd_widgets;
-
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
-				wp_die();
-			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
-				wp_die();
-			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
-				wp_die();
-			}
+        /**
+         * Output the version in the header.
+         */
+        public function generator() {
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme of SD
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
 
-			// invoke an instance method
-			$widget = new $class_name;
+            echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+        }
 
-			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>";
-			?>
+        /**
+         * Get widget settings.
+         *
+         * @since 1.0.0
+         */
+        public static function get_widget_settings() {
+            global $sd_widgets;
+
+            $shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
+            if ( ! $shortcode ) {
+                wp_die();
+            }
+            $widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
+            if ( ! $widget_args ) {
+                wp_die();
+            }
+            $class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+            if ( ! $class_name ) {
+                wp_die();
+            }
+
+            // invoke an instance method
+            $widget = new $class_name;
+
+            ob_start();
+            $widget->form( array() );
+            $form = ob_get_clean();
+            echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
+            echo "<style>" . $widget->widget_css() . "</style>";
+            echo "<script>" . $widget->widget_js() . "</script>";
+            ?>
 			<?php
-			wp_die();
-		}
-
-		/**
-		 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
-		 *
-		 * @param string $editor_id Optional. Shortcode editor id. Default null.
-		 * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
-		 *
-		 *@since 1.0.0
-		 *
-		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
-			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
-				return;
-			}
-			add_thickbox();
-
-
-			/**
-			 * Cornerstone makes us play dirty tricks :/
-			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
-			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '<span id="insert-media-button">';
-			}
-
-			echo self::shortcode_button( 'this', 'true' );
-
-			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '</span>'; // end #insert-media-button
-			}
-
-			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
-			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
-			}
+            wp_die();
+        }
 
-			$shortcode_insert_button_once = true;
-		}
+        /**
+         * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
+         *
+         * @param string $editor_id Optional. Shortcode editor id. Default null.
+         * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
+         *
+         *@since 1.0.0
+         *
+         */
+        public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+            global $sd_widgets, $shortcode_insert_button_once;
+            if ( $shortcode_insert_button_once ) {
+                return;
+            }
+            add_thickbox();
+
+
+            /**
+             * Cornerstone makes us play dirty tricks :/
+             * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
+             */
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '<span id="insert-media-button">';
+            }
+
+            echo self::shortcode_button( 'this', 'true' );
+
+            // see opening note
+            if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+                echo '</span>'; // end #insert-media-button
+            }
+
+            // Add separate script for generatepress theme sections
+            if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+            } else {
+                self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+            }
+
+            $shortcode_insert_button_once = true;
+        }
 
-		/**
-		 * Gets the shortcode insert button html.
-		 *
-		 * @param string $id
-		 * @param string $search_for_id
-		 *
-		 * @return mixed
-		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
-			ob_start();
-			?>
+        /**
+         * 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>
@@ -481,21 +481,21 @@ 
 			</span>
 
 			<?php
-			$html = ob_get_clean();
+            $html = ob_get_clean();
 
-			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
-		}
+            // remove line breaks so we can use it in js
+            return preg_replace( "/\r|\n/", "", trim( $html ) );
+        }
 
-		/**
-		 * Makes SD work with the siteOrigin page builder.
-		 *
-		 * @return mixed
-		 *@since 1.0.6
-		 */
-		public static function siteorigin_js() {
-			ob_start();
-			?>
+        /**
+         * Makes SD work with the siteOrigin page builder.
+         *
+         * @return mixed
+         *@since 1.0.6
+         */
+        public static function siteorigin_js() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * Check a form to see what items should be shown or hidden.
@@ -571,29 +571,29 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
-		/**
-		 * Output the JS and CSS for the shortcode insert button.
-		 *
-		 * @param string $editor_id
-		 * @param string $insert_shortcode_function
-		 *
-		 *@since 1.0.6
-		 *
-		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
-			?>
+        /**
+         * Output the JS and CSS for the shortcode insert button.
+         *
+         * @param string $editor_id
+         * @param string $insert_shortcode_function
+         *
+         *@since 1.0.6
+         *
+         */
+        public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+            ?>
 			<style>
 				.sd-shortcode-left-wrap {
 					float: left;
@@ -721,35 +721,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;
 						}
@@ -1063,18 +1063,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 {
@@ -1114,26 +1114,26 @@ 
 				.elementor-control .sd-argument select[multiple] option{padding:3px}
 			</style>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', $output );
+        }
 
-		/**
-		 * Gets some JS for the widgets screen.
-		 *
-		 * @return mixed
-		 */
-		public function widget_js() {
-			ob_start();
-			?>
+        /**
+         * Gets some JS for the widgets screen.
+         *
+         * @return mixed
+         */
+        public function widget_js() {
+            ob_start();
+            ?>
 			<script>
 
 				/**
@@ -1284,513 +1284,513 @@ 
 				<?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 );
-		}
+            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;
-				}
-			}
+        /**
+         * 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;
-		}
+            return $options;
+        }
 
-		/**
-		 * Register the parent shortcode.
-		 *
-		 * @since 1.0.0
-		 */
-		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
-		}
+        /**
+         * Register the parent shortcode.
+         *
+         * @since 1.0.0
+         */
+        public function register_shortcode() {
+            add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
+            add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+        }
 
-		/**
-		 * Render the shortcode via ajax so we can return it to Gutenberg.
-		 *
-		 * @since 1.0.0
-		 */
-		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die();
-			}
+        /**
+         * Render the shortcode via ajax so we can return it to Gutenberg.
+         *
+         * @since 1.0.0
+         */
+        public function render_shortcode() {
+            check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die();
+            }
+
+            // we might need the $post value here so lets set it.
+            if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
+                $post_obj = get_post( absint( $_POST['post_id'] ) );
+                if ( ! empty( $post_obj ) && empty( $post ) ) {
+                    global $post;
+                    $post = $post_obj;
+                }
+            }
+
+            if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+                $is_preview = $this->is_preview();
+                $shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
+                $attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+                $attributes       = '';
+                if ( ! empty( $attributes_array ) ) {
+                    foreach ( $attributes_array as $key => $value ) {
+                        if ( is_array( $value ) ) {
+                            $value = implode( ",", $value );
+                        }
+
+                        if ( ! empty( $value ) ) {
+                            $value = wp_unslash( $value );
+
+                            // Encode [ and ].
+                            if ( $is_preview ) {
+                                $value = $this->encode_shortcodes( $value );
+                            }
+                        }
+                        $attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+                    }
+                }
 
-			// 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;
-				}
-			}
+                $shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
-				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
-				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
-						}
+                $content = do_shortcode( $shortcode );
 
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
+                // Decode [ and ].
+                if ( ! empty( $content ) && $is_preview ) {
+                    $content = $this->decode_shortcodes( $content );
+                }
 
-							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
-							}
-						}
-						$attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
-					}
-				}
+                echo $content;
+            }
+            wp_die();
+        }
 
-				$shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
+        /**
+         * Output the shortcode.
+         *
+         * @param array $args
+         * @param string $content
+         *
+         * @return string
+         */
+        public function shortcode_output( $args = array(), $content = '' ) {
+            $_instance = $args;
+
+            $args = $this->argument_values( $args );
+
+            // add extra argument so we know its a output to gutenberg
+            //$args
+            $args = $this->string_to_bool( $args );
+
+            // if we have a enclosed shortcode we add it to the special `html` argument
+            if ( ! empty( $content ) ) {
+                $args['html'] = $content;
+            }
+
+            if ( ! $this->is_preview() ) {
+                /**
+                 * Filters the settings for a particular widget args.
+                 *
+                 * @param array          $args      The current widget instance's settings.
+                 * @param WP_Super_Duper $widget    The current widget settings.
+                 * @param array          $_instance An array of default widget arguments.
+                 *
+                 *@since 1.0.28
+                 *
+                 */
+                $args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+
+                if ( ! is_array( $args ) ) {
+                    return $args;
+                }
+            }
+
+            $class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+            $class .= " sdel-".$this->get_instance_hash();
+
+            $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+            $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+
+            $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+
+            $shortcode_args = array();
+            $output         = '';
+            $no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+            if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+                $no_wrap = true;
+            }
+            $main_content = $this->output( $args, $shortcode_args, $content );
+            if ( $main_content && ! $no_wrap ) {
+                // wrap the shortcode in a div with the same class as the widget
+                $output .= '<div class="' . $class . '" ' . $attrs . '>';
+                if ( ! empty( $args['title'] ) ) {
+                    // if its a shortcode and there is a title try to grab the title wrappers
+                    $shortcode_args = array( 'before_title' => '', 'after_title' => '' );
+                    if ( empty( $instance ) ) {
+                        global $wp_registered_sidebars;
+                        if ( ! empty( $wp_registered_sidebars ) ) {
+                            foreach ( $wp_registered_sidebars as $sidebar ) {
+                                if ( ! empty( $sidebar['before_title'] ) ) {
+                                    $shortcode_args['before_title'] = $sidebar['before_title'];
+                                    $shortcode_args['after_title']  = $sidebar['after_title'];
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    $output .= $this->output_title( $shortcode_args, $args );
+                }
+                $output .= $main_content;
+                $output .= '</div>';
+            } elseif ( $main_content && $no_wrap ) {
+                $output .= $main_content;
+            }
+
+            // if preview show a placeholder if empty
+            if ( $this->is_preview() && $output == '' ) {
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+            }
+
+            return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+        }
 
-				$content = do_shortcode( $shortcode );
+        /**
+         * Placeholder text to show if output is empty and we are on a preview/builder page.
+         *
+         * @param string $name
+         *
+         * @return string
+         */
+        public function preview_placeholder_text( $name = '' ) {
+            return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
+        }
 
-				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
-				}
+        /**
+         * 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;
+                }
+            }
 
-				echo $content;
-			}
-			wp_die();
-		}
+            return $options;
+        }
 
-		/**
-		 * Output the shortcode.
-		 *
-		 * @param array $args
-		 * @param string $content
-		 *
-		 * @return string
-		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$_instance = $args;
-
-			$args = $this->argument_values( $args );
-
-			// add extra argument so we know its a output to gutenberg
-			//$args
-			$args = $this->string_to_bool( $args );
-
-			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
-				$args['html'] = $content;
-			}
+        /**
+         * Get the argument values that are also filterable.
+         *
+         * @param $instance
+         *
+         * @return array
+         *@since 1.0.12 Don't set checkbox default value if the value is empty.
+         *
+         */
+        public function argument_values( $instance ) {
+            $argument_values = array();
+
+            // set widget instance
+            $this->instance = $instance;
+
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->get_arguments();
+            }
+
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $key => $args ) {
+                    // set the input name from the key
+                    $args['name'] = $key;
+                    //
+                    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
+                    if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+                        // don't set default for an empty checkbox
+                    } elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+                        $argument_values[ $key ] = $args['default'];
+                    }
+                }
+            }
 
-			if ( ! $this->is_preview() ) {
-				/**
-				 * Filters the settings for a particular widget args.
-				 *
-				 * @param array          $args      The current widget instance's settings.
-				 * @param WP_Super_Duper $widget    The current widget settings.
-				 * @param array          $_instance An array of default widget arguments.
-				 *
-				 *@since 1.0.28
-				 *
-				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+            return $argument_values;
+        }
 
-				if ( ! is_array( $args ) ) {
-					return $args;
-				}
-			}
+        /**
+         * Set arguments in super duper.
+         *
+         * @return array Set arguments.
+         *@since 1.0.0
+         *
+         */
+        public function set_arguments() {
+            return $this->arguments;
+        }
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
+        /**
+         * Get arguments in super duper.
+         *
+         * @return array Get arguments.
+         *@since 1.0.0
+         *
+         */
+        public function get_arguments() {
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->set_arguments();
+            }
 
-			$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 );
+            $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
+            $this->arguments = $this->add_name_from_key( $this->arguments, true );
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+            return $this->arguments;
+        }
 
-			$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;
-			}
+        /**
+         * 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 = '' ) {
 
-			// 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 );
-		}
+        /**
+         * 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() );
+            }
+        }
 
-		/**
-		 * Placeholder text to show if output is empty and we are on a preview/builder page.
-		 *
-		 * @param string $name
-		 *
-		 * @return string
-		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
-		}
+        /**
+         * Check if we need to show advanced options.
+         *
+         * @return bool
+         */
+        public function block_show_advanced() {
 
-		/**
-		 * 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;
-				}
-			}
+            $show      = false;
+            $arguments = $this->get_arguments();
 
-			return $options;
-		}
+            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
+                    }
+                }
+            }
 
-		/**
-		 * Get the argument values that are also filterable.
-		 *
-		 * @param $instance
-		 *
-		 * @return array
-		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
-		 *
-		 */
-		public function argument_values( $instance ) {
-			$argument_values = array();
-
-			// set widget instance
-			$this->instance = $instance;
-
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->get_arguments();
-			}
+            return $show;
+        }
 
-			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'];
-					}
-				}
-			}
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+            $url = $this->url;
 
-			return $argument_values;
-		}
+            if ( ! $url ) {
+                $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+                $content_url = untrailingslashit( WP_CONTENT_URL );
 
-		/**
-		 * Set arguments in super duper.
-		 *
-		 * @return array Set arguments.
-		 *@since 1.0.0
-		 *
-		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
+                // Replace http:// to https://.
+                if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                    $content_url = str_replace( 'http://', 'https://', $content_url );
+                }
 
-		/**
-		 * Get arguments in super duper.
-		 *
-		 * @return array Get arguments.
-		 *@since 1.0.0
-		 *
-		 */
-		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->set_arguments();
-			}
+                // Check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+                $url = str_replace( $content_dir, $content_url, $file_dir );
+                $url = trailingslashit( $url );
+                $this->url = $url;
+            }
 
-			$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 $url;
+        }
 
-			return $this->arguments;
-		}
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url_old() {
 
-		/**
-		 * 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 = '' ) {
+            $url = $this->url;
 
-		}
+            if ( ! $url ) {
+                // check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
 
-		/**
-		 * 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() );
-			}
-		}
+                $dir_parts = explode( "/wp-content/", $file_dir );
+                $url_parts = explode( "/wp-content/", plugins_url() );
 
-		/**
-		 * Check if we need to show advanced options.
-		 *
-		 * @return bool
-		 */
-		public function block_show_advanced() {
-
-			$show      = false;
-			$arguments = $this->get_arguments();
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
-						$show = true;
-						break; // no need to continue if we know we have it
-					}
-				}
-			}
+                if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
+                    $url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+                    $this->url = $url;
+                }
+            }
 
-			return $show;
-		}
 
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-			$url = $this->url;
-
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
-
-				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
-				}
+            return $url;
+        }
 
-				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
-				$this->url = $url;
-			}
+        /**
+         * Generate the block icon.
+         *
+         * Enables the use of Font Awesome icons.
+         *
+         * @note xlink:href is actually deprecated but href is not supported by all so we use both.
+         *
+         * @param $icon
+         *
+         * @return string
+         *@since 1.1.0
+         */
+        public function get_block_icon( $icon ) {
+
+            // check if we have a Font Awesome icon
+            $fa_type = '';
+            if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+                $fa_type = 'solid';
+            } elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+                $fa_type = 'regular';
+            } elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+                $fa_type = 'brands';
+            } else {
+                $icon = "'" . $icon . "'";
+            }
+
+            // set the icon if we found one
+            if ( $fa_type ) {
+                $fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+                $icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
+            }
+
+            return $icon;
+        }
 
-			return $url;
-		}
+        public function group_arguments( $arguments ) {
+            if ( ! empty( $arguments ) ) {
+                $temp_arguments = array();
+                $general        = __( "General", 'ayecode-connect' );
+                $add_sections   = false;
+                foreach ( $arguments as $key => $args ) {
+                    if ( isset( $args['group'] ) ) {
+                        $temp_arguments[ $args['group'] ][ $key ] = $args;
+                        $add_sections                             = true;
+                    } else {
+                        $temp_arguments[ $general ][ $key ] = $args;
+                    }
+                }
 
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url_old() {
-
-			$url = $this->url;
-
-			if ( ! $url ) {
-				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
-
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
-
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
-					$this->url = $url;
-				}
-			}
-
-
-			return $url;
-		}
-
-		/**
-		 * Generate the block icon.
-		 *
-		 * Enables the use of Font Awesome icons.
-		 *
-		 * @note xlink:href is actually deprecated but href is not supported by all so we use both.
-		 *
-		 * @param $icon
-		 *
-		 * @return string
-		 *@since 1.1.0
-		 */
-		public function get_block_icon( $icon ) {
-
-			// check if we have a Font Awesome icon
-			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
-				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
-				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
-				$fa_type = 'brands';
-			} else {
-				$icon = "'" . $icon . "'";
-			}
-
-			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
-				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
-			}
-
-			return $icon;
-		}
+                // only add sections if more than one
+                if ( $add_sections ) {
+                    $arguments = $temp_arguments;
+                }
+            }
 
-		public function group_arguments( $arguments ) {
-			if ( ! empty( $arguments ) ) {
-				$temp_arguments = array();
-				$general        = __( "General", 'ayecode-connect' );
-				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
-						$add_sections                             = true;
-					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
-					}
-				}
+            return $arguments;
+        }
 
-				// only add sections if more than one
-				if ( $add_sections ) {
-					$arguments = $temp_arguments;
-				}
-			}
+        /**
+         * Parse used group tabs.
+         *
+         * @since 1.1.17
+         */
+        public function group_block_tabs( $tabs, $arguments ) {
+            if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+                $has_sections = false;
+
+                foreach ( $this->arguments as $key => $args ) {
+                    if ( isset( $args['group'] ) ) {
+                        $has_sections = true;
+                        break;
+                    }
+                }
 
-			return $arguments;
-		}
+                if ( ! $has_sections ) {
+                    return $tabs;
+                }
 
-		/**
-		 * Parse used group tabs.
-		 *
-		 * @since 1.1.17
-		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
-				$has_sections = false;
-
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$has_sections = true;
-						break;
-					}
-				}
+                $new_tabs = array();
 
-				if ( ! $has_sections ) {
-					return $tabs;
-				}
+                foreach ( $tabs as $tab_key => $tab ) {
+                    $new_groups = array();
 
-				$new_tabs = array();
+                    if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
+                        foreach ( $tab['groups'] as $group ) {
+                            if ( isset( $arguments[ $group ] ) ) {
+                                $new_groups[] = $group;
+                            }
+                        }
+                    }
 
-				foreach ( $tabs as $tab_key => $tab ) {
-					$new_groups = array();
+                    if ( ! empty( $new_groups ) ) {
+                        $tab['groups'] = $new_groups;
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
-								$new_groups[] = $group;
-							}
-						}
-					}
+                        $new_tabs[ $tab_key ] = $tab;
+                    }
+                }
 
-					if ( ! empty( $new_groups ) ) {
-						$tab['groups'] = $new_groups;
+                $tabs = $new_tabs;
+            }
 
-						$new_tabs[ $tab_key ] = $tab;
-					}
-				}
+            return $tabs;
+        }
 
-				$tabs = $new_tabs;
-			}
+        /**
+         * Output the JS for building the dynamic Guntenberg block.
+         *
+         * @return mixed
+         *@since 1.0.9 Save numbers as numbers and not strings.
+         * @since 1.1.0 Font Awesome classes can be used for icons.
+         * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
+         */
+        public function block() {
+            global $sd_is_js_functions_loaded, $aui_bs5;
 
-			return $tabs;
-		}
+            $show_advanced = $this->block_show_advanced();
 
-		/**
-		 * Output the JS for building the dynamic Guntenberg block.
-		 *
-		 * @return mixed
-		 *@since 1.0.9 Save numbers as numbers and not strings.
-		 * @since 1.1.0 Font Awesome classes can be used for icons.
-		 * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
-		 */
-		public function block() {
-			global $sd_is_js_functions_loaded, $aui_bs5;
-
-			$show_advanced = $this->block_show_advanced();
-
-			ob_start();
-			?>
+            ob_start();
+            ?>
 			<script>
 			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
-				$sd_is_js_functions_loaded = true;
-			?>
+            if ( ! $sd_is_js_functions_loaded ) {
+                $sd_is_js_functions_loaded = true;
+            ?>
 function sd_show_view_options($this){
 	if(jQuery($this).html().length){
 		jQuery($this).html('');
@@ -2244,8 +2244,8 @@ 
 				$classes = [];
 
 				<?php
-				if($aui_bs5){
-					?>
+                if($aui_bs5){
+                    ?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
 				$p_mr = 'me-';
@@ -2253,8 +2253,8 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
-						?>
+                }else{
+                        ?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
 				$p_mr = 'mr-';
@@ -2262,8 +2262,8 @@ 
 				$p_pl = 'pl-';
 				$p_pr = 'pr-';
 					<?php
-				}
-				?>
+                }
+                ?>
 
 				// margins
 				if ( $args['mt'] !== undefined && $args['mt'] !== '' ) { $classes.push( "mt-" + $args['mt'] );  $mt = $args['mt']; }else{$mt = null;}
@@ -2447,12 +2447,12 @@ 
 			<?php
 
 
-			}
+            }
 
-			if(method_exists($this,'block_global_js')){
-					echo $this->block_global_js();
-			}
-			?>
+            if(method_exists($this,'block_global_js')){
+                    echo $this->block_global_js();
+            }
+            ?>
 
 jQuery(function() {
 
@@ -2505,13 +2505,13 @@ 
 						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if(!isset($this->options['block-supports']['renaming'])){
-								$this->options['block-supports']['renaming'] = false;
-							}
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
-							}
-							?>
+                            if(!isset($this->options['block-supports']['renaming'])){
+                                $this->options['block-supports']['renaming'] = false;
+                            }
+                            if ( isset( $this->options['block-supports'] ) ) {
+                                echo $this->array_to_attributes( $this->options['block-supports'] );
+                            }
+                            ?>
 						},
 						__experimentalLabel( attributes, { context } ) {
 							var visibility_html = attributes && attributes.visibility_conditions ? ' &#128065;' : '';
@@ -2521,174 +2521,174 @@ 
 						},
 						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
 						<?php if ( isset( $this->options['block-keywords'] ) ) {
-						echo "keywords : " . $this->options['block-keywords'] . ",";
-						}
-
-
-						// block hover preview.
-						$example_args = array();
-						if(!empty($this->arguments)){
-							foreach($this->arguments as $key => $a_args){
-								if(isset($a_args['example'])){
-									$example_args[$key] = $a_args['example'];
-								}
-							}
-						}
-						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
-						$example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
-						if( isset( $this->options['example'] ) && $this->options['example'] === false ){
-							// no preview if set to false
-						}elseif( !empty( $example_args ) ){
-							echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-						}elseif( !empty( $this->options['example'] ) ){
-							unset($this->options['example']['viewportWidth']);
-							unset($this->options['example']['innerBlocks']);
-							$example_atts = $this->array_to_attributes( $this->options['example'] );
-							$example_parts = array();
-							if($example_atts){
-								$example_parts[] = rtrim($example_atts,",");
-							}
-							if($viewport_width){
-								$example_parts[] = $viewport_width;
-							}
-							if($example_inner_blocks){
-								$example_parts[] = $example_inner_blocks;
-							}
-							if(!empty($example_parts)){
-								echo "example : {".implode(',', $example_parts)."},";
-							}
-						}else{
-							echo 'example : {viewportWidth: 500},';
-						}
-
-
-
-						// limit to parent
-						if( !empty( $this->options['parent'] ) ){
-							echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
-						}
-
-						// limit allowed blocks
-						if( !empty( $this->options['allowed-blocks'] ) ){
-							echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
-						}
-
-						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
-							$no_wrap = true;
-						}
-						if ( $no_wrap ) {
-							$this->options['block-wrap'] = '';
-						}
-
-						// maybe load the drag/drop functions.
-						$img_drag_drop = false;
-
-						$show_alignment = false;
-						// align feature
-						/*echo "supports: {";
+                        echo "keywords : " . $this->options['block-keywords'] . ",";
+                        }
+
+
+                        // block hover preview.
+                        $example_args = array();
+                        if(!empty($this->arguments)){
+                            foreach($this->arguments as $key => $a_args){
+                                if(isset($a_args['example'])){
+                                    $example_args[$key] = $a_args['example'];
+                                }
+                            }
+                        }
+                        $viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
+                        $example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
+                        if( isset( $this->options['example'] ) && $this->options['example'] === false ){
+                            // no preview if set to false
+                        }elseif( !empty( $example_args ) ){
+                            echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
+                        }elseif( !empty( $this->options['example'] ) ){
+                            unset($this->options['example']['viewportWidth']);
+                            unset($this->options['example']['innerBlocks']);
+                            $example_atts = $this->array_to_attributes( $this->options['example'] );
+                            $example_parts = array();
+                            if($example_atts){
+                                $example_parts[] = rtrim($example_atts,",");
+                            }
+                            if($viewport_width){
+                                $example_parts[] = $viewport_width;
+                            }
+                            if($example_inner_blocks){
+                                $example_parts[] = $example_inner_blocks;
+                            }
+                            if(!empty($example_parts)){
+                                echo "example : {".implode(',', $example_parts)."},";
+                            }
+                        }else{
+                            echo 'example : {viewportWidth: 500},';
+                        }
+
+
+
+                        // limit to parent
+                        if( !empty( $this->options['parent'] ) ){
+                            echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
+                        }
+
+                        // limit allowed blocks
+                        if( !empty( $this->options['allowed-blocks'] ) ){
+                            echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
+                        }
+
+                        // maybe set no_wrap
+                        $no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+                        if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+                            $no_wrap = true;
+                        }
+                        if ( $no_wrap ) {
+                            $this->options['block-wrap'] = '';
+                        }
+
+                        // maybe load the drag/drop functions.
+                        $img_drag_drop = false;
+
+                        $show_alignment = false;
+                        // align feature
+                        /*echo "supports: {";
 						echo "	align: true,";
 						echo "  html: false";
 						echo "},";*/
 
 
-							echo "attributes : {";
-
-							if ( $show_advanced ) {
-								echo "show_advanced: {";
-								echo "	type: 'boolean',";
-								echo "  default: false,";
-								echo "},";
-							}
-
-							// block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
-								echo "block_wrap: {";
-								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
-								echo "},";
-							}
-
-
-							if ( ! empty( $this->arguments ) ) {
-
-								foreach ( $this->arguments as $key => $args ) {
-
-									if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
-										$img_drag_drop = true;
-									}
-
-									// set if we should show alignment
-									if ( $key == 'alignment' ) {
-										$show_alignment = true;
-									}
-
-									$extra = '';
-
-									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
-										continue;
-									}
-									elseif ( $args['type'] == 'checkbox' ) {
-										$type    = 'boolean';
-										$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-									} elseif ( $args['type'] == 'number' ) {
-										$type    = 'number';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
-										$type = 'array';
-										if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-											$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
-										} else {
-											$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-										}
-									} elseif ( $args['type'] == 'tagselect' ) {
-										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'multiselect' ) {
-										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image_xy' ) {
-										$type    = 'object';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image' ) {
-										$type    = 'string';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-
-										// add a field for ID
-	//                                    echo $key . "_id : {";
-	//                                    echo "type : 'number',";
-	//                                    echo "},";
-	//                                    echo $key . "_xy : {";
-	//                                    echo "type : 'object',";
-	//                                    echo "},";
-
-									} else {
-										$type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_type']) : 'string';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-
-									}
-									echo $key . " : {";
-									echo "type : '$type',";
-									echo "default : $default,";
-									echo "},";
-								}
-							}
-
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
-							echo "sd_shortcode : {type : 'string',default: ''},";
-
-							if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-								echo "sd_shortcode_close : {type : 'string',default: ''},";
-							}
-
-							echo "className: { type: 'string', default: '' },";
-
-							echo "},";
-
-
-
-						?>
+                            echo "attributes : {";
+
+                            if ( $show_advanced ) {
+                                echo "show_advanced: {";
+                                echo "	type: 'boolean',";
+                                echo "  default: false,";
+                                echo "},";
+                            }
+
+                            // block wrap element
+                            if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+                                echo "block_wrap: {";
+                                echo "	type: 'string',";
+                                echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+                                echo "},";
+                            }
+
+
+                            if ( ! empty( $this->arguments ) ) {
+
+                                foreach ( $this->arguments as $key => $args ) {
+
+                                    if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
+                                        $img_drag_drop = true;
+                                    }
+
+                                    // set if we should show alignment
+                                    if ( $key == 'alignment' ) {
+                                        $show_alignment = true;
+                                    }
+
+                                    $extra = '';
+
+                                    if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+                                        continue;
+                                    }
+                                    elseif ( $args['type'] == 'checkbox' ) {
+                                        $type    = 'boolean';
+                                        $default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
+                                    } elseif ( $args['type'] == 'number' ) {
+                                        $type    = 'number';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    } elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+                                        $type = 'array';
+                                        if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
+                                            $default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+                                        } else {
+                                            $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                        }
+                                    } elseif ( $args['type'] == 'tagselect' ) {
+                                        $type    = 'array';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    } elseif ( $args['type'] == 'multiselect' ) {
+                                        $type    = 'array';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    } elseif ( $args['type'] == 'image_xy' ) {
+                                        $type    = 'object';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                    } elseif ( $args['type'] == 'image' ) {
+                                        $type    = 'string';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+
+                                        // add a field for ID
+    //                                    echo $key . "_id : {";
+    //                                    echo "type : 'number',";
+    //                                    echo "},";
+    //                                    echo $key . "_xy : {";
+    //                                    echo "type : 'object',";
+    //                                    echo "},";
+
+                                    } else {
+                                        $type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_type']) : 'string';
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+
+                                    }
+                                    echo $key . " : {";
+                                    echo "type : '$type',";
+                                    echo "default : $default,";
+                                    echo "},";
+                                }
+                            }
+
+                            echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+                            echo "sd_shortcode : {type : 'string',default: ''},";
+
+                            if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+                                echo "sd_shortcode_close : {type : 'string',default: ''},";
+                            }
+
+                            echo "className: { type: 'string', default: '' },";
+
+                            echo "},";
+
+
+
+                        ?>
 
 						// The "edit" property must be a valid function.
 						edit: function (props) {
@@ -2763,10 +2763,10 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-raw'])) {
-								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
-							?>
+                            if(!empty($this->options['block-edit-raw'])) {
+                                echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
+                            }else{
+                            ?>
 
 function hasSelectedInnerBlock(props) {
 	const select = wp.data.select('core/editor');
@@ -2788,9 +2788,9 @@ 
 
 	var $value = '';
 	<?php
-	// if we have a post_type and a category then link them
-	if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
-	?>
+    // if we have a post_type and a category then link them
+    if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+    ?>
 	if(typeof(prev_attributes[props.clientId]) != 'undefined' && selectedBlock && selectedBlock.clientId === props.clientId){
 		$pt = props.attributes.post_type;
 		if(post_type_rest_slugs.length){
@@ -2803,11 +2803,11 @@ 
 			term_query_type = $pt;
 		}
 <?php
-	$cat_path = '';
-	if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
-		$cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
-		$cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
-	}
+    $cat_path = '';
+    if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
+        $cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
+        $cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
+    }
 ?>
 		/* taxonomies */
 		if($value && 'post_type' in prev_attributes[props.clientId] && 'category' in prev_attributes[props.clientId] && run){
@@ -2899,7 +2899,7 @@ 
 <?php
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
 if(!empty($current_screen->base) && $current_screen->base==='widgets'){
-	echo 'const { deviceType } = "";';
+    echo 'const { deviceType } = "";';
 }else{
 ?>
 /** Get device type const. */
@@ -2963,8 +2963,8 @@ 
 										'attributes': props.attributes,
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
-										echo $post->ID;
-									}else{echo '0';}?>,
+                                        echo $post->ID;
+                                    }else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -2978,20 +2978,20 @@ 
 										}
 
 										 <?php
-										if(!empty($this->options['nested-block'])){
-											?>
+                                        if(!empty($this->options['nested-block'])){
+                                            ?>
 											// props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 											 <?php
-										}else{
-										?>
+                                        }else{
+                                        ?>
 										props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 										<?php
-										}
-										?>
+                                        }
+                                        ?>
 
 
 										// if AUI is active call the js init function
@@ -3010,31 +3010,31 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-js'])) {
-								echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
-							}
+                            if(!empty($this->options['block-edit-js'])) {
+                                echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
+                            }
 
 
 
 
-							if(empty($this->options['block-save-return'])){
-							?>
+                            if(empty($this->options['block-save-return'])){
+                            ?>
 								///////////////////////////////////////////////////////////////////////
 
 									 // build the shortcode.
 								shortcode = "[<?php echo $this->options['base_id'];?>";
 								<?php
 
-								if(! empty( $this->arguments )){
+                                if(! empty( $this->arguments )){
 
-								foreach($this->arguments as $key => $args){
-								   // if($args['type']=='tabs'){continue;}
+                                foreach($this->arguments as $key => $args){
+                                    // if($args['type']=='tabs'){continue;}
 
-								   // don't add metadata arguments
-								   if (substr($key, 0, 9 ) === 'metadata_') {
-									   continue;
-								   }
-								?>
+                                    // don't add metadata arguments
+                                    if (substr($key, 0, 9 ) === 'metadata_') {
+                                        continue;
+                                    }
+                                ?>
 								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 									if ('<?php echo esc_attr( $key );?>' == 'html') {
 									} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
@@ -3045,10 +3045,10 @@ 
 									}
 								}
 								<?php
-								}
-								}
+                                }
+                                }
 
-								?>
+                                ?>
 								shortcode += "]";
 
 								if(shortcode){
@@ -3060,17 +3060,17 @@ 
 
 
 									<?php
-									if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-										echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
-									}
-									?>
+                                    if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+                                        echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
+                                    }
+                                    ?>
 								}
 
 
 							///////////////////////////////////////////////////////////////////////
 							<?php
-							} // end nested block check
-							?>
+                            } // end nested block check
+                            ?>
 
 							return [
 
@@ -3094,10 +3094,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'}
 										},
@@ -3114,119 +3114,119 @@ 
 									)
 									,
 									<?php
-									}
-
-									$arguments = $this->group_arguments( $this->arguments );
-									$block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
-
-									// Do we have sections?
-									$has_sections = $arguments == $this->arguments ? false : true;
-
-									if($has_sections){
-									$panel_count = 0;
-									$open_tab = '';
-
-									$open_tab_groups = array();
-									$used_tabs = array();
-
-									foreach ( $arguments as $key => $args ) {
-										$close_tab = false;
-										$close_tabs = false;
-
-										 if ( ! empty( $block_group_tabs ) ) {
-											foreach ( $block_group_tabs as $tab_name => $tab_args ) {
-												if ( in_array( $key, $tab_args['groups'] ) ) {
-													$open_tab_groups[] = $key;
-
-													if ( $open_tab != $tab_name ) {
-														$tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
-														$tab_args['tab']['open'] = true;
-
-														$this->block_tab_start( '', $tab_args );
-														$open_tab = $tab_name;
-														$used_tabs[] = $tab_name;
-													}
-
-													if ( $open_tab_groups == $tab_args['groups'] ) {
-														$close_tab = true;
-														$open_tab_groups = array();
-
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
-															$close_tabs = true;
-														}
-													}
-												}
-											}
-										}
-										?>
+                                    }
+
+                                    $arguments = $this->group_arguments( $this->arguments );
+                                    $block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
+
+                                    // Do we have sections?
+                                    $has_sections = $arguments == $this->arguments ? false : true;
+
+                                    if($has_sections){
+                                    $panel_count = 0;
+                                    $open_tab = '';
+
+                                    $open_tab_groups = array();
+                                    $used_tabs = array();
+
+                                    foreach ( $arguments as $key => $args ) {
+                                        $close_tab = false;
+                                        $close_tabs = false;
+
+                                            if ( ! empty( $block_group_tabs ) ) {
+                                            foreach ( $block_group_tabs as $tab_name => $tab_args ) {
+                                                if ( in_array( $key, $tab_args['groups'] ) ) {
+                                                    $open_tab_groups[] = $key;
+
+                                                    if ( $open_tab != $tab_name ) {
+                                                        $tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
+                                                        $tab_args['tab']['open'] = true;
+
+                                                        $this->block_tab_start( '', $tab_args );
+                                                        $open_tab = $tab_name;
+                                                        $used_tabs[] = $tab_name;
+                                                    }
+
+                                                    if ( $open_tab_groups == $tab_args['groups'] ) {
+                                                        $close_tab = true;
+                                                        $open_tab_groups = array();
+
+                                                        if ( $used_tabs == array_keys( $block_group_tabs ) ) {
+                                                            $close_tabs = true;
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        ?>
 										el(wp.components.PanelBody, {
 												title: '<?php esc_attr_e( $key ); ?>',
 												initialOpen: <?php if ( $panel_count ) {
-												echo "false";
-											} else {
-												echo "true";
-											}?>
+                                                echo "false";
+                                            } else {
+                                                echo "true";
+                                            }?>
 											},
 											<?php
-											foreach ( $args as $k => $a ) {
-												$this->block_tab_start( $k, $a );
-												$this->block_row_start( $k, $a );
-												$this->build_block_arguments( $k, $a );
-												$this->block_row_end( $k, $a );
-												$this->block_tab_end( $k, $a );
-											}
-											?>
+                                            foreach ( $args as $k => $a ) {
+                                                $this->block_tab_start( $k, $a );
+                                                $this->block_row_start( $k, $a );
+                                                $this->build_block_arguments( $k, $a );
+                                                $this->block_row_end( $k, $a );
+                                                $this->block_tab_end( $k, $a );
+                                            }
+                                            ?>
 										),
 										<?php
-										$panel_count ++;
+                                        $panel_count ++;
 
-										if($close_tab || $close_tabs){
-											$tab_args = array(
-												'tab'	=> array(
-													'tabs_close' => $close_tabs,
-												'close' => true,
-												)
+                                        if($close_tab || $close_tabs){
+                                            $tab_args = array(
+                                                'tab'	=> array(
+                                                    'tabs_close' => $close_tabs,
+                                                'close' => true,
+                                                )
 
-											);
-											$this->block_tab_end( '', $tab_args );
+                                            );
+                                            $this->block_tab_end( '', $tab_args );
 //											echo '###close'; print_r($tab_args);
-											$panel_count = 0;
-										}
+                                            $panel_count = 0;
+                                        }
 //
 
-									}
-									}else {
-									?>
+                                    }
+                                    }else {
+                                    ?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
-										}
-										?>
+                                        foreach ( $this->arguments as $key => $args ) {
+                                            $this->block_row_start( $key, $args );
+                                            $this->build_block_arguments( $key, $args );
+                                            $this->block_row_end( $key, $args );
+                                        }
+                                        ?>
 									),
 									<?php
-									}
+                                    }
 
-									}
-									?>
+                                    }
+                                    ?>
 
 								),
 
 								<?php
-								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
-								   echo $this->options['block-edit-return'];
-							}else{
-								// if no block-output is set then we try and get the shortcode html output via ajax.
-								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
-								?>
+                                // If the user sets block-output array then build it
+                                if ( ! empty( $this->options['block-output'] ) ) {
+                                $this->block_element( $this->options['block-output'] );
+                            }elseif(!empty($this->options['block-edit-return'])){
+                                    echo $this->options['block-edit-return'];
+                            }else{
+                                // if no block-output is set then we try and get the shortcode html output via ajax.
+                                $block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
+                                ?>
 								el('<?php echo esc_attr($block_edit_wrap_tag); ?>', wp.blockEditor.useBlockProps({
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
 									className: props.className,
@@ -3234,13 +3234,13 @@ 
 									style: {'minHeight': '30px'}
 								}))
 								<?php
-								}
-								?>
+                                }
+                                ?>
 							]; // end return
 
 							<?php
-							} // end block-edit-raw else
-							?>
+                            } // end block-edit-raw else
+                            ?>
 						},
 
 						// The "save" property must be specified and must be a valid function.
@@ -3254,16 +3254,16 @@ 
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+                            if(! empty( $this->arguments )){
 
-							foreach($this->arguments as $key => $args){
-							   // if($args['type']=='tabs'){continue;}
+                            foreach($this->arguments as $key => $args){
+                                // if($args['type']=='tabs'){continue;}
 
-							   // don't add metadata arguments
-							   if (substr($key, 0, 9 ) === 'metadata_') {
-								   continue;
-							   }
-							?>
+                                // don't add metadata arguments
+                                if (substr($key, 0, 9 ) === 'metadata_') {
+                                    continue;
+                                }
+                            ?>
 							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 								if ('<?php echo esc_attr( $key );?>' == 'html') {
 									$html = attr.<?php echo esc_attr( $key );?>;
@@ -3274,10 +3274,10 @@ 
 								}
 							}
 							<?php
-							}
-							}
+                            }
+                            }
 
-							?>
+                            ?>
 							content += "]";
 							 content = '';
 
@@ -3287,7 +3287,7 @@ 
 //                                $html = 'el( InnerBlocks.Content )';
 //                                <?php
 //                            }
-							?>
+                            ?>
 							// if has html element
 							if ($html) {
 								//content += $html + "[/<?php echo $this->options['base_id'];?>]";
@@ -3320,12 +3320,12 @@ 
 //                                <x?php
 //							}else
 
-							if(!empty($this->options['block-output'])){
+                            if(!empty($this->options['block-output'])){
 //                               echo "return";
 //                               $this->block_element( $this->options['block-output'], true );
 //                               echo ";";
 
-							   ?>
+                                ?>
 							  return el(
 								   '',
 								   {},
@@ -3335,10 +3335,10 @@ 
 							   );
 								<?php
 
-							}elseif(!empty($this->options['block-save-return'])){
-								   echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
-								?>
+                            }elseif(!empty($this->options['block-save-return'])){
+                                    echo 'return ' . $this->options['block-save-return'];
+                            }elseif(!empty($this->options['nested-block'])){
+                                ?>
 							  return el(
 								   '',
 								   {},
@@ -3347,22 +3347,22 @@ 
 								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
 							   );
 								<?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
-								echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
-							?>
+                            }elseif(!empty( $this->options['block-save-return'] ) ){
+                                echo "return ". $this->options['block-edit-return'].";";
+                            }elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+                            ?>
 							return content;
 							<?php
-							}else{
-							?>
+                            }else{
+                            ?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
 								block_wrap = attr.block_wrap;
 							}
 							return el(block_wrap, wp.blockEditor.useBlockProps.save( {dangerouslySetInnerHTML: {__html: content}, className: align} ));
 							<?php
-							}
-							?>
+                            }
+                            ?>
 
 
 						}
@@ -3376,43 +3376,43 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
 
 
-		public function block_row_start($key, $args){
+        public function block_row_start($key, $args){
 
-			// check for row
-			if(!empty($args['row'])){
+            // check for row
+            if(!empty($args['row'])){
 
-				if(!empty($args['row']['open'])){
+                if(!empty($args['row']['open'])){
 
-				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-				$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-				$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
-				$device_type_icon = '';
-				if($device_type=='Desktop'){
-					$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Tablet'){
-					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Mobile'){
-					$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}
-				echo $element_require;
-				echo $device_type_require;
+                // element require
+                $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+                $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
+                $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+                $device_type_icon = '';
+                if($device_type=='Desktop'){
+                    $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+                }elseif($device_type=='Tablet'){
+                    $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+                }elseif($device_type=='Mobile'){
+                    $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+                }
+                echo $element_require;
+                echo $device_type_require;
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
@@ -3425,8 +3425,8 @@ 
 								<?php if($device_type_icon){ ?>
 									deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
 								<?php
-								}
-								?>
+                                }
+                                ?>
 
 
 							),
@@ -3450,51 +3450,51 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+                    if(false){?></script><?php }
+                }elseif(!empty($args['row']['close'])){
+                    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+                    if(false){?></script><?php }
+                }else{
+                    if(false){?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0 pr-2 pe-2',
 							},
 					<?php
-					if(false){?></script><?php }
-				}
+                    if(false){?></script><?php }
+                }
 
-			}
+            }
 
-		}
+        }
 
-		public function block_row_end($key, $args){
+        public function block_row_end($key, $args){
 
-			if(!empty($args['row'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "))";
-				}
+            if(!empty($args['row'])){
+                // maybe close
+                if(!empty($args['row']['close'])){
+                    echo "))";
+                }
 
-				echo "),";
-			}
-		}
+                echo "),";
+            }
+        }
 
-		public function block_tab_start($key, $args){
+        public function block_tab_start($key, $args){
 
-			// check for row
-			if(!empty($args['tab'])){
+            // check for row
+            if(!empty($args['tab'])){
 
-				if(!empty($args['tab']['tabs_open'])){
+                if(!empty($args['tab']['tabs_open'])){
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 
 el('div',{className: 'bsui'},
 
@@ -3507,12 +3507,12 @@ 
 										tabs: [
 
 					<?php
-					if(false){?></script><?php }
-				}
+                    if(false){?></script><?php }
+                }
 
-				if(!empty($args['tab']['open'])){
+                if(!empty($args['tab']['open'])){
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 							{
 												name: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
 												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes( esc_attr( $args['tab']['title']) ); ?>'}}),
@@ -3521,93 +3521,93 @@ 
 									className: 'components-base-control__help mb-0',
 									dangerouslySetInnerHTML: {__html:'<?php echo addslashes( $args['tab']['desc'] ); ?>'}
 								}),<?php }
-					if(false){?></script><?php }
-				}
+                    if(false){?></script><?php }
+                }
 
-			}
+            }
 
-		}
+        }
 
-		public function block_tab_end($key, $args){
+        public function block_tab_end($key, $args){
 
-			if(!empty($args['tab'])){
-				// maybe close
-				if(!empty($args['tab']['close'])){
-					echo ")}, /* tab close */";
-				}
+            if(!empty($args['tab'])){
+                // maybe close
+                if(!empty($args['tab']['close'])){
+                    echo ")}, /* tab close */";
+                }
 
-				if(!empty($args['tab']['tabs_close'])){
-					if(false){?><script><?php }?>
+                if(!empty($args['tab']['tabs_close'])){
+                    if(false){?><script><?php }?>
 						]}, ( tab ) => {
 								return tab.content;
 							}
 						)), /* tabs close */
 					<?php if(false){ ?></script><?php }
-				}
-			}
-		}
-
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
-			$options           = '';
-			$extra             = '';
-			$require           = '';
-			$inside_elements   = '';
-			$after_elements	   = '';
-
-			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
-				return;
-			}
-
-			$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-			$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
-			$device_type_icon = '';
-			if($device_type=='Desktop'){
-				$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Tablet'){
-				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Mobile'){
-				$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}
-
-			// icon
-			$icon = '';
-			if( !empty( $args['icon'] ) ){
-				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
-									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
-								$icon .= "}),";
-
-				// blank title as its added to the icon.
-				$args['title'] = '';
-			}
-
-			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
-
-			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-
+                }
+            }
+        }
 
-			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
-			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','range' );
-			if ( in_array( $args['type'], $text_type ) ) {
-				$type = 'TextControl';
-				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
-					$onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
-				}
+        public function build_block_arguments( $key, $args ) {
+            $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+            $options           = '';
+            $extra             = '';
+            $require           = '';
+            $inside_elements   = '';
+            $after_elements	   = '';
+
+            // `content` is a protected and special argument
+            if ( $key == 'content' ) {
+                return;
+            }
+
+            $device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
+            $device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+            $device_type_icon = '';
+            if($device_type=='Desktop'){
+                $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+            }elseif($device_type=='Tablet'){
+                $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+            }elseif($device_type=='Mobile'){
+                $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
+            }
+
+            // icon
+            $icon = '';
+            if( !empty( $args['icon'] ) ){
+                $icon .= "el('div', {";
+                                    $icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+                                    $icon .= "className: 'text-center',";
+                                    $icon .= "title: '".addslashes( $args['title'] )."',";
+                                $icon .= "}),";
+
+                // blank title as its added to the icon.
+                $args['title'] = '';
+            }
+
+            // require advanced
+            $require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+
+            // element require
+            $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+
+
+            $onchange  = "props.setAttributes({ $key: $key } )";
+            $onchangecomplete  = "";
+            $value     = "props.attributes.$key";
+            $text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','range' );
+            if ( in_array( $args['type'], $text_type ) ) {
+                $type = 'TextControl';
+                // Save numbers as numbers and not strings
+                if ( $args['type'] == 'number' ) {
+                    $onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
+                }
 
-				if (substr($key, 0, 9 ) === 'metadata_') {
-					$real_key = str_replace('metadata_','', $key );
-					$onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
-					$value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
-				}
-			}
+                if (substr($key, 0, 9 ) === 'metadata_') {
+                    $real_key = str_replace('metadata_','', $key );
+                    $onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
+                    $value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
+                }
+            }
 //			else if ( $args['type'] == 'popup' ) {
 //				$type = 'TextControl';
 //				$args['type'] == 'text';
@@ -3625,21 +3625,21 @@ 
 //
 //				$value     = "props.attributes.$key ? props.attributes.$key : ''";
 //			}
-			else if ( $args['type'] == 'styleid' ) {
-				$type = 'TextControl';
-				$args['type'] == 'text';
-				// Save numbers as numbers and not strings
-				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
-
-				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
-				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
-
-				$notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
-				echo $notice_message ? $element_require . $notice : '';
-				return;
-			}
-			/*
+            else if ( $args['type'] == 'styleid' ) {
+                $type = 'TextControl';
+                $args['type'] == 'text';
+                // Save numbers as numbers and not strings
+                $value     = "props.attributes.$key ? props.attributes.$key : ''";
+            }else if ( $args['type'] == 'notice' ) {
+
+                $notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
+                $notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
+
+                $notice = "el('div',{className:'bsui'},el(wp.components.Notice, {status: '$notice_status',isDismissible: false,className: 'm-0 pr-0 pe-0 mb-3'},el('div',{dangerouslySetInnerHTML: {__html: '$notice_message'}}))),";
+                echo $notice_message ? $element_require . $notice : '';
+                return;
+            }
+            /*
 			 * https://www.wptricks.com/question/set-current-tab-on-a-gutenberg-tabpanel-component-from-outside-that-component/ es5 layout
 						elseif($args['type']=='tabs'){
 							?>
@@ -3692,22 +3692,22 @@ 
 							return;
 						}
 */
-			elseif ( $args['type'] == 'color' ) {
-				$type = 'ColorPicker';
-				$onchange = "";
-				$extra = "color: $value,";
-				if(!empty($args['disable_alpha'])){
-					$extra .= "disableAlpha: true,";
-				}
-				$onchangecomplete = "onChangeComplete: function($key) {
+            elseif ( $args['type'] == 'color' ) {
+                $type = 'ColorPicker';
+                $onchange = "";
+                $extra = "color: $value,";
+                if(!empty($args['disable_alpha'])){
+                    $extra .= "disableAlpha: true,";
+                }
+                $onchangecomplete = "onChangeComplete: function($key) {
 				value =  $key.rgb.a && $key.rgb.a < 1 ? \"rgba(\"+$key.rgb.r+\",\"+$key.rgb.g+\",\"+$key.rgb.b+\",\"+$key.rgb.a+\")\" : $key.hex;
 						props.setAttributes({
 							$key: value
 						});
 					},";
-			}elseif ( $args['type'] == 'gradient' ) {
-				$type = 'GradientPicker';
-				$extra .= "gradients: [{
+            }elseif ( $args['type'] == 'gradient' ) {
+                $type = 'GradientPicker';
+                $extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
 			gradient:
 				'linear-gradient(135deg,rgba(6,147,227,1) 0%,rgb(155,81,224) 100%)',
@@ -3744,10 +3744,10 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
+            }elseif ( $args['type'] == 'image' ) {
 //                print_r($args);
 
-				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
+                $img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
 							url:  props.attributes.{$key}_use_featured === true ? 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiID8+CjxzdmcgYmFzZVByb2ZpbGU9InRpbnkiIGhlaWdodD0iNDAwIiB2ZXJzaW9uPSIxLjIiIHdpZHRoPSI0MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6ZXY9Imh0dHA6Ly93d3cudzMub3JnLzIwMDEveG1sLWV2ZW50cyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzIC8+PHJlY3QgZmlsbD0iI2QzZDNkMyIgaGVpZ2h0PSI0MDAiIHdpZHRoPSI0MDAiIHg9IjAiIHk9IjAiIC8+PGxpbmUgc3Ryb2tlPSJ3aGl0ZSIgc3Ryb2tlLXdpZHRoPSIxMCIgeDE9IjAiIHgyPSI0MDAiIHkxPSIwIiB5Mj0iNDAwIiAvPjxsaW5lIHN0cm9rZT0id2hpdGUiIHN0cm9rZS13aWR0aD0iMTAiIHgxPSIwIiB4Mj0iNDAwIiB5MT0iNDAwIiB5Mj0iMCIgLz48cmVjdCBmaWxsPSIjZDNkM2QzIiBoZWlnaHQ9IjUwIiB3aWR0aD0iMjE4LjAiIHg9IjkxLjAiIHk9IjE3NS4wIiAvPjx0ZXh0IGZpbGw9IndoaXRlIiBmb250LXNpemU9IjMwIiBmb250LXdlaWdodD0iYm9sZCIgdGV4dC1hbmNob3I9Im1pZGRsZSIgeD0iMjAwLjAiIHk9IjIwNy41Ij5QTEFDRUhPTERFUjwvdGV4dD48L3N2Zz4='  : props.attributes.$key,
 							value: props.attributes.{$key}_xy.x !== undefined && props.attributes.{$key}_xy.x >= 0 ? props.attributes.{$key}_xy  : {x: 0.5,y: 0.5,},
 //                            value: props.attributes.{$key}_xy,
@@ -3768,16 +3768,16 @@ 
 						}), ";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+                $value = '""';
+                $type = 'MediaUpload';
+                $extra .= "onSelect: function(media){
 					  return props.setAttributes({
 						  $key: media.url,
 						  {$key}_id: media.id
 						});
 					  },";
-				   $extra .= "type: 'image',";
-				   $extra .= "render: function (obj) {
+                    $extra .= "type: 'image',";
+                    $extra .= "render: function (obj) {
 						return el( 'div',{},
 						( !props.attributes.$key && !props.attributes.{$key}_use_featured ) && el( wp.components.Button, {
 						  className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
@@ -3803,11 +3803,11 @@ 
 
 
 					  }";
-				$onchange = "";
+                $onchange = "";
 
-				//$inside_elements = ",el('div',{},'file upload')";
-			} else if ( $args['type'] == 'images' ) {
-				$img_preview = "props.attributes.$key && (function() {
+                //$inside_elements = ",el('div',{},'file upload')";
+            } else if ( $args['type'] == 'images' ) {
+                $img_preview = "props.attributes.$key && (function() {
 	let uploads = JSON.parse('['+props.attributes.$key+']');
 	let images = [];
 	uploads.map((upload, index) => (
@@ -3834,9 +3834,9 @@ 
 })(),";
 
 
-				$value = '""';
-				$type = 'MediaUpload';
-				$extra .= "onSelect: function(media){
+                $value = '""';
+                $type = 'MediaUpload';
+                $extra .= "onSelect: function(media){
 	let slim_images = props.attributes.$key ? JSON.parse('['+props.attributes.$key+']') : [];
 	if(media.length){
 		for (var i=0; i < media.length; i++) {
@@ -3849,9 +3849,9 @@ 
 	}
 	return props.setAttributes({ $key: slimImagesV});
 },";
-				$extra .= "type: 'image',";
-				$extra .= "multiple: true,";
-				$extra .= "render: function (obj) {
+                $extra .= "type: 'image',";
+                $extra .= "multiple: true,";
+                $extra .= "render: function (obj) {
 	/* Init the sort */
 	enableDragSort('sd-sortable');
 	return el( 'div',{},
@@ -3878,40 +3878,40 @@ 
 		)
 	)
 }";
-				$onchange = "";
-
-				//$inside_elements = ",el('div',{},'file upload')";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
-				$type = 'CheckboxControl';
-				$extra .= "checked: props.attributes.$key,";
-				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
-				$type = 'TextareaControl';
-
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
-				$type = 'SelectControl';
-
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
-
-					if ( ! empty( $args['options'] ) ) {
-						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . esc_js( addslashes( $option_label ) ) . "' },";
-						}
-						$options .= "],";
-					}
-				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
-					$extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px","overflow-y":"auto"}, ';
-				}
+                $onchange = "";
+
+                //$inside_elements = ",el('div',{},'file upload')";
+            }
+            elseif ( $args['type'] == 'checkbox' ) {
+                $type = 'CheckboxControl';
+                $extra .= "checked: props.attributes.$key,";
+                $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
+            } elseif ( $args['type'] == 'textarea' ) {
+                $type = 'TextareaControl';
+
+            } elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+                $type = 'SelectControl';
+
+                if($args['name'] == 'category' && !empty($args['post_type_linked'])){
+                    $options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
+                }elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
+                    $options .= "options: sort_by_".str_replace("-","_", $this->id).",";
+                }else {
+
+                    if ( ! empty( $args['options'] ) ) {
+                        $options .= "options: [";
+                        foreach ( $args['options'] as $option_val => $option_label ) {
+                            $options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . esc_js( addslashes( $option_label ) ) . "' },";
+                        }
+                        $options .= "],";
+                    }
+                }
+                if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+                    $extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px","overflow-y":"auto"}, ';
+                }
 
-				if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
-					$after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
+                if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
+                    $after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
 									  className: 'components-button components-circular-option-picker__clear is-secondary is-small',
 									  style: {margin:'-8px 0 8px 0',display: 'block'},
 									  onClick: function(){
@@ -3922,8 +3922,8 @@ 
 									},
 									'Clear'
 							),";
-				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+                }
+            } elseif ( $args['type'] == 'tagselect' ) {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3958,20 +3958,20 @@ 
 //				$value     = "[]";
 //				$extra .= ' __experimentalExpandOnFocus: true,';
 
-			} else if ( $args['type'] == 'alignment' ) {
-				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			} else if ( $args['type'] == 'margins' ) {
-
-			} else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
-				$type = 'TextControl';
-				$value = "(props.attributes.$key ? props.attributes.$key : '')";
-				$args['type'] = 'text';
-				$options .= 'disabled:true,';
-				$bsvc_title = esc_attr( addslashes( $args['title'] ) );
-				$bsvc_body = $this->block_visibility_fields( $args );
-				// @TODO reset button
-				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
-				$after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
+            } else if ( $args['type'] == 'alignment' ) {
+                $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
+            } else if ( $args['type'] == 'margins' ) {
+
+            } else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
+                $type = 'TextControl';
+                $value = "(props.attributes.$key ? props.attributes.$key : '')";
+                $args['type'] = 'text';
+                $options .= 'disabled:true,';
+                $bsvc_title = esc_attr( addslashes( $args['title'] ) );
+                $bsvc_body = $this->block_visibility_fields( $args );
+                // @TODO reset button
+                $bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
+                $after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
 						className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
 						onClick: function() {
 							var sValue = props.attributes." . $key . ";
@@ -3997,39 +3997,39 @@ 
 					},
 					'" . addslashes( ! empty( $args['button_title'] ) ? $args['button_title'] : $args['title'] ) . "'
 				) ),";
-			} else {
-				return;// if we have not implemented the control then don't break the JS.
-			}
-
-			// color input does not show the labels so we add them
-			if($args['type']=='color'){
-				// add show only if advanced
-				echo $require_advanced;
-				// add setting require if defined
-				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
-			}
-
-			// add show only if advanced
-			echo $require_advanced;
-			// add setting require if defined
-			echo $element_require;
-			echo $device_type_require;
-
-			// icon
-			echo $icon;
-			?>
+            } else {
+                return;// if we have not implemented the control then don't break the JS.
+            }
+
+            // color input does not show the labels so we add them
+            if($args['type']=='color'){
+                // add show only if advanced
+                echo $require_advanced;
+                // add setting require if defined
+                echo $element_require;
+                echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+            }
+
+            // add show only if advanced
+            echo $require_advanced;
+            // add setting require if defined
+            echo $element_require;
+            echo $device_type_require;
+
+            // icon
+            echo $icon;
+            ?>
 			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
 			label: <?php if ( empty( $args['title'] ) ) { echo "''"; } else if ( empty( $args['row'] ) && ! empty( $args['device_type'] ) ) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['title'] ) ?>'}}),<?php if ( $device_type_icon ) { ?>deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
-			} else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
+            } else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
 			help: <?php echo ( isset( $args['desc'] ) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim( wp_kses_post( addslashes( $args['desc'] ) ) ) . "'}})" : "''" ); ?>,
 			value: <?php echo $value; ?>,
 			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
-			} ?>
+                echo "type: '" . addslashes( $args['type'] ) . "',";
+            } ?>
 			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
-			} ?>
+                echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
+            } ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
@@ -4041,1266 +4041,1266 @@ 
 			<?php } ?>
 		} <?php echo $inside_elements; ?> ),
 			<?php
-			echo $after_elements;
-		}
+            echo $after_elements;
+        }
 
-		/**
-		 * Convert an array of attributes to block string.
-		 *
-		 * @param $custom_attributes
-		 *
-		 * @return string
-		 *@todo there is prob a faster way to do this, also we could add some validation here.
-		 *
-		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
-			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
-
-				foreach ( $custom_attributes as $key => $val ) {
-					if(is_array($val)){
-						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
-						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
-					}
-				}
+        /**
+         * Convert an array of attributes to block string.
+         *
+         * @param $custom_attributes
+         *
+         * @return string
+         *@todo there is prob a faster way to do this, also we could add some validation here.
+         *
+         */
+        public function array_to_attributes( $custom_attributes, $html = false ) {
+            $attributes = '';
+            if ( ! empty( $custom_attributes ) ) {
+
+                foreach ( $custom_attributes as $key => $val ) {
+                    if(is_array($val)){
+                        $attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
+                    }else{
+                        $attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
+                    }
+                }
 
-			}
+            }
 
-			return $attributes;
-		}
+            return $attributes;
+        }
 
 
 
-		/**
-		 * A self looping function to create the output for JS block elements.
-		 *
-		 * This is what is output in the WP Editor visual view.
-		 *
-		 * @param $args
-		 */
-		public function block_element( $args, $save = false ) {
+        /**
+         * A self looping function to create the output for JS block elements.
+         *
+         * This is what is output in the WP Editor visual view.
+         *
+         * @param $args
+         */
+        public function block_element( $args, $save = false ) {
 
 //            print_r($args);echo '###';exit;
 
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+            if ( ! empty( $args ) ) {
+                foreach ( $args as $element => $new_args ) {
 
-					if ( is_array( $new_args ) ) { // its an element
+                    if ( is_array( $new_args ) ) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+                        if ( isset( $new_args['element'] ) ) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
-										"'+",
-										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
-							}
+                            if ( isset( $new_args['element_require'] ) ) {
+                                echo str_replace( array(
+                                        "'+",
+                                        "+'"
+                                    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+                                unset( $new_args['element_require'] );
+                            }
 
-							if($new_args['element']=='InnerBlocks'){
-								echo "\n el( InnerBlocks, {";
-							}elseif($new_args['element']=='innerBlocksProps'){
-								$element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
-							  //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
+                            if($new_args['element']=='InnerBlocks'){
+                                echo "\n el( InnerBlocks, {";
+                            }elseif($new_args['element']=='innerBlocksProps'){
+                                $element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
+                                //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
-								echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
-								echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
-
-								echo "} ), {";
-								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
-							//    echo '###';
-
-							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
-
-								if ( isset($new_args['if_inner_element']) ) {
-									$element = $new_args['if_inner_element'];
-								}else {
-									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
-								}
-
-								unset($new_args['inner_element']);
-								echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
-
-
-							   // echo "} ),";
-
-							}else{
-								echo "\n el( '" . $new_args['element'] . "', {";
-							}
-
-
-							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
-
-
-								if ( $new_key == 'element' || $new_key == 'content'|| $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
-									// do nothing
-								} else {
-									echo $this->block_element( array( $new_key => $new_value ),$save );
-								}
-							}
-
-							echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
-
-							// get the content
-							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
-
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
-										echo  $this->block_props_replace(  $new_value  );
-									}
-
-									if ( is_array( $new_value ) ) {
-
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
-													"'+",
-													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
-										}
-
-										if ( isset( $new_value['element_repeat'] ) ) {
-											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ),$save );
-												$x ++;
-											}
-										} else {
-											$this->block_element( array( '' => $new_value ),$save );
-										}
-									}
-									$first_item ++;
-								}
-							}
-
-							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
-								echo "))";// end content
-							}else{
-								echo ")";// end content
-							}
-
-
-							echo ", \n";
-
-						}
-					} else {
-
-						if ( substr( $element, 0, 3 ) === "if_" ) {
-							$extra = '';
-							if( strpos($new_args, '[%WrapClass%]') !== false ){
-								$new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
-								$new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
-							}
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
-							$new_args = str_replace('[%WrapStyle%]','',$new_args);
-							echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
+                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
+                                echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
+                                echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+
+                                echo "} ), {";
+                                echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
+                            //    echo '###';
+
+                                //  echo '###';
+                            }elseif($new_args['element']=='BlocksProps'){
+
+                                if ( isset($new_args['if_inner_element']) ) {
+                                    $element = $new_args['if_inner_element'];
+                                }else {
+                                    $element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
+                                }
+
+                                unset($new_args['inner_element']);
+                                echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
+                                echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+
+
+                                // echo "} ),";
+
+                            }else{
+                                echo "\n el( '" . $new_args['element'] . "', {";
+                            }
+
+
+                            // get the attributes
+                            foreach ( $new_args as $new_key => $new_value ) {
+
+
+                                if ( $new_key == 'element' || $new_key == 'content'|| $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+                                    // do nothing
+                                } else {
+                                    echo $this->block_element( array( $new_key => $new_value ),$save );
+                                }
+                            }
+
+                            echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
+
+                            // get the content
+                            $first_item = 0;
+                            foreach ( $new_args as $new_key => $new_value ) {
+                                if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
+
+                                    if ( $new_key === 'content' ) {
+                                        echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+                                    }else if ( $new_key === 'if_content' ) {
+                                        echo  $this->block_props_replace(  $new_value  );
+                                    }
+
+                                    if ( is_array( $new_value ) ) {
+
+                                        if ( isset( $new_value['element_require'] ) ) {
+                                            echo str_replace( array(
+                                                    "'+",
+                                                    "+'"
+                                                ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
+                                            unset( $new_value['element_require'] );
+                                        }
+
+                                        if ( isset( $new_value['element_repeat'] ) ) {
+                                            $x = 1;
+                                            while ( $x <= absint( $new_value['element_repeat'] ) ) {
+                                                $this->block_element( array( '' => $new_value ),$save );
+                                                $x ++;
+                                            }
+                                        } else {
+                                            $this->block_element( array( '' => $new_value ),$save );
+                                        }
+                                    }
+                                    $first_item ++;
+                                }
+                            }
+
+                            if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
+                                echo "))";// end content
+                            }else{
+                                echo ")";// end content
+                            }
+
+
+                            echo ", \n";
+
+                        }
+                    } else {
+
+                        if ( substr( $element, 0, 3 ) === "if_" ) {
+                            $extra = '';
+                            if( strpos($new_args, '[%WrapClass%]') !== false ){
+                                $new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
+                                $new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
+                            }
+                            echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
+                        } elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
+                            $new_args = str_replace('[%WrapStyle%]','',$new_args);
+                            echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
 //                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
-							$new_args = str_replace('[%WrapClass%]','',$new_args);
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
-						} elseif ( $element == 'template' && $new_args ) {
-							echo $element . ": $new_args,";
-						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
-						}
-
-					}
-				}
-			}
-		}
-
-		/**
-		 * Replace block attributes placeholders with the proper naming.
-		 *
-		 * @param $string
-		 *
-		 * @return mixed
-		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
-			} else {
-				$string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
-			}
-
-			return $string;
-		}
-
-		/**
-		 * Outputs the content of the widget
-		 *
-		 * @param array $args
-		 * @param array $instance
-		 */
-		public function widget( $args, $instance ) {
-			if ( ! is_array( $args ) ) {
-				$args = array();
-			}
-
-			// Get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
-
-			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
-				$no_wrap = true;
-			}
-
-			ob_start();
-			if ( $output && ! $no_wrap ) {
-
-				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
-
-				// Before widget
-				$before_widget = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
-				$before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $before_widget;
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
-
-				// After widget
-				$after_widget = ! empty( $args['after_widget'] ) ? $args['after_widget'] : '';
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
-
-				echo $before_widget;
-				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
-					// Filter class & attrs for elementor widget output.
-					$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-					$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
-
-					$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-					$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
-
-					echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
-				}
-				echo $this->output_title( $args, $instance );
-				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
-					echo "</span>";
-				}
-				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-				echo $output;
-			} elseif ( $output && $no_wrap ) {
-				echo $output;
-			}
-			$output = ob_get_clean();
-
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+                        } elseif ( $element == 'style' ) {
+                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+                        } elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
+                            $new_args = str_replace('[%WrapClass%]','',$new_args);
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
+                        } elseif ( $element == 'template' && $new_args ) {
+                            echo $element . ": $new_args,";
+                        } else {
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+                        }
+
+                    }
+                }
+            }
+        }
 
-			echo $output;
-		}
+        /**
+         * Replace block attributes placeholders with the proper naming.
+         *
+         * @param $string
+         *
+         * @return mixed
+         */
+        public function block_props_replace( $string, $no_wrap = false ) {
+            if ( $no_wrap ) {
+                $string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
+            } else {
+                $string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
+            }
+
+            return $string;
+        }
 
-		/**
-		 * Tests if the current output is inside a elementor container.
-		 *
-		 * @return bool
-		 *@since 1.0.4
-		 */
-		public function is_elementor_widget_output() {
-			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
-				$result = true;
-			}
+        /**
+         * Outputs the content of the widget
+         *
+         * @param array $args
+         * @param array $instance
+         */
+        public function widget( $args, $instance ) {
+            if ( ! is_array( $args ) ) {
+                $args = array();
+            }
+
+            // Get the filtered values
+            $argument_values = $this->argument_values( $instance );
+            $argument_values = $this->string_to_bool( $argument_values );
+            $output          = $this->output( $argument_values, $args );
+
+            $no_wrap = false;
+            if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+                $no_wrap = true;
+            }
+
+            ob_start();
+            if ( $output && ! $no_wrap ) {
+
+                $class_original = $this->options['widget_ops']['classname'];
+                $class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+
+                // Before widget
+                $before_widget = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
+                $before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $before_widget;
+                $before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
+                $before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+
+                // After widget
+                $after_widget = ! empty( $args['after_widget'] ) ? $args['after_widget'] : '';
+                $after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
+                $after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+
+                echo $before_widget;
+                // elementor strips the widget wrapping div so we check for and add it back if needed
+                if ( $this->is_elementor_widget_output() ) {
+                    // Filter class & attrs for elementor widget output.
+                    $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
+                    $class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+
+                    $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+                    $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+
+                    echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
+                }
+                echo $this->output_title( $args, $instance );
+                echo $output;
+                if ( $this->is_elementor_widget_output() ) {
+                    echo "</span>";
+                }
+                echo $after_widget;
+            } elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+                echo $output;
+            } elseif ( $output && $no_wrap ) {
+                echo $output;
+            }
+            $output = ob_get_clean();
+
+            $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+
+            echo $output;
+        }
 
-			return $result;
-		}
+        /**
+         * Tests if the current output is inside a elementor container.
+         *
+         * @return bool
+         *@since 1.0.4
+         */
+        public function is_elementor_widget_output() {
+            $result = false;
+            if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+                $result = true;
+            }
 
-		/**
-		 * Tests if the current output is inside a elementor preview.
-		 *
-		 * @return bool
-		 *@since 1.0.4
-		 */
-		public function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Tests if the current output is inside a elementor preview.
+         *
+         * @return bool
+         *@since 1.0.4
+         */
+        public function is_elementor_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+                $result = true;
+            }
 
-		/**
-		 * Tests if the current output is inside a Divi preview.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		public function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Tests if the current output is inside a Divi preview.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        public function is_divi_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+                $result = true;
+            }
 
-		/**
-		 * Tests if the current output is inside a Beaver builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		public function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Tests if the current output is inside a Beaver builder preview.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        public function is_beaver_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['fl_builder'] ) ) {
+                $result = true;
+            }
 
-		/**
-		 * Tests if the current output is inside a siteorigin builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		public function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Tests if the current output is inside a siteorigin builder preview.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        public function is_siteorigin_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+                $result = true;
+            }
 
-		/**
-		 * Tests if the current output is inside a cornerstone builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.8
-		 */
-		public function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Tests if the current output is inside a cornerstone builder preview.
+         *
+         * @return bool
+         *@since 1.0.8
+         */
+        public function is_cornerstone_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+                $result = true;
+            }
 
-		/**
-		 * Tests if the current output is inside a fusion builder preview.
-		 *
-		 * @return bool
-		 *@since 1.1.0
-		 */
-		public function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Tests if the current output is inside a fusion builder preview.
+         *
+         * @return bool
+         *@since 1.1.0
+         */
+        public function is_fusion_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+                $result = true;
+            }
 
-		/**
-		 * Tests if the current output is inside a Oxygen builder preview.
-		 *
-		 * @return bool
-		 *@since 1.0.18
-		 */
-		public function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Tests if the current output is inside a Oxygen builder preview.
+         *
+         * @return bool
+         *@since 1.0.18
+         */
+        public function is_oxygen_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+                $result = true;
+            }
 
-		/**
-		 * Check for Kallyas theme Zion builder preview.
-		 *
-		 * @since 1.1.22
-		 *
-		 * @return bool True when preview page otherwise false.
-		 */
-		public function is_kallyas_zion_preview() {
-			$result = false;
-
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Check for Kallyas theme Zion builder preview.
+         *
+         * @since 1.1.22
+         *
+         * @return bool True when preview page otherwise false.
+         */
+        public function is_kallyas_zion_preview() {
+            $result = false;
 
-		/**
-		 * Check for Bricks theme builder preview.
-		 *
-		 * @since 1.1.31
-		 *
-		 * @return bool True when preview page otherwise false.
-		 */
-		public function is_bricks_preview() {
-			$result = false;
-
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$result = true;
-			}
+            if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            return $result;
+        }
 
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @return bool
-		 *@since 1.0.6
-		 */
-		public function is_preview() {
-			$preview = false;
-			if ( $this->is_divi_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
-				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
-				$preview = true;
-			} elseif( $this->is_kallyas_zion_preview() ) {
-				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
-				$preview = true;
-			} elseif( $this->is_bricks_preview() ) {
-				$preview = true;
-			}
+        /**
+         * Check for Bricks theme builder preview.
+         *
+         * @since 1.1.31
+         *
+         * @return bool True when preview page otherwise false.
+         */
+        public function is_bricks_preview() {
+            $result = false;
 
-			return $preview;
-		}
+            if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+                $result = true;
+            }
 
-		/**
-		 * Output the super title.
-		 *
-		 * @param $args
-		 * @param array $instance
-		 *
-		 * @return string
-		 */
-		public function output_title( $args, $instance = array() ) {
-			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
-				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-
-				if ( empty( $instance['widget_title_tag'] ) ) {
-					if ( ! isset( $args['before_title'] ) ) {
-						$args['before_title'] = '';
-					}
+            return $result;
+        }
 
-					if ( ! isset( $args['after_title'] ) ) {
-						$args['after_title'] = '';
-					}
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @return bool
+         *@since 1.0.6
+         */
+        public function is_preview() {
+            $preview = false;
+            if ( $this->is_divi_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_elementor_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_beaver_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_siteorigin_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_cornerstone_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_fusion_preview() ) {
+                $preview = true;
+            } elseif ( $this->is_oxygen_preview() ) {
+                $preview = true;
+            } elseif( $this->is_kallyas_zion_preview() ) {
+                $preview = true;
+            } elseif( $this->is_block_content_call() ) {
+                $preview = true;
+            } elseif( $this->is_bricks_preview() ) {
+                $preview = true;
+            }
+
+            return $preview;
+        }
 
-					$output = $args['before_title'] . $title . $args['after_title'];
-				} else {
-					$tag 			= esc_attr( $instance['widget_title_tag'] );
-					$allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
-					$title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
-
-					// 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>";
-				}
+        /**
+         * Output the super title.
+         *
+         * @param $args
+         * @param array $instance
+         *
+         * @return string
+         */
+        public function output_title( $args, $instance = array() ) {
+            $output = '';
+            if ( ! empty( $instance['title'] ) ) {
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+
+                if ( empty( $instance['widget_title_tag'] ) ) {
+                    if ( ! isset( $args['before_title'] ) ) {
+                        $args['before_title'] = '';
+                    }
+
+                    if ( ! isset( $args['after_title'] ) ) {
+                        $args['after_title'] = '';
+                    }
+
+                    $output = $args['before_title'] . $title . $args['after_title'];
+                } else {
+                    $tag 			= esc_attr( $instance['widget_title_tag'] );
+                    $allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
+                    $title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
+
+                    // 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;
-		}
+            return $output;
+        }
 
-		/**
-		 * Outputs the options form inputs for the widget.
-		 *
-		 * @param array $instance The widget options.
-		 */
-		public function form( $instance ) {
+        /**
+         * 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 widget instance
+            $this->instance = $instance;
 
-			// set it as a SD widget
-			echo $this->widget_advanced_toggle();
+            // 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();
+            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;
+                // Do we have sections?
+                $has_sections = $arguments == $arguments_raw ? false : true;
 
 
-				if ( $has_sections ) {
-					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
+                if ( $has_sections ) {
+                    $panel_count = 0;
+                    foreach ( $arguments as $key => $args ) {
 
-						?>
+                        ?>
 						<script>
 							//							jQuery(this).find("i").toggleClass("fas fa-chevron-up fas fa-chevron-down");jQuery(this).next().toggle();
 						</script>
 						<?php
 
-						$hide       = $panel_count ? ' style="display:none;" ' : '';
-						$icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
-						echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+                        $hide       = $panel_count ? ' style="display:none;" ' : '';
+                        $icon_class = $panel_count ? 'fas fa-chevron-up' : 'fas fa-chevron-down';
+                        echo "<button onclick='jQuery(this).find(\"i\").toggleClass(\"fas fa-chevron-up fas fa-chevron-down\");jQuery(this).next().slideToggle();' type='button' class='sd-toggle-group-button sd-input-group-toggle" . sanitize_title_with_dashes( $key ) . "'>" . esc_attr( $key ) . " <i style='float:right;' class='" . $icon_class . "'></i></button>";
+                        echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
 
-						foreach ( $args as $k => $a ) {
+                        foreach ( $args as $k => $a ) {
 
-							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
-							$this->widget_inputs_row_end($k, $a);
+                            $this->widget_inputs_row_start($k, $a);
+                            $this->widget_inputs( $a, $instance );
+                            $this->widget_inputs_row_end($k, $a);
 
-						}
+                        }
 
-						echo "</div>";
+                        echo "</div>";
 
-						$panel_count ++;
+                        $panel_count ++;
 
-					}
-				} else {
-					foreach ( $arguments as $key => $args ) {
-						$this->widget_inputs_row_start($key, $args);
-						$this->widget_inputs( $args, $instance );
-						$this->widget_inputs_row_end($key, $args);
-					}
-				}
+                    }
+                } else {
+                    foreach ( $arguments as $key => $args ) {
+                        $this->widget_inputs_row_start($key, $args);
+                        $this->widget_inputs( $args, $instance );
+                        $this->widget_inputs_row_end($key, $args);
+                    }
+                }
 
-			}
-		}
+            }
+        }
 
-		public function widget_inputs_row_start( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
-				// Maybe open
-				if ( ! empty( $args['row']['open'] ) ) {
-					?>
+        public function widget_inputs_row_start( $key, $args ) {
+            if ( ! empty( $args['row'] ) ) {
+                // Maybe open
+                if ( ! empty( $args['row']['open'] ) ) {
+                    ?>
 					<div class='bsui sd-argument' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php echo ( ! empty( $args['row']['element_require'] ) ? $this->convert_element_require( $args['row']['element_require'] ) : '' ); ?>'>
 					<?php if ( ! empty( $args['row']['title'] ) ) { ?>
 					<?php
-						if ( isset( $args['row']['icon'] ) ) {
-							$args['row']['icon'] = '';
-						}
-
-						if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
-							$args['row']['device_type'] = $args['device_type'];
-						}
-					?>
+                        if ( isset( $args['row']['icon'] ) ) {
+                            $args['row']['icon'] = '';
+                        }
+
+                        if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
+                            $args['row']['device_type'] = $args['device_type'];
+                        }
+                    ?>
 					<label class="mb-0"><?php echo $this->widget_field_title( $args['row'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
 					<?php } ?>
 					<div class='row<?php echo ( ! empty( $args['row']['class'] ) ? ' ' . esc_attr( $args['row']['class'] ) : '' ); ?>'>
 					<div class='col pr-2'>
 					<?php
-				} else if ( ! empty( $args['row']['close'] ) ) {
-					echo "<div class='col pl-0 ps-0'>";
-				} else {
-					echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
-				}
-			}
-		}
-
-		public function widget_inputs_row_end( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
-				// Maybe close
-				if ( ! empty( $args['row']['close'] ) ) {
-					echo "</div></div>";
-				}
-				echo "</div>";
-			}
-		}
-
-		/**
-		 * Get the hidden input that when added makes the advanced button show on widget settings.
-		 *
-		 * @return string
-		 */
-		public function widget_advanced_toggle() {
-
-			$output = '';
-			if ( $this->block_show_advanced() ) {
-				$val = 1;
-			} else {
-				$val = 0;
-			}
+                } else if ( ! empty( $args['row']['close'] ) ) {
+                    echo "<div class='col pl-0 ps-0'>";
+                } else {
+                    echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
+                }
+            }
+        }
 
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
+        public function widget_inputs_row_end( $key, $args ) {
+            if ( ! empty( $args['row'] ) ) {
+                // Maybe close
+                if ( ! empty( $args['row']['close'] ) ) {
+                    echo "</div></div>";
+                }
+                echo "</div>";
+            }
+        }
 
-			return $output;
-		}
+        /**
+         * Get the hidden input that when added makes the advanced button show on widget settings.
+         *
+         * @return string
+         */
+        public function widget_advanced_toggle() {
 
-		/**
-		 * Convert require element.
-		 *
-		 * @param string $input Input element.
-		 *
-		 * @return string $output
-		 *@since 1.0.0
-		 *
-		 */
-		public function convert_element_require( $input ) {
-			$input = str_replace( "'", '"', $input );// we only want double quotes
-
-			$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()",
-				"\"]').find('input:checked').val()"
-			), $input ) );
-
-			return $output;
-		}
+            $output = '';
+            if ( $this->block_show_advanced() ) {
+                $val = 1;
+            } else {
+                $val = 0;
+            }
 
-		/**
-		 * 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 = '';
-			}
+            $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
 
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
+            return $output;
+        }
 
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
+        /**
+         * Convert require element.
+         *
+         * @param string $input Input element.
+         *
+         * @return string $output
+         *@since 1.0.0
+         *
+         */
+        public function convert_element_require( $input ) {
+            $input = str_replace( "'", '"', $input );// we only want double quotes
 
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
+            $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select,textarea').val()",
+                "\"]').find('input:checked').val()"
+            ), $input ) );
 
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
+            return $output;
+        }
 
-			// before wrapper
-			?>
+        /**
+         * Builds the inputs for the widget options.
+         *
+         * @param $args
+         * @param $instance
+         */
+        public function widget_inputs( $args, $instance ) {
+
+            $class             = "";
+            $element_require   = "";
+            $custom_attributes = "";
+
+            // get value
+            if ( isset( $instance[ $args['name'] ] ) ) {
+                $value = $instance[ $args['name'] ];
+            } elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
+                $value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+            } else {
+                $value = '';
+            }
+
+            // get placeholder
+            if ( ! empty( $args['placeholder'] ) ) {
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+            } else {
+                $placeholder = '';
+            }
+
+            // get if advanced
+            if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+                $class .= " sd-advanced-setting ";
+            }
+
+            // element_require
+            if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+                $element_require = $args['element_require'];
+            }
+
+            // custom_attributes
+            if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
+                $custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+            }
+
+            // before wrapper
+            ?>
 			<p class="sd-argument <?php echo esc_attr( $class ); ?>" data-argument='<?php echo esc_attr( $args['name'] ); ?>' data-element_require='<?php if ( $element_require ) { echo $this->convert_element_require( $element_require );} ?>'>
 			<?php
-			switch ( $args['type'] ) {
-				//array('text','password','number','email','tel','url','color')
-				case "text":
-				case "password":
-				case "number":
-				case "email":
-				case "tel":
-				case "url":
-				case "color":
-					?>
+            switch ( $args['type'] ) {
+                //array('text','password','number','email','tel','url','color')
+                case "text":
+                case "password":
+                case "number":
+                case "email":
+                case "tel":
+                case "url":
+                case "color":
+                    ?>
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="<?php echo esc_attr( $args['type'] ); ?>" value="<?php echo esc_attr( $value ); ?>">
 					<?php
 
-					break;
-				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
-							$value = array();
-						}
-					}
-					?>
+                    break;
+                case "select":
+                    $multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
+                    if ( $multiple ) {
+                        if ( empty( $value ) ) {
+                            $value = array();
+                        }
+                    }
+                    ?>
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); if ( $multiple ) { echo "[]"; } ?>"
 						<?php if ( $multiple ) {
-							echo "multiple";
-						} //@todo not implemented yet due to gutenberg not supporting it
-						?>>
+                            echo "multiple";
+                        } //@todo not implemented yet due to gutenberg not supporting it
+                        ?>>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
-								} else {
-									$selected = selected( $value, $val, false );
-								}
-								echo "<option value='$val' " . $selected . ">$label</option>";
-							}
-						}
-						?>
+                        if ( ! empty( $args['options'] ) ) {
+                            foreach ( $args['options'] as $val => $label ) {
+                                if ( $multiple ) {
+                                    $selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+                                } else {
+                                    $selected = selected( $value, $val, false );
+                                }
+                                echo "<option value='$val' " . $selected . ">$label</option>";
+                            }
+                        }
+                        ?>
 					</select>
 					<?php
-					break;
-				case "checkbox":
-					?>
+                    break;
+                case "checkbox":
+                    ?>
 					<input <?php echo $placeholder; ?> <?php checked( 1, $value, true ) ?> <?php echo $custom_attributes; ?> class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox" value="1">
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<?php
-					break;
-				case "textarea":
-					?>
+                    break;
+                case "textarea":
+                    ?>
 					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"><?php echo esc_attr( $value ); ?></textarea>
 					<?php
 
-					break;
-				case "hidden":
-					?>
+                    break;
+                case "hidden":
+                    ?>
 					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden" value="<?php echo esc_attr( $value ); ?>">
 					<?php
-					break;
-				default:
-					echo "No input type found!"; // @todo we need to add more input types.
-			}
-			// after wrapper
-			?></p><?php
-		}
+                    break;
+                default:
+                    echo "No input type found!"; // @todo we need to add more input types.
+            }
+            // after wrapper
+            ?></p><?php
+        }
 
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
-			}
-		}
+        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>';
-				}
-			}
+        /**
+         * 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;
-		}
+            return $description;
+        }
 
-		/**
-		 * Get the widget input title html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 */
-		public function widget_field_title( $args ) {
-			$title = '';
-
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( ! empty( $args['device_type'] ) ) {
-					$args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
-				}
+        /**
+         * Get the widget input title html.
+         *
+         * @param $args
+         *
+         * @return string
+         */
+        public function widget_field_title( $args ) {
+            $title = '';
 
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
-				} else {
-					$title = esc_attr( $args['title'] );
-				}
-			}
+            if ( isset( $args['title'] ) && $args['title'] ) {
+                if ( ! empty( $args['device_type'] ) ) {
+                    $args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
+                }
 
-			return $title;
-		}
+                if ( isset( $args['icon'] ) && $args['icon'] ) {
+                    $title = self::get_widget_icon( $args['icon'], $args['title']  );
+                } else {
+                    $title = esc_attr( $args['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 $title;
+        }
 
-			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
-		}
+        /**
+         * 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(),
-			) ) );
-		}
+        /**
+         * 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();
-			}
+        /**
+         * 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 ) {
 
-			// 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';
-					}
-				}
-			}
+            //save the widget
+            $instance = array_merge( (array) $old_instance, (array) $new_instance );
 
-			return $instance;
-		}
+            // set widget instance
+            $this->instance = $instance;
 
-		/**
-		 * Checks if the current call is a ajax call to get the block content.
-		 *
-		 * This can be used in your widget to return different content as the block content.
-		 *
-		 * @return bool
-		 *@since 1.0.3
-		 */
-		public function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
+            if ( empty( $this->arguments ) ) {
+                $this->get_arguments();
+            }
 
-			return $result;
-		}
+            // 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';
+                    }
+                }
+            }
 
-		/**
-		 * Get an instance hash that will be unique to the type and settings.
-		 *
-		 * @return string
-		 *@since 1.0.20
-		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
-		}
+            return $instance;
+        }
 
-		/**
-		 * Generate and return inline styles from CSS rules that will match the unique class of the instance.
-		 *
-		 * @param array $rules
-		 *
-		 * @return string
-		 *@since 1.0.20
-		 */
-		public function get_instance_style($rules = array()){
-			$css = '';
-
-			if(!empty($rules)){
-				$rules = array_unique($rules);
-				$instance_hash = $this->get_instance_hash();
-				$css .= "<style>";
-				foreach($rules as $rule){
-					$css .= ".sdel-$instance_hash $rule";
-				}
-				$css .= "</style>";
-			}
+        /**
+         * Checks if the current call is a ajax call to get the block content.
+         *
+         * This can be used in your widget to return different content as the block content.
+         *
+         * @return bool
+         *@since 1.0.3
+         */
+        public function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
 
-			return $css;
-		}
+            return $result;
+        }
+
+        /**
+         * Get an instance hash that will be unique to the type and settings.
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        public function get_instance_hash(){
+            $instance_string = $this->base_id.serialize($this->instance);
+            return hash('crc32b',$instance_string);
+        }
+
+        /**
+         * Generate and return inline styles from CSS rules that will match the unique class of the instance.
+         *
+         * @param array $rules
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        public function get_instance_style($rules = array()){
+            $css = '';
+
+            if(!empty($rules)){
+                $rules = array_unique($rules);
+                $instance_hash = $this->get_instance_hash();
+                $css .= "<style>";
+                foreach($rules as $rule){
+                    $css .= ".sdel-$instance_hash $rule";
+                }
+                $css .= "</style>";
+            }
+
+            return $css;
+        }
 
-		/**
-		 * Encode shortcodes tags.
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 *
+        /**
+         * Encode shortcodes tags.
+         *
+         * @param string $content Content to search for shortcode tags.
+         *
 *@return string Content with shortcode tags removed.
-		 *@since 1.0.28
-		 *
-		 */
-		public function encode_shortcodes( $content ) {
-			// Avoids existing encoded tags.
-			$trans   = array(
-				'&#91;' => '&#091;',
-				'&#93;' => '&#093;',
-				'&amp;#91;' => '&#091;',
-				'&amp;#93;' => '&#093;',
-				'&lt;' => '&0lt;',
-				'&gt;' => '&0gt;',
-				'&amp;lt;' => '&0lt;',
-				'&amp;gt;' => '&0gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'[' => '&#91;',
-				']' => '&#93;',
-				'<' => '&lt;',
-				'>' => '&gt;',
-				'"' => '&quot;',
-				"'" => '&#39;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
+         *@since 1.0.28
+         *
+         */
+        public function encode_shortcodes( $content ) {
+            // Avoids existing encoded tags.
+            $trans   = array(
+                '&#91;' => '&#091;',
+                '&#93;' => '&#093;',
+                '&amp;#91;' => '&#091;',
+                '&amp;#93;' => '&#093;',
+                '&lt;' => '&0lt;',
+                '&gt;' => '&0gt;',
+                '&amp;lt;' => '&0lt;',
+                '&amp;gt;' => '&0gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '[' => '&#91;',
+                ']' => '&#93;',
+                '<' => '&lt;',
+                '>' => '&gt;',
+                '"' => '&quot;',
+                "'" => '&#39;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
 
-		/**
-		 * Remove encoded shortcod tags.
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 *
+        /**
+         * Remove encoded shortcod tags.
+         *
+         * @param string $content Content to search for shortcode tags.
+         *
 *@return string Content with decoded shortcode tags.
-		 *@since 1.0.28
-		 *
-		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
-				'&#91;' => '[',
-				'&#93;' => ']',
-				'&amp;#91;' => '[',
-				'&amp;#93;' => ']',
-				'&lt;' => '<',
-				'&gt;' => '>',
-				'&amp;lt;' => '<',
-				'&amp;gt;' => '>',
-				'&quot;' => '"',
-				'&apos;' => "'",
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'&#091;' => '&#91;',
-				'&#093;' => '&#93;',
-				'&amp;#091;' => '&#91;',
-				'&amp;#093;' => '&#93;',
-				'&0lt;' => '&lt;',
-				'&0gt;' => '&gt;',
-				'&amp;0lt;' => '&lt;',
-				'&amp;0gt;' => '&gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
-
-		public function block_visibility_fields( $args ) {
-			$value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
-			$content = '<div class="bs-vc-rule-template d-none">';
-				$content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
-					$content .= '<div class="row">';
-						$content .= '<div class="col-sm-12">';
-							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
-							$content .= aui()->select(
-								array(
-									'id'          => 'bsvc_rule_BSVCINDEX',
-									'name'        => 'bsvc_rule_BSVCINDEX',
-									'label'       => __( 'Rule', 'ayecode-connect' ),
-									'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
-									'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
-									'options'     => sd_visibility_rules_options(),
-									'default'     => '',
-									'value'       => '',
-									'label_type'  => '',
-									'select2'     => false,
-									'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
-									'extra_attributes' => array(
-										'data-minimum-results-for-search' => '-1'
-									)
-								)
-							);
-
-						$content .= '</div>';
-
-						if ( class_exists( 'GeoDirectory' ) ) {
-							$content .= '<div class="col-md-7 col-sm-12">';
-
-								$content .= aui()->select(
-									array(
-										'id'          => 'bsvc_gd_field_BSVCINDEX',
-										'name'        => 'bsvc_gd_field_BSVCINDEX',
-										'label'       => __( 'FIELD', 'ayecode-connect' ),
-										'placeholder' => __( 'FIELD', 'ayecode-connect' ),
-										'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
-										'options'     => sd_visibility_gd_field_options(),
-										'default'     => '',
-										'value'       => '',
-										'label_type'  => '',
-										'select2'     => false,
-										'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
-										'extra_attributes' => array(
-											'data-minimum-results-for-search' => '-1'
-										)
-									)
-								);
-
-							$content .= '</div>';
-							$content .= '<div class="col-md-5 col-sm-12">';
-
-								$content .= aui()->select(
-									array(
-										'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
-										'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
-										'label'       => __( 'CONDITION', 'ayecode-connect' ),
-										'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
-										'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
-										'options'     => sd_visibility_field_condition_options(),
-										'default'     => '',
-										'value'       => '',
-										'label_type'  => '',
-										'select2'     => false,
-										'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
-										'extra_attributes' => array(
-											'data-minimum-results-for-search' => '-1'
-										)
-									)
-								);
-
-							$content .= '</div>';
-							$content .= '<div class="col-sm-12">';
-
-								$content .= aui()->input(
-									array(
-										'type'            => 'text',
-										'id'              => 'bsvc_gd_field_search_BSVCINDEX',
-										'name'            => 'bsvc_gd_field_search_BSVCINDEX',
-										'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
-										'class'           => 'bsvc_gd_field_search form-control-sm',
-										'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
-										'label_type'      => '',
-										'value'           => '',
-										'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
-									)
-								);
+         *@since 1.0.28
+         *
+         */
+        public function decode_shortcodes( $content ) {
+            $trans   = array(
+                '&#91;' => '[',
+                '&#93;' => ']',
+                '&amp;#91;' => '[',
+                '&amp;#93;' => ']',
+                '&lt;' => '<',
+                '&gt;' => '>',
+                '&amp;lt;' => '<',
+                '&amp;gt;' => '>',
+                '&quot;' => '"',
+                '&apos;' => "'",
+            );
+
+            $content = strtr( $content, $trans );
+
+            $trans   = array(
+                '&#091;' => '&#91;',
+                '&#093;' => '&#93;',
+                '&amp;#091;' => '&#91;',
+                '&amp;#093;' => '&#93;',
+                '&0lt;' => '&lt;',
+                '&0gt;' => '&gt;',
+                '&amp;0lt;' => '&lt;',
+                '&amp;0gt;' => '&gt;',
+            );
+
+            $content = strtr( $content, $trans );
+
+            return $content;
+        }
 
-							$content .= '</div>';
-						}
+        public function block_visibility_fields( $args ) {
+            $value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
+            $content = '<div class="bs-vc-rule-template d-none">';
+                $content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
+                    $content .= '<div class="row">';
+                        $content .= '<div class="col-sm-12">';
+                            $content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
+                            $content .= aui()->select(
+                                array(
+                                    'id'          => 'bsvc_rule_BSVCINDEX',
+                                    'name'        => 'bsvc_rule_BSVCINDEX',
+                                    'label'       => __( 'Rule', 'ayecode-connect' ),
+                                    'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
+                                    'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
+                                    'options'     => sd_visibility_rules_options(),
+                                    'default'     => '',
+                                    'value'       => '',
+                                    'label_type'  => '',
+                                    'select2'     => false,
+                                    'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
+                                    'extra_attributes' => array(
+                                        'data-minimum-results-for-search' => '-1'
+                                    )
+                                )
+                            );
+
+                        $content .= '</div>';
+
+                        if ( class_exists( 'GeoDirectory' ) ) {
+                            $content .= '<div class="col-md-7 col-sm-12">';
+
+                                $content .= aui()->select(
+                                    array(
+                                        'id'          => 'bsvc_gd_field_BSVCINDEX',
+                                        'name'        => 'bsvc_gd_field_BSVCINDEX',
+                                        'label'       => __( 'FIELD', 'ayecode-connect' ),
+                                        'placeholder' => __( 'FIELD', 'ayecode-connect' ),
+                                        'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
+                                        'options'     => sd_visibility_gd_field_options(),
+                                        'default'     => '',
+                                        'value'       => '',
+                                        'label_type'  => '',
+                                        'select2'     => false,
+                                        'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
+                                        'extra_attributes' => array(
+                                            'data-minimum-results-for-search' => '-1'
+                                        )
+                                    )
+                                );
+
+                            $content .= '</div>';
+                            $content .= '<div class="col-md-5 col-sm-12">';
+
+                                $content .= aui()->select(
+                                    array(
+                                        'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
+                                        'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
+                                        'label'       => __( 'CONDITION', 'ayecode-connect' ),
+                                        'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
+                                        'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
+                                        'options'     => sd_visibility_field_condition_options(),
+                                        'default'     => '',
+                                        'value'       => '',
+                                        'label_type'  => '',
+                                        'select2'     => false,
+                                        'element_require'  => '[%bsvc_rule_BSVCINDEX%]=="gd_field"',
+                                        'extra_attributes' => array(
+                                            'data-minimum-results-for-search' => '-1'
+                                        )
+                                    )
+                                );
+
+                            $content .= '</div>';
+                            $content .= '<div class="col-sm-12">';
+
+                                $content .= aui()->input(
+                                    array(
+                                        'type'            => 'text',
+                                        'id'              => 'bsvc_gd_field_search_BSVCINDEX',
+                                        'name'            => 'bsvc_gd_field_search_BSVCINDEX',
+                                        'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'class'           => 'bsvc_gd_field_search form-control-sm',
+                                        'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+                                        'label_type'      => '',
+                                        'value'           => '',
+                                        'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
+                                    )
+                                );
+
+                            $content .= '</div>';
+                        }
+
+                    $content .= '</div>';
+
+                    $content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
+                        $role_options = sd_user_roles_options();
+
+                        $role_option_i = 0;
+                        foreach ( $role_options as $role_option_key => $role_option_name ) {
+                            $role_option_i++;
+
+                            $content .= '<div class="col-sm-6">';
+                            $content .= aui()->input(
+                                array(
+                                    'id'               => 'bsvc_user_roles_BSVCINDEX_' . $role_option_i,
+                                    'name'             => 'bsvc_user_roles_BSVCINDEX[]',
+                                    'type'             => 'checkbox',
+                                    'label'            => $role_option_name,
+                                    'label_type'       => 'hidden',
+                                    'class'            => 'bsvc_user_roles',
+                                    'value'            => $role_option_key,
+                                    'switch'           => 'md',
+                                    'no_wrap'          => true
+                                )
+                            );
+                            $content .= '</div>';
+                        }
+                    $content .= '</div>';
+                $content .= '</div>';
+            $content .= '</div>';
+            $content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
+            $content .= '<div class="bs-vc-rule-sets"></div>';
+            $content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
+            $content .= '<div class="row"><div class="col-md-6 col-sm-12">';
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_output',
+                    'name'        => 'bsvc_output',
+                    'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
+                    'placeholder' => __( 'Default Output', 'ayecode-connect' ),
+                    'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
+                    'options'     => sd_visibility_output_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-md-6 col-sm-12">';
+
+            $content .= aui()->select(
+                array(
+                    'id'              => 'bsvc_page',
+                    'name'            => 'bsvc_page',
+                    'label'           => __( 'Page Content', 'ayecode-connect' ),
+                    'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+                    'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
+                    'options'         => sd_template_page_options(),
+                    'default'         => '',
+                    'value'           => '',
+                    'label_type'      => 'top',
+                    'select2'         => false,
+                    'element_require' => '[%bsvc_output%]=="page"'
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'          => 'bsvc_tmpl_part',
+                    'name'        => 'bsvc_tmpl_part',
+                    'label'       => __( 'Template Part', 'ayecode-connect' ),
+                    'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+                    'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
+                    'options'     => sd_template_part_options(),
+                    'default'     => '',
+                    'value'       => '',
+                    'label_type'  => 'top',
+                    'select2'     => false,
+                    'element_require'  => '[%bsvc_output%]=="template_part"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= aui()->select(
+                array(
+                    'id'               => 'bsvc_message_type',
+                    'name'             => 'bsvc_message_type',
+                    'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
+                    'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+                    'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
+                    'options'          => sd_aui_colors(),
+                    'default'          => '',
+                    'value'            => '',
+                    'label_type'       => 'top',
+                    'select2'          => false,
+                    'element_require'  => '[%bsvc_output%]=="message"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-sm-12">';
+
+            $content .= aui()->input(
+                array(
+                    'type'            => 'text',
+                    'id'              => 'bsvc_message',
+                    'name'            => 'bsvc_message',
+                    'label'           => '',
+                    'class'           => 'bsvc_message form-control-sm',
+                    'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+                    'label_type'      => '',
+                    'value'           => '',
+                    'form_group_class' => ' ',
+                    'element_require' => '[%bsvc_output%]=="message"',
+                )
+            );
+
+            $content .= '</div></div></form><input type="hidden" id="bsvc_raw_value" name="bsvc_raw_value" value="' . $value . '">';
+
+            return $content;
+        }
 
-					$content .= '</div>';
-
-					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
-						$role_options = sd_user_roles_options();
-
-						$role_option_i = 0;
-						foreach ( $role_options as $role_option_key => $role_option_name ) {
-							$role_option_i++;
-
-							$content .= '<div class="col-sm-6">';
-							$content .= aui()->input(
-								array(
-									'id'               => 'bsvc_user_roles_BSVCINDEX_' . $role_option_i,
-									'name'             => 'bsvc_user_roles_BSVCINDEX[]',
-									'type'             => 'checkbox',
-									'label'            => $role_option_name,
-									'label_type'       => 'hidden',
-									'class'            => 'bsvc_user_roles',
-									'value'            => $role_option_key,
-									'switch'           => 'md',
-									'no_wrap'          => true
-								)
-							);
-							$content .= '</div>';
-						}
-					$content .= '</div>';
-				$content .= '</div>';
-			$content .= '</div>';
-			$content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
-			$content .= '<div class="bs-vc-rule-sets"></div>';
-			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
-			$content .= '<div class="row"><div class="col-md-6 col-sm-12">';
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_output',
-					'name'        => 'bsvc_output',
-					'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Default Output', 'ayecode-connect' ),
-					'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
-					'options'     => sd_visibility_output_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-md-6 col-sm-12">';
-
-			$content .= aui()->select(
-				array(
-					'id'              => 'bsvc_page',
-					'name'            => 'bsvc_page',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
-					'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
-					'options'         => sd_template_page_options(),
-					'default'         => '',
-					'value'           => '',
-					'label_type'      => 'top',
-					'select2'         => false,
-					'element_require' => '[%bsvc_output%]=="page"'
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'          => 'bsvc_tmpl_part',
-					'name'        => 'bsvc_tmpl_part',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
-					'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
-					'options'     => sd_template_part_options(),
-					'default'     => '',
-					'value'       => '',
-					'label_type'  => 'top',
-					'select2'     => false,
-					'element_require'  => '[%bsvc_output%]=="template_part"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= aui()->select(
-				array(
-					'id'               => 'bsvc_message_type',
-					'name'             => 'bsvc_message_type',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
-					'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
-					'options'          => sd_aui_colors(),
-					'default'          => '',
-					'value'            => '',
-					'label_type'       => 'top',
-					'select2'          => false,
-					'element_require'  => '[%bsvc_output%]=="message"',
-					'extra_attributes' => array(
-						'data-minimum-results-for-search' => '-1'
-					)
-				)
-			);
-
-			$content .= '</div><div class="col-sm-12">';
-
-			$content .= aui()->input(
-				array(
-					'type'            => 'text',
-					'id'              => 'bsvc_message',
-					'name'            => 'bsvc_message',
-					'label'           => '',
-					'class'           => 'bsvc_message form-control-sm',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
-					'label_type'      => '',
-					'value'           => '',
-					'form_group_class' => ' ',
-					'element_require' => '[%bsvc_output%]=="message"',
-				)
-			);
-
-			$content .= '</div></div></form><input type="hidden" id="bsvc_raw_value" name="bsvc_raw_value" value="' . $value . '">';
-
-			return $content;
-		}
+        /**
+         * Handle media_buttons hook.
+         *
+         * @since 1.2.7
+         */
+        public function wp_media_buttons() {
+            global $shortcode_insert_button_once;
 
-		/**
-		 * Handle media_buttons hook.
-		 *
-		 * @since 1.2.7
-		 */
-		public function wp_media_buttons() {
-			global $shortcode_insert_button_once;
-
-			// Fix conflicts with UpSolution Core in header template edit element.
-			if ( defined( 'US_CORE_DIR' ) && ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html' ) {
-				$shortcode_insert_button_once = true;
-			}
-		}
-	}
+            // Fix conflicts with UpSolution Core in header template edit element.
+            if ( defined( 'US_CORE_DIR' ) && ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html' ) {
+                $shortcode_insert_button_once = true;
+            }
+        }
+    }
 }

Spacing +820 added lines, -820 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 
-	define( 'SUPER_DUPER_VER', '1.2.16' );
+	define('SUPER_DUPER_VER', '1.2.16');
 
 	/**
 	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
@@ -38,40 +38,40 @@ 
 		/**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
+		public function __construct($options) {
 			global $sd_widgets;
 
-			$sd_widgets[ $options['base_id'] ] = array(
+			$sd_widgets[$options['base_id']] = array(
 				'name'       => $options['name'],
 				'class_name' => $options['class_name'],
 				'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
 			);
-			$this->base_id                     = $options['base_id'];
+			$this->base_id = $options['base_id'];
 			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
+			$options       = apply_filters("wp_super_duper_options", $options);
+			$options       = apply_filters("wp_super_duper_options_{$this->base_id}", $options);
+			$options       = $this->add_name_from_key($options);
 			$this->options = $options;
 
 			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+			$this->arguments = isset($options['arguments']) ? $options['arguments'] : array();
 
 			// nested blocks can't work as a widget
-			if(!empty($this->options['nested-block'])){
-				if(empty($this->options['output_types'])){
-					$this->options['output_types'] = array('shortcode','block');
+			if (!empty($this->options['nested-block'])) {
+				if (empty($this->options['output_types'])) {
+					$this->options['output_types'] = array('shortcode', 'block');
 				}elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
 					unset($this->options['output_types'][$key]);
 				}
 			}
 
 			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-				parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
+				parent::__construct($options['base_id'], $options['name'], $options['widget_ops']);
 			}
 
 
-			if ( isset( $options['class_name'] ) ) {
+			if (isset($options['class_name'])) {
 				// register widget
 				$this->class_name = $options['class_name'];
 
@@ -80,67 +80,67 @@ 
 
 
 				// 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'));
 				}
 
                 // maybe load the Bricks transformer class
-                if( class_exists('\Bricks\Elements', false) ){
-					add_action( 'init', array( $this, 'load_bricks_element_class' ) );
+                if (class_exists('\Bricks\Elements', false)) {
+					add_action('init', array($this, 'load_bricks_element_class'));
                 }
 
 				// register block
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-					add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				if (empty($this->options['output_types']) || in_array('block', $this->options['output_types'])) {
+					add_action('admin_enqueue_scripts', array($this, 'register_block'));
 				}
 			}
 
 			// add the CSS and JS we need ONCE
 			global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+			if (!$sd_widget_scripts) {
+				wp_add_inline_script('admin-widgets', $this->widget_js());
+				wp_add_inline_script('customize-controls', $this->widget_js());
+				wp_add_inline_style('widgets', $this->widget_css());
 
 				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+				add_action('elementor/editor/after_enqueue_styles', array($this, 'elementor_editor_styles'));
 
 				$sd_widget_scripts = true;
 
 				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'wp_media_buttons' ), 1 );
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+				add_action('media_buttons', array($this, 'wp_media_buttons'), 1);
+				add_action('media_buttons', array($this, 'shortcode_insert_button'));
 				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+				if (function_exists('generate_sections_sections_metabox')) {
+					add_action('generate_sections_metabox', array($this, 'shortcode_insert_button_script'));
 				}
 				/* Load script on Divi theme builder page */
-				if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) {
+				if (function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) {
 					add_thickbox();
-					add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
+					add_action('admin_footer', array($this, 'shortcode_insert_button_script'));
 				}
 
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+				if ($this->is_preview()) {
+					add_action('wp_footer', array($this, 'shortcode_insert_button_script'));
 					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
+					add_action('elementor/editor/after_enqueue_scripts', array(
 						$this,
 						'shortcode_insert_button_script'
-					) ); // for elementor
+					)); // for elementor
 				}
 				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'maybe_cornerstone_builder'));
 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+				add_action('wp_ajax_super_duper_get_widget_settings', array(__CLASS__, 'get_widget_settings'));
+				add_action('wp_ajax_super_duper_get_picker', array(__CLASS__, 'get_picker'));
 
 				// add generator text to head
-				add_action( 'admin_head', array( $this, 'generator' ), 99 );
-				add_action( 'wp_head', array( $this, 'generator' ), 99 );
+				add_action('admin_head', array($this, 'generator'), 99);
+				add_action('wp_head', array($this, 'generator'), 99);
 			}
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 		}
 
         /**
@@ -156,7 +156,7 @@ 
 		 * @return void
 		 */
 		public function _register() {
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+			if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
 				parent::_register();
 			}
 		}
@@ -165,14 +165,14 @@ 
 		 * Add our widget CSS to elementor editor.
 		 */
 		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+			wp_add_inline_style('elementor-editor', $this->widget_css(false));
 		}
 
 		public function register_fusion_element() {
 
 			$options = $this->options;
 
-			if ( $this->base_id ) {
+			if ($this->base_id) {
 
 				$params = $this->get_fusion_params();
 
@@ -183,11 +183,11 @@ 
 					'allow_generator' => true,
 				);
 
-				if ( ! empty( $params ) ) {
+				if (!empty($params)) {
 					$args['params'] = $params;
 				}
 
-				fusion_builder_map( $args );
+				fusion_builder_map($args);
 			}
 
 		}
@@ -196,8 +196,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(
@@ -219,38 +219,38 @@ 
 						$val['type'] );
 
 					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+					if ($val['type'] == 'multiselect' || (($param['type'] == 'select' || $val['type'] == 'select') && !empty($val['multiple']))) {
 						$param['type']     = 'multiple_select';
 						$param['multiple'] = true;
 					}
 
 					// heading
-					$param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+					$param['heading'] = isset($val['title']) ? $val['title'] : '';
 
 					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+					$param['description'] = isset($val['desc']) ? $val['desc'] : '';
 
 					// param_name
 					$param['param_name'] = $key;
 
 					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+					$param['default'] = isset($val['default']) ? $val['default'] : '';
 
 					// Group
-					if ( isset( $val['group'] ) ) {
+					if (isset($val['group'])) {
 						$param['group'] = $val['group'];
 					}
 
 					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
+					if ($val['type'] == 'checkbox') {
+						if (isset($val['default']) && $val['default'] == '0') {
+							unset($param['default']);
 						}
-						$param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+						$param['value'] = array('0' => __("No", 'ayecode-connect'), '1' => __("Yes", 'ayecode-connect'));
+					} elseif ($param['type'] == 'select' || $param['type'] == 'multiple_select') {
+						$param['value'] = isset($val['options']) ? $val['options'] : array();
 					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+						$param['value'] = isset($val['default']) ? $val['default'] : '';
 					}
 
 					// setup the param
@@ -267,7 +267,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();
 			}
 		}
@@ -279,12 +279,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';
 			}
 
@@ -295,14 +295,14 @@ 
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
+				ksort($sd_widgets);
 				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
+				if (!empty($sd_widgets)) {
 					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode', 'ayecode-connect') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						if (!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])) { continue; }
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 
@@ -315,37 +315,37 @@ 
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
-					<?php if ( $editor_id != '' ) { ?>
+					<?php if ($editor_id != '') { ?>
 						<button class="button sd-insert-shortcode-button"
-								onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
+								onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) {
 									echo "'" . $editor_id . "'";
-								} ?>)"><?php _e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
+								} ?>)"><?php _e('Insert shortcode', 'ayecode-connect'); ?></button>
 					<?php } ?>
 					<button class="button"
-							onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
+							onclick="sd_copy_to_clipboard()"><?php _e('Copy shortcode'); ?></button>
 				</div>
 			</div>
 			<?php
 
 			$html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
+			if (wp_doing_ajax()) {
 				echo $html;
 				$should_die = true;
 
 				// some builder get the editor via ajax so we should not die on those occasions
 				$dont_die = array(
-					'parent_tag',// WP Bakery
+					'parent_tag', // WP Bakery
 					'avia_request' // enfold
 				);
 
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
+				foreach ($dont_die as $request) {
+					if (isset($_REQUEST[$request])) {
 						$should_die = false;
 					}
 				}
 
-				if ( $should_die ) {
+				if ($should_die) {
 					wp_die();
 				}
 
@@ -361,22 +361,22 @@ 
 		 * Output the version in the header.
 		 */
 		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+			$file = str_replace(array("/", "\\"), "/", realpath(__FILE__));
+			$plugins_dir = str_replace(array("/", "\\"), "/", realpath(WP_PLUGIN_DIR));
 
 			// Find source plugin/theme of SD
 			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+			if (strpos($file, $plugins_dir) !== false) {
+				$source = explode("/", plugin_basename($file));
+			} else if (function_exists('get_theme_root')) {
+				$themes_dir = str_replace(array("/", "\\"), "/", realpath(get_theme_root()));
 
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+				if (strpos($file, $themes_dir) !== false) {
+					$source = explode("/", ltrim(str_replace($themes_dir, "", $file), "/"));
 				}
 			}
 
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+			echo '<meta name="generator" content="WP Super Duper v' . esc_attr($this->version) . '"' . (!empty($source[0]) ? ' data-sd-source="' . esc_attr($source[0]) . '"' : '') . ' />';
 		}
 
 		/**
@@ -387,16 +387,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();
 			}
 
@@ -404,7 +404,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>";
@@ -423,9 +423,9 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
 			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
+			if ($shortcode_insert_button_once) {
 				return;
 			}
 			add_thickbox();
@@ -435,21 +435,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;
@@ -463,12 +463,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">
@@ -484,7 +484,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));
 		}
 
 		/**
@@ -542,7 +542,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings', 'ayecode-connect' );?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
+					var $button = '<button title="<?php _e('Advanced Settings', 'ayecode-connect'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -577,10 +577,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);
 		}
 
 		/**
@@ -592,7 +592,7 @@ 
 		 *@since 1.0.6
 		 *
 		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
 			?>
 			<style>
 				.sd-shortcode-left-wrap {
@@ -711,25 +711,25 @@ 
 					width: 100%;
 				}
 
-				<?php if ( function_exists( 'generate_sections_sections_metabox' ) ) { ?>
+				<?php if (function_exists('generate_sections_sections_metabox')) { ?>
 				.generate-sections-modal #custom-media-buttons > .sd-lable-shortcode-inserter {
 					display: inline;
 				}
 				<?php } ?>
-				<?php if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) { ?>
+				<?php if (function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) { ?>
 				body.divi_page_et_theme_builder div#TB_window.gd-tb-window{z-index:9999999}
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
+			if (class_exists('SiteOrigin_Panels')) {
 				echo "<script>" . self::siteorigin_js() . "</script>";
 			}
 			?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
+				if (!empty($insert_shortcode_function)) {
 					echo $insert_shortcode_function;
-				}else{
+				} else {
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -742,9 +742,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";';
@@ -827,11 +827,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) {
@@ -1030,11 +1030,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) {
@@ -1056,9 +1056,9 @@ 
 				 */
 				function sd_shortcode_button($id) {
 					if ($id) {
-						return '<?php echo self::shortcode_button( "\\''+\$id+'\\'" );?>';
+						return '<?php echo self::shortcode_button("\\''+\$id+'\\'"); ?>';
 					} else {
-						return '<?php echo self::shortcode_button();?>';
+						return '<?php echo self::shortcode_button(); ?>';
 					}
 				}
 			</script>
@@ -1072,11 +1072,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;
 				}
@@ -1120,10 +1120,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);
 		}
 
 		/**
@@ -1190,7 +1190,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings', 'ayecode-connect' );?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
+					var $button = '<button title="<?php _e('Advanced Settings', 'ayecode-connect'); ?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
 					var form = $form ? $form : jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -1281,7 +1281,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();
@@ -1290,10 +1290,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);
 		}
 
 
@@ -1304,14 +1304,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;
 				}
 			}
 
@@ -1324,8 +1324,8 @@ 
 		 * @since 1.0.0
 		 */
 		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+			add_shortcode($this->base_id, array($this, 'shortcode_output'));
+			add_action('wp_ajax_super_duper_output_shortcode', array($this, 'render_shortcode'));
 		}
 
 		/**
@@ -1334,50 +1334,50 @@ 
 		 * @since 1.0.0
 		 */
 		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
+			check_ajax_referer('super_duper_output_shortcode', '_ajax_nonce', true);
+			if (!current_user_can('manage_options')) {
 				wp_die();
 			}
 
 			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
+			if (isset($_POST['post_id']) && $_POST['post_id']) {
+				$post_obj = get_post(absint($_POST['post_id']));
+				if (!empty($post_obj) && empty($post)) {
 					global $post;
 					$post = $post_obj;
 				}
 			}
 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+			if (isset($_POST['shortcode']) && $_POST['shortcode']) {
 				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+				$shortcode_name   = sanitize_title_with_dashes($_POST['shortcode']);
+				$attributes_array = isset($_POST['attributes']) && $_POST['attributes'] ? $_POST['attributes'] : array();
 				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
+				if (!empty($attributes_array)) {
+					foreach ($attributes_array as $key => $value) {
+						if (is_array($value)) {
+							$value = implode(",", $value);
 						}
 
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
+						if (!empty($value)) {
+							$value = wp_unslash($value);
 
 							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
+							if ($is_preview) {
+								$value = $this->encode_shortcodes($value);
 							}
 						}
-						$attributes .= " " . esc_attr( sanitize_title_with_dashes( $key ) ) . "='" . esc_attr( $value ) . "' ";
+						$attributes .= " " . esc_attr(sanitize_title_with_dashes($key)) . "='" . esc_attr($value) . "' ";
 					}
 				}
 
-				$shortcode = "[" . esc_attr( $shortcode_name ) . " " . $attributes . "]";
+				$shortcode = "[" . esc_attr($shortcode_name) . " " . $attributes . "]";
 
-				$content = do_shortcode( $shortcode );
+				$content = do_shortcode($shortcode);
 
 				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
+				if (!empty($content) && $is_preview) {
+					$content = $this->decode_shortcodes($content);
 				}
 
 				echo $content;
@@ -1393,21 +1393,21 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
+		public function shortcode_output($args = array(), $content = '') {
 			$_instance = $args;
 
-			$args = $this->argument_values( $args );
+			$args = $this->argument_values($args);
 
 			// add extra argument so we know its a output to gutenberg
 			//$args
-			$args = $this->string_to_bool( $args );
+			$args = $this->string_to_bool($args);
 
 			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
+			if (!empty($content)) {
 				$args['html'] = $content;
 			}
 
-			if ( ! $this->is_preview() ) {
+			if (!$this->is_preview()) {
 				/**
 				 * Filters the settings for a particular widget args.
 				 *
@@ -1418,40 +1418,40 @@ 
 				 *@since 1.0.28
 				 *
 				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+				$args = apply_filters('wp_super_duper_widget_display_callback', $args, $this, $_instance);
 
-				if ( ! is_array( $args ) ) {
+				if (!is_array($args)) {
 					return $args;
 				}
 			}
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
+			$class = isset($this->options['widget_ops']['classname']) ? esc_attr($this->options['widget_ops']['classname']) : '';
+			$class .= " sdel-" . $this->get_instance_hash();
 
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+			$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+			$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+			$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+			$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
 
 			$shortcode_args = array();
 			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+			$no_wrap        = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+			if (isset($args['no_wrap']) && $args['no_wrap']) {
 				$no_wrap = true;
 			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
+			$main_content = $this->output($args, $shortcode_args, $content);
+			if ($main_content && !$no_wrap) {
 				// wrap the shortcode in a div with the same class as the widget
 				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
+				if (!empty($args['title'])) {
 					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
+					$shortcode_args = array('before_title' => '', 'after_title' => '');
+					if (empty($instance)) {
 						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
+						if (!empty($wp_registered_sidebars)) {
+							foreach ($wp_registered_sidebars as $sidebar) {
+								if (!empty($sidebar['before_title'])) {
 									$shortcode_args['before_title'] = $sidebar['before_title'];
 									$shortcode_args['after_title']  = $sidebar['after_title'];
 									break;
@@ -1459,20 +1459,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);
 		}
 
 		/**
@@ -1482,8 +1482,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf(__('Placeholder for: %s', 'ayecode-connect'), $name) . "</div>";
 		}
 
 		/**
@@ -1493,13 +1493,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;
 				}
 			}
 
@@ -1515,26 +1515,26 @@ 
 		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
 		 *
 		 */
-		public function argument_values( $instance ) {
+		public function argument_values($instance) {
 			$argument_values = array();
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $key => $args) {
 					// set the input name from the key
 					$args['name'] = $key;
 					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
+					if ($args['type'] == 'checkbox' && $argument_values[$key] == '') {
 						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
+					} elseif ($argument_values[$key] == '' && isset($args['default'])) {
+						$argument_values[$key] = $args['default'];
 					}
 				}
 			}
@@ -1561,12 +1561,12 @@ 
 		 *
 		 */
 		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->set_arguments();
 			}
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
 
 			return $this->arguments;
 		}
@@ -1578,7 +1578,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 = '') {
 
 		}
 
@@ -1586,9 +1586,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());
 			}
 		}
 
@@ -1602,9 +1602,9 @@ 
 			$show      = false;
 			$arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $argument) {
+					if (isset($argument['advanced']) && $argument['advanced']) {
 						$show = true;
 						break; // no need to continue if we know we have it
 					}
@@ -1622,19 +1622,19 @@ 
 		public function get_url() {
 			$url = $this->url;
 
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
+			if (!$url) {
+				$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+				$content_url = untrailingslashit(WP_CONTENT_URL);
 
 				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
+				if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+					$content_url = str_replace('http://', 'https://', $content_url);
 				}
 
 				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
+				$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+				$url = str_replace($content_dir, $content_url, $file_dir);
+				$url = trailingslashit($url);
 				$this->url = $url;
 			}
 
@@ -1650,15 +1650,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;
 				}
 			}
@@ -1679,45 +1679,45 @@ 
 		 * @return string
 		 *@since 1.1.0
 		 */
-		public function get_block_icon( $icon ) {
+		public function get_block_icon($icon) {
 
 			// check if we have a Font Awesome icon
 			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+			if (substr($icon, 0, 7) === "fas fa-") {
 				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+			} elseif (substr($icon, 0, 7) === "far fa-") {
 				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+			} elseif (substr($icon, 0, 7) === "fab fa-") {
 				$fa_type = 'brands';
 			} else {
 				$icon = "'" . $icon . "'";
 			}
 
 			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+			if ($fa_type) {
+				$fa_icon = str_replace(array("fas fa-", "far fa-", "fab fa-"), "", $icon);
 				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
 			}
 
 			return $icon;
 		}
 
-		public function group_arguments( $arguments ) {
-			if ( ! empty( $arguments ) ) {
+		public function group_arguments($arguments) {
+			if (!empty($arguments)) {
 				$temp_arguments = array();
-				$general        = __( "General", 'ayecode-connect' );
+				$general        = __("General", 'ayecode-connect');
 				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
+				foreach ($arguments as $key => $args) {
+					if (isset($args['group'])) {
+						$temp_arguments[$args['group']][$key] = $args;
 						$add_sections                             = true;
 					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
+						$temp_arguments[$general][$key] = $args;
 					}
 				}
 
 				// only add sections if more than one
-				if ( $add_sections ) {
+				if ($add_sections) {
 					$arguments = $temp_arguments;
 				}
 			}
@@ -1730,38 +1730,38 @@ 
 		 *
 		 * @since 1.1.17
 		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+		public function group_block_tabs($tabs, $arguments) {
+			if (!empty($tabs) && !empty($arguments)) {
 				$has_sections = false;
 
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
+				foreach ($this->arguments as $key => $args) {
+					if (isset($args['group'])) {
 						$has_sections = true;
 						break;
 					}
 				}
 
-				if ( ! $has_sections ) {
+				if (!$has_sections) {
 					return $tabs;
 				}
 
 				$new_tabs = array();
 
-				foreach ( $tabs as $tab_key => $tab ) {
+				foreach ($tabs as $tab_key => $tab) {
 					$new_groups = array();
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
+					if (!empty($tab['groups']) && is_array($tab['groups'])) {
+						foreach ($tab['groups'] as $group) {
+							if (isset($arguments[$group])) {
 								$new_groups[] = $group;
 							}
 						}
 					}
 
-					if ( ! empty( $new_groups ) ) {
+					if (!empty($new_groups)) {
 						$tab['groups'] = $new_groups;
 
-						$new_tabs[ $tab_key ] = $tab;
+						$new_tabs[$tab_key] = $tab;
 					}
 				}
 
@@ -1788,7 +1788,7 @@ 
 			?>
 			<script>
 			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
+			if (!$sd_is_js_functions_loaded) {
 				$sd_is_js_functions_loaded = true;
 			?>
 function sd_show_view_options($this){
@@ -2065,7 +2065,7 @@ 
 	}
 }
 
-<?php if( !isset( $_REQUEST['sd-block-recover-debug'] ) ){ ?>
+<?php if (!isset($_REQUEST['sd-block-recover-debug'])) { ?>
 // Wait will window is loaded before calling.
 window.onload = function() {
 	sd_auto_recover_blocks();
@@ -2244,7 +2244,7 @@ 
 				$classes = [];
 
 				<?php
-				if($aui_bs5){
+				if ($aui_bs5) {
 					?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
@@ -2253,7 +2253,7 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
+				} else {
 						?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
@@ -2441,7 +2441,7 @@ 
 			}
 
 			function sd_get_class_build_keys(){
-				return <?php echo json_encode(sd_get_class_build_keys());?>;
+				return <?php echo json_encode(sd_get_class_build_keys()); ?>;
 			}
 
 			<?php
@@ -2449,7 +2449,7 @@ 
 
 			}
 
-			if(method_exists($this,'block_global_js')){
+			if (method_exists($this, 'block_global_js')) {
 					echo $this->block_global_js();
 			}
 			?>
@@ -2481,9 +2481,9 @@ 
 					var InnerBlocks = blockEditor.InnerBlocks;
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
-					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
-					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
+					var post_type_rest_slugs = <?php if (!empty($this->arguments) && isset($this->arguments['post_type']['onchange_rest']['values'])) {echo "[" . json_encode($this->arguments['post_type']['onchange_rest']['values']) . "]"; } else {echo "[]"; } ?>;
+					const taxonomies_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
+					const sort_by_<?php echo str_replace("-", "_", $this->id); ?> = [{label: "Please wait", value: 0}];
 					const MediaUpload = wp.blockEditor.MediaUpload;
 
 					/**
@@ -2498,87 +2498,87 @@ 
 					 * @return {?WPBlock}          The block, if it has been successfully
 					 *                             registered; otherwise `undefined`.
 					 */
-					registerBlockType('<?php echo str_replace( "_", "-", sanitize_title_with_dashes( $this->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->options['class_name'] ) );  ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
-						apiVersion: <?php echo isset($this->options['block-api-version']) ? absint($this->options['block-api-version']) : 2 ; ?>,
-						title: '<?php echo addslashes( $this->options['name'] ); ?>', // Block title.
-						description: '<?php echo addslashes( $this->options['widget_ops']['description'] )?>', // Block title.
-						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
+					registerBlockType('<?php echo str_replace("_", "-", sanitize_title_with_dashes($this->options['textdomain']) . '/' . sanitize_title_with_dashes($this->options['class_name'])); ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
+						apiVersion: <?php echo isset($this->options['block-api-version']) ? absint($this->options['block-api-version']) : 2; ?>,
+						title: '<?php echo addslashes($this->options['name']); ?>', // Block title.
+						description: '<?php echo addslashes($this->options['widget_ops']['description'])?>', // Block title.
+						icon: <?php echo $this->get_block_icon($this->options['block-icon']); ?>,//'<?php echo isset($this->options['block-icon']) ? esc_attr($this->options['block-icon']) : 'shield-alt'; ?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if(!isset($this->options['block-supports']['renaming'])){
+							if (!isset($this->options['block-supports']['renaming'])) {
 								$this->options['block-supports']['renaming'] = false;
 							}
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
+							if (isset($this->options['block-supports'])) {
+								echo $this->array_to_attributes($this->options['block-supports']);
 							}
 							?>
 						},
 						__experimentalLabel( attributes, { context } ) {
 							var visibility_html = attributes && attributes.visibility_conditions ? ' &#128065;' : '';
 							var metadata_name = attributes && attributes.metadata && attributes.metadata.name ? attributes.metadata.name : '';
-							var label_name = <?php echo !empty($this->options['block-label']) ? $this->options['block-label'] : "'" . esc_attr( addslashes( $this->options['name'] ) ) . "'"; ?>;
+							var label_name = <?php echo !empty($this->options['block-label']) ? $this->options['block-label'] : "'" . esc_attr(addslashes($this->options['name'])) . "'"; ?>;
 							return metadata_name ? metadata_name + visibility_html  : label_name + visibility_html;
 						},
-						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
-						<?php if ( isset( $this->options['block-keywords'] ) ) {
+						category: '<?php echo isset($this->options['block-category']) ? esc_attr($this->options['block-category']) : 'common'; ?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+						<?php if (isset($this->options['block-keywords'])) {
 						echo "keywords : " . $this->options['block-keywords'] . ",";
 						}
 
 
 						// block hover preview.
 						$example_args = array();
-						if(!empty($this->arguments)){
-							foreach($this->arguments as $key => $a_args){
-								if(isset($a_args['example'])){
+						if (!empty($this->arguments)) {
+							foreach ($this->arguments as $key => $a_args) {
+								if (isset($a_args['example'])) {
 									$example_args[$key] = $a_args['example'];
 								}
 							}
 						}
-						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: '.absint($this->options['example']['viewportWidth']) : '';
+						$viewport_width = isset($this->options['example']['viewportWidth']) ? 'viewportWidth: ' . absint($this->options['example']['viewportWidth']) : '';
 						$example_inner_blocks = !empty($this->options['example']['innerBlocks']) && is_array($this->options['example']['innerBlocks']) ? 'innerBlocks: ' . wp_json_encode($this->options['example']['innerBlocks']) : '';
-						if( isset( $this->options['example'] ) && $this->options['example'] === false ){
+						if (isset($this->options['example']) && $this->options['example'] === false) {
 							// no preview if set to false
-						}elseif( !empty( $example_args ) ){
-							echo "example : {attributes:{".$this->array_to_attributes( $example_args )."},$viewport_width},";
-						}elseif( !empty( $this->options['example'] ) ){
+						}elseif (!empty($example_args)) {
+							echo "example : {attributes:{" . $this->array_to_attributes($example_args) . "},$viewport_width},";
+						}elseif (!empty($this->options['example'])) {
 							unset($this->options['example']['viewportWidth']);
 							unset($this->options['example']['innerBlocks']);
-							$example_atts = $this->array_to_attributes( $this->options['example'] );
+							$example_atts = $this->array_to_attributes($this->options['example']);
 							$example_parts = array();
-							if($example_atts){
-								$example_parts[] = rtrim($example_atts,",");
+							if ($example_atts) {
+								$example_parts[] = rtrim($example_atts, ",");
 							}
-							if($viewport_width){
+							if ($viewport_width) {
 								$example_parts[] = $viewport_width;
 							}
-							if($example_inner_blocks){
+							if ($example_inner_blocks) {
 								$example_parts[] = $example_inner_blocks;
 							}
-							if(!empty($example_parts)){
-								echo "example : {".implode(',', $example_parts)."},";
+							if (!empty($example_parts)) {
+								echo "example : {" . implode(',', $example_parts) . "},";
 							}
-						}else{
+						} else {
 							echo 'example : {viewportWidth: 500},';
 						}
 
 
 
 						// limit to parent
-						if( !empty( $this->options['parent'] ) ){
-							echo "parent : " . wp_json_encode( $this->options['parent'] ) . ",";
+						if (!empty($this->options['parent'])) {
+							echo "parent : " . wp_json_encode($this->options['parent']) . ",";
 						}
 
 						// limit allowed blocks
-						if( !empty( $this->options['allowed-blocks'] ) ){
-							echo "allowedBlocks : " . wp_json_encode( $this->options['allowed-blocks'] ) . ",";
+						if (!empty($this->options['allowed-blocks'])) {
+							echo "allowedBlocks : " . wp_json_encode($this->options['allowed-blocks']) . ",";
 						}
 
 						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+						$no_wrap = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+						if (isset($this->arguments['no_wrap']) && $this->arguments['no_wrap']) {
 							$no_wrap = true;
 						}
-						if ( $no_wrap ) {
+						if ($no_wrap) {
 							$this->options['block-wrap'] = '';
 						}
 
@@ -2595,7 +2595,7 @@ 
 
 							echo "attributes : {";
 
-							if ( $show_advanced ) {
+							if ($show_advanced) {
 								echo "show_advanced: {";
 								echo "	type: 'boolean',";
 								echo "  default: false,";
@@ -2603,57 +2603,57 @@ 
 							}
 
 							// block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+							if (!empty($this->options['block-wrap'])) { //@todo we should validate this?
 								echo "block_wrap: {";
 								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+								echo "  default: '" . esc_attr($this->options['block-wrap']) . "',";
 								echo "},";
 							}
 
 
-							if ( ! empty( $this->arguments ) ) {
+							if (!empty($this->arguments)) {
 
-								foreach ( $this->arguments as $key => $args ) {
+								foreach ($this->arguments as $key => $args) {
 
-									if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
+									if ($args['type'] == 'image' || $args['type'] == 'images') {
 										$img_drag_drop = true;
 									}
 
 									// set if we should show alignment
-									if ( $key == 'alignment' ) {
+									if ($key == 'alignment') {
 										$show_alignment = true;
 									}
 
 									$extra = '';
 
-									if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
+									if ($args['type'] == 'notice' || $args['type'] == 'tab') {
 										continue;
 									}
-									elseif ( $args['type'] == 'checkbox' ) {
+									elseif ($args['type'] == 'checkbox') {
 										$type    = 'boolean';
-										$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-									} elseif ( $args['type'] == 'number' ) {
+										$default = isset($args['default']) && $args['default'] ? 'true' : 'false';
+									} elseif ($args['type'] == 'number') {
 										$type    = 'number';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+									} elseif ($args['type'] == 'select' && !empty($args['multiple'])) {
 										$type = 'array';
-										if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-											$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+										if (isset($args['default']) && is_array($args['default'])) {
+											$default = !empty($args['default']) ? "['" . implode("','", $args['default']) . "']" : "[]";
 										} else {
-											$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+											$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 										}
-									} elseif ( $args['type'] == 'tagselect' ) {
+									} elseif ($args['type'] == 'tagselect') {
 										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'multiselect' ) {
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+									} elseif ($args['type'] == 'multiselect') {
 										$type    = 'array';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image_xy' ) {
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+									} elseif ($args['type'] == 'image_xy') {
 										$type    = 'object';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-									} elseif ( $args['type'] == 'image' ) {
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+									} elseif ($args['type'] == 'image') {
 										$type    = 'string';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 
 										// add a field for ID
 	//                                    echo $key . "_id : {";
@@ -2665,7 +2665,7 @@ 
 
 									} else {
 										$type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_type']) : 'string';
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 
 									}
 									echo $key . " : {";
@@ -2678,7 +2678,7 @@ 
 							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
 							echo "sd_shortcode : {type : 'string',default: ''},";
 
-							if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
+							if (!empty($this->options['nested-block']) || !empty($this->arguments['html'])) {
 								echo "sd_shortcode_close : {type : 'string',default: ''},";
 							}
 
@@ -2697,7 +2697,7 @@ 
 
 <?php
 // only include the drag/drop functions if required.
-if( $img_drag_drop ){
+if ($img_drag_drop) {
 
 ?>
 
@@ -2763,9 +2763,9 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-raw'])) {
+							if (!empty($this->options['block-edit-raw'])) {
 								echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-							}else{
+							} else {
 							?>
 
 function hasSelectedInnerBlock(props) {
@@ -2789,7 +2789,7 @@ 
 	var $value = '';
 	<?php
 	// if we have a post_type and a category then link them
-	if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+	if (isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked'])) {
 	?>
 	if(typeof(prev_attributes[props.clientId]) != 'undefined' && selectedBlock && selectedBlock.clientId === props.clientId){
 		$pt = props.attributes.post_type;
@@ -2804,9 +2804,9 @@ 
 		}
 <?php
 	$cat_path = '';
-	if ( ! empty( $this->arguments['post_type']['onchange_rest']['path'] ) ) {
-		$cat_path = esc_js( strip_tags( $this->arguments['post_type']['onchange_rest']['path'] ) );
-		$cat_path = str_replace( array( '&quot;', '&#039;' ), array( '"', "'" ), $cat_path );
+	if (!empty($this->arguments['post_type']['onchange_rest']['path'])) {
+		$cat_path = esc_js(strip_tags($this->arguments['post_type']['onchange_rest']['path']));
+		$cat_path = str_replace(array('&quot;', '&#039;'), array('"', "'"), $cat_path);
 	}
 ?>
 		/* taxonomies */
@@ -2814,15 +2814,15 @@ 
 			if (!window.gdCPTCats) {
 				window.gdCPTCats = [];
 			}
-			var gdCatPath = "<?php echo ( ! empty( $cat_path ) ? $cat_path : "/wp/v2/" + $value + "/categories/?per_page=100" ); ?>";
+			var gdCatPath = "<?php echo (!empty($cat_path) ? $cat_path : "/wp/v2/" +$value + "/categories/?per_page=100"); ?>";
 			if (window.gdCPTCats[gdCatPath]) {
 				terms = window.gdCPTCats[gdCatPath];
-				while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+				while (taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+					taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 				}
-				taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: "All", value: 0});
+				taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: "All", value: 0});
 				jQuery.each( terms, function( key, val ) {
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: val.name, value: val.id});
+					taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val.name, value: val.id});
 				});
 
 				/* Setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options. */
@@ -2832,12 +2832,12 @@ 
 			} else {
 				wp.apiFetch({path: gdCatPath}).then(terms => {
 					window.gdCPTCats[gdCatPath] = terms;
-					while (taxonomies_<?php echo str_replace("-","_", $this->id);?>.length) {
-						taxonomies_<?php echo str_replace("-","_", $this->id);?>.pop();
+					while (taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+						taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 					}
-					taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: "All", value: 0});
+					taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: "All", value: 0});
 					jQuery.each( terms, function( key, val ) {
-						taxonomies_<?php echo str_replace("-","_", $this->id);?>.push({label: val.name, value: val.id});
+						taxonomies_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val.name, value: val.id});
 					});
 
 					/* Setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options. */
@@ -2845,7 +2845,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); ?>;
 				});
 			}
 		}
@@ -2857,12 +2857,12 @@ 
 			}
 			if (window.gdCPTSort[$pt]) {
 				response = window.gdCPTSort[$pt];
-				while (sort_by_<?php echo str_replace("-","_", $this->id);?>.length) {
-					sort_by_<?php echo str_replace("-","_", $this->id);?>.pop();
+				while (sort_by_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+					sort_by_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 				}
 
 				jQuery.each( response, function( key, val ) {
-					sort_by_<?php echo str_replace("-","_", $this->id);?>.push({label: val, value: key});
+					sort_by_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val, value: key});
 				});
 
 				// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -2877,12 +2877,12 @@ 
 				jQuery.post(ajaxurl, data, function(response) {
 					response = JSON.parse(response);
 					window.gdCPTSort[$pt] = response;
-					while (sort_by_<?php echo str_replace("-","_", $this->id);?>.length) {
-						sort_by_<?php echo str_replace("-","_", $this->id);?>.pop();
+					while (sort_by_<?php echo str_replace("-", "_", $this->id); ?>.length) {
+						sort_by_<?php echo str_replace("-", "_", $this->id); ?>.pop();
 					}
 
 					jQuery.each( response, function( key, val ) {
-						sort_by_<?php echo str_replace("-","_", $this->id);?>.push({label: val, value: key});
+						sort_by_<?php echo str_replace("-", "_", $this->id); ?>.push({label: val, value: key});
 					});
 
 					// setting the value back and fourth fixes the no update issue that sometimes happens where it won't update the options.
@@ -2890,7 +2890,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); ?>;
 				});
 			}
 		}
@@ -2898,9 +2898,9 @@ 
 	<?php } ?>
 <?php
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
-if(!empty($current_screen->base) && $current_screen->base==='widgets'){
+if (!empty($current_screen->base) && $current_screen->base === 'widgets') {
 	echo 'const { deviceType } = "";';
-}else{
+} else {
 ?>
 /** Get device type const. */
 const wpVersion = '<?php global $wp_version; echo esc_attr($wp_version); ?>';
@@ -2959,13 +2959,13 @@ 
 
 									var data = {
 										'action': 'super_duper_output_shortcode',
-										'shortcode': '<?php echo $this->options['base_id'];?>',
+										'shortcode': '<?php echo $this->options['base_id']; ?>',
 										'attributes': props.attributes,
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
-										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
+										'post_id': <?php global $post; if (isset($post->ID)) {
 										echo $post->ID;
-									}else{echo '0';}?>,
-										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+									} else {echo '0'; }?>,
+										'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 									};
 
 									jQuery.post(ajaxurl, data, function (response) {
@@ -2974,17 +2974,17 @@ 
 
 										// if the content is empty then we place some placeholder text
 										if (env == '') {
-											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e( 'Placeholder for:', 'ayecode-connect' );?> " + props.name + "</div>";
+											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for:', 'ayecode-connect'); ?> " + props.name + "</div>";
 										}
 
 										 <?php
-										if(!empty($this->options['nested-block'])){
+										if (!empty($this->options['nested-block'])) {
 											?>
 											// props.setAttributes({content: env});
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
 											 <?php
-										}else{
+										} else {
 										?>
 										props.setAttributes({content: env});
 										is_fetching = false;
@@ -3010,38 +3010,38 @@ 
 							}
 
 							<?php
-							if(!empty($this->options['block-edit-js'])) {
-								echo  $this->options['block-edit-js'] ; // strings have to be in single quotes, may cause issues
+							if (!empty($this->options['block-edit-js'])) {
+								echo  $this->options['block-edit-js']; // strings have to be in single quotes, may cause issues
 							}
 
 
 
 
-							if(empty($this->options['block-save-return'])){
+							if (empty($this->options['block-save-return'])) {
 							?>
 								///////////////////////////////////////////////////////////////////////
 
 									 // build the shortcode.
-								shortcode = "[<?php echo $this->options['base_id'];?>";
+								shortcode = "[<?php echo $this->options['base_id']; ?>";
 								<?php
 
-								if(! empty( $this->arguments )){
+								if (!empty($this->arguments)) {
 
-								foreach($this->arguments as $key => $args){
+								foreach ($this->arguments as $key => $args) {
 								   // if($args['type']=='tabs'){continue;}
 
 								   // don't add metadata arguments
-								   if (substr($key, 0, 9 ) === 'metadata_') {
+								   if (substr($key, 0, 9) === 'metadata_') {
 									   continue;
 								   }
 								?>
-								if (props.attributes.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-									if ('<?php echo esc_attr( $key );?>' == 'html') {
-									} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
-										shortcode += props.attributes.<?php echo esc_attr( $key );?>.length && ( props.attributes.<?php echo esc_attr( $key );?>.x.length || props.attributes.<?php echo esc_attr( $key );?>.y.length ) ? " <?php echo esc_attr( $key );?>='{x:" + props.attributes.<?php echo esc_attr( $key );?>.x + ",y:"+props.attributes.<?php echo esc_attr( $key );?>.y +"}' " : "";
+								if (props.attributes.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+									if ('<?php echo esc_attr($key); ?>' == 'html') {
+									} else if ('<?php echo esc_attr($args['type']); ?>' == 'image_xy') {
+										shortcode += props.attributes.<?php echo esc_attr($key); ?>.length && ( props.attributes.<?php echo esc_attr($key); ?>.x.length || props.attributes.<?php echo esc_attr($key); ?>.y.length ) ? " <?php echo esc_attr($key); ?>='{x:" + props.attributes.<?php echo esc_attr($key); ?>.x + ",y:"+props.attributes.<?php echo esc_attr($key); ?>.y +"}' " : "";
 									} else {
-										//shortcode += props.attributes.<?php echo esc_attr( $key );?>.length ? " <?php echo esc_attr( $key );?>='" + props.attributes.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' " : "";
-										shortcode +=  " <?php echo esc_attr( $key );?>='" + props.attributes.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' ";
+										//shortcode += props.attributes.<?php echo esc_attr($key); ?>.length ? " <?php echo esc_attr($key); ?>='" + props.attributes.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' " : "";
+										shortcode +=  " <?php echo esc_attr($key); ?>='" + props.attributes.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' ";
 									}
 								}
 								<?php
@@ -3060,8 +3060,8 @@ 
 
 
 									<?php
-									if(!empty($this->options['nested-block']) || !empty($this->arguments['html']) ){
-										echo "props.setAttributes({sd_shortcode_close: '[/".esc_attr( $this->options['base_id'] )."]'});";
+									if (!empty($this->options['nested-block']) || !empty($this->arguments['html'])) {
+										echo "props.setAttributes({sd_shortcode_close: '[/" . esc_attr($this->options['base_id']) . "]'});";
 									}
 									?>
 								}
@@ -3076,7 +3076,7 @@ 
 
 								el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-									<?php if($show_alignment){?>
+									<?php if ($show_alignment) {?>
 									el(
 										wp.blockEditor.AlignmentToolbar,
 										{
@@ -3094,9 +3094,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'}
@@ -3116,42 +3116,42 @@ 
 									<?php
 									}
 
-									$arguments = $this->group_arguments( $this->arguments );
-									$block_group_tabs = ! empty( $this->options['block_group_tabs'] ) ? $this->group_block_tabs( $this->options['block_group_tabs'], $arguments ) : array();
+									$arguments = $this->group_arguments($this->arguments);
+									$block_group_tabs = !empty($this->options['block_group_tabs']) ? $this->group_block_tabs($this->options['block_group_tabs'], $arguments) : array();
 
 									// Do we have sections?
 									$has_sections = $arguments == $this->arguments ? false : true;
 
-									if($has_sections){
+									if ($has_sections) {
 									$panel_count = 0;
 									$open_tab = '';
 
 									$open_tab_groups = array();
 									$used_tabs = array();
 
-									foreach ( $arguments as $key => $args ) {
+									foreach ($arguments as $key => $args) {
 										$close_tab = false;
 										$close_tabs = false;
 
-										 if ( ! empty( $block_group_tabs ) ) {
-											foreach ( $block_group_tabs as $tab_name => $tab_args ) {
-												if ( in_array( $key, $tab_args['groups'] ) ) {
+										 if (!empty($block_group_tabs)) {
+											foreach ($block_group_tabs as $tab_name => $tab_args) {
+												if (in_array($key, $tab_args['groups'])) {
 													$open_tab_groups[] = $key;
 
-													if ( $open_tab != $tab_name ) {
+													if ($open_tab != $tab_name) {
 														$tab_args['tab']['tabs_open'] = $open_tab == '' ? true : false;
 														$tab_args['tab']['open'] = true;
 
-														$this->block_tab_start( '', $tab_args );
+														$this->block_tab_start('', $tab_args);
 														$open_tab = $tab_name;
 														$used_tabs[] = $tab_name;
 													}
 
-													if ( $open_tab_groups == $tab_args['groups'] ) {
+													if ($open_tab_groups == $tab_args['groups']) {
 														$close_tab = true;
 														$open_tab_groups = array();
 
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
+														if ($used_tabs == array_keys($block_group_tabs)) {
 															$close_tabs = true;
 														}
 													}
@@ -3160,27 +3160,27 @@ 
 										}
 										?>
 										el(wp.components.PanelBody, {
-												title: '<?php esc_attr_e( $key ); ?>',
-												initialOpen: <?php if ( $panel_count ) {
+												title: '<?php esc_attr_e($key); ?>',
+												initialOpen: <?php if ($panel_count) {
 												echo "false";
 											} else {
 												echo "true";
 											}?>
 											},
 											<?php
-											foreach ( $args as $k => $a ) {
-												$this->block_tab_start( $k, $a );
-												$this->block_row_start( $k, $a );
-												$this->build_block_arguments( $k, $a );
-												$this->block_row_end( $k, $a );
-												$this->block_tab_end( $k, $a );
+											foreach ($args as $k => $a) {
+												$this->block_tab_start($k, $a);
+												$this->block_row_start($k, $a);
+												$this->build_block_arguments($k, $a);
+												$this->block_row_end($k, $a);
+												$this->block_tab_end($k, $a);
 											}
 											?>
 										),
 										<?php
-										$panel_count ++;
+										$panel_count++;
 
-										if($close_tab || $close_tabs){
+										if ($close_tab || $close_tabs) {
 											$tab_args = array(
 												'tab'	=> array(
 													'tabs_close' => $close_tabs,
@@ -3188,24 +3188,24 @@ 
 												)
 
 											);
-											$this->block_tab_end( '', $tab_args );
+											$this->block_tab_end('', $tab_args);
 //											echo '###close'; print_r($tab_args);
 											$panel_count = 0;
 										}
 //
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
-											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
+											title: '<?php esc_attr_e("Settings", 'ayecode-connect'); ?>',
 											initialOpen: true
 										},
 										<?php
-										foreach ( $this->arguments as $key => $args ) {
-											$this->block_row_start( $key, $args );
-											$this->build_block_arguments( $key, $args );
-											$this->block_row_end( $key, $args );
+										foreach ($this->arguments as $key => $args) {
+											$this->block_row_start($key, $args);
+											$this->build_block_arguments($key, $args);
+											$this->block_row_end($key, $args);
 										}
 										?>
 									),
@@ -3219,11 +3219,11 @@ 
 
 								<?php
 								// If the user sets block-output array then build it
-								if ( ! empty( $this->options['block-output'] ) ) {
-								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
+								if (!empty($this->options['block-output'])) {
+								$this->block_element($this->options['block-output']);
+							}elseif (!empty($this->options['block-edit-return'])) {
 								   echo $this->options['block-edit-return'];
-							}else{
+							} else {
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
 								?>
@@ -3250,27 +3250,27 @@ 
 							var align = '';
 
 							// build the shortcode.
-							var content = "[<?php echo $this->options['base_id'];?>";
+							var content = "[<?php echo $this->options['base_id']; ?>";
 							$html = '';
 							<?php
 
-							if(! empty( $this->arguments )){
+							if (!empty($this->arguments)) {
 
-							foreach($this->arguments as $key => $args){
+							foreach ($this->arguments as $key => $args) {
 							   // if($args['type']=='tabs'){continue;}
 
 							   // don't add metadata arguments
-							   if (substr($key, 0, 9 ) === 'metadata_') {
+							   if (substr($key, 0, 9) === 'metadata_') {
 								   continue;
 							   }
 							?>
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-								if ('<?php echo esc_attr( $key );?>' == 'html') {
-									$html = attr.<?php echo esc_attr( $key );?>;
-								} else if ('<?php echo esc_attr( $args['type'] );?>' == 'image_xy') {
-									content += " <?php echo esc_attr( $key );?>='{x:" + attr.<?php echo esc_attr( $key );?>.x + ",y:"+attr.<?php echo esc_attr( $key );?>.y +"}' ";
+							if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+								if ('<?php echo esc_attr($key); ?>' == 'html') {
+									$html = attr.<?php echo esc_attr($key); ?>;
+								} else if ('<?php echo esc_attr($args['type']); ?>' == 'image_xy') {
+									content += " <?php echo esc_attr($key); ?>='{x:" + attr.<?php echo esc_attr($key); ?>.x + ",y:"+attr.<?php echo esc_attr($key); ?>.y +"}' ";
 								} else {
-									content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>.toString().replace('\'','&#39;') + "' ";
+									content += " <?php echo esc_attr($key); ?>='" + attr.<?php echo esc_attr($key); ?>.toString().replace('\'','&#39;') + "' ";
 								}
 							}
 							<?php
@@ -3290,7 +3290,7 @@ 
 							?>
 							// if has html element
 							if ($html) {
-								//content += $html + "[/<?php echo $this->options['base_id'];?>]";
+								//content += $html + "[/<?php echo $this->options['base_id']; ?>]";
 							}
 
 							// @todo should we add inline style here or just css classes?
@@ -3320,7 +3320,7 @@ 
 //                                <x?php
 //							}else
 
-							if(!empty($this->options['block-output'])){
+							if (!empty($this->options['block-output'])) {
 //                               echo "return";
 //                               $this->block_element( $this->options['block-output'], true );
 //                               echo ";";
@@ -3330,30 +3330,30 @@ 
 								   '',
 								   {},
 								  // el('', {dangerouslySetInnerHTML: {__html: content}}),
-								   <?php $this->block_element( $this->options['block-output'], true ); ?>
-								  // el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
+								   <?php $this->block_element($this->options['block-output'], true); ?>
+								  // el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id']; ?>]"}})
 							   );
 								<?php
 
-							}elseif(!empty($this->options['block-save-return'])){
+							}elseif (!empty($this->options['block-save-return'])) {
 								   echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
+							}elseif (!empty($this->options['nested-block'])) {
 								?>
 							  return el(
 								   '',
 								   {},
 								   el('', {dangerouslySetInnerHTML: {__html: content+"\n"}}),
 								   InnerBlocks.Content ? el( InnerBlocks.Content ) : '', // @todo i think we need a comma here
-								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
+								 //  el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id']; ?>]"}})
 							   );
 								<?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
-								echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							}elseif (!empty($this->options['block-save-return'])) {
+								echo "return " . $this->options['block-edit-return'] . ";";
+							}elseif (isset($this->options['block-wrap']) && $this->options['block-wrap'] == '') {
 							?>
 							return content;
 							<?php
-							}else{
+							} else {
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -3382,48 +3382,48 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 
 
-		public function block_row_start($key, $args){
+		public function block_row_start($key, $args) {
 
 			// check for row
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 
 				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-				$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-				$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+				$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
+				$device_type = !empty($args['device_type']) ? esc_attr($args['device_type']) : '';
+				$device_type_require = !empty($args['device_type']) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
 				$device_type_icon = '';
-				if($device_type=='Desktop'){
+				if ($device_type == 'Desktop') {
 					$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Tablet'){
+				}elseif ($device_type == 'Tablet') {
 					$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-				}elseif($device_type=='Mobile'){
+				}elseif ($device_type == 'Mobile') {
 					$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 				}
 				echo $element_require;
 				echo $device_type_require;
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
-							<?php if(!empty($args['row']['title'])){ ?>
+							<?php if (!empty($args['row']['title'])) { ?>
 							el('label', {
 									className: 'components-base-control__label position-relative',
 									style: {width:"100%"}
 								},
-								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['row']['title'] ) ?>'}}),
-								<?php if($device_type_icon){ ?>
-									deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
+								el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes($args['row']['title']) ?>'}}),
+								<?php if ($device_type_icon) { ?>
+									deviceType == '<?php echo $device_type; ?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})
 								<?php
 								}
 								?>
@@ -3431,17 +3431,17 @@ 
 
 							),
 							<?php }?>
-							<?php if(!empty($args['row']['desc'])){ ?>
+							<?php if (!empty($args['row']['desc'])) { ?>
 							el('p', {
 									className: 'components-base-control__help mb-0',
 								},
-								'<?php echo addslashes( $args['row']['desc'] ); ?>'
+								'<?php echo addslashes($args['row']['desc']); ?>'
 							),
 							<?php }?>
 							el(
 								'div',
 								{
-									className: 'row mb-n2 <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>',
+									className: 'row mb-n2 <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>',
 								},
 								el(
 									'div',
@@ -3450,36 +3450,36 @@ 
 									},
 
 					<?php
-					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				}elseif (!empty($args['row']['close'])) {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0',
 							},
 					<?php
-					if(false){?></script><?php }
-				}else{
-					if(false){?><script><?php }?>
+					if (false) {?></script><?php }
+				} else {
+					if (false) {?><script><?php }?>
 						el(
 							'div',
 							{
 								className: 'col pl-0 ps-0 pr-2 pe-2',
 							},
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_row_end($key, $args){
+		public function block_row_end($key, $args) {
 
-			if(!empty($args['row'])){
+			if (!empty($args['row'])) {
 				// maybe close
-				if(!empty($args['row']['close'])){
+				if (!empty($args['row']['close'])) {
 					echo "))";
 				}
 
@@ -3487,14 +3487,14 @@ 
 			}
 		}
 
-		public function block_tab_start($key, $args){
+		public function block_tab_start($key, $args) {
 
 			// check for row
-			if(!empty($args['tab'])){
+			if (!empty($args['tab'])) {
 
-				if(!empty($args['tab']['tabs_open'])){
+				if (!empty($args['tab']['tabs_open'])) {
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 
 el('div',{className: 'bsui'},
 
@@ -3503,52 +3503,52 @@ 
 									{
 										activeClass: 'is-active',
 										className: 'btn-groupx',
-										initialTabName: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
+										initialTabName: '<?php echo addslashes(esc_attr($args['tab']['key'])); ?>',
 										tabs: [
 
 					<?php
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
-				if(!empty($args['tab']['open'])){
+				if (!empty($args['tab']['open'])) {
 
-					if(false){?><script><?php }?>
+					if (false) {?><script><?php }?>
 							{
-												name: '<?php echo addslashes( esc_attr( $args['tab']['key']) ); ?>',
-												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes( esc_attr( $args['tab']['title']) ); ?>'}}),
-												className: '<?php echo addslashes( esc_attr( $args['tab']['class']) ); ?>',
-												content: el('div',{}, <?php if(!empty($args['tab']['desc'])){ ?>el('p', {
+												name: '<?php echo addslashes(esc_attr($args['tab']['key'])); ?>',
+												title: el('div', {dangerouslySetInnerHTML: {__html: '<?php echo addslashes(esc_attr($args['tab']['title'])); ?>'}}),
+												className: '<?php echo addslashes(esc_attr($args['tab']['class'])); ?>',
+												content: el('div',{}, <?php if (!empty($args['tab']['desc'])) { ?>el('p', {
 									className: 'components-base-control__help mb-0',
-									dangerouslySetInnerHTML: {__html:'<?php echo addslashes( $args['tab']['desc'] ); ?>'}
+									dangerouslySetInnerHTML: {__html:'<?php echo addslashes($args['tab']['desc']); ?>'}
 								}),<?php }
-					if(false){?></script><?php }
+					if (false) {?></script><?php }
 				}
 
 			}
 
 		}
 
-		public function block_tab_end($key, $args){
+		public function block_tab_end($key, $args) {
 
-			if(!empty($args['tab'])){
+			if (!empty($args['tab'])) {
 				// maybe close
-				if(!empty($args['tab']['close'])){
+				if (!empty($args['tab']['close'])) {
 					echo ")}, /* tab close */";
 				}
 
-				if(!empty($args['tab']['tabs_close'])){
-					if(false){?><script><?php }?>
+				if (!empty($args['tab']['tabs_close'])) {
+					if (false) {?><script><?php }?>
 						]}, ( tab ) => {
 								return tab.content;
 							}
 						)), /* tabs close */
-					<?php if(false){ ?></script><?php }
+					<?php if (false) { ?></script><?php }
 				}
 			}
 		}
 
-		public function build_block_arguments( $key, $args ) {
-			$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
+		public function build_block_arguments($key, $args) {
+			$custom_attributes = !empty($args['custom_attributes']) ? $this->array_to_attributes($args['custom_attributes']) : '';
 			$options           = '';
 			$extra             = '';
 			$require           = '';
@@ -3556,28 +3556,28 @@ 
 			$after_elements	   = '';
 
 			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
+			if ($key == 'content') {
 				return;
 			}
 
-			$device_type = ! empty( $args['device_type'] ) ? esc_attr($args['device_type']) : '';
-			$device_type_require = ! empty( $args['device_type'] ) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
+			$device_type = !empty($args['device_type']) ? esc_attr($args['device_type']) : '';
+			$device_type_require = !empty($args['device_type']) ? " deviceType == '" . esc_attr($device_type) . "' && " : '';
 			$device_type_icon = '';
-			if($device_type=='Desktop'){
+			if ($device_type == 'Desktop') {
 				$device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Tablet'){
+			}elseif ($device_type == 'Tablet') {
 				$device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-			}elseif($device_type=='Mobile'){
+			}elseif ($device_type == 'Mobile') {
 				$device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
 			}
 
 			// icon
 			$icon = '';
-			if( !empty( $args['icon'] ) ){
+			if (!empty($args['icon'])) {
 				$icon .= "el('div', {";
-									$icon .= "dangerouslySetInnerHTML: {__html: '".self::get_widget_icon( esc_attr($args['icon']))."'},";
+									$icon .= "dangerouslySetInnerHTML: {__html: '" . self::get_widget_icon(esc_attr($args['icon'])) . "'},";
 									$icon .= "className: 'text-center',";
-									$icon .= "title: '".addslashes( $args['title'] )."',";
+									$icon .= "title: '" . addslashes($args['title']) . "',";
 								$icon .= "}),";
 
 				// blank title as its added to the icon.
@@ -3585,27 +3585,27 @@ 
 			}
 
 			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+			$require_advanced = !empty($args['advanced']) ? "props.attributes.show_advanced && " : "";
 
 			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+			$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 
 
 			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
+			$onchangecomplete = "";
 			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','range' );
-			if ( in_array( $args['type'], $text_type ) ) {
+			$text_type = array('text', 'password', 'number', 'email', 'tel', 'url', 'colorx', 'range');
+			if (in_array($args['type'], $text_type)) {
 				$type = 'TextControl';
 				// Save numbers as numbers and not strings
-				if ( $args['type'] == 'number' ) {
+				if ($args['type'] == 'number') {
 					$onchange = "props.setAttributes({ $key: $key ? Number($key) : '' } )";
 				}
 
-				if (substr($key, 0, 9 ) === 'metadata_') {
-					$real_key = str_replace('metadata_','', $key );
+				if (substr($key, 0, 9) === 'metadata_') {
+					$real_key = str_replace('metadata_', '', $key);
 					$onchange = "props.setAttributes({ metadata: { $real_key: $key } } )";
-					$value     = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
+					$value = "props.attributes.metadata && props.attributes.metadata.$real_key ? props.attributes.metadata.$real_key : ''";
 				}
 			}
 //			else if ( $args['type'] == 'popup' ) {
@@ -3625,12 +3625,12 @@ 
 //
 //				$value     = "props.attributes.$key ? props.attributes.$key : ''";
 //			}
-			else if ( $args['type'] == 'styleid' ) {
+			else if ($args['type'] == 'styleid') {
 				$type = 'TextControl';
 				$args['type'] == 'text';
 				// Save numbers as numbers and not strings
-				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
+				$value = "props.attributes.$key ? props.attributes.$key : ''";
+			} else if ($args['type'] == 'notice') {
 
 				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
 				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
@@ -3692,11 +3692,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) {
@@ -3705,7 +3705,7 @@ 
 							$key: value
 						});
 					},";
-			}elseif ( $args['type'] == 'gradient' ) {
+			}elseif ($args['type'] == 'gradient') {
 				$type = 'GradientPicker';
 				$extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
@@ -3744,7 +3744,7 @@ 
 			slug: 'cool-to-warm-spectrum',
 		}],";
 
-			}elseif ( $args['type'] == 'image' ) {
+			}elseif ($args['type'] == 'image') {
 //                print_r($args);
 
 				$img_preview = isset($args['focalpoint']) && !$args['focalpoint'] ? " props.attributes.$key && el('img', { src: props.attributes.$key,style: {maxWidth:'100%',background: '#ccc'}})," : " ( props.attributes.$key ||  props.attributes.{$key}_use_featured ) && el(wp.components.FocalPointPicker,{
@@ -3806,7 +3806,7 @@ 
 				$onchange = "";
 
 				//$inside_elements = ",el('div',{},'file upload')";
-			} else if ( $args['type'] == 'images' ) {
+			} else if ($args['type'] == 'images') {
 				$img_preview = "props.attributes.$key && (function() {
 	let uploads = JSON.parse('['+props.attributes.$key+']');
 	let images = [];
@@ -3819,7 +3819,7 @@ 
 			el('i',{
 				className: 'fas fa-times-circle text-danger position-absolute  ml-n2 mt-n1 bg-white rounded-circle c-pointer',
 				onClick: function() {
-					aui_confirm('".esc_attr__('Are you sure?')."', '".esc_attr__('Delete')."', '".esc_attr__('Cancel')."', true).then(function(confirmed) {
+					aui_confirm('" . esc_attr__('Are you sure?') . "', '" . esc_attr__('Delete') . "', '" . esc_attr__('Cancel') . "', true).then(function(confirmed) {
 						if (confirmed) {
 							let new_uploads = JSON.parse('['+props.attributes.$key+']');
 							new_uploads.splice(index, 1);
@@ -3882,36 +3882,36 @@ 
 
 				//$inside_elements = ",el('div',{},'file upload')";
 			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			elseif ($args['type'] == 'checkbox') {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-			} elseif ( $args['type'] == 'textarea' ) {
+			} elseif ($args['type'] == 'textarea') {
 				$type = 'TextareaControl';
 
-			} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+			} elseif ($args['type'] == 'select' || $args['type'] == 'multiselect') {
 				$type = 'SelectControl';
 
-				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
-					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
-					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
+				if ($args['name'] == 'category' && !empty($args['post_type_linked'])) {
+					$options .= "options: taxonomies_" . str_replace("-", "_", $this->id) . ",";
+				}elseif ($args['name'] == 'sort_by' && !empty($args['post_type_linked'])) {
+					$options .= "options: sort_by_" . str_replace("-", "_", $this->id) . ",";
+				} else {
 
-					if ( ! empty( $args['options'] ) ) {
+					if (!empty($args['options'])) {
 						$options .= "options: [";
-						foreach ( $args['options'] as $option_val => $option_label ) {
-							$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . esc_js( addslashes( $option_label ) ) . "' },";
+						foreach ($args['options'] as $option_val => $option_label) {
+							$options .= "{ value: '" . esc_attr($option_val) . "', label: '" . esc_js(addslashes($option_label)) . "' },";
 						}
 						$options .= "],";
 					}
 				}
-				if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+				if (isset($args['multiple']) && $args['multiple']) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
 					$extra .= ' multiple:true,style:{height:"auto",paddingRight:"8px","overflow-y":"auto"}, ';
 				}
 
-				if($args['type'] == 'multiselect' ||  ( isset( $args['multiple'] ) && $args['multiple'] ) ){
-					$after_elements	 .= "props.attributes.$key && el( wp.components.Button, {
+				if ($args['type'] == 'multiselect' || (isset($args['multiple']) && $args['multiple'])) {
+					$after_elements .= "props.attributes.$key && el( wp.components.Button, {
 									  className: 'components-button components-circular-option-picker__clear is-secondary is-small',
 									  style: {margin:'-8px 0 8px 0',display: 'block'},
 									  onClick: function(){
@@ -3923,7 +3923,7 @@ 
 									'Clear'
 							),";
 				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+			} elseif ($args['type'] == 'tagselect') {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3958,19 +3958,19 @@ 
 //				$value     = "[]";
 //				$extra .= ' __experimentalExpandOnFocus: true,';
 
-			} else if ( $args['type'] == 'alignment' ) {
+			} else if ($args['type'] == 'alignment') {
 				$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-			} else if ( $args['type'] == 'margins' ) {
+			} else if ($args['type'] == 'margins') {
 
-			} else if ( $args['type'] == 'visibility_conditions' && ( function_exists( 'wp_is_block_theme' ) && wp_is_block_theme() ) ) {
+			} else if ($args['type'] == 'visibility_conditions' && (function_exists('wp_is_block_theme') && wp_is_block_theme())) {
 				$type = 'TextControl';
 				$value = "(props.attributes.$key ? props.attributes.$key : '')";
 				$args['type'] = 'text';
 				$options .= 'disabled:true,';
-				$bsvc_title = esc_attr( addslashes( $args['title'] ) );
-				$bsvc_body = $this->block_visibility_fields( $args );
+				$bsvc_title = esc_attr(addslashes($args['title']));
+				$bsvc_body = $this->block_visibility_fields($args);
 				// @TODO reset button
-				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __( 'Reset', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __( 'Close', 'ayecode-connect' ) . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __( 'Save Rules', 'ayecode-connect' ) . '</button>';
+				$bsvc_footer = '<button type="button" class="btn btn-danger d-none">' . __('Reset', 'ayecode-connect') . '</button><button type="button" class="btn btn-secondary bs-vc-close text-white" data-bs-dismiss="modal">' . __('Close', 'ayecode-connect') . '</button><button type="button" class="btn btn-primary bs-vc-save">' . __('Save Rules', 'ayecode-connect') . '</button>';
 				$after_elements .= "el('div', {className: 'components-base-control bs-vc-button-wrap'}, el(wp.components.Button, {
 						className: 'components-button components-circular-option-picker__clear is-primary is-smallx',
 						onClick: function() {
@@ -3989,25 +3989,25 @@ 
 									jQuery('.bs-vc-modal-form').trigger('change');
 								}
 							});
-							aui_modal('" . $bsvc_title . "', '" . addslashes( $bsvc_body ) . "', '" . $bsvc_footer . "', true, 'bs-vc-modal', 'modal-lg', '');
+							aui_modal('" . $bsvc_title . "', '" . addslashes($bsvc_body) . "', '" . $bsvc_footer . "', true, 'bs-vc-modal', 'modal-lg', '');
 							jQuery(document).off('change', '#bsvc_raw_value').on('change', '#bsvc_raw_value', function(e) {
 								props.setAttributes({" . $key . ": e.target.value});
 							});
 						}
 					},
-					'" . addslashes( ! empty( $args['button_title'] ) ? $args['button_title'] : $args['title'] ) . "'
+					'" . addslashes(!empty($args['button_title']) ? $args['button_title'] : $args['title']) . "'
 				) ),";
 			} else {
-				return;// if we have not implemented the control then don't break the JS.
+				return; // if we have not implemented the control then don't break the JS.
 			}
 
 			// color input does not show the labels so we add them
-			if($args['type']=='color'){
+			if ($args['type'] == 'color') {
 				// add show only if advanced
 				echo $require_advanced;
 				// add setting require if defined
 				echo $element_require;
-				echo "el('div', {style: {'marginBottom': '8px'}}, '".addslashes( $args['title'] )."'),";
+				echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes($args['title']) . "'),";
 			}
 
 			// add show only if advanced
@@ -4019,22 +4019,22 @@ 
 			// icon
 			echo $icon;
 			?>
-			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type  : "wp.components.".$type; ?>, {
-			label: <?php if ( empty( $args['title'] ) ) { echo "''"; } else if ( empty( $args['row'] ) && ! empty( $args['device_type'] ) ) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes( $args['title'] ) ?>'}}),<?php if ( $device_type_icon ) { ?>deviceType == '<?php echo $device_type;?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
-			} else { ?>'<?php echo addslashes( trim( esc_html( $args['title'] ) ) ); ?>'<?php } ?>,
-			help: <?php echo ( isset( $args['desc'] ) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim( wp_kses_post( addslashes( $args['desc'] ) ) ) . "'}})" : "''" ); ?>,
+			el( <?php echo $args['type'] == 'image' || $args['type'] == 'images' ? $type : "wp.components." . $type; ?>, {
+			label: <?php if (empty($args['title'])) { echo "''"; } else if (empty($args['row']) && !empty($args['device_type'])) { ?>el('label',{className:'components-base-control__label',style:{width:"100%"}},el('span',{dangerouslySetInnerHTML: {__html: '<?php echo addslashes($args['title']) ?>'}}),<?php if ($device_type_icon) { ?>deviceType == '<?php echo $device_type; ?>' && el('span',{dangerouslySetInnerHTML: {__html: '<?php echo $device_type_icon; ?>'},title: deviceType + ": Set preview mode to change",style: {right:"0",position:"absolute",color:"var(--wp-admin-theme-color)"}})<?php } ?>)<?php
+			} else { ?>'<?php echo addslashes(trim(esc_html($args['title']))); ?>'<?php } ?>,
+			help: <?php echo (isset($args['desc']) ? "el('span', {dangerouslySetInnerHTML: {__html: '" . trim(wp_kses_post(addslashes($args['desc']))) . "'}})" : "''"); ?>,
 			value: <?php echo $value; ?>,
-			<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-				echo "type: '" . addslashes( $args['type'] ) . "',";
+			<?php if ($type == 'TextControl' && $args['type'] != 'text') {
+				echo "type: '" . addslashes($args['type']) . "',";
 			} ?>
-			<?php if ( ! empty( $args['placeholder'] ) ) {
-				echo "placeholder: '" . esc_js( addslashes( trim( esc_html( $args['placeholder'] ) ) ) ) . "',";
+			<?php if (!empty($args['placeholder'])) {
+				echo "placeholder: '" . esc_js(addslashes(trim(esc_html($args['placeholder'])))) . "',";
 			} ?>
 			<?php echo $options; ?>
 			<?php echo $extra; ?>
 			<?php echo $custom_attributes; ?>
 			<?php echo $onchangecomplete; ?>
-			<?php if ( $onchange ) { ?>
+			<?php if ($onchange) { ?>
 			onChange: function ( <?php echo $key; ?> ) {
 				<?php echo $onchange; ?>
 			}
@@ -4053,15 +4053,15 @@ 
 		 *@todo there is prob a faster way to do this, also we could add some validation here.
 		 *
 		 */
-		public function array_to_attributes( $custom_attributes, $html = false ) {
+		public function array_to_attributes($custom_attributes, $html = false) {
 			$attributes = '';
-			if ( ! empty( $custom_attributes ) ) {
+			if (!empty($custom_attributes)) {
 
-				foreach ( $custom_attributes as $key => $val ) {
-					if(is_array($val)){
-						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
-						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
+				foreach ($custom_attributes as $key => $val) {
+					if (is_array($val)) {
+						$attributes .= $key . ': {' . $this->array_to_attributes($val, $html) . '},';
+					} else {
+						$attributes .= $html ? " $key='$val' " : "'$key': '$val',";
 					}
 				}
 
@@ -4079,113 +4079,113 @@ 
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args, $save = false ) {
+		public function block_element($args, $save = false) {
 
 //            print_r($args);echo '###';exit;
 
-			if ( ! empty( $args ) ) {
-				foreach ( $args as $element => $new_args ) {
+			if (!empty($args)) {
+				foreach ($args as $element => $new_args) {
 
-					if ( is_array( $new_args ) ) { // its an element
+					if (is_array($new_args)) { // its an element
 
 
-						if ( isset( $new_args['element'] ) ) {
+						if (isset($new_args['element'])) {
 
-							if ( isset( $new_args['element_require'] ) ) {
-								echo str_replace( array(
+							if (isset($new_args['element_require'])) {
+								echo str_replace(array(
 										"'+",
 										"+'"
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-								unset( $new_args['element_require'] );
+									), '', $this->block_props_replace($new_args['element_require'])) . " &&  ";
+								unset($new_args['element_require']);
 							}
 
-							if($new_args['element']=='InnerBlocks'){
+							if ($new_args['element'] == 'InnerBlocks') {
 								echo "\n el( InnerBlocks, {";
-							}elseif($new_args['element']=='innerBlocksProps'){
+							}elseif ($new_args['element'] == 'innerBlocksProps') {
 								$element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
 							  //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
 								echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
 								echo $save ? "wp.blockEditor.useBlockProps.save( {" : "wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+								echo !empty($new_args['blockProps']) ? $this->block_element($new_args['blockProps'], $save) : '';
 
 								echo "} ), {";
-								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
+								echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element($new_args['innerBlocksProps'], $save) : '';
 							//    echo '###';
 
 							  //  echo '###';
-							}elseif($new_args['element']=='BlocksProps'){
+							}elseif ($new_args['element'] == 'BlocksProps') {
 
-								if ( isset($new_args['if_inner_element']) ) {
+								if (isset($new_args['if_inner_element'])) {
 									$element = $new_args['if_inner_element'];
-								}else {
-									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
+								} else {
+									$element = isset($new_args['inner_element']) ? "'" . esc_attr($new_args['inner_element']) . "'" : "'div'";
 								}
 
 								unset($new_args['inner_element']);
 								echo $save ? "\n el( $element, wp.blockEditor.useBlockProps.save( {" : "\n el( $element, wp.blockEditor.useBlockProps( {";
-								echo !empty($new_args['blockProps']) ? $this->block_element( $new_args['blockProps'],$save ) : '';
+								echo !empty($new_args['blockProps']) ? $this->block_element($new_args['blockProps'], $save) : '';
 
 
 							   // echo "} ),";
 
-							}else{
+							} else {
 								echo "\n el( '" . $new_args['element'] . "', {";
 							}
 
 
 							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
+							foreach ($new_args as $new_key => $new_value) {
 
 
-								if ( $new_key == 'element' || $new_key == 'content'|| $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+								if ($new_key == 'element' || $new_key == 'content' || $new_key == 'if_content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array($new_value)) {
 									// do nothing
 								} else {
-									echo $this->block_element( array( $new_key => $new_value ),$save );
+									echo $this->block_element(array($new_key => $new_value), $save);
 								}
 							}
 
-							echo $new_args['element']=='BlocksProps' ? '} ),' : "},";// end attributes
+							echo $new_args['element'] == 'BlocksProps' ? '} ),' : "},"; // end attributes
 
 							// get the content
 							$first_item = 0;
-							foreach ( $new_args as $new_key => $new_value ) {
-								if ( $new_key === 'content' || $new_key === 'if_content' || is_array( $new_value ) ) {
+							foreach ($new_args as $new_key => $new_value) {
+								if ($new_key === 'content' || $new_key === 'if_content' || is_array($new_value)) {
 
-									if ( $new_key === 'content' ) {
-										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
-										echo  $this->block_props_replace(  $new_value  );
+									if ($new_key === 'content') {
+										echo "'" . $this->block_props_replace(wp_slash($new_value)) . "'";
+									} else if ($new_key === 'if_content') {
+										echo  $this->block_props_replace($new_value);
 									}
 
-									if ( is_array( $new_value ) ) {
+									if (is_array($new_value)) {
 
-										if ( isset( $new_value['element_require'] ) ) {
-											echo str_replace( array(
+										if (isset($new_value['element_require'])) {
+											echo str_replace(array(
 													"'+",
 													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
+												), '', $this->block_props_replace($new_value['element_require'])) . " &&  ";
+											unset($new_value['element_require']);
 										}
 
-										if ( isset( $new_value['element_repeat'] ) ) {
+										if (isset($new_value['element_repeat'])) {
 											$x = 1;
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
-												$this->block_element( array( '' => $new_value ),$save );
-												$x ++;
+											while ($x <= absint($new_value['element_repeat'])) {
+												$this->block_element(array('' => $new_value), $save);
+												$x++;
 											}
 										} else {
-											$this->block_element( array( '' => $new_value ),$save );
+											$this->block_element(array('' => $new_value), $save);
 										}
 									}
-									$first_item ++;
+									$first_item++;
 								}
 							}
 
-							if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
-								echo "))";// end content
-							}else{
-								echo ")";// end content
+							if ($new_args['element'] == 'innerBlocksProps' || $new_args['element'] == 'xBlocksProps') {
+								echo "))"; // end content
+							} else {
+								echo ")"; // end content
 							}
 
 
@@ -4194,26 +4194,26 @@ 
 						}
 					} else {
 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
+						if (substr($element, 0, 3) === "if_") {
 							$extra = '';
-							if( strpos($new_args, '[%WrapClass%]') !== false ){
-								$new_args = str_replace('[%WrapClass%]"','" + sd_build_aui_class(props.attributes)',$new_args);
-								$new_args = str_replace('[%WrapClass%]','+ sd_build_aui_class(props.attributes)',$new_args);
+							if (strpos($new_args, '[%WrapClass%]') !== false) {
+								$new_args = str_replace('[%WrapClass%]"', '" + sd_build_aui_class(props.attributes)', $new_args);
+								$new_args = str_replace('[%WrapClass%]', '+ sd_build_aui_class(props.attributes)', $new_args);
 							}
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-						} elseif ( $element == 'style' &&  strpos($new_args, '[%WrapStyle%]') !== false ) {
-							$new_args = str_replace('[%WrapStyle%]','',$new_args);
-							echo $element . ": {..." . $this->block_props_replace( $new_args ) . " , ...sd_build_aui_styles(props.attributes) },";
+							echo str_replace("if_", "", $element) . ": " . $this->block_props_replace($new_args, true) . ",";
+						} elseif ($element == 'style' && strpos($new_args, '[%WrapStyle%]') !== false) {
+							$new_args = str_replace('[%WrapStyle%]', '', $new_args);
+							echo $element . ": {..." . $this->block_props_replace($new_args) . " , ...sd_build_aui_styles(props.attributes) },";
 //                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( $element == 'style' ) {
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-						} elseif ( ( $element == 'class' || $element == 'className'  ) &&  strpos($new_args, '[%WrapClass%]') !== false ) {
-							$new_args = str_replace('[%WrapClass%]','',$new_args);
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "' + sd_build_aui_class(props.attributes),";
-						} elseif ( $element == 'template' && $new_args ) {
+						} elseif ($element == 'style') {
+							echo $element . ": " . $this->block_props_replace($new_args) . ",";
+						} elseif (($element == 'class' || $element == 'className') && strpos($new_args, '[%WrapClass%]') !== false) {
+							$new_args = str_replace('[%WrapClass%]', '', $new_args);
+							echo $element . ": '" . $this->block_props_replace($new_args) . "' + sd_build_aui_class(props.attributes),";
+						} elseif ($element == 'template' && $new_args) {
 							echo $element . ": $new_args,";
 						} else {
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+							echo $element . ": '" . $this->block_props_replace($new_args) . "',";
 						}
 
 					}
@@ -4228,11 +4228,11 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function block_props_replace( $string, $no_wrap = false ) {
-			if ( $no_wrap ) {
-				$string = str_replace( array( "[%", "%]", "%:checked]" ), array( "props.attributes.", "", "" ), $string );
+		public function block_props_replace($string, $no_wrap = false) {
+			if ($no_wrap) {
+				$string = str_replace(array("[%", "%]", "%:checked]"), array("props.attributes.", "", ""), $string);
 			} else {
-				$string = str_replace( array( "![%", "[%", "%]", "%:checked]" ), array( "'+!props.attributes.", "'+props.attributes.", "+'", "+'" ), $string );
+				$string = str_replace(array("![%", "[%", "%]", "%:checked]"), array("'+!props.attributes.", "'+props.attributes.", "+'", "+'"), $string);
 			}
 
 			return $string;
@@ -4244,65 +4244,65 @@ 
 		 * @param array $args
 		 * @param array $instance
 		 */
-		public function widget( $args, $instance ) {
-			if ( ! is_array( $args ) ) {
+		public function widget($args, $instance) {
+			if (!is_array($args)) {
 				$args = array();
 			}
 
 			// Get the filtered values
-			$argument_values = $this->argument_values( $instance );
-			$argument_values = $this->string_to_bool( $argument_values );
-			$output          = $this->output( $argument_values, $args );
+			$argument_values = $this->argument_values($instance);
+			$argument_values = $this->string_to_bool($argument_values);
+			$output          = $this->output($argument_values, $args);
 
 			$no_wrap = false;
-			if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+			if (isset($argument_values['no_wrap']) && $argument_values['no_wrap']) {
 				$no_wrap = true;
 			}
 
 			ob_start();
-			if ( $output && ! $no_wrap ) {
+			if ($output && !$no_wrap) {
 
 				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+				$class = $this->options['widget_ops']['classname'] . " sdel-" . $this->get_instance_hash();
 
 				// Before widget
-				$before_widget = ! empty( $args['before_widget'] ) ? $args['before_widget'] : '';
-				$before_widget = $before_widget ? str_replace( $class_original, $class, $before_widget ) : $before_widget;
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
+				$before_widget = !empty($args['before_widget']) ? $args['before_widget'] : '';
+				$before_widget = $before_widget ? str_replace($class_original, $class, $before_widget) : $before_widget;
+				$before_widget = apply_filters('wp_super_duper_before_widget', $before_widget, $args, $instance, $this);
+				$before_widget = apply_filters('wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this);
 
 				// After widget
-				$after_widget = ! empty( $args['after_widget'] ) ? $args['after_widget'] : '';
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
+				$after_widget = !empty($args['after_widget']) ? $args['after_widget'] : '';
+				$after_widget = apply_filters('wp_super_duper_after_widget', $after_widget, $args, $instance, $this);
+				$after_widget = apply_filters('wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this);
 
 				echo $before_widget;
 				// elementor strips the widget wrapping div so we check for and add it back if needed
-				if ( $this->is_elementor_widget_output() ) {
+				if ($this->is_elementor_widget_output()) {
 					// Filter class & attrs for elementor widget output.
-					$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-					$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+					$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+					$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-					$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-					$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+					$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+					$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
 
-					echo "<span class='" . esc_attr( $class  ) . "' " . $attrs . ">";
+					echo "<span class='" . esc_attr($class) . "' " . $attrs . ">";
 				}
-				echo $this->output_title( $args, $instance );
+				echo $this->output_title($args, $instance);
 				echo $output;
-				if ( $this->is_elementor_widget_output() ) {
+				if ($this->is_elementor_widget_output()) {
 					echo "</span>";
 				}
 				echo $after_widget;
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			} elseif ($this->is_preview() && $output == '') {// if preview show a placeholder if empty
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 				echo $output;
-			} elseif ( $output && $no_wrap ) {
+			} elseif ($output && $no_wrap) {
 				echo $output;
 			}
 			$output = ob_get_clean();
 
-			$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+			$output = apply_filters('wp_super_duper_widget_output', $output, $instance, $args, $this);
 
 			echo $output;
 		}
@@ -4315,7 +4315,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;
 			}
 
@@ -4330,7 +4330,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;
 			}
 
@@ -4345,7 +4345,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;
 			}
 
@@ -4360,7 +4360,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 
@@ -4375,7 +4375,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 
@@ -4390,7 +4390,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;
 			}
 
@@ -4405,7 +4405,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;
 			}
 
@@ -4420,7 +4420,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;
 			}
 
@@ -4437,7 +4437,7 @@ 
 		public function is_kallyas_zion_preview() {
 			$result = false;
 
-			if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+			if (function_exists('znhg_kallyas_theme_config') && !empty($_REQUEST['zn_pb_edit'])) {
 				$result = true;
 			}
 
@@ -4454,7 +4454,7 @@ 
 		public function is_bricks_preview() {
 			$result = false;
 
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+			if (function_exists('bricks_is_builder') && (bricks_is_builder() || bricks_is_builder_call())) {
 				$result = true;
 			}
 
@@ -4469,25 +4469,25 @@ 
 		 */
 		public function is_preview() {
 			$preview = false;
-			if ( $this->is_divi_preview() ) {
+			if ($this->is_divi_preview()) {
 				$preview = true;
-			} elseif ( $this->is_elementor_preview() ) {
+			} elseif ($this->is_elementor_preview()) {
 				$preview = true;
-			} elseif ( $this->is_beaver_preview() ) {
+			} elseif ($this->is_beaver_preview()) {
 				$preview = true;
-			} elseif ( $this->is_siteorigin_preview() ) {
+			} elseif ($this->is_siteorigin_preview()) {
 				$preview = true;
-			} elseif ( $this->is_cornerstone_preview() ) {
+			} elseif ($this->is_cornerstone_preview()) {
 				$preview = true;
-			} elseif ( $this->is_fusion_preview() ) {
+			} elseif ($this->is_fusion_preview()) {
 				$preview = true;
-			} elseif ( $this->is_oxygen_preview() ) {
+			} elseif ($this->is_oxygen_preview()) {
 				$preview = true;
-			} elseif( $this->is_kallyas_zion_preview() ) {
+			} elseif ($this->is_kallyas_zion_preview()) {
 				$preview = true;
-			} elseif( $this->is_block_content_call() ) {
+			} elseif ($this->is_block_content_call()) {
 				$preview = true;
-			} elseif( $this->is_bricks_preview() ) {
+			} elseif ($this->is_bricks_preview()) {
 				$preview = true;
 			}
 
@@ -4502,44 +4502,44 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
+		public function output_title($args, $instance = array()) {
 			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
+			if (!empty($instance['title'])) {
 				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+				$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
 
-				if ( empty( $instance['widget_title_tag'] ) ) {
-					if ( ! isset( $args['before_title'] ) ) {
+				if (empty($instance['widget_title_tag'])) {
+					if (!isset($args['before_title'])) {
 						$args['before_title'] = '';
 					}
 
-					if ( ! isset( $args['after_title'] ) ) {
+					if (!isset($args['after_title'])) {
 						$args['after_title'] = '';
 					}
 
 					$output = $args['before_title'] . $title . $args['after_title'];
 				} else {
-					$tag 			= esc_attr( $instance['widget_title_tag'] );
-					$allowed_tags 	= array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p' );
-					$title_tag      = in_array( $tag, $allowed_tags, true ) ? esc_attr( $tag ) : 'h2';
+					$tag 			= esc_attr($instance['widget_title_tag']);
+					$allowed_tags = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'span', 'div', 'p');
+					$title_tag = in_array($tag, $allowed_tags, true) ? esc_attr($tag) : 'h2';
 
 					// 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>";
 				}
 
@@ -4553,7 +4553,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 
 			// set widget instance
 			$this->instance = $instance;
@@ -4561,20 +4561,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>
@@ -4584,26 +4584,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);
 					}
 				}
@@ -4611,28 +4611,28 @@ 
 			}
 		}
 
-		public function widget_inputs_row_start( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
+		public function widget_inputs_row_start($key, $args) {
+			if (!empty($args['row'])) {
 				// Maybe open
-				if ( ! empty( $args['row']['open'] ) ) {
+				if (!empty($args['row']['open'])) {
 					?>
-					<div class='bsui sd-argument' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php echo ( ! empty( $args['row']['element_require'] ) ? $this->convert_element_require( $args['row']['element_require'] ) : '' ); ?>'>
-					<?php if ( ! empty( $args['row']['title'] ) ) { ?>
+					<div class='bsui sd-argument' data-argument='<?php echo esc_attr($args['row']['key']); ?>' data-element_require='<?php echo (!empty($args['row']['element_require']) ? $this->convert_element_require($args['row']['element_require']) : ''); ?>'>
+					<?php if (!empty($args['row']['title'])) { ?>
 					<?php
-						if ( isset( $args['row']['icon'] ) ) {
+						if (isset($args['row']['icon'])) {
 							$args['row']['icon'] = '';
 						}
 
-						if ( ! isset( $args['row']['device_type'] ) && isset( $args['device_type'] ) ) {
+						if (!isset($args['row']['device_type']) && isset($args['device_type'])) {
 							$args['row']['device_type'] = $args['device_type'];
 						}
 					?>
-					<label class="mb-0"><?php echo $this->widget_field_title( $args['row'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+					<label class="mb-0"><?php echo $this->widget_field_title($args['row']); ?><?php echo $this->widget_field_desc($args['row']); ?></label>
 					<?php } ?>
-					<div class='row<?php echo ( ! empty( $args['row']['class'] ) ? ' ' . esc_attr( $args['row']['class'] ) : '' ); ?>'>
+					<div class='row<?php echo (!empty($args['row']['class']) ? ' ' . esc_attr($args['row']['class']) : ''); ?>'>
 					<div class='col pr-2'>
 					<?php
-				} else if ( ! empty( $args['row']['close'] ) ) {
+				} else if (!empty($args['row']['close'])) {
 					echo "<div class='col pl-0 ps-0'>";
 				} else {
 					echo "<div class='col pl-0 ps-0 pr-2 pe-2'>";
@@ -4640,10 +4640,10 @@ 
 			}
 		}
 
-		public function widget_inputs_row_end( $key, $args ) {
-			if ( ! empty( $args['row'] ) ) {
+		public function widget_inputs_row_end($key, $args) {
+			if (!empty($args['row'])) {
 				// Maybe close
-				if ( ! empty( $args['row']['close'] ) ) {
+				if (!empty($args['row']['close'])) {
 					echo "</div></div>";
 				}
 				echo "</div>";
@@ -4658,7 +4658,7 @@ 
 		public function widget_advanced_toggle() {
 
 			$output = '';
-			if ( $this->block_show_advanced() ) {
+			if ($this->block_show_advanced()) {
 				$val = 1;
 			} else {
 				$val = 0;
@@ -4678,14 +4678,14 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public function convert_element_require( $input ) {
-			$input = str_replace( "'", '"', $input );// we only want double quotes
+		public function convert_element_require($input) {
+			$input = str_replace("'", '"', $input); // we only want double quotes
 
-			$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+			$output = esc_attr(str_replace(array("[%", "%]", "%:checked]"), array(
 				"jQuery(form).find('[data-argument=\"",
 				"\"]').find('input,select,textarea').val()",
 				"\"]').find('input:checked').val()"
-			), $input ) );
+			), $input));
 
 			return $output;
 		}
@@ -4696,48 +4696,48 @@ 
 		 * @param $args
 		 * @param $instance
 		 */
-		public function widget_inputs( $args, $instance ) {
+		public function widget_inputs($args, $instance) {
 
 			$class             = "";
 			$element_require   = "";
 			$custom_attributes = "";
 
 			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+			if (isset($instance[$args['name']])) {
+				$value = $instance[$args['name']];
+			} elseif (!isset($instance[$args['name']]) && !empty($args['default'])) {
+				$value = is_array($args['default']) ? array_map("esc_html", $args['default']) : esc_html($args['default']);
 			} else {
 				$value = '';
 			}
 
 			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			if (!empty($args['placeholder'])) {
+				$placeholder = "placeholder='" . esc_html($args['placeholder']) . "'";
 			} else {
 				$placeholder = '';
 			}
 
 			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+			if (isset($args['advanced']) && $args['advanced']) {
 				$class .= " sd-advanced-setting ";
 			}
 
 			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+			if (isset($args['element_require']) && $args['element_require']) {
 				$element_require = $args['element_require'];
 			}
 
 			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+			if (isset($args['custom_attributes']) && $args['custom_attributes']) {
+				$custom_attributes = $this->array_to_attributes($args['custom_attributes'], true);
 			}
 
 			// before wrapper
 			?>
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>" data-argument='<?php echo esc_attr( $args['name'] ); ?>' data-element_require='<?php if ( $element_require ) { echo $this->convert_element_require( $element_require );} ?>'>
+			<p class="sd-argument <?php echo esc_attr($class); ?>" data-argument='<?php echo esc_attr($args['name']); ?>' data-element_require='<?php if ($element_require) { echo $this->convert_element_require($element_require); } ?>'>
 			<?php
-			switch ( $args['type'] ) {
+			switch ($args['type']) {
 				//array('text','password','number','email','tel','url','color')
 				case "text":
 				case "password":
@@ -4747,33 +4747,33 @@ 
 				case "url":
 				case "color":
 					?>
-					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
-					<input <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="<?php echo esc_attr( $args['type'] ); ?>" value="<?php echo esc_attr( $value ); ?>">
+					<label for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
+					<input <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="<?php echo esc_attr($args['type']); ?>" value="<?php echo esc_attr($value); ?>">
 					<?php
 
 					break;
 				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
+					$multiple = isset($args['multiple']) && $args['multiple'] ? true : false;
+					if ($multiple) {
+						if (empty($value)) {
 							$value = array();
 						}
 					}
 					?>
-					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
-					<select <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); if ( $multiple ) { echo "[]"; } ?>"
-						<?php if ( $multiple ) {
+					<label for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
+					<select <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); if ($multiple) { echo "[]"; } ?>"
+						<?php if ($multiple) {
 							echo "multiple";
 						} //@todo not implemented yet due to gutenberg not supporting it
 						?>>
 						<?php
 
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+						if (!empty($args['options'])) {
+							foreach ($args['options'] as $val => $label) {
+								if ($multiple) {
+									$selected = in_array($val, $value) ? 'selected="selected"' : '';
 								} else {
-									$selected = selected( $value, $val, false );
+									$selected = selected($value, $val, false);
 								}
 								echo "<option value='$val' " . $selected . ">$label</option>";
 							}
@@ -4784,20 +4784,20 @@ 
 					break;
 				case "checkbox":
 					?>
-					<input <?php echo $placeholder; ?> <?php checked( 1, $value, true ) ?> <?php echo $custom_attributes; ?> class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox" value="1">
-					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+					<input <?php echo $placeholder; ?> <?php checked(1, $value, true) ?> <?php echo $custom_attributes; ?> class="widefat" id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="checkbox" value="1">
+					<label for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<?php
 					break;
 				case "textarea":
 					?>
-					<label for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
-					<textarea <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"><?php echo esc_attr( $value ); ?></textarea>
+					<label for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
+					<textarea <?php echo $placeholder; ?> class="widefat" <?php echo $custom_attributes; ?> id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"><?php echo esc_attr($value); ?></textarea>
 					<?php
 
 					break;
 				case "hidden":
 					?>
-					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden" value="<?php echo esc_attr( $value ); ?>">
+					<input id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>" name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="hidden" value="<?php echo esc_attr($value); ?>">
 					<?php
 					break;
 				default:
@@ -4807,15 +4807,15 @@ 
 			?></p><?php
 		}
 
-		public function get_widget_icon($icon = 'box-top', $title = ''){
-			if($icon=='box-top'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
-				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
+		public function get_widget_icon($icon = 'box-top', $title = '') {
+			if ($icon == 'box-top') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-right') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
+			}elseif ($icon == 'box-bottom') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
+			}elseif ($icon == 'box-left') {
+				return '<svg title="' . esc_attr($title) . '" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
 			}
 		}
 
@@ -4827,14 +4827,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>';
 				}
 			}
 
@@ -4848,18 +4848,18 @@ 
 		 *
 		 * @return string
 		 */
-		public function widget_field_title( $args ) {
+		public function widget_field_title($args) {
 			$title = '';
 
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( ! empty( $args['device_type'] ) ) {
+			if (isset($args['title']) && $args['title']) {
+				if (!empty($args['device_type'])) {
 					$args['title'] .= ' (' . $args['device_type'] . ')'; // Append device type to title.
 				}
 
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = self::get_widget_icon( $args['icon'], $args['title']  );
+				if (isset($args['icon']) && $args['icon']) {
+					$title = self::get_widget_icon($args['icon'], $args['title']);
 				} else {
-					$title = esc_attr( $args['title'] );
+					$title = esc_attr($args['title']);
 				}
 			}
 
@@ -4874,11 +4874,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>';
@@ -4891,8 +4891,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(),
@@ -4902,7 +4902,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 
 		/**
@@ -4914,23 +4914,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';
 					}
 				}
 			}
@@ -4948,7 +4948,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;
 			}
 
@@ -4961,9 +4961,9 @@ 
 		 * @return string
 		 *@since 1.0.20
 		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id.serialize($this->instance);
-			return hash('crc32b',$instance_string);
+		public function get_instance_hash() {
+			$instance_string = $this->base_id . serialize($this->instance);
+			return hash('crc32b', $instance_string);
 		}
 
 		/**
@@ -4974,14 +4974,14 @@ 
 		 * @return string
 		 *@since 1.0.20
 		 */
-		public function get_instance_style($rules = array()){
+		public function get_instance_style($rules = array()) {
 			$css = '';
 
-			if(!empty($rules)){
+			if (!empty($rules)) {
 				$rules = array_unique($rules);
 				$instance_hash = $this->get_instance_hash();
 				$css .= "<style>";
-				foreach($rules as $rule){
+				foreach ($rules as $rule) {
 					$css .= ".sdel-$instance_hash $rule";
 				}
 				$css .= "</style>";
@@ -4999,9 +4999,9 @@ 
 		 *@since 1.0.28
 		 *
 		 */
-		public function encode_shortcodes( $content ) {
+		public function encode_shortcodes($content) {
 			// Avoids existing encoded tags.
-			$trans   = array(
+			$trans = array(
 				'&#91;' => '&#091;',
 				'&#93;' => '&#093;',
 				'&amp;#91;' => '&#091;',
@@ -5012,7 +5012,7 @@ 
 				'&amp;gt;' => '&0gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'[' => '&#91;',
@@ -5023,7 +5023,7 @@ 
 				"'" => '&#39;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}
@@ -5037,8 +5037,8 @@ 
 		 *@since 1.0.28
 		 *
 		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
+		public function decode_shortcodes($content) {
+			$trans = array(
 				'&#91;' => '[',
 				'&#93;' => ']',
 				'&amp;#91;' => '[',
@@ -5051,7 +5051,7 @@ 
 				'&apos;' => "'",
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'&#091;' => '&#91;',
@@ -5064,31 +5064,31 @@ 
 				'&amp;0gt;' => '&gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}
 
-		public function block_visibility_fields( $args ) {
-			$value = ! empty( $args['value'] ) ? esc_attr( $args['value'] ) : '';
+		public function block_visibility_fields($args) {
+			$value = !empty($args['value']) ? esc_attr($args['value']) : '';
 			$content = '<div class="bs-vc-rule-template d-none">';
 				$content .= '<div class="p-3 pb-0 mb-3 border border-1 rounded-1 position-relative bs-vc-rule" data-bs-index="BSVCINDEX" >';
 					$content .= '<div class="row">';
 						$content .= '<div class="col-sm-12">';
-							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__( 'Remove Rule', 'ayecode-connect' ) . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
+							$content .= '<div class="bs-rule-action position-absolute top-0 end-0 p-2 zindex-5"><span class="text-danger c-pointer bs-vc-remove-rule" title="' . esc_attr__('Remove Rule', 'ayecode-connect') . '"><i class="fas fa-circle-minus fs-6"></i></span></div>';
 							$content .= aui()->select(
 								array(
 									'id'          => 'bsvc_rule_BSVCINDEX',
 									'name'        => 'bsvc_rule_BSVCINDEX',
-									'label'       => __( 'Rule', 'ayecode-connect' ),
-									'placeholder' => __( 'Select Rule...', 'ayecode-connect' ),
+									'label'       => __('Rule', 'ayecode-connect'),
+									'placeholder' => __('Select Rule...', 'ayecode-connect'),
 									'class'       => 'bsvc_rule form-select-sm no-select2 mw-100',
 									'options'     => sd_visibility_rules_options(),
 									'default'     => '',
 									'value'       => '',
 									'label_type'  => '',
 									'select2'     => false,
-									'input_group_left' => __( 'Rule:', 'ayecode-connect' ),
+									'input_group_left' => __('Rule:', 'ayecode-connect'),
 									'extra_attributes' => array(
 										'data-minimum-results-for-search' => '-1'
 									)
@@ -5097,15 +5097,15 @@ 
 
 						$content .= '</div>';
 
-						if ( class_exists( 'GeoDirectory' ) ) {
+						if (class_exists('GeoDirectory')) {
 							$content .= '<div class="col-md-7 col-sm-12">';
 
 								$content .= aui()->select(
 									array(
 										'id'          => 'bsvc_gd_field_BSVCINDEX',
 										'name'        => 'bsvc_gd_field_BSVCINDEX',
-										'label'       => __( 'FIELD', 'ayecode-connect' ),
-										'placeholder' => __( 'FIELD', 'ayecode-connect' ),
+										'label'       => __('FIELD', 'ayecode-connect'),
+										'placeholder' => __('FIELD', 'ayecode-connect'),
 										'class'       => 'bsvc_gd_field form-select-sm no-select2 mw-100',
 										'options'     => sd_visibility_gd_field_options(),
 										'default'     => '',
@@ -5126,8 +5126,8 @@ 
 									array(
 										'id'          => 'bsvc_gd_field_condition_BSVCINDEX',
 										'name'        => 'bsvc_gd_field_condition_BSVCINDEX',
-										'label'       => __( 'CONDITION', 'ayecode-connect' ),
-										'placeholder' => __( 'CONDITION', 'ayecode-connect' ),
+										'label'       => __('CONDITION', 'ayecode-connect'),
+										'placeholder' => __('CONDITION', 'ayecode-connect'),
 										'class'       => 'bsvc_gd_field_condition form-select-sm no-select2 mw-100',
 										'options'     => sd_visibility_field_condition_options(),
 										'default'     => '',
@@ -5149,9 +5149,9 @@ 
 										'type'            => 'text',
 										'id'              => 'bsvc_gd_field_search_BSVCINDEX',
 										'name'            => 'bsvc_gd_field_search_BSVCINDEX',
-										'label'           => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+										'label'           => __('VALUE TO MATCH', 'ayecode-connect'),
 										'class'           => 'bsvc_gd_field_search form-control-sm',
-										'placeholder'     => __( 'VALUE TO MATCH', 'ayecode-connect' ),
+										'placeholder'     => __('VALUE TO MATCH', 'ayecode-connect'),
 										'label_type'      => '',
 										'value'           => '',
 										'element_require' => '([%bsvc_rule_BSVCINDEX%]=="gd_field" && [%bsvc_gd_field_condition_BSVCINDEX%] && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_empty" && [%bsvc_gd_field_condition_BSVCINDEX%]!="is_not_empty")'
@@ -5163,11 +5163,11 @@ 
 
 					$content .= '</div>';
 
-					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __( 'Select User Roles:', 'ayecode-connect' ) . '</label>';
+					$content .= '<div class="row aui-conditional-field" data-element-require="jQuery(form).find(\'[name=bsvc_rule_BSVCINDEX]\').val()==\'user_roles\'" data-argument="bsvc_user_roles_BSVCINDEX_1"><label for="bsvc_user_roles_BSVCINDEX_1" class="form-label mb-3">' . __('Select User Roles:', 'ayecode-connect') . '</label>';
 						$role_options = sd_user_roles_options();
 
 						$role_option_i = 0;
-						foreach ( $role_options as $role_option_key => $role_option_name ) {
+						foreach ($role_options as $role_option_key => $role_option_name) {
 							$role_option_i++;
 
 							$content .= '<div class="col-sm-6">';
@@ -5191,14 +5191,14 @@ 
 			$content .= '</div>';
 			$content .= '<form id="bs-vc-modal-form" class="bs-vc-modal-form">';
 			$content .= '<div class="bs-vc-rule-sets"></div>';
-			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __( 'Add Rule', 'ayecode-connect' ) . '</button></div></div>';
+			$content .= '<div class="row"><div class="col-sm-12 text-center pt-1 pb-4"><button type="button" class="btn btn-sm btn-primary d-block w-100 bs-vc-add-rule"><i class="fas fa-plus"></i> ' . __('Add Rule', 'ayecode-connect') . '</button></div></div>';
 			$content .= '<div class="row"><div class="col-md-6 col-sm-12">';
 			$content .= aui()->select(
 				array(
 					'id'          => 'bsvc_output',
 					'name'        => 'bsvc_output',
-					'label'       => __( 'What should happen if rules met.', 'ayecode-connect' ),
-					'placeholder' => __( 'Default Output', 'ayecode-connect' ),
+					'label'       => __('What should happen if rules met.', 'ayecode-connect'),
+					'placeholder' => __('Default Output', 'ayecode-connect'),
 					'class'       => 'bsvc_output form-select-sm no-select2 mw-100',
 					'options'     => sd_visibility_output_options(),
 					'default'     => '',
@@ -5217,8 +5217,8 @@ 
 				array(
 					'id'              => 'bsvc_page',
 					'name'            => 'bsvc_page',
-					'label'           => __( 'Page Content', 'ayecode-connect' ),
-					'placeholder'     => __( 'Select Page ID...', 'ayecode-connect' ),
+					'label'           => __('Page Content', 'ayecode-connect'),
+					'placeholder'     => __('Select Page ID...', 'ayecode-connect'),
 					'class'           => 'bsvc_page form-select-sm no-select2 mw-100',
 					'options'         => sd_template_page_options(),
 					'default'         => '',
@@ -5233,8 +5233,8 @@ 
 				array(
 					'id'          => 'bsvc_tmpl_part',
 					'name'        => 'bsvc_tmpl_part',
-					'label'       => __( 'Template Part', 'ayecode-connect' ),
-					'placeholder' => __( 'Select Template Part...', 'ayecode-connect' ),
+					'label'       => __('Template Part', 'ayecode-connect'),
+					'placeholder' => __('Select Template Part...', 'ayecode-connect'),
 					'class'       => 'bsvc_tmpl_part form-select-sm no-select2 mw-100',
 					'options'     => sd_template_part_options(),
 					'default'     => '',
@@ -5252,8 +5252,8 @@ 
 				array(
 					'id'               => 'bsvc_message_type',
 					'name'             => 'bsvc_message_type',
-					'label'            => __( 'Custom Message Type', 'ayecode-connect' ),
-					'placeholder'      => __( 'Default (none)', 'ayecode-connect' ),
+					'label'            => __('Custom Message Type', 'ayecode-connect'),
+					'placeholder'      => __('Default (none)', 'ayecode-connect'),
 					'class'            => 'bsvc_message_type form-select-sm no-select2 mw-100',
 					'options'          => sd_aui_colors(),
 					'default'          => '',
@@ -5276,7 +5276,7 @@ 
 					'name'            => 'bsvc_message',
 					'label'           => '',
 					'class'           => 'bsvc_message form-control-sm',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+					'placeholder'     => __('CUSTOM MESSAGE TO SHOW', 'ayecode-connect'),
 					'label_type'      => '',
 					'value'           => '',
 					'form_group_class' => ' ',
@@ -5298,7 +5298,7 @@ 
 			global $shortcode_insert_button_once;
 
 			// Fix conflicts with UpSolution Core in header template edit element.
-			if ( defined( 'US_CORE_DIR' ) && ! empty( $_REQUEST['action'] ) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html' ) {
+			if (defined('US_CORE_DIR') && !empty($_REQUEST['action']) && $_REQUEST['action'] == 'us_ajax_hb_get_ebuilder_html') {
 				$shortcode_insert_button_once = true;
 			}
 		}

invoicing.php

Indentation +4 added lines, -4 removed lines

@@ -19,16 +19,16 @@ 
 
 // Define constants.
 if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+    define( 'WPINV_PLUGIN_FILE', __FILE__ );
 }
 
 if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.8.19' );
+    define( 'WPINV_VERSION', '2.8.19' );
 }
 
 // Include the main Invoicing class.
 if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+    require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -43,7 +43,7 @@ 
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
-	return $GLOBALS['invoicing'];
+    return $GLOBALS['invoicing'];
 }
 
 /**

Spacing +11 added lines, -11 removed lines

@@ -15,20 +15,20 @@ 
  * @package GetPaid
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Define constants.
-if ( ! defined( 'WPINV_PLUGIN_FILE' ) ) {
-	define( 'WPINV_PLUGIN_FILE', __FILE__ );
+if (!defined('WPINV_PLUGIN_FILE')) {
+	define('WPINV_PLUGIN_FILE', __FILE__);
 }
 
-if ( ! defined( 'WPINV_VERSION' ) ) {
-	define( 'WPINV_VERSION', '2.8.19' );
+if (!defined('WPINV_VERSION')) {
+	define('WPINV_VERSION', '2.8.19');
 }
 
 // Include the main Invoicing class.
-if ( ! class_exists( 'WPInv_Plugin', false ) ) {
-	require_once plugin_dir_path( WPINV_PLUGIN_FILE ) . 'includes/class-wpinv.php';
+if (!class_exists('WPInv_Plugin', false)) {
+	require_once plugin_dir_path(WPINV_PLUGIN_FILE) . 'includes/class-wpinv.php';
 }
 
 /**
@@ -39,7 +39,7 @@ 
  */
 function getpaid() {
 
-    if ( empty( $GLOBALS['invoicing'] ) ) {
+    if (empty($GLOBALS['invoicing'])) {
         $GLOBALS['invoicing'] = new WPInv_Plugin();
     }
 
@@ -52,9 +52,9 @@ 
  * @since  2.0.8
  */
 function getpaid_deactivation_hook() {
-    update_option( 'wpinv_flush_permalinks', 1 );
+    update_option('wpinv_flush_permalinks', 1);
 }
-register_deactivation_hook( __FILE__, 'getpaid_deactivation_hook' );
+register_deactivation_hook(__FILE__, 'getpaid_deactivation_hook');
 
 /**
  * @deprecated
@@ -64,4 +64,4 @@ 
 }
 
 // Kickstart the plugin.
-add_action( 'plugins_loaded', 'getpaid', 0 );
+add_action('plugins_loaded', 'getpaid', 0);