AyeCode / invoicing

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

Indentation +108 added lines, -108 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,112 +11,112 @@ 
  */
 class AUI_Component_Pagination {
 
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function get( $args = array() ) {
-		global $wp_query, $aui_bs5;
-
-		$defaults = array(
-			'class'              => '',
-			'mid_size'           => 2,
-			'prev_text'          => '<i class="fas fa-chevron-left"></i>',
-			'next_text'          => '<i class="fas fa-chevron-right"></i>',
-			'screen_reader_text' => __( 'Posts navigation', 'ayecode-connect' ),
-			'before_paging'      => '',
-			'after_paging'       => '',
-			'type'               => 'array',
-			'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
-			'links'              => array(), // an array of links if using custom links, this includes the a tag.
-			'rounded_style'      => false,
-			'custom_next_text'   => '', // Custom next page text
-			'custom_prev_text'   => '', // Custom prev page text
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-		// Don't print empty markup if there's only one page.
-		if ( $args['total'] > 1 ) {
-			// Set up paginated links.
-			$links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
-
-			$class = !empty($args['class']) ? $args['class'] : '';
-
-			$custom_prev_link = '';
-			$custom_next_link = '';
-
-			// make the output bootstrap ready
-			$links_html = "<ul class='pagination m-0 p-0 $class'>";
-			if ( ! empty( $links ) ) {
-				foreach ( $links as $link ) {
-					$_link = $link;
-
-					if ( $aui_bs5 ) {
-						$link_class = $args['rounded_style'] ? 'page-link badge rounded-pill border-0 mx-1 fs-base text-dark link-primary' : 'page-link';
-						$link_class_active = $args['rounded_style'] ? ' current active fw-bold badge rounded-pill' : ' current active';
-						$links_html .= "<li class='page-item mx-0'>";
-						$link = str_replace( array( "page-numbers", " current" ), array( $link_class, $link_class_active ), $link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
-						$links_html .=  $link;
-						$links_html .= "</li>";
-					} else {
-						$active = strpos( $link, 'current' ) !== false ? 'active' : '';
-						$links_html .= "<li class='page-item $active'>";
-						$links_html .= str_replace( "page-numbers", "page-link", $link );
-						$links_html .= "</li>";
-					}
-
-					if ( strpos( $_link, 'next page-numbers' ) || strpos( $_link, 'prev page-numbers' ) ) {
-						$link = str_replace( array( "page-numbers", " current" ), array( 'btn btn-outline-primary rounded' . ( $args['rounded_style'] ? '-pill' : '' ) . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill' ), $_link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
-
-						if ( strpos( $_link, 'next page-numbers' ) && ! empty( $args['custom_next_text'] ) ) {
-							$custom_next_link = str_replace( $args['next_text'], $args['custom_next_text'], $link );
-						} else if ( strpos( $_link, 'prev page-numbers' ) && ! empty( $args['custom_prev_text'] ) ) {
-							$custom_prev_link = str_replace( $args['prev_text'], $args['custom_prev_text'], $link );
-						}
-					}
-				}
-			}
-			$links_html .= "</ul>";
-
-			if ( $links ) {
-				$output .= '<section class="px-0 py-2 w-100">';
-				$output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
-				$output .= '</section>';
-			}
-
-			$output = str_replace( "screen-reader-text", "screen-reader-text sr-only", $output );
-			$output = str_replace( "nav-links", "aui-nav-links", $output );
-		}
-
-		if ( $output ) {
-			if ( $custom_next_link || $custom_prev_link ) {
-				$total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
-				$current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
-
-				$output = '<div class="row d-flex align-items-center justify-content-between"><div class="col text-start">' . $custom_prev_link . '</div><div class="col text-center d-none d-md-block">' . $output . '</div><div class="col text-center d-md-none">' . $current . '/' . $args['total'] . '</div><div class="col text-end">' . $custom_next_link . '</div></div>';
-			}
-
-			if ( ! empty( $args['before_paging'] ) ) {
-				$output = $args['before_paging'] . $output;
-			}
-
-			if ( ! empty( $args['after_paging'] ) ) {
-				$output = $output . $args['after_paging'];
-			}
-		}
-
-		return $output;
-	}
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function get( $args = array() ) {
+        global $wp_query, $aui_bs5;
+
+        $defaults = array(
+            'class'              => '',
+            'mid_size'           => 2,
+            'prev_text'          => '<i class="fas fa-chevron-left"></i>',
+            'next_text'          => '<i class="fas fa-chevron-right"></i>',
+            'screen_reader_text' => __( 'Posts navigation', 'ayecode-connect' ),
+            'before_paging'      => '',
+            'after_paging'       => '',
+            'type'               => 'array',
+            'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
+            'links'              => array(), // an array of links if using custom links, this includes the a tag.
+            'rounded_style'      => false,
+            'custom_next_text'   => '', // Custom next page text
+            'custom_prev_text'   => '', // Custom prev page text
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        $output = '';
+
+        // Don't print empty markup if there's only one page.
+        if ( $args['total'] > 1 ) {
+            // Set up paginated links.
+            $links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
+
+            $class = !empty($args['class']) ? $args['class'] : '';
+
+            $custom_prev_link = '';
+            $custom_next_link = '';
+
+            // make the output bootstrap ready
+            $links_html = "<ul class='pagination m-0 p-0 $class'>";
+            if ( ! empty( $links ) ) {
+                foreach ( $links as $link ) {
+                    $_link = $link;
+
+                    if ( $aui_bs5 ) {
+                        $link_class = $args['rounded_style'] ? 'page-link badge rounded-pill border-0 mx-1 fs-base text-dark link-primary' : 'page-link';
+                        $link_class_active = $args['rounded_style'] ? ' current active fw-bold badge rounded-pill' : ' current active';
+                        $links_html .= "<li class='page-item mx-0'>";
+                        $link = str_replace( array( "page-numbers", " current" ), array( $link_class, $link_class_active ), $link );
+                        $link = str_replace( 'text-dark link-primary current', 'current', $link );
+                        $links_html .=  $link;
+                        $links_html .= "</li>";
+                    } else {
+                        $active = strpos( $link, 'current' ) !== false ? 'active' : '';
+                        $links_html .= "<li class='page-item $active'>";
+                        $links_html .= str_replace( "page-numbers", "page-link", $link );
+                        $links_html .= "</li>";
+                    }
+
+                    if ( strpos( $_link, 'next page-numbers' ) || strpos( $_link, 'prev page-numbers' ) ) {
+                        $link = str_replace( array( "page-numbers", " current" ), array( 'btn btn-outline-primary rounded' . ( $args['rounded_style'] ? '-pill' : '' ) . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill' ), $_link );
+                        $link = str_replace( 'text-dark link-primary current', 'current', $link );
+
+                        if ( strpos( $_link, 'next page-numbers' ) && ! empty( $args['custom_next_text'] ) ) {
+                            $custom_next_link = str_replace( $args['next_text'], $args['custom_next_text'], $link );
+                        } else if ( strpos( $_link, 'prev page-numbers' ) && ! empty( $args['custom_prev_text'] ) ) {
+                            $custom_prev_link = str_replace( $args['prev_text'], $args['custom_prev_text'], $link );
+                        }
+                    }
+                }
+            }
+            $links_html .= "</ul>";
+
+            if ( $links ) {
+                $output .= '<section class="px-0 py-2 w-100">';
+                $output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
+                $output .= '</section>';
+            }
+
+            $output = str_replace( "screen-reader-text", "screen-reader-text sr-only", $output );
+            $output = str_replace( "nav-links", "aui-nav-links", $output );
+        }
+
+        if ( $output ) {
+            if ( $custom_next_link || $custom_prev_link ) {
+                $total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
+                $current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
+
+                $output = '<div class="row d-flex align-items-center justify-content-between"><div class="col text-start">' . $custom_prev_link . '</div><div class="col text-center d-none d-md-block">' . $output . '</div><div class="col text-center d-md-none">' . $current . '/' . $args['total'] . '</div><div class="col text-end">' . $custom_next_link . '</div></div>';
+            }
+
+            if ( ! empty( $args['before_paging'] ) ) {
+                $output = $args['before_paging'] . $output;
+            }
+
+            if ( ! empty( $args['after_paging'] ) ) {
+                $output = $output . $args['after_paging'];
+            }
+        }
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function get( $args = array() ) {
+	public static function get($args = array()) {
 		global $wp_query, $aui_bs5;
 
 		$defaults = array(
@@ -26,11 +26,11 @@ 
 			'mid_size'           => 2,
 			'prev_text'          => '<i class="fas fa-chevron-left"></i>',
 			'next_text'          => '<i class="fas fa-chevron-right"></i>',
-			'screen_reader_text' => __( 'Posts navigation', 'ayecode-connect' ),
+			'screen_reader_text' => __('Posts navigation', 'ayecode-connect'),
 			'before_paging'      => '',
 			'after_paging'       => '',
 			'type'               => 'array',
-			'total'              => isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1,
+			'total'              => isset($wp_query->max_num_pages) ? $wp_query->max_num_pages : 1,
 			'links'              => array(), // an array of links if using custom links, this includes the a tag.
 			'rounded_style'      => false,
 			'custom_next_text'   => '', // Custom next page text
@@ -40,14 +40,14 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$output = '';
 
 		// Don't print empty markup if there's only one page.
-		if ( $args['total'] > 1 ) {
+		if ($args['total'] > 1) {
 			// Set up paginated links.
-			$links = !empty(  $args['links'] ) ? $args['links'] :  paginate_links( $args );
+			$links = !empty($args['links']) ? $args['links'] : paginate_links($args);
 
 			$class = !empty($args['class']) ? $args['class'] : '';
 
@@ -56,62 +56,62 @@ 
 
 			// make the output bootstrap ready
 			$links_html = "<ul class='pagination m-0 p-0 $class'>";
-			if ( ! empty( $links ) ) {
-				foreach ( $links as $link ) {
+			if (!empty($links)) {
+				foreach ($links as $link) {
 					$_link = $link;
 
-					if ( $aui_bs5 ) {
+					if ($aui_bs5) {
 						$link_class = $args['rounded_style'] ? 'page-link badge rounded-pill border-0 mx-1 fs-base text-dark link-primary' : 'page-link';
 						$link_class_active = $args['rounded_style'] ? ' current active fw-bold badge rounded-pill' : ' current active';
 						$links_html .= "<li class='page-item mx-0'>";
-						$link = str_replace( array( "page-numbers", " current" ), array( $link_class, $link_class_active ), $link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
-						$links_html .=  $link;
+						$link = str_replace(array("page-numbers", " current"), array($link_class, $link_class_active), $link);
+						$link = str_replace('text-dark link-primary current', 'current', $link);
+						$links_html .= $link;
 						$links_html .= "</li>";
 					} else {
-						$active = strpos( $link, 'current' ) !== false ? 'active' : '';
+						$active = strpos($link, 'current') !== false ? 'active' : '';
 						$links_html .= "<li class='page-item $active'>";
-						$links_html .= str_replace( "page-numbers", "page-link", $link );
+						$links_html .= str_replace("page-numbers", "page-link", $link);
 						$links_html .= "</li>";
 					}
 
-					if ( strpos( $_link, 'next page-numbers' ) || strpos( $_link, 'prev page-numbers' ) ) {
-						$link = str_replace( array( "page-numbers", " current" ), array( 'btn btn-outline-primary rounded' . ( $args['rounded_style'] ? '-pill' : '' ) . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill' ), $_link );
-						$link = str_replace( 'text-dark link-primary current', 'current', $link );
+					if (strpos($_link, 'next page-numbers') || strpos($_link, 'prev page-numbers')) {
+						$link = str_replace(array("page-numbers", " current"), array('btn btn-outline-primary rounded' . ($args['rounded_style'] ? '-pill' : '') . ' mx-1 fs-base text-dark link-primary', ' current active fw-bold badge rounded-pill'), $_link);
+						$link = str_replace('text-dark link-primary current', 'current', $link);
 
-						if ( strpos( $_link, 'next page-numbers' ) && ! empty( $args['custom_next_text'] ) ) {
-							$custom_next_link = str_replace( $args['next_text'], $args['custom_next_text'], $link );
-						} else if ( strpos( $_link, 'prev page-numbers' ) && ! empty( $args['custom_prev_text'] ) ) {
-							$custom_prev_link = str_replace( $args['prev_text'], $args['custom_prev_text'], $link );
+						if (strpos($_link, 'next page-numbers') && !empty($args['custom_next_text'])) {
+							$custom_next_link = str_replace($args['next_text'], $args['custom_next_text'], $link);
+						} else if (strpos($_link, 'prev page-numbers') && !empty($args['custom_prev_text'])) {
+							$custom_prev_link = str_replace($args['prev_text'], $args['custom_prev_text'], $link);
 						}
 					}
 				}
 			}
 			$links_html .= "</ul>";
 
-			if ( $links ) {
+			if ($links) {
 				$output .= '<section class="px-0 py-2 w-100">';
-				$output .= _navigation_markup( $links_html, 'aui-pagination', $args['screen_reader_text'] );
+				$output .= _navigation_markup($links_html, 'aui-pagination', $args['screen_reader_text']);
 				$output .= '</section>';
 			}
 
-			$output = str_replace( "screen-reader-text", "screen-reader-text sr-only", $output );
-			$output = str_replace( "nav-links", "aui-nav-links", $output );
+			$output = str_replace("screen-reader-text", "screen-reader-text sr-only", $output);
+			$output = str_replace("nav-links", "aui-nav-links", $output);
 		}
 
-		if ( $output ) {
-			if ( $custom_next_link || $custom_prev_link ) {
-				$total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
-				$current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
+		if ($output) {
+			if ($custom_next_link || $custom_prev_link) {
+				$total   = isset($wp_query->max_num_pages) ? $wp_query->max_num_pages : 1;
+				$current = get_query_var('paged') ? (int) get_query_var('paged') : 1;
 
 				$output = '<div class="row d-flex align-items-center justify-content-between"><div class="col text-start">' . $custom_prev_link . '</div><div class="col text-center d-none d-md-block">' . $output . '</div><div class="col text-center d-md-none">' . $current . '/' . $args['total'] . '</div><div class="col text-end">' . $custom_next_link . '</div></div>';
 			}
 
-			if ( ! empty( $args['before_paging'] ) ) {
+			if (!empty($args['before_paging'])) {
 				$output = $args['before_paging'] . $output;
 			}
 
-			if ( ! empty( $args['after_paging'] ) ) {
+			if (!empty($args['after_paging'])) {
 				$output = $output . $args['after_paging'];
 			}
 		}

vendor/ayecode/wp-ayecode-ui/includes/inc/bs5-js.php

Indentation +2 added lines, -2 removed lines

@@ -1001,8 +1001,8 @@
     aui_flip_color_scheme_on_scroll();
 
 	<?php
-	// FSE tweaks.
-	if(!empty($_REQUEST['postType'])){ ?>
+    // FSE tweaks.
+    if(!empty($_REQUEST['postType'])){ ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

Spacing +2 added lines, -2 removed lines

@@ -252,7 +252,7 @@ 
     function aui_init_flatpickr(){
         if ( typeof jQuery.fn.flatpickr === "function" && !$aui_doing_init_flatpickr) {
             $aui_doing_init_flatpickr = true;
-			<?php if ( ! empty( $flatpickr_locale ) ) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
+			<?php if (!empty($flatpickr_locale)) { ?>try{flatpickr.localize(<?php echo $flatpickr_locale; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>);}catch(err){console.log(err.message);}<?php } ?>
             jQuery('input[data-aui-init="flatpickr"]:not(.flatpickr-input)').flatpickr();
         }
         $aui_doing_init_flatpickr = false;
@@ -1013,7 +1013,7 @@ 
 
 	<?php
 	// FSE tweaks.
-	if(!empty($_REQUEST['postType'])){ ?>
+	if (!empty($_REQUEST['postType'])) { ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php

Indentation +302 added lines, -302 removed lines

@@ -1,264 +1,264 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
-	/**
-	 * Allow the quick setup and connection of our AyeCode Connect plugin.
-	 *
-	 * Class AyeCode_Connect_Helper
-	 */
-	class AyeCode_Connect_Helper {
-
-		// Hold the version number
-		var $version = "1.0.4";
-
-		// Hold the default strings.
-		var $strings = array();
-
-		// Hold the default pages.
-		var $pages = array();
-
-		/**
-		 * The constructor.
-		 *
-		 * AyeCode_Connect_Helper constructor.
-		 *
-		 * @param array $strings
-		 * @param array $pages
-		 */
-		public function __construct( $strings = array(), $pages = array() ) {
-			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
-				// set default strings
-				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
-					'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
-					'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
-					'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
-				);
-				$this->strings   = array_merge( $default_strings, $strings );
-
-				// set default pages
-				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
-
-				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
-
-				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
-				}
-			}
-
-			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
-			}
-		}
-
-		/**
-		 * Give a way to check we can connect via a external redirect.
-		 */
-		public function ayecode_connect_helper_installed(){
-			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
-			);
-			wp_send_json_success( $active );
-			wp_die();
-		}
-
-		/**
-		 * Get slug from path
-		 *
-		 * @param  string $key
-		 *
-		 * @return string
-		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
-
-			return $slug[0];
-		}
-
-		/**
-		 * Install and activate the AyeCode Connect Plugin
-		 */
-		public function ayecode_connect_install() {
-			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-
-			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
-
-			$success     = true;
-			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-
-				WP_Filesystem();
-
-				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
-				$plugin_slug       = $plugin_slug;
-				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
-				$installed         = false;
-				$activate          = false;
-
-				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
-					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
-				}
-
-				// Install this thing!
-				if ( ! $installed ) {
-
-					// Suppress feedback
-					ob_start();
-
-					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
-							'slug'   => $plugin_slug,
-							'fields' => array(
-								'short_description' => false,
-								'sections'          => false,
-								'requires'          => false,
-								'rating'            => false,
-								'ratings'           => false,
-								'downloaded'        => false,
-								'last_updated'      => false,
-								'added'             => false,
-								'tags'              => false,
-								'homepage'          => false,
-								'donate_link'       => false,
-								'author_profile'    => false,
-								'author'            => false,
-							),
-						) );
-
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
-						}
-
-						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
-
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
-						}
-
-						$working_dir = $upgrader->unpack_package( $download, true );
-
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
-						}
-
-						$result = $upgrader->install_package( array(
-							'source'                      => $working_dir,
-							'destination'                 => WP_PLUGIN_DIR,
-							'clear_destination'           => false,
-							'abort_if_destination_exists' => false,
-							'clear_working'               => true,
-							'hook_extra'                  => array(
-								'type'   => 'plugin',
-								'action' => 'install',
-							),
-						) );
-
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
-						}
-
-						$activate = true;
-
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-
-					// Discard feedback
-					ob_end_clean();
-				}
-
-				wp_clean_plugins_cache();
-
-				// Activate this thing
-				if ( $activate ) {
-					try {
-						$result = activate_plugin( $plugin );
-
-						if ( is_wp_error( $result ) ) {
-							$success = false;
-						} else {
-							$success = true;
-						}
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-				}
-			}
-
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
-				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
-			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-			wp_die();
-		}
-
-		/**
-		 * Check if maybe localhost.
-		 *
-		 * @return bool
-		 */
-		public function is_localhost() {
-			$localhost = false;
-
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
-			$localhost_domains = array(
-				'localhost',
-				'localhost.localdomain',
-				'127.0.0.1',
-				'::1'
-			);
-
-			if ( in_array( $host, $localhost_domains ) ) {
-				$localhost = true;
-			}
-
-			return $localhost;
-		}
-
-		/**
-		 * Show notice to connect site.
-		 */
-		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
-				$connect_title_string     = $this->strings['connect_title'];
-				$connect_external_string  = $this->strings['connect_external'];
-				$connect_string           = $this->strings['connect'];
-				$connect_button_string    = $this->strings['connect_button'];
-				$connecting_button_string = $this->strings['connecting_button'];
-				?>
+    /**
+     * Allow the quick setup and connection of our AyeCode Connect plugin.
+     *
+     * Class AyeCode_Connect_Helper
+     */
+    class AyeCode_Connect_Helper {
+
+        // Hold the version number
+        var $version = "1.0.4";
+
+        // Hold the default strings.
+        var $strings = array();
+
+        // Hold the default pages.
+        var $pages = array();
+
+        /**
+         * The constructor.
+         *
+         * AyeCode_Connect_Helper constructor.
+         *
+         * @param array $strings
+         * @param array $pages
+         */
+        public function __construct( $strings = array(), $pages = array() ) {
+            // Only fire if not localhost and the current user has the right permissions.
+            if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+                // set default strings
+                $default_strings = array(
+                    'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
+                    'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
+                    'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
+                    'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
+                    'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
+                    'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
+                    'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
+                );
+                $this->strings   = array_merge( $default_strings, $strings );
+
+                // set default pages
+                $default_pages = array();
+                $this->pages   = array_merge( $default_pages, $pages );
+
+                // maybe show connect site notice
+                add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+
+                // add ajax action if not already added
+                if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
+                    add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+                }
+            }
+
+            // add ajax action if not already added
+            if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
+                add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+            }
+        }
+
+        /**
+         * Give a way to check we can connect via a external redirect.
+         */
+        public function ayecode_connect_helper_installed(){
+            $active = array(
+                'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
+                'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
+                'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+            );
+            wp_send_json_success( $active );
+            wp_die();
+        }
+
+        /**
+         * Get slug from path
+         *
+         * @param  string $key
+         *
+         * @return string
+         */
+        private function format_plugin_slug( $key ) {
+            $slug = explode( '/', $key );
+            $slug = explode( '.', end( $slug ) );
+
+            return $slug[0];
+        }
+
+        /**
+         * Install and activate the AyeCode Connect Plugin
+         */
+        public function ayecode_connect_install() {
+            // bail if localhost
+            if ( $this->is_localhost() ) {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+
+            // Explicitly clear the event.
+            wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+
+            $success     = true;
+            $plugin_slug = "ayecode-connect";
+            if ( ! empty( $plugin_slug ) ) {
+                require_once( ABSPATH . 'wp-admin/includes/file.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+                require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+
+                WP_Filesystem();
+
+                $skin              = new Automatic_Upgrader_Skin;
+                $upgrader          = new WP_Upgrader( $skin );
+                $installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+                $plugin_slug       = $plugin_slug;
+                $plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
+                $installed         = false;
+                $activate          = false;
+
+                // See if the plugin is installed already
+                if ( in_array( $plugin_slug, $installed_plugins ) ) {
+                    $installed = true;
+                    $activate  = ! is_plugin_active( $plugin );
+                }
+
+                // Install this thing!
+                if ( ! $installed ) {
+
+                    // Suppress feedback
+                    ob_start();
+
+                    try {
+                        $plugin_information = plugins_api( 'plugin_information', array(
+                            'slug'   => $plugin_slug,
+                            'fields' => array(
+                                'short_description' => false,
+                                'sections'          => false,
+                                'requires'          => false,
+                                'rating'            => false,
+                                'ratings'           => false,
+                                'downloaded'        => false,
+                                'last_updated'      => false,
+                                'added'             => false,
+                                'tags'              => false,
+                                'homepage'          => false,
+                                'donate_link'       => false,
+                                'author_profile'    => false,
+                                'author'            => false,
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $plugin_information ) ) {
+                            throw new Exception( $plugin_information->get_error_message() );
+                        }
+
+                        $package  = $plugin_information->download_link;
+                        $download = $upgrader->download_package( $package );
+
+                        if ( is_wp_error( $download ) ) {
+                            throw new Exception( $download->get_error_message() );
+                        }
+
+                        $working_dir = $upgrader->unpack_package( $download, true );
+
+                        if ( is_wp_error( $working_dir ) ) {
+                            throw new Exception( $working_dir->get_error_message() );
+                        }
+
+                        $result = $upgrader->install_package( array(
+                            'source'                      => $working_dir,
+                            'destination'                 => WP_PLUGIN_DIR,
+                            'clear_destination'           => false,
+                            'abort_if_destination_exists' => false,
+                            'clear_working'               => true,
+                            'hook_extra'                  => array(
+                                'type'   => 'plugin',
+                                'action' => 'install',
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $result ) ) {
+                            throw new Exception( $result->get_error_message() );
+                        }
+
+                        $activate = true;
+
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+
+                    // Discard feedback
+                    ob_end_clean();
+                }
+
+                wp_clean_plugins_cache();
+
+                // Activate this thing
+                if ( $activate ) {
+                    try {
+                        $result = activate_plugin( $plugin );
+
+                        if ( is_wp_error( $result ) ) {
+                            $success = false;
+                        } else {
+                            $success = true;
+                        }
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+                }
+            }
+
+            if ( $success && function_exists( 'ayecode_connect_args' ) ) {
+                ayecode_connect();// init
+                $args        = ayecode_connect_args();
+                $client      = new AyeCode_Connect( $args );
+                $redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
+                $redirect    = $client->build_connect_url( $redirect_to );
+                wp_send_json_success( array( 'connect_url' => $redirect ) );
+            } else {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+            wp_die();
+        }
+
+        /**
+         * Check if maybe localhost.
+         *
+         * @return bool
+         */
+        public function is_localhost() {
+            $localhost = false;
+
+            $host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+            $localhost_domains = array(
+                'localhost',
+                'localhost.localdomain',
+                '127.0.0.1',
+                '::1'
+            );
+
+            if ( in_array( $host, $localhost_domains ) ) {
+                $localhost = true;
+            }
+
+            return $localhost;
+        }
+
+        /**
+         * Show notice to connect site.
+         */
+        public function ayecode_connect_install_notice() {
+            if ( $this->maybe_show() ) {
+                $connect_title_string     = $this->strings['connect_title'];
+                $connect_external_string  = $this->strings['connect_external'];
+                $connect_string           = $this->strings['connect'];
+                $connect_button_string    = $this->strings['connect_button'];
+                $connecting_button_string = $this->strings['connecting_button'];
+                ?>
 				<div class="notice notice-info acch-notice">
 					<span class="acch-float-left">
 						<svg width="61px" height="61px" viewBox="0 0 61 61" version="1.1"
@@ -305,9 +305,9 @@ 
 				</div>
 
 				<?php
-				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-					?>
+                // only include the popup HTML if needed.
+                if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                    ?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
 					<span class="acch-float-left">
@@ -353,23 +353,23 @@ 
 						</div>
 					</div>
 					<?php
-				}
-
-				// add required scripts
-				$this->script();
-			}
-		}
-
-		/**
-		 * Get the JS Script.
-		 */
-		public function script() {
-
-			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-				add_thickbox();
-			}
-			?>
+                }
+
+                // add required scripts
+                $this->script();
+            }
+        }
+
+        /**
+         * Get the JS Script.
+         */
+        public function script() {
+
+            // add thickbox if external request is requested
+            if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                add_thickbox();
+            }
+            ?>
 			<style>
 				.acch-title {
 					margin: 0;
@@ -435,38 +435,38 @@ 
 					});
 				} 
 				<?php
-				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
-				?>
+                // add thickbox if external request is requested
+                if(! empty( $_REQUEST['external-connect-request'] )) {
+                ?>
 				jQuery(function () {
 					setTimeout(function () {
 						tb_show("AyeCode Connect", "?TB_inline?width=300&height=80&inlineId=ayecode-connect-helper-external-confirm");
 					}, 200);
 				});
 				<?php
-				}
-				?>
+                }
+                ?>
 			</script>
 			<?php
-		}
-
-		/**
-		 * Decide what pages to show on.
-		 *
-		 * @return bool
-		 */
-		public function maybe_show() {
-			$show = false;
-
-			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
-				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
-					$show = true;
-				}
-			}
-
-			return $show;
-		}
-	}
+        }
+
+        /**
+         * Decide what pages to show on.
+         *
+         * @return bool
+         */
+        public function maybe_show() {
+            $show = false;
+
+            // check if on a page set to show
+            if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+                // check if not active and connected
+                if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+                    $show = true;
+                }
+            }
+
+            return $show;
+        }
+    }
 }

Spacing +78 added lines, -78 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
+if (!class_exists("AyeCode_Connect_Helper")) {
 	/**
 	 * Allow the quick setup and connection of our AyeCode Connect plugin.
 	 *
@@ -28,50 +28,50 @@ 
 		 * @param array $strings
 		 * @param array $pages
 		 */
-		public function __construct( $strings = array(), $pages = array() ) {
+		public function __construct($strings = array(), $pages = array()) {
 			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+			if (!$this->is_localhost() && current_user_can('manage_options')) {
 				// set default strings
 				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
-					'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
-					'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
-					'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
+					'connect_title'     => __("Thanks for choosing an AyeCode Product!", 'ayecode-connect'),
+					'connect_external'  => __("Please confirm you wish to connect your site?", 'ayecode-connect'),
+					'connect'           => wp_sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect'), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+					'connect_button'    => __("Connect Site", 'ayecode-connect'),
+					'connecting_button' => __("Connecting...", 'ayecode-connect'),
+					'error_localhost'   => __("This service will only work with a live domain, not a localhost.", 'ayecode-connect'),
+					'error'             => __("Something went wrong, please refresh and try again.", 'ayecode-connect'),
 				);
-				$this->strings   = array_merge( $default_strings, $strings );
+				$this->strings = array_merge($default_strings, $strings);
 
 				// set default pages
 				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
+				$this->pages   = array_merge($default_pages, $pages);
 
 				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+				add_action('admin_notices', array($this, 'ayecode_connect_install_notice'));
 
 				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+				if (!has_action('wp_ajax_ayecode_connect_helper')) {
+					add_action('wp_ajax_ayecode_connect_helper', array($this, 'ayecode_connect_install'));
 				}
 			}
 
 			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+			if (!has_action('wp_ajax_nopriv_ayecode_connect_helper_installed')) {
+				add_action('wp_ajax_nopriv_ayecode_connect_helper_installed', array($this, 'ayecode_connect_helper_installed'));
 			}
 		}
 
 		/**
 		 * Give a way to check we can connect via a external redirect.
 		 */
-		public function ayecode_connect_helper_installed(){
+		public function ayecode_connect_helper_installed() {
 			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION, '2.0.0.79', '>') ? 1 : 0,
+				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION, '1.2.1.5', '>') ? 1 : 0,
+				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION, '1.0.14', '>') ? 1 : 0,
 			);
-			wp_send_json_success( $active );
+			wp_send_json_success($active);
 			wp_die();
 		}
 
@@ -82,9 +82,9 @@ 
 		 *
 		 * @return string
 		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
+		private function format_plugin_slug($key) {
+			$slug = explode('/', $key);
+			$slug = explode('.', end($slug));
 
 			return $slug[0];
 		}
@@ -94,45 +94,45 @@ 
 		 */
 		public function ayecode_connect_install() {
 			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
+			if ($this->is_localhost()) {
+				wp_send_json_error($this->strings['error_localhost']);
 			}
 
 			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+			wp_clear_scheduled_hook('geodir_plugin_background_installer', func_get_args());
 
 			$success     = true;
 			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+			if (!empty($plugin_slug)) {
+				require_once(ABSPATH . 'wp-admin/includes/file.php');
+				require_once(ABSPATH . 'wp-admin/includes/plugin-install.php');
+				require_once(ABSPATH . 'wp-admin/includes/class-wp-upgrader.php');
+				require_once(ABSPATH . 'wp-admin/includes/plugin.php');
 
 				WP_Filesystem();
 
 				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+				$upgrader          = new WP_Upgrader($skin);
+				$installed_plugins = array_map(array($this, 'format_plugin_slug'), array_keys(get_plugins()));
 				$plugin_slug       = $plugin_slug;
 				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
 				$installed         = false;
 				$activate          = false;
 
 				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
+				if (in_array($plugin_slug, $installed_plugins)) {
 					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
+					$activate  = !is_plugin_active($plugin);
 				}
 
 				// Install this thing!
-				if ( ! $installed ) {
+				if (!$installed) {
 
 					// Suppress feedback
 					ob_start();
 
 					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
+						$plugin_information = plugins_api('plugin_information', array(
 							'slug'   => $plugin_slug,
 							'fields' => array(
 								'short_description' => false,
@@ -149,26 +149,26 @@ 
 								'author_profile'    => false,
 								'author'            => false,
 							),
-						) );
+						));
 
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
+						if (is_wp_error($plugin_information)) {
+							throw new Exception($plugin_information->get_error_message());
 						}
 
 						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
+						$download = $upgrader->download_package($package);
 
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
+						if (is_wp_error($download)) {
+							throw new Exception($download->get_error_message());
 						}
 
-						$working_dir = $upgrader->unpack_package( $download, true );
+						$working_dir = $upgrader->unpack_package($download, true);
 
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
+						if (is_wp_error($working_dir)) {
+							throw new Exception($working_dir->get_error_message());
 						}
 
-						$result = $upgrader->install_package( array(
+						$result = $upgrader->install_package(array(
 							'source'                      => $working_dir,
 							'destination'                 => WP_PLUGIN_DIR,
 							'clear_destination'           => false,
@@ -178,15 +178,15 @@ 
 								'type'   => 'plugin',
 								'action' => 'install',
 							),
-						) );
+						));
 
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
+						if (is_wp_error($result)) {
+							throw new Exception($result->get_error_message());
 						}
 
 						$activate = true;
 
-					} catch ( Exception $e ) {
+					} catch (Exception $e) {
 						$success = false;
 					}
 
@@ -197,30 +197,30 @@ 
 				wp_clean_plugins_cache();
 
 				// Activate this thing
-				if ( $activate ) {
+				if ($activate) {
 					try {
-						$result = activate_plugin( $plugin );
+						$result = activate_plugin($plugin);
 
-						if ( is_wp_error( $result ) ) {
+						if (is_wp_error($result)) {
 							$success = false;
 						} else {
 							$success = true;
 						}
-					} catch ( Exception $e ) {
+					} catch (Exception $e) {
 						$success = false;
 					}
 				}
 			}
 
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
+			if ($success && function_exists('ayecode_connect_args')) {
+				ayecode_connect(); // init
 				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
+				$client      = new AyeCode_Connect($args);
+				$redirect_to = !empty($_POST['redirect_to']) ? esc_url_raw($_POST['redirect_to']) : '';
+				$redirect    = $client->build_connect_url($redirect_to);
+				wp_send_json_success(array('connect_url' => $redirect));
 			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
+				wp_send_json_error($this->strings['error_localhost']);
 			}
 			wp_die();
 		}
@@ -233,7 +233,7 @@ 
 		public function is_localhost() {
 			$localhost = false;
 
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+			$host              = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
 			$localhost_domains = array(
 				'localhost',
 				'localhost.localdomain',
@@ -241,7 +241,7 @@ 
 				'::1'
 			);
 
-			if ( in_array( $host, $localhost_domains ) ) {
+			if (in_array($host, $localhost_domains)) {
 				$localhost = true;
 			}
 
@@ -252,7 +252,7 @@ 
 		 * Show notice to connect site.
 		 */
 		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
+			if ($this->maybe_show()) {
 				$connect_title_string     = $this->strings['connect_title'];
 				$connect_external_string  = $this->strings['connect_external'];
 				$connect_string           = $this->strings['connect'];
@@ -294,19 +294,19 @@ 
 					</svg>
 					</span>
 					<span class="acch-float-left acch-text">
-						<h3 class="acch-title"><?php echo esc_attr( $connect_title_string ); ?></h3>
+						<h3 class="acch-title"><?php echo esc_attr($connect_title_string); ?></h3>
 					<p><?php echo $connect_string; ?>
 					</p>
 					</span>
 
 					<span class="acch-float-left acch-button">
-						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr($connecting_button_string); ?>"><?php echo esc_attr($connect_button_string) ?></button>
 					</span>
 				</div>
 
 				<?php
 				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+				if (!empty($_REQUEST['external-connect-request'])) {
 					?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
@@ -344,11 +344,11 @@ 
 					</svg>
 					</span>
 					<span class="acch-float-left acch-text">
-						<h3 class="acch-title"><?php echo esc_attr( $connect_external_string ); ?></h3>
+						<h3 class="acch-title"><?php echo esc_attr($connect_external_string); ?></h3>
 					</span>
 
 					<span class="acch-float-left acch-button">
-						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr($connecting_button_string); ?>"><?php echo esc_attr($connect_button_string) ?></button>
 					</span>
 						</div>
 					</div>
@@ -366,7 +366,7 @@ 
 		public function script() {
 
 			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+			if (!empty($_REQUEST['external-connect-request'])) {
 				add_thickbox();
 			}
 			?>
@@ -417,7 +417,7 @@ 
 						url: ajaxurl,
 						data: {
 							action: 'ayecode_connect_helper',
-							security: '<?php echo wp_create_nonce( 'ayecode-connect-helper' );?>',
+							security: '<?php echo wp_create_nonce('ayecode-connect-helper'); ?>',
 							redirect_to: $current_url
 						},
 						beforeSend: function () {
@@ -436,7 +436,7 @@ 
 				} 
 				<?php
 				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
+				if (!empty($_REQUEST['external-connect-request'])) {
 				?>
 				jQuery(function () {
 					setTimeout(function () {
@@ -459,9 +459,9 @@ 
 			$show = false;
 
 			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+			if (isset($_REQUEST['page']) && in_array($_REQUEST['page'], $this->pages)) {
 				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+				if (!defined('AYECODE_CONNECT_VERSION') || !get_option('ayecode_connect_blog_token')) {
 					$show = true;
 				}
 			}

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

Indentation +75 added lines, -75 removed lines

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

Spacing +32 added lines, -32 removed lines

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

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

Indentation +102 added lines, -102 removed lines

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

Spacing +15 added lines, -15 removed lines

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

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

Braces +40 added lines, -42 removed lines

@@ -60,7 +60,7 @@ 
             if(!empty($this->options['nested-block'])){
                 if(empty($this->options['output_types'])){
                     $this->options['output_types'] = array('shortcode','block');
-                }elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
+                } elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
                     unset($this->options['output_types'][$key]);
                 }
             }
@@ -715,7 +715,7 @@ 
 				<?php
 				if(! empty( $insert_shortcode_function )){
 					echo $insert_shortcode_function;
-				}else{
+				} else{
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -2233,7 +2233,7 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
+				} else{
 						?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
@@ -2455,7 +2455,7 @@ 
                     var InnerBlocks = blockEditor.InnerBlocks;
 
 					var term_query_type = '';
-					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";}else{echo "[]";} ?>;
+					var post_type_rest_slugs = <?php if(! empty( $this->arguments ) && isset($this->arguments['post_type']['onchange_rest']['values'])){echo "[".json_encode($this->arguments['post_type']['onchange_rest']['values'])."]";} else{echo "[]";} ?>;
 					const taxonomies_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
 					const sort_by_<?php echo str_replace("-","_", $this->id);?> = [{label: "Please wait", value: 0}];
                     const MediaUpload = wp.blockEditor.MediaUpload;
@@ -2574,8 +2574,7 @@ 
 
 								if ( $args['type'] == 'notice' ||  $args['type'] == 'tab' ) {
 									continue;
-								}
-								elseif ( $args['type'] == 'checkbox' ) {
+								} elseif ( $args['type'] == 'checkbox' ) {
 									$type    = 'boolean';
 									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
 								} elseif ( $args['type'] == 'number' ) {
@@ -2703,7 +2702,7 @@ 
                             <?php
                             if(!empty($this->options['block-edit-raw'])) {
                                 echo $this->options['block-edit-raw']; // strings have to be in single quotes, may cause issues
-                            }else{
+                            } else{
                             ?>
 
 function hasSelectedInnerBlock(props) {
@@ -2838,7 +2837,7 @@ 
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
 if(!empty($current_screen->base) && $current_screen->base==='widgets'){
 	echo 'const { deviceType } = "";';
-}else{
+} else{
 ?>
 /** Get device type const. */
 const { deviceType } = wp.data.useSelect != 'undefined' ?  wp.data.useSelect(select => {
@@ -2872,7 +2871,7 @@ 
 										'block_parent_name': parentBlocks.length ? parentBlocks[parentBlocks.length - 1].name : '',
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
 										echo $post->ID;
-									}else{echo '0';}?>,
+									} else{echo '0';}?>,
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 									};
 
@@ -2892,7 +2891,7 @@ 
 										is_fetching = false;
 										prev_attributes[props.clientId] = props.attributes;
                                              <?php
-                                        }else{
+                                        } else{
                                         ?>
                                         props.setAttributes({content: env});
 										is_fetching = false;
@@ -3050,7 +3049,7 @@ 
 //
 
 									}
-									}else {
+									} else {
 									?>
 									el(wp.components.PanelBody, {
 											title: '<?php esc_attr_e( "Settings", 'ayecode-connect' ); ?>',
@@ -3076,9 +3075,9 @@ 
 								// If the user sets block-output array then build it
 								if ( ! empty( $this->options['block-output'] ) ) {
 								$this->block_element( $this->options['block-output'] );
-							}elseif(!empty($this->options['block-edit-return'])){
+							} elseif(!empty($this->options['block-edit-return'])){
                                    echo $this->options['block-edit-return'];
-							}else{
+							} else{
 								// if no block-output is set then we try and get the shortcode html output via ajax.
 								$block_edit_wrap_tag = !empty($this->options['block_edit_wrap_tag']) ? esc_attr($this->options['block_edit_wrap_tag']) : 'div';
 								?>
@@ -3183,9 +3182,9 @@ 
                                );
                                 <?php
 
-							}elseif(!empty($this->options['block-save-return'])){
+							} elseif(!empty($this->options['block-save-return'])){
                                    echo 'return ' . $this->options['block-save-return'];
-							}elseif(!empty($this->options['nested-block'])){
+							} elseif(!empty($this->options['nested-block'])){
                                 ?>
                               return el(
                                    '',
@@ -3195,13 +3194,13 @@ 
                                    el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
                                );
                                 <?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
+							} elseif(!empty( $this->options['block-save-return'] ) ){
                                 echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+							} elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
 							?>
 							return content;
 							<?php
-							}else{
+							} else{
 							?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
@@ -3252,9 +3251,9 @@ 
                 $device_type_icon = '';
                 if($device_type=='Desktop'){
                     $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-                }elseif($device_type=='Tablet'){
+                } elseif($device_type=='Tablet'){
                     $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-                }elseif($device_type=='Mobile'){
+                } elseif($device_type=='Mobile'){
                     $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
                 }
 				echo $element_require;
@@ -3299,7 +3298,7 @@ 
 
 					<?php
 					if(false){?></script><?php }
-				}elseif(!empty($args['row']['close'])){
+				} elseif(!empty($args['row']['close'])){
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -3308,7 +3307,7 @@ 
 							},
 					<?php
 					if(false){?></script><?php }
-				}else{
+				} else{
 					if(false){?><script><?php }?>
 						el(
 							'div',
@@ -3413,9 +3412,9 @@ 
             $device_type_icon = '';
             if($device_type=='Desktop'){
                 $device_type_icon = '<span class="dashicons dashicons-desktop" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-            }elseif($device_type=='Tablet'){
+            } elseif($device_type=='Tablet'){
                 $device_type_icon = '<span class="dashicons dashicons-tablet" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
-            }elseif($device_type=='Mobile'){
+            } elseif($device_type=='Mobile'){
                 $device_type_icon = '<span class="dashicons dashicons-smartphone" style="font-size: 18px;" onclick="sd_show_view_options(this);"></span>';
             }
 
@@ -3472,7 +3471,7 @@ 
 				$args['type'] == 'text';
 				// Save numbers as numbers and not strings
 				$value     = "props.attributes.$key ? props.attributes.$key : ''";
-			}else if ( $args['type'] == 'notice' ) {
+			} else if ( $args['type'] == 'notice' ) {
 
 				$notice_message = !empty($args['desc']) ? addslashes($args['desc']) : '';
 				$notice_status = !empty($args['status']) ? esc_attr($args['status']) : 'info';
@@ -3547,7 +3546,7 @@ 
                             $key: value
                         });
                     },";
-			}elseif ( $args['type'] == 'gradient' ) {
+			} elseif ( $args['type'] == 'gradient' ) {
 				$type = 'GradientPicker';
 				$extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
@@ -3586,7 +3585,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,{
@@ -3723,8 +3722,7 @@ 
                 $onchange = "";
 
                 //$inside_elements = ",el('div',{},'file upload')";
-			}
-			elseif ( $args['type'] == 'checkbox' ) {
+			} elseif ( $args['type'] == 'checkbox' ) {
 				$type = 'CheckboxControl';
 				$extra .= "checked: props.attributes.$key,";
 				$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
@@ -3736,9 +3734,9 @@ 
 
 				if($args['name'] == 'category' && !empty($args['post_type_linked'])){
 					$options .= "options: taxonomies_".str_replace("-","_", $this->id).",";
-				}elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
+				} elseif($args['name'] == 'sort_by' && !empty($args['post_type_linked'])){
 					$options .= "options: sort_by_".str_replace("-","_", $this->id).",";
-				}else {
+				} else {
 
 					if ( ! empty( $args['options'] ) ) {
 						$options .= "options: [";
@@ -3902,7 +3900,7 @@ 
 				foreach ( $custom_attributes as $key => $val ) {
 					if(is_array($val)){
 						$attributes .= $key.': {'.$this->array_to_attributes( $val, $html ).'},';
-					}else{
+					} else{
 						$attributes .= $html ?  " $key='$val' " : "'$key': '$val',";
 					}
 				}
@@ -3942,7 +3940,7 @@ 
 
                             if($new_args['element']=='InnerBlocks'){
                                 echo "\n el( InnerBlocks, {";
-                            }elseif($new_args['element']=='innerBlocksProps'){
+                            } elseif($new_args['element']=='innerBlocksProps'){
                                 $element = isset($new_args['inner_element']) ? esc_attr($new_args['inner_element']) : 'div';
                               //  echo "\n el( 'section', wp.blockEditor.useInnerBlocksProps( blockProps, {";
 //                                echo $save ? "\n el( '$element', wp.blockEditor.useInnerBlocksProps.save( " : "\n el( '$element', wp.blockEditor.useInnerBlocksProps( ";
@@ -3955,11 +3953,11 @@ 
                             //    echo '###';
 
                               //  echo '###';
-                            }elseif($new_args['element']=='BlocksProps'){
+                            } elseif($new_args['element']=='BlocksProps'){
 
 								if ( isset($new_args['if_inner_element']) ) {
 									$element = $new_args['if_inner_element'];
-								}else {
+								} else {
 									$element = isset($new_args['inner_element']) ? "'".esc_attr($new_args['inner_element'])."'" : "'div'";
 								}
 
@@ -3970,7 +3968,7 @@ 
 
                                // echo "} ),";
 
-                            }else{
+                            } else{
                                 echo "\n el( '" . $new_args['element'] . "', {";
                             }
 
@@ -3995,7 +3993,7 @@ 
 
 									if ( $new_key === 'content' ) {
 										echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-									}else if ( $new_key === 'if_content' ) {
+									} else if ( $new_key === 'if_content' ) {
 										echo  $this->block_props_replace(  $new_value  );
 									}
 
@@ -4025,7 +4023,7 @@ 
 
                             if($new_args['element']=='innerBlocksProps' || $new_args['element']=='xBlocksProps'){
                                 echo "))";// end content
-                            }else{
+                            } else{
                                 echo ")";// end content
                             }
 
@@ -4351,7 +4349,7 @@ 
 
 				if(empty($instance['widget_title_tag'])){
 					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
+				} else{
 					$title_tag = esc_attr( $instance['widget_title_tag'] );
 
 					// classes
@@ -4641,11 +4639,11 @@ 
 		public function get_widget_icon($icon = 'box-top', $title = ''){
 			if($icon=='box-top'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.048" height="9.017" fill="#555D66"></rect><rect x="16.265" y="5.498" width="1.023" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.186" width="8.964" height="2.482" fill="#272B2F"></rect><rect x="5.487" y="16.261" width="9.026" height="1.037" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-right'){
+			} elseif($icon=='box-right'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1.046" height="9.017" fill="#555D66"></rect><rect x="15.244" y="5.498" width="2.518" height="9.003" fill="#272B2F"></rect><rect x="5.518" y="2.719" width="8.964" height="0.954" fill="#555D66"></rect><rect x="5.487" y="16.308" width="9.026" height="0.99" fill="#555D66"></rect></svg>';
-			}elseif($icon=='box-bottom'){
+			} elseif($icon=='box-bottom'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.714" y="5.492" width="1" height="9.017" fill="#555D66"></rect><rect x="16.261" y="5.498" width="1.027" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.968" fill="#555D66"></rect><rect x="5.487" y="15.28" width="9.026" height="2.499" fill="#272B2F"></rect></svg>';
-			}elseif($icon=='box-left'){
+			} elseif($icon=='box-left'){
 				return '<svg title="'.esc_attr($title).'" width="20px" height="20px" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="round" stroke-miterlimit="1.414" role="img" aria-hidden="true" focusable="false"><rect x="2.202" y="5.492" width="2.503" height="9.017" fill="#272B2F"></rect><rect x="16.276" y="5.498" width="1.012" height="9.003" fill="#555D66"></rect><rect x="5.518" y="2.719" width="8.964" height="0.966" fill="#555D66"></rect><rect x="5.487" y="16.303" width="9.026" height="0.995" fill="#555D66"></rect></svg>';
 			}
 		}

Indentation +2322 added lines, -2322 removed lines

@@ -1,60 +1,60 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
-	define( 'SUPER_DUPER_VER', '1.1.35' );
-
-	/**
-	 * 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();
+    define( 'SUPER_DUPER_VER', '1.1.35' );
+
+    /**
+     * 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'])){
@@ -65,235 +65,235 @@ 
                 }
             }
 
-			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+            // 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'];
+            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
+                // 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' ) );
+                }
 
-				// 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, '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, '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 );
+        }
 
         /**
          * The register widget function
          * @return void
          */
-		public function _register() {
+        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 ) );
-		}
+        /**
+         * 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() {
+        public function register_fusion_element() {
 
-			$options = $this->options;
+            $options = $this->options;
 
-			if ( $this->base_id ) {
+            if ( $this->base_id ) {
 
-				$params = $this->get_fusion_params();
+                $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,
-				);
+                $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;
-				}
+                if ( ! empty( $params ) ) {
+                    $args['params'] = $params;
+                }
 
-				fusion_builder_map( $args );
-			}
+                fusion_builder_map( $args );
+            }
 
-		}
+        }
 
-		public function get_fusion_params() {
-			$params    = array();
-			$arguments = $this->get_arguments();
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
-					$param = array();
-					// type
-					$param['type'] = str_replace(
-						array(
-							"text",
-							"number",
-							"email",
-							"color",
-							"checkbox"
-						),
-						array(
-							"textfield",
-							"textfield",
-							"textfield",
-							"colorpicker",
-							"select",
-
-						),
-						$val['type'] );
-
-					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
-						$param['type']     = 'multiple_select';
-						$param['multiple'] = true;
-					}
+        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",
 
-					// heading
-					$param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+                        ),
+                        $val['type'] );
 
-					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+                    // multiselect
+                    if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+                        $param['type']     = 'multiple_select';
+                        $param['multiple'] = true;
+                    }
 
-					// param_name
-					$param['param_name'] = $key;
+                    // heading
+                    $param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
 
-					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+                    // description
+                    $param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
 
-					// Group
-					if ( isset( $val['group'] ) ) {
-						$param['group'] = $val['group'];
-					}
+                    // param_name
+                    $param['param_name'] = $key;
 
-					// 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'] : '';
-					}
+                    // Default
+                    $param['default'] = isset( $val['default'] ) ? $val['default'] : '';
 
-					// setup the param
-					$params[] = $param;
+                    // Group
+                    if ( isset( $val['group'] ) ) {
+                        $param['group'] = $val['group'];
+                    }
 
-				}
-			}
+                    // value
+                    if ( $val['type'] == 'checkbox' ) {
+                        if ( isset( $val['default'] ) && $val['default'] == '0' ) {
+                            unset( $param['default'] );
+                        }
+                        $param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
+                    } elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
+                        $param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+                    } else {
+                        $param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+                    }
 
+                    // setup the param
+                    $params[] = $param;
 
-			return $params;
-		}
+                }
+            }
 
-		/**
-		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
-		 */
-		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
-				self::shortcode_insert_button_script();
-			}
-		}
 
-		/**
-		 * A function to ge the shortcode builder picker html.
-		 *
-		 * @param string $editor_id
-		 *
-		 * @return string
-		 */
-		public static function get_picker( $editor_id = '' ) {
-
-			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
-				$editor_id = 'main_content_content_vb_tiny_mce';
-			}
+            return $params;
+        }
+
+        /**
+         * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
+         */
+        public static function maybe_cornerstone_builder() {
+            if ( did_action( 'cornerstone_before_boot_app' ) ) {
+                self::shortcode_insert_button_script();
+            }
+        }
+
+        /**
+         * A function to ge the shortcode builder picker html.
+         *
+         * @param string $editor_id
+         *
+         * @return string
+         */
+        public static function get_picker( $editor_id = '' ) {
+
+            ob_start();
+            if ( isset( $_POST['editor_id'] ) ) {
+                $editor_id = esc_attr( $_POST['editor_id'] );
+            } elseif ( isset( $_REQUEST['et_fb'] ) ) {
+                $editor_id = 'main_content_content_vb_tiny_mce';
+            }
 
-			global $sd_widgets;
+            global $sd_widgets;
 
 //			print_r($sd_widgets);exit;
-			?>
+            ?>
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
-				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
-					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
-					}
-					echo "</select>";
+                ksort( $sd_widgets );
+                //				print_r($sd_widgets);exit;
+                if ( ! empty( $sd_widgets ) ) {
+                    echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
+                    echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
+                    foreach ( $sd_widgets as $shortcode => $class ) {
+                        if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
+                        echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+                    }
+                    echo "</select>";
 
-				}
-				?>
+                }
+                ?>
 				<div class="sd-shortcode-settings"></div>
 
 			</div>
@@ -304,8 +304,8 @@ 
 					<?php if ( $editor_id != '' ) { ?>
 						<button class="button sd-insert-shortcode-button"
 						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
-							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
+                                    echo "'" . $editor_id . "'";
+                                } ?>)"><?php _e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
 					<?php } ?>
 					<button class="button"
 					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
@@ -313,150 +313,150 @@ 
 			</div>
 			<?php
 
-			$html = ob_get_clean();
+            $html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
-				echo $html;
-				$should_die = true;
+            if ( wp_doing_ajax() ) {
+                echo $html;
+                $should_die = true;
 
-				// some builder get the editor via ajax so we should not die on those occasions
-				$dont_die = array(
-					'parent_tag',// WP Bakery
-					'avia_request' // enfold
-				);
+                // 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;
-					}
-				}
+                foreach ( $dont_die as $request ) {
+                    if ( isset( $_REQUEST[ $request ] ) ) {
+                        $should_die = false;
+                    }
+                }
 
-				if ( $should_die ) {
-					wp_die();
-				}
+                if ( $should_die ) {
+                    wp_die();
+                }
 
-			} else {
-				return $html;
-			}
+            } else {
+                return $html;
+            }
 
-			return '';
+            return '';
 
-		}
+        }
 
-		/**
-		 * Output the version in the header.
-		 */
-		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-			// Find source plugin/theme of SD
-			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-				}
-			}
+        /**
+         * Output the version in the header.
+         */
+        public function generator() {
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme of SD
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
 
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
-		}
+            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();
-			}
+        /**
+         * 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;
+            // 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>";
-			?>
+            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();
-		}
+            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();
+        /**
+         * 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">';
-			}
+            /**
+             * 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' );
+            echo self::shortcode_button( 'this', 'true' );
 
-			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-				echo '</span>'; // end #insert-media-button
-			}
+            // 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 );
-			}
+            // 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;
-		}
+            $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>
@@ -467,21 +467,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.
@@ -557,29 +557,29 @@ 
 				});
 			</script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            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;
@@ -707,35 +707,35 @@ 
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				echo "<script>" . self::siteorigin_js() . "</script>";
-			}
-			?>
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
+                echo "<script>" . self::siteorigin_js() . "</script>";
+            }
+            ?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
-					echo $insert_shortcode_function;
-				}else{
+                if(! empty( $insert_shortcode_function )){
+                    echo $insert_shortcode_function;
+                }else{
 
-				/**
-				 * Function for super duper insert shortcode.
-				 *
-				 * @since 1.0.0
-				 */
-				?>
+                /**
+                 * Function for super duper insert shortcode.
+                 *
+                 * @since 1.0.0
+                 */
+                ?>
 				function sd_insert_shortcode($editor_id) {
 					$shortcode = jQuery('#TB_ajaxContent #sd-shortcode-output').val();
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
-								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
-								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
-							} else {
-								echo '$editor_id = "#wp-content-editor-container textarea";';
-							}
-							?>
+                            if ( isset( $_REQUEST['et_fb'] ) ) {
+                                echo '$editor_id = "#main_content_content_vb_tiny_mce";';
+                            } elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+                                echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
+                            } else {
+                                echo '$editor_id = "#wp-content-editor-container textarea";';
+                            }
+                            ?>
 						} else {
 							$editor_id = '#' + $editor_id;
 						}
@@ -1049,18 +1049,18 @@ 
 				}
 			</script>
 			<?php
-		}
+        }
 
-		/**
-		 * Gets some CSS for the widgets screen.
-		 *
-		 * @param bool $advanced If we should include advanced CSS.
-		 *
-		 * @return mixed
-		 */
-		public function widget_css( $advanced = true ) {
-			ob_start();
-			?>
+        /**
+         * Gets some CSS for the widgets screen.
+         *
+         * @param bool $advanced If we should include advanced CSS.
+         *
+         * @return mixed
+         */
+        public function widget_css( $advanced = true ) {
+            ob_start();
+            ?>
 			<style>
 				<?php if( $advanced ){ ?>
 				.sd-advanced-setting {
@@ -1100,26 +1100,26 @@ 
 				.elementor-control .sd-argument select[multiple] option{padding:3px}
 			</style>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', $output );
-		}
+            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>
 
 				/**
@@ -1270,513 +1270,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;
-				}
-			}
+            // 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 ( 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 );
+                        if ( ! empty( $value ) ) {
+                            $value = wp_unslash( $value );
 
-							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
-							}
-						}
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . esc_attr( $value ) . "' ";
-					}
-				}
+                            // Encode [ and ].
+                            if ( $is_preview ) {
+                                $value = $this->encode_shortcodes( $value );
+                            }
+                        }
+                        $attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . esc_attr( $value ) . "' ";
+                    }
+                }
 
-				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
+                $shortcode = "[" . $shortcode_name . " " . $attributes . "]";
 
-				$content = do_shortcode( $shortcode );
+                $content = do_shortcode( $shortcode );
 
-				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
-				}
+                // Decode [ and ].
+                if ( ! empty( $content ) && $is_preview ) {
+                    $content = $this->decode_shortcodes( $content );
+                }
 
-				echo $content;
-			}
-			wp_die();
-		}
+                echo $content;
+            }
+            wp_die();
+        }
 
-		/**
-		 * Output the shortcode.
-		 *
-		 * @param array $args
-		 * @param string $content
-		 *
-		 * @return string
-		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
-			$_instance = $args;
-
-			$args = $this->argument_values( $args );
-
-			// add extra argument so we know its a output to gutenberg
-			//$args
-			$args = $this->string_to_bool( $args );
-
-			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
-				$args['html'] = $content;
-			}
+        /**
+         * Output the shortcode.
+         *
+         * @param array $args
+         * @param string $content
+         *
+         * @return string
+         */
+        public function shortcode_output( $args = array(), $content = '' ) {
+            $_instance = $args;
 
-			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 );
+            $args = $this->argument_values( $args );
 
-				if ( ! is_array( $args ) ) {
-					return $args;
-				}
-			}
+            // add extra argument so we know its a output to gutenberg
+            //$args
+            $args = $this->string_to_bool( $args );
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
+            // if we have a enclosed shortcode we add it to the special `html` argument
+            if ( ! empty( $content ) ) {
+                $args['html'] = $content;
+            }
 
-			$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 );
+            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;
+                }
+            }
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+            $class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
+            $class .= " sdel-".$this->get_instance_hash();
 
-			$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;
-			}
+            $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 );
 
-			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-			}
+            $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
+            $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
 
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_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;
+            }
 
-		/**
-		 * Placeholder text to show if output is empty and we are on a preview/builder page.
-		 *
-		 * @param string $name
-		 *
-		 * @return string
-		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
-		}
+            // if preview show a placeholder if empty
+            if ( $this->is_preview() && $output == '' ) {
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+            }
 
-		/**
-		 * Sometimes booleans values can be turned to strings, so we fix that.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		public function string_to_bool( $options ) {
-			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
-				}
-			}
+            return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+        }
 
-			return $options;
-		}
+        /**
+         * 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>";
+        }
 
-		/**
-		 * 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();
-			}
+        /**
+         * 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;
+                }
+            }
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
-					// set the input name from the key
-					$args['name'] = $key;
-					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
-						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
-					}
-				}
-			}
+            return $options;
+        }
 
-			return $argument_values;
-		}
+        /**
+         * 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 arguments in super duper.
-		 *
-		 * @return array Set arguments.
-		 *@since 1.0.0
-		 *
-		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
+            // set widget instance
+            $this->instance = $instance;
 
-		/**
-		 * 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();
-			}
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->get_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 );
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $key => $args ) {
+                    // set the input name from the key
+                    $args['name'] = $key;
+                    //
+                    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
+                    if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+                        // don't set default for an empty checkbox
+                    } elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+                        $argument_values[ $key ] = $args['default'];
+                    }
+                }
+            }
 
-			return $this->arguments;
-		}
+            return $argument_values;
+        }
 
-		/**
-		 * 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 = '' ) {
+        /**
+         * Set arguments in super duper.
+         *
+         * @return array Set arguments.
+         *@since 1.0.0
+         *
+         */
+        public function set_arguments() {
+            return $this->arguments;
+        }
 
-		}
+        /**
+         * Get arguments in super duper.
+         *
+         * @return array Get arguments.
+         *@since 1.0.0
+         *
+         */
+        public function get_arguments() {
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->set_arguments();
+            }
 
-		/**
-		 * 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() );
-			}
-		}
+            $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
+            $this->arguments = $this->add_name_from_key( $this->arguments, true );
 
-		/**
-		 * Check if we need to show advanced options.
-		 *
-		 * @return bool
-		 */
-		public function block_show_advanced() {
-
-			$show      = false;
-			$arguments = $this->get_arguments();
-
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
-						$show = true;
-						break; // no need to continue if we know we have it
-					}
-				}
-			}
+            return $this->arguments;
+        }
 
-			return $show;
-		}
+        /**
+         * 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 = '' ) {
 
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-			$url = $this->url;
-
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
-
-				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
-				}
+        }
 
-				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
-				$this->url = $url;
-			}
+        /**
+         * 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() );
+            }
+        }
 
-			return $url;
-		}
+        /**
+         * Check if we need to show advanced options.
+         *
+         * @return bool
+         */
+        public function block_show_advanced() {
 
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url_old() {
+            $show      = false;
+            $arguments = $this->get_arguments();
 
-			$url = $this->url;
+            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 ( ! $url ) {
-				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+            return $show;
+        }
 
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+            $url = $this->url;
 
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
-					$this->url = $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 . "'";
-			}
+            return $url;
+        }
 
-			// 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 . "'}))";
-			}
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url_old() {
 
-			return $icon;
-		}
+            $url = $this->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;
-					}
-				}
+            if ( ! $url ) {
+                // check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
 
-				// only add sections if more than one
-				if ( $add_sections ) {
-					$arguments = $temp_arguments;
-				}
-			}
+                $dir_parts = explode( "/wp-content/", $file_dir );
+                $url_parts = explode( "/wp-content/", plugins_url() );
 
-			return $arguments;
-		}
+                if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
+                    $url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+                    $this->url = $url;
+                }
+            }
 
-		/**
-		 * Parse used group tabs.
-		 *
-		 * @since 1.1.17
-		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
-				$has_sections = false;
-
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$has_sections = true;
-						break;
-					}
-				}
 
-				if ( ! $has_sections ) {
-					return $tabs;
-				}
+            return $url;
+        }
 
-				$new_tabs = array();
+        /**
+         * 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 . "'";
+            }
 
-				foreach ( $tabs as $tab_key => $tab ) {
-					$new_groups = array();
+            // 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 . "'}))";
+            }
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
-								$new_groups[] = $group;
-							}
-						}
-					}
+            return $icon;
+        }
 
-					if ( ! empty( $new_groups ) ) {
-						$tab['groups'] = $new_groups;
+        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;
+                    }
+                }
 
-						$new_tabs[ $tab_key ] = $tab;
-					}
-				}
+                // only add sections if more than one
+                if ( $add_sections ) {
+                    $arguments = $temp_arguments;
+                }
+            }
 
-				$tabs = $new_tabs;
-			}
+            return $arguments;
+        }
 
-			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;
+                    }
+                }
+
+                if ( ! $has_sections ) {
+                    return $tabs;
+                }
+
+                $new_tabs = array();
+
+                foreach ( $tabs as $tab_key => $tab ) {
+                    $new_groups = array();
+
+                    if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
+                        foreach ( $tab['groups'] as $group ) {
+                            if ( isset( $arguments[ $group ] ) ) {
+                                $new_groups[] = $group;
+                            }
+                        }
+                    }
+
+                    if ( ! empty( $new_groups ) ) {
+                        $tab['groups'] = $new_groups;
+
+                        $new_tabs[ $tab_key ] = $tab;
+                    }
+                }
+
+                $tabs = $new_tabs;
+            }
 
-		/**
-		 * 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();
-			?>
+            return $tabs;
+        }
+
+        /**
+         * Output the JS for building the dynamic Guntenberg block.
+         *
+         * @return mixed
+         *@since 1.0.9 Save numbers as numbers and not strings.
+         * @since 1.1.0 Font Awesome classes can be used for icons.
+         * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
+         */
+        public function block() {
+            global $sd_is_js_functions_loaded, $aui_bs5;
+
+            $show_advanced = $this->block_show_advanced();
+
+            ob_start();
+            ?>
 			<script>
 			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
-				$sd_is_js_functions_loaded = true;
-			?>
+            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('');
@@ -2226,8 +2226,8 @@ 
                 $classes = [];
 
 				<?php
-				if($aui_bs5){
-					?>
+                if($aui_bs5){
+                    ?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
 				$p_mr = 'me-';
@@ -2235,8 +2235,8 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
-						?>
+                }else{
+                        ?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
 				$p_mr = 'mr-';
@@ -2244,8 +2244,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;}
@@ -2428,10 +2428,10 @@ 
 
             }
 
-			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() {
 
@@ -2481,14 +2481,14 @@ 
 						icon: <?php echo $this->get_block_icon( $this->options['block-icon'] );?>,//'<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 						supports: {
 							<?php
-							if ( isset( $this->options['block-supports'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
-							}
-							?>
+                            if ( isset( $this->options['block-supports'] ) ) {
+                                echo $this->array_to_attributes( $this->options['block-supports'] );
+                            }
+                            ?>
 						},
 						<?php
-						if ( isset( $this->options['block-label'] ) ) {
-						?>
+                        if ( isset( $this->options['block-label'] ) ) {
+                        ?>
 						__experimentalLabel( attributes, { context } ) {
                             return <?php echo $this->options['block-label']; ?>;
                         },
@@ -2497,7 +2497,7 @@ 
                         ?>
 						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
 						<?php if ( isset( $this->options['block-keywords'] ) ) {
-						echo "keywords : " . $this->options['block-keywords'] . ",";
+                        echo "keywords : " . $this->options['block-keywords'] . ",";
 
 //						// block hover preview.
 //						$example_args = array();
@@ -2522,86 +2522,86 @@ 
 
                         }
 
-						// maybe set no_wrap
-						$no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-						if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
-							$no_wrap = true;
-						}
-						if ( $no_wrap ) {
-							$this->options['block-wrap'] = '';
-						}
+                        // maybe set no_wrap
+                        $no_wrap = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
+                        if ( isset( $this->arguments['no_wrap'] ) && $this->arguments['no_wrap'] ) {
+                            $no_wrap = true;
+                        }
+                        if ( $no_wrap ) {
+                            $this->options['block-wrap'] = '';
+                        }
 
-						// maybe load the drag/drop functions.
-						$img_drag_drop = false;
+                        // maybe load the drag/drop functions.
+                        $img_drag_drop = false;
 
-						$show_alignment = false;
-						// align feature
-						/*echo "supports: {";
+                        $show_alignment = false;
+                        // align feature
+                        /*echo "supports: {";
 						echo "	align: true,";
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
-							echo "attributes : {";
+                        if ( ! empty( $this->arguments ) ) {
+                            echo "attributes : {";
 
-							if ( $show_advanced ) {
-								echo "show_advanced: {";
-								echo "	type: 'boolean',";
-								echo "  default: false,";
-								echo "},";
-							}
+                            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 "},";
-							}
+                            // block wrap element
+                            if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+                                echo "block_wrap: {";
+                                echo "	type: 'string',";
+                                echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+                                echo "},";
+                            }
 
 
 
-							foreach ( $this->arguments as $key => $args ) {
+                            foreach ( $this->arguments as $key => $args ) {
 
-								if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
-									$img_drag_drop = true;
-								}
+                                if( $args['type'] == 'image' ||  $args['type'] == 'images' ){
+                                    $img_drag_drop = true;
+                                }
 
-								// set if we should show alignment
-								if ( $key == 'alignment' ) {
-									$show_alignment = true;
-								}
+                                // set if we should show alignment
+                                if ( $key == 'alignment' ) {
+                                    $show_alignment = true;
+                                }
 
-								$extra = '';
+                                $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'] . "'" : "''";
+                                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 : {";
@@ -2611,25 +2611,25 @@ 
 //                                    echo "type : 'object',";
 //                                    echo "},";
 
-								} else {
-									$type    = !empty($args['hidden_type']) ? esc_attr($args['hidden_type']) : 'string';
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                } 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 $key . " : {";
+                                echo "type : '$type',";
+                                echo "default : $default,";
+                                echo "},";
+                            }
 
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
-							echo "className: { type: 'string', default: '' },";
+                            echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+                            echo "className: { type: 'string', default: '' },";
 
-							echo "},";
+                            echo "},";
 
-						}
+                        }
 
-						?>
+                        ?>
 
 						// The "edit" property must be a valid function.
 						edit: function (props) {
@@ -2728,9 +2728,9 @@ 
 
 	var $value = '';
 	<?php
-	// if we have a post_type and a category then link them
-	if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
-	?>
+    // if we have a post_type and a category then link them
+    if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+    ?>
 	if(typeof(prev_attributes[props.clientId]) != 'undefined'){
 		$pt = props.attributes.post_type;
 		if(post_type_rest_slugs.length){
@@ -2743,11 +2743,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){
@@ -2839,7 +2839,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. */
@@ -2873,8 +2873,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' );?>'
 									};
 
@@ -2951,10 +2951,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'}
 										},
@@ -2971,127 +2971,127 @@ 
 									)
 									,
 									<?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;
+                                    // Do we have sections?
+                                    $has_sections = $arguments == $this->arguments ? false : true;
 
-									if($has_sections){
-									$panel_count = 0;
-									$open_tab = '';
+                                    if($has_sections){
+                                    $panel_count = 0;
+                                    $open_tab = '';
 
-									$open_tab_groups = array();
-									$used_tabs = array();
+                                    $open_tab_groups = array();
+                                    $used_tabs = array();
 
-									foreach ( $arguments as $key => $args ) {
-										$close_tab = false;
-										$close_tabs = false;
+                                    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 ( ! 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;
+                                                    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;
-													}
+                                                        $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 ( $open_tab_groups == $tab_args['groups'] ) {
+                                                        $close_tab = true;
+                                                        $open_tab_groups = array();
 
-														if ( $used_tabs == array_keys( $block_group_tabs ) ) {
-															$close_tabs = true;
-														}
-													}
-												}
-											}
-										}
-										?>
+                                                        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,
 									style: {'minHeight': '30px'}
 								}))
 								<?php
-								}
-								?>
+                                }
+                                ?>
 							]; // end return
 
 							<?php
@@ -3110,11 +3110,11 @@ 
 							$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;}
+                            ?>
 							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 								if ('<?php echo esc_attr( $key );?>' == 'html') {
 									$html = attr.<?php echo esc_attr( $key );?>;
@@ -3125,10 +3125,10 @@ 
 								}
 							}
 							<?php
-							}
-							}
+                            }
+                            }
 
-							?>
+                            ?>
 							content += "]";
 
                             <?php
@@ -3175,7 +3175,7 @@ 
 //                               $this->block_element( $this->options['block-output'], true );
 //                               echo ";";
 
-                               ?>
+                                ?>
                               return el(
                                    '',
                                    {},
@@ -3185,9 +3185,9 @@ 
                                );
                                 <?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(
                                    '',
@@ -3197,22 +3197,22 @@ 
                                    el('', {dangerouslySetInnerHTML: {__html: "[/<?php echo $this->options['base_id'];?>]"}})
                                );
                                 <?php
-							}elseif(!empty( $this->options['block-save-return'] ) ){
+                            }elseif(!empty( $this->options['block-save-return'] ) ){
                                 echo "return ". $this->options['block-edit-return'].";";
-							}elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
-							?>
+                            }elseif(isset( $this->options['block-wrap'] ) && $this->options['block-wrap'] == ''){
+                            ?>
 							return content;
 							<?php
-							}else{
-							?>
+                            }else{
+                            ?>
 							var block_wrap = 'div';
 							if (attr.hasOwnProperty("block_wrap")) {
 								block_wrap = attr.block_wrap;
 							}
 							return el(block_wrap, wp.blockEditor.useBlockProps.save( {dangerouslySetInnerHTML: {__html: content}, className: align} ));
 							<?php
-							}
-							?>
+                            }
+                            ?>
 
 
 						}
@@ -3226,29 +3226,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 );
+        }
 
 
 
-		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 ) . " && " : "";
+                // 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 = '';
@@ -3259,10 +3259,10 @@ 
                 }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 $element_require;
                 echo $device_type_require;
 
-					if(false){?><script><?php }?>
+                    if(false){?><script><?php }?>
 						el('div', {
 								className: 'bsui components-base-control',
 							},
@@ -3300,51 +3300,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'},
 
@@ -3357,12 +3357,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']) ); ?>'}}),
@@ -3371,44 +3371,44 @@ 
 									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           = '';
+        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	   = '';
+            $after_elements	   = '';
 
-			// `content` is a protected and special argument
-			if ( $key == 'content' ) {
-				return;
-			}
+            // `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) . "' && " : '';
@@ -3421,37 +3421,37 @@ 
                 $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'] = '';
-			}
+            // 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 && " : "";
+            // 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 ) . " && " : "";
+            // 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) : '' } )";
-				}
-			}
+            $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) : '' } )";
+                }
+            }
 //			else if ( $args['type'] == 'popup' ) {
 //				$type = 'TextControl';
 //				$args['type'] == 'text';
@@ -3469,21 +3469,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'){
 							?>
@@ -3536,22 +3536,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%)',
@@ -3588,7 +3588,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,{
@@ -3613,15 +3613,15 @@ 
 
 
                 $value = '""';
-				$type = 'MediaUpload';
+                $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',
@@ -3650,8 +3650,8 @@ 
                 $onchange = "";
 
                 //$inside_elements = ",el('div',{},'file upload')";
-			} else if ( $args['type'] == 'images' ) {
-				$img_preview = "props.attributes.$key && (function() {
+            } else if ( $args['type'] == 'images' ) {
+                $img_preview = "props.attributes.$key && (function() {
 	let uploads = JSON.parse('['+props.attributes.$key+']');
 	let images = [];
 	uploads.map((upload, index) => (
@@ -3678,9 +3678,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++) {
@@ -3693,9 +3693,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',{},
@@ -3725,37 +3725,37 @@ 
                 $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"}, ';
-				}
+            }
+            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(){
@@ -3766,8 +3766,8 @@ 
                                     },
                                     'Clear'
                             ),";
-				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+                }
+            } elseif ( $args['type'] == 'tagselect' ) {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3802,20 +3802,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 . ";
@@ -3841,39 +3841,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.
-			}
+            } 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'] )."'),";
-			}
+            // 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;
+            // add show only if advanced
+            echo $require_advanced;
+            // add setting require if defined
+            echo $element_require;
             echo $device_type_require;
 
-			// icon
-			echo $icon;
-			?>
+            // 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; ?>
@@ -3885,68 +3885,68 @@ 
 			<?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 ) {
 
 
-			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, {";
+                                //  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( {";
@@ -3956,74 +3956,74 @@ 
                                 echo !empty($new_args['innerBlocksProps']) && !$save ? $this->block_element( $new_args['innerBlocksProps'],$save ) : '';
                             //    echo '###';
 
-                              //  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'";
-								}
+                                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']);
+                                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 "} ),";
+                                // echo "} ),";
 
                             }else{
                                 echo "\n el( '" . $new_args['element'] . "', {";
                             }
 
 
-							// get the attributes
-							foreach ( $new_args as $new_key => $new_value ) {
+                            // 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 );
-								}
-							}
+                                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
+                            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 ) ) {
+                            // 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 ( $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(
-													"'+",
-													"+'"
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-											unset( $new_value['element_require'] );
-										}
+                                        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 ( 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
@@ -4032,1094 +4032,1094 @@ 
                             }
 
 
-							echo ", \n";
+                            echo ", \n";
 
-						}
-					} else {
+                        }
+                    } 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 ) {
+                        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 ) {
+                        } 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 ) . "',";
-						}
+                        } 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 );
-			}
+        /**
+         * 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;
-		}
+            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();
-			}
+        /**
+         * 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 );
+            // 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;
-			}
+            $no_wrap = false;
+            if ( isset( $argument_values['no_wrap'] ) && $argument_values['no_wrap'] ) {
+                $no_wrap = true;
+            }
 
-			ob_start();
-			if ( $output && ! $no_wrap ) {
+            ob_start();
+            if ( $output && ! $no_wrap ) {
 
-				$class_original = $this->options['widget_ops']['classname'];
-				$class = $this->options['widget_ops']['classname']." sdel-".$this->get_instance_hash();
+                $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 );
+                // 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 );
+                // 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 );
+                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 );
+                    $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();
+                    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 );
+            $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
 
-			echo $output;
-		}
+            echo $output;
+        }
 
-		/**
-		 * Tests if the current output is inside a elementor container.
-		 *
-		 * @return bool
-		 *@since 1.0.4
-		 */
-		public function is_elementor_widget_output() {
-			$result = false;
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
-				$result = true;
-			}
+        /**
+         * Tests if the current output is inside a elementor container.
+         *
+         * @return bool
+         *@since 1.0.4
+         */
+        public function is_elementor_widget_output() {
+            $result = false;
+            if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
+                $result = true;
+            }
 
-			return $result;
-		}
+            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 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 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 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 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 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 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 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 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 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 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 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 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;
-			}
+        /**
+         * 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;
+        }
 
-		/**
-		 * 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;
-			}
+        /**
+         * 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;
 
-			return $result;
-		}
+            if ( function_exists( 'znhg_kallyas_theme_config' ) && ! empty( $_REQUEST['zn_pb_edit'] ) ) {
+                $result = 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;
-
-			if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
-				$result = true;
-			}
+            return $result;
+        }
 
-			return $result;
-		}
+        /**
+         * Check for Bricks theme builder preview.
+         *
+         * @since 1.1.31
+         *
+         * @return bool True when preview page otherwise false.
+         */
+        public function is_bricks_preview() {
+            $result = false;
 
-		/**
-		 * 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;
-			}
+            if ( function_exists( 'bricks_is_builder' ) && ( bricks_is_builder() || bricks_is_builder_call() ) ) {
+                $result = true;
+            }
 
-			return $preview;
-		}
+            return $result;
+        }
 
-		/**
-		 * Output the super title.
-		 *
-		 * @param $args
-		 * @param array $instance
-		 *
-		 * @return string
-		 */
-		public function output_title( $args, $instance = array() ) {
-			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
-				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
-
-				if(empty($instance['widget_title_tag'])){
-					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
-					$title_tag = esc_attr( $instance['widget_title_tag'] );
-
-					// classes
-					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
-					$output = "<$title_tag class='$class' >$title</$title_tag>";
-				}
+        /**
+         * 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;
+        }
 
-			return $output;
-		}
+        /**
+         * Output the super title.
+         *
+         * @param $args
+         * @param array $instance
+         *
+         * @return string
+         */
+        public function output_title( $args, $instance = array() ) {
+            $output = '';
+            if ( ! empty( $instance['title'] ) ) {
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
+                $title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+
+                if(empty($instance['widget_title_tag'])){
+                    $output = $args['before_title'] . $title . $args['after_title'];
+                }else{
+                    $title_tag = esc_attr( $instance['widget_title_tag'] );
+
+                    // classes
+                    $title_classes = array();
+                    $title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
+                    $title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
+
+                    $class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+                    $output = "<$title_tag class='$class' >$title</$title_tag>";
+                }
+
+            }
 
-		/**
-		 * Outputs the options form inputs for the widget.
-		 *
-		 * @param array $instance The widget options.
-		 */
-		public function form( $instance ) {
+            return $output;
+        }
+
+        /**
+         * Outputs the options form inputs for the widget.
+         *
+         * @param array $instance The widget options.
+         */
+        public function form( $instance ) {
 
-			// set widget instance
-			$this->instance = $instance;
+            // set 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']['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']['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'>";
-				}
-			}
-		}
+                } 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>";
-			}
-		}
+        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() {
+        /**
+         * Get the hidden input that when added makes the advanced button show on widget settings.
+         *
+         * @return string
+         */
+        public function widget_advanced_toggle() {
 
-			$output = '';
-			if ( $this->block_show_advanced() ) {
-				$val = 1;
-			} else {
-				$val = 0;
-			}
+            $output = '';
+            if ( $this->block_show_advanced() ) {
+                $val = 1;
+            } else {
+                $val = 0;
+            }
 
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
+            $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
 
-			return $output;
-		}
+            return $output;
+        }
 
-		/**
-		 * Convert require element.
-		 *
-		 * @param string $input Input element.
-		 *
-		 * @return string $output
-		 *@since 1.0.0
-		 *
-		 */
-		public function convert_element_require( $input ) {
-			$input = str_replace( "'", '"', $input );// we only want double quotes
-
-			$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()",
-				"\"]').find('input:checked').val()"
-			), $input ) );
-
-			return $output;
-		}
+        /**
+         * 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
 
-		/**
-		 * 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 = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select,textarea').val()",
+                "\"]').find('input:checked').val()"
+            ), $input ) );
 
-			// 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 ";
-			}
+        /**
+         * 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 = '';
+            }
 
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
+            // get placeholder
+            if ( ! empty( $args['placeholder'] ) ) {
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+            } else {
+                $placeholder = '';
+            }
 
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
+            // 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'];
+            }
 
-			// before wrapper
-			?>
+            // 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 );
+            }
 
-		/**
-		 * 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(),
-			) ) );
-		}
+            return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
+        }
 
-		/**
-		 * 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();
-			}
+        /**
+         * 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(),
+            ) ) );
+        }
 
-			// 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';
-					}
-				}
-			}
+        /**
+         * 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 ) {
 
-			return $instance;
-		}
+            //save the widget
+            $instance = array_merge( (array) $old_instance, (array) $new_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;
-			}
+            // set widget instance
+            $this->instance = $instance;
 
-			return $result;
-		}
+            if ( empty( $this->arguments ) ) {
+                $this->get_arguments();
+            }
 
-		/**
-		 * 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);
-		}
+            // 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';
+                    }
+                }
+            }
 
-		/**
-		 * 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 $instance;
+        }
 
-			return $css;
-		}
+        /**
+         * 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;
+            }
 
-		/**
-		 * Encode shortcodes tags.
-		 *
-		 * @param string $content Content to search for shortcode tags.
-		 *
+            return $result;
+        }
+
+        /**
+         * Get an instance hash that will be unique to the type and settings.
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        public function get_instance_hash(){
+            $instance_string = $this->base_id.serialize($this->instance);
+            return hash('crc32b',$instance_string);
+        }
+
+        /**
+         * Generate and return inline styles from CSS rules that will match the unique class of the instance.
+         *
+         * @param array $rules
+         *
+         * @return string
+         *@since 1.0.20
+         */
+        public function get_instance_style($rules = array()){
+            $css = '';
+
+            if(!empty($rules)){
+                $rules = array_unique($rules);
+                $instance_hash = $this->get_instance_hash();
+                $css .= "<style>";
+                foreach($rules as $rule){
+                    $css .= ".sdel-$instance_hash $rule";
+                }
+                $css .= "</style>";
+            }
+
+            return $css;
+        }
+
+        /**
+         * Encode shortcodes tags.
+         *
+         * @param string $content Content to search for shortcode tags.
+         *
 *@return string Content with shortcode tags removed.
-		 *@since 1.0.28
-		 *
-		 */
-		public function encode_shortcodes( $content ) {
-			// Avoids existing encoded tags.
-			$trans   = array(
-				'&#91;' => '&#091;',
-				'&#93;' => '&#093;',
-				'&amp;#91;' => '&#091;',
-				'&amp;#93;' => '&#093;',
-				'&lt;' => '&0lt;',
-				'&gt;' => '&0gt;',
-				'&amp;lt;' => '&0lt;',
-				'&amp;gt;' => '&0gt;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			$trans   = array(
-				'[' => '&#91;',
-				']' => '&#93;',
-				'<' => '&lt;',
-				'>' => '&gt;',
-				'"' => '&quot;',
-				"'" => '&#39;',
-			);
-
-			$content = strtr( $content, $trans );
-
-			return $content;
-		}
+         *@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',
-									'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',
-										'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',
-										'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',
+                                    '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',
+                                        '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',
+                                        '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',
-					'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',
-					'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',
-					'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',
-					'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',
+                    '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',
+                    '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',
+                    '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',
+                    'options'          => sd_aui_colors(),
+                    'default'          => '',
+                    'value'            => '',
+                    'label_type'       => 'top',
+                    'select2'          => false,
+                    'element_require'  => '[%bsvc_output%]=="message"',
+                    'extra_attributes' => array(
+                        'data-minimum-results-for-search' => '-1'
+                    )
+                )
+            );
+
+            $content .= '</div><div class="col-sm-12">';
+
+            $content .= aui()->input(
+                array(
+                    'type'            => 'text',
+                    'id'              => 'bsvc_message',
+                    'name'            => 'bsvc_message',
+                    'label'           => '',
+                    'class'           => 'bsvc_message form-control-sm',
+                    'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+                    'label_type'      => '',
+                    'value'           => '',
+                    'form_group_class' => ' ',
+                    'element_require' => '[%bsvc_output%]=="message"',
+                )
+            );
+
+            $content .= '</div></div></form><input type="hidden" id="bsvc_raw_value" name="bsvc_raw_value" value="' . $value . '">';
+
+            return $content;
+        }
+    }
 }

Spacing +775 added lines, -775 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.1.35' );
+	define('SUPER_DUPER_VER', '1.1.35');
 
 	/**
 	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
@@ -38,40 +38,40 @@ 
 		/**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
+		public function __construct($options) {
 			global $sd_widgets;
 
-			$sd_widgets[ $options['base_id'] ] = array(
+			$sd_widgets[$options['base_id']] = array(
 				'name'       => $options['name'],
 				'class_name' => $options['class_name'],
 				'output_types' => !empty($options['output_types']) ? $options['output_types'] : array()
 			);
-			$this->base_id                     = $options['base_id'];
+			$this->base_id = $options['base_id'];
 			// lets filter the options before we do anything
-			$options       = apply_filters( "wp_super_duper_options", $options );
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
-			$options       = $this->add_name_from_key( $options );
+			$options       = apply_filters("wp_super_duper_options", $options);
+			$options       = apply_filters("wp_super_duper_options_{$this->base_id}", $options);
+			$options       = $this->add_name_from_key($options);
 			$this->options = $options;
 
 			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+			$this->arguments = isset($options['arguments']) ? $options['arguments'] : array();
 
             // nested blocks can't work as a widget
-            if(!empty($this->options['nested-block'])){
-                if(empty($this->options['output_types'])){
-                    $this->options['output_types'] = array('shortcode','block');
+            if (!empty($this->options['nested-block'])) {
+                if (empty($this->options['output_types'])) {
+                    $this->options['output_types'] = array('shortcode', 'block');
                 }elseif (($key = array_search('widget', $this->options['output_types'])) !== false) {
                     unset($this->options['output_types'][$key]);
                 }
             }
 
 			// init parent
-			if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
-                parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
+			if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
+                parent::__construct($options['base_id'], $options['name'], $options['widget_ops']);
 			}
 
 
-			if ( isset( $options['class_name'] ) ) {
+			if (isset($options['class_name'])) {
 				// register widget
 				$this->class_name = $options['class_name'];
 
@@ -80,61 +80,61 @@ 
 
 
 				// Fusion Builder (avada) support
-				if ( function_exists( 'fusion_builder_map' ) ) {
-					add_action( 'init', array( $this, 'register_fusion_element' ) );
+				if (function_exists('fusion_builder_map')) {
+					add_action('init', array($this, 'register_fusion_element'));
 				}
 
 				// register block
-				if(empty($this->options['output_types']) || in_array('block',$this->options['output_types'])){
-				    add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+				if (empty($this->options['output_types']) || in_array('block', $this->options['output_types'])) {
+				    add_action('admin_enqueue_scripts', array($this, 'register_block'));
                 }
 			}
 
 			// add the CSS and JS we need ONCE
 			global $sd_widget_scripts;
 
-			if ( ! $sd_widget_scripts ) {
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
-				wp_add_inline_style( 'widgets', $this->widget_css() );
+			if (!$sd_widget_scripts) {
+				wp_add_inline_script('admin-widgets', $this->widget_js());
+				wp_add_inline_script('customize-controls', $this->widget_js());
+				wp_add_inline_style('widgets', $this->widget_css());
 
 				// maybe add elementor editor styles
-				add_action( 'elementor/editor/after_enqueue_styles', array( $this, 'elementor_editor_styles' ) );
+				add_action('elementor/editor/after_enqueue_styles', array($this, 'elementor_editor_styles'));
 
 				$sd_widget_scripts = true;
 
 				// add shortcode insert button once
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+				add_action('media_buttons', array($this, 'shortcode_insert_button'));
 				// generatepress theme sections compatibility
-				if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-					add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+				if (function_exists('generate_sections_sections_metabox')) {
+					add_action('generate_sections_metabox', array($this, 'shortcode_insert_button_script'));
 				}
 				/* Load script on Divi theme builder page */
-				if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) {
+				if (function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) {
 					add_thickbox();
-					add_action( 'admin_footer', array( $this, 'shortcode_insert_button_script' ) );
+					add_action('admin_footer', array($this, 'shortcode_insert_button_script'));
 				}
 
-				if ( $this->is_preview() ) {
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+				if ($this->is_preview()) {
+					add_action('wp_footer', array($this, 'shortcode_insert_button_script'));
 					// this makes the insert button work for elementor
-					add_action( 'elementor/editor/after_enqueue_scripts', array(
+					add_action('elementor/editor/after_enqueue_scripts', array(
 						$this,
 						'shortcode_insert_button_script'
-					) ); // for elementor
+					)); // for elementor
 				}
 				// this makes the insert button work for cornerstone
-				add_action( 'wp_print_footer_scripts', array( __CLASS__, 'maybe_cornerstone_builder' ) );
+				add_action('wp_print_footer_scripts', array(__CLASS__, 'maybe_cornerstone_builder'));
 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
-				add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+				add_action('wp_ajax_super_duper_get_widget_settings', array(__CLASS__, 'get_widget_settings'));
+				add_action('wp_ajax_super_duper_get_picker', array(__CLASS__, 'get_picker'));
 
 				// add generator text to head
-				add_action( 'admin_head', array( $this, 'generator' ), 99 );
-				add_action( 'wp_head', array( $this, 'generator' ), 99 );
+				add_action('admin_head', array($this, 'generator'), 99);
+				add_action('wp_head', array($this, 'generator'), 99);
 			}
 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 		}
 
         /**
@@ -142,7 +142,7 @@ 
          * @return void
          */
 		public function _register() {
-            if(empty($this->options['output_types']) || in_array('widget',$this->options['output_types'])){
+            if (empty($this->options['output_types']) || in_array('widget', $this->options['output_types'])) {
                 parent::_register();
 			}
 		}
@@ -151,14 +151,14 @@ 
 		 * Add our widget CSS to elementor editor.
 		 */
 		public function elementor_editor_styles() {
-			wp_add_inline_style( 'elementor-editor', $this->widget_css( false ) );
+			wp_add_inline_style('elementor-editor', $this->widget_css(false));
 		}
 
 		public function register_fusion_element() {
 
 			$options = $this->options;
 
-			if ( $this->base_id ) {
+			if ($this->base_id) {
 
 				$params = $this->get_fusion_params();
 
@@ -169,11 +169,11 @@ 
 					'allow_generator' => true,
 				);
 
-				if ( ! empty( $params ) ) {
+				if (!empty($params)) {
 					$args['params'] = $params;
 				}
 
-				fusion_builder_map( $args );
+				fusion_builder_map($args);
 			}
 
 		}
@@ -182,8 +182,8 @@ 
 			$params    = array();
 			$arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $key => $val ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $key => $val) {
 					$param = array();
 					// type
 					$param['type'] = str_replace(
@@ -205,38 +205,38 @@ 
 						$val['type'] );
 
 					// multiselect
-					if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+					if ($val['type'] == 'multiselect' || (($param['type'] == 'select' || $val['type'] == 'select') && !empty($val['multiple']))) {
 						$param['type']     = 'multiple_select';
 						$param['multiple'] = true;
 					}
 
 					// heading
-					$param['heading'] = isset( $val['title'] ) ? $val['title'] : '';
+					$param['heading'] = isset($val['title']) ? $val['title'] : '';
 
 					// description
-					$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+					$param['description'] = isset($val['desc']) ? $val['desc'] : '';
 
 					// param_name
 					$param['param_name'] = $key;
 
 					// Default
-					$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+					$param['default'] = isset($val['default']) ? $val['default'] : '';
 
 					// Group
-					if ( isset( $val['group'] ) ) {
+					if (isset($val['group'])) {
 						$param['group'] = $val['group'];
 					}
 
 					// value
-					if ( $val['type'] == 'checkbox' ) {
-						if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-							unset( $param['default'] );
+					if ($val['type'] == 'checkbox') {
+						if (isset($val['default']) && $val['default'] == '0') {
+							unset($param['default']);
 						}
-						$param['value'] = array( '0' => __( "No", 'ayecode-connect' ), '1' => __( "Yes", 'ayecode-connect' ) );
-					} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-						$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+						$param['value'] = array('0' => __("No", 'ayecode-connect'), '1' => __("Yes", 'ayecode-connect'));
+					} elseif ($param['type'] == 'select' || $param['type'] == 'multiple_select') {
+						$param['value'] = isset($val['options']) ? $val['options'] : array();
 					} else {
-						$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+						$param['value'] = isset($val['default']) ? $val['default'] : '';
 					}
 
 					// setup the param
@@ -253,7 +253,7 @@ 
 		 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
 		 */
 		public static function maybe_cornerstone_builder() {
-			if ( did_action( 'cornerstone_before_boot_app' ) ) {
+			if (did_action('cornerstone_before_boot_app')) {
 				self::shortcode_insert_button_script();
 			}
 		}
@@ -265,12 +265,12 @@ 
 		 *
 		 * @return string
 		 */
-		public static function get_picker( $editor_id = '' ) {
+		public static function get_picker($editor_id = '') {
 
 			ob_start();
-			if ( isset( $_POST['editor_id'] ) ) {
-				$editor_id = esc_attr( $_POST['editor_id'] );
-			} elseif ( isset( $_REQUEST['et_fb'] ) ) {
+			if (isset($_POST['editor_id'])) {
+				$editor_id = esc_attr($_POST['editor_id']);
+			} elseif (isset($_REQUEST['et_fb'])) {
 				$editor_id = 'main_content_content_vb_tiny_mce';
 			}
 
@@ -281,14 +281,14 @@ 
 
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
+				ksort($sd_widgets);
 				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
+				if (!empty($sd_widgets)) {
 					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode', 'ayecode-connect' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						if(!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])){ continue; }
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode', 'ayecode-connect') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						if (!empty($class['output_types']) && !in_array('shortcode', $class['output_types'])) { continue; }
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 
@@ -301,37 +301,37 @@ 
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
-					<?php if ( $editor_id != '' ) { ?>
+					<?php if ($editor_id != '') { ?>
 						<button class="button sd-insert-shortcode-button"
-						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
+						        onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) {
 							        echo "'" . $editor_id . "'";
-						        } ?>)"><?php _e( 'Insert shortcode', 'ayecode-connect' ); ?></button>
+						        } ?>)"><?php _e('Insert shortcode', 'ayecode-connect'); ?></button>
 					<?php } ?>
 					<button class="button"
-					        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
+					        onclick="sd_copy_to_clipboard()"><?php _e('Copy shortcode'); ?></button>
 				</div>
 			</div>
 			<?php
 
 			$html = ob_get_clean();
 
-			if ( wp_doing_ajax() ) {
+			if (wp_doing_ajax()) {
 				echo $html;
 				$should_die = true;
 
 				// some builder get the editor via ajax so we should not die on those occasions
 				$dont_die = array(
-					'parent_tag',// WP Bakery
+					'parent_tag', // WP Bakery
 					'avia_request' // enfold
 				);
 
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
+				foreach ($dont_die as $request) {
+					if (isset($_REQUEST[$request])) {
 						$should_die = false;
 					}
 				}
 
-				if ( $should_die ) {
+				if ($should_die) {
 					wp_die();
 				}
 
@@ -347,22 +347,22 @@ 
 		 * Output the version in the header.
 		 */
 		public function generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+			$file = str_replace(array("/", "\\"), "/", realpath(__FILE__));
+			$plugins_dir = str_replace(array("/", "\\"), "/", realpath(WP_PLUGIN_DIR));
 
 			// Find source plugin/theme of SD
 			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+			if (strpos($file, $plugins_dir) !== false) {
+				$source = explode("/", plugin_basename($file));
+			} else if (function_exists('get_theme_root')) {
+				$themes_dir = str_replace(array("/", "\\"), "/", realpath(get_theme_root()));
 
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+				if (strpos($file, $themes_dir) !== false) {
+					$source = explode("/", ltrim(str_replace($themes_dir, "", $file), "/"));
 				}
 			}
 
-			echo '<meta name="generator" content="WP Super Duper v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-sd-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+			echo '<meta name="generator" content="WP Super Duper v' . esc_attr($this->version) . '"' . (!empty($source[0]) ? ' data-sd-source="' . esc_attr($source[0]) . '"' : '') . ' />';
 		}
 
 		/**
@@ -373,16 +373,16 @@ 
 		public static function get_widget_settings() {
 			global $sd_widgets;
 
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
-			if ( ! $shortcode ) {
+			$shortcode = isset($_REQUEST['shortcode']) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes($_REQUEST['shortcode']) : '';
+			if (!$shortcode) {
 				wp_die();
 			}
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
-			if ( ! $widget_args ) {
+			$widget_args = isset($sd_widgets[$shortcode]) ? $sd_widgets[$shortcode] : '';
+			if (!$widget_args) {
 				wp_die();
 			}
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
-			if ( ! $class_name ) {
+			$class_name = isset($widget_args['class_name']) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
+			if (!$class_name) {
 				wp_die();
 			}
 
@@ -390,7 +390,7 @@ 
 			$widget = new $class_name;
 
 			ob_start();
-			$widget->form( array() );
+			$widget->form(array());
 			$form = ob_get_clean();
 			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
 			echo "<style>" . $widget->widget_css() . "</style>";
@@ -409,9 +409,9 @@ 
 		 *@since 1.0.0
 		 *
 		 */
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
 			global $sd_widgets, $shortcode_insert_button_once;
-			if ( $shortcode_insert_button_once ) {
+			if ($shortcode_insert_button_once) {
 				return;
 			}
 			add_thickbox();
@@ -421,21 +421,21 @@ 
 			 * Cornerstone makes us play dirty tricks :/
 			 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
 			 */
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '<span id="insert-media-button">';
 			}
 
-			echo self::shortcode_button( 'this', 'true' );
+			echo self::shortcode_button('this', 'true');
 
 			// see opening note
-			if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+			if (function_exists('cornerstone_plugin_init') && !is_admin()) {
 				echo '</span>'; // end #insert-media-button
 			}
 
 			// Add separate script for generatepress theme sections
-			if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+			if (function_exists('generate_sections_sections_metabox') && did_action('generate_sections_metabox')) {
 			} else {
-				self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+				self::shortcode_insert_button_script($editor_id, $insert_shortcode_function);
 			}
 
 			$shortcode_insert_button_once = true;
@@ -449,12 +449,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public static function shortcode_button( $id = '', $search_for_id = '' ) {
+		public static function shortcode_button($id = '', $search_for_id = '') {
 			ob_start();
 			?>
 			<span class="sd-lable-shortcode-inserter">
 				<a onclick="sd_ajax_get_picker(<?php echo $id;
-				if ( $search_for_id ) {
+				if ($search_for_id) {
 					echo "," . $search_for_id;
 				} ?>);" href="#TB_inline?width=100%&height=550&inlineId=super-duper-content-ajaxed"
 				   class="thickbox button super-duper-content-open" title="Add Shortcode">
@@ -470,7 +470,7 @@ 
 			$html = ob_get_clean();
 
 			// remove line breaks so we can use it in js
-			return preg_replace( "/\r|\n/", "", trim( $html ) );
+			return preg_replace("/\r|\n/", "", trim($html));
 		}
 
 		/**
@@ -528,7 +528,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings', 'ayecode-connect' );?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
+					var $button = '<button title="<?php _e('Advanced Settings', 'ayecode-connect'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -563,10 +563,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -578,7 +578,7 @@ 
 		 *@since 1.0.6
 		 *
 		 */
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+		public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
 			?>
 			<style>
 				.sd-shortcode-left-wrap {
@@ -697,25 +697,25 @@ 
 					width: 100%;
 				}
 
-				<?php if ( function_exists( 'generate_sections_sections_metabox' ) ) { ?>
+				<?php if (function_exists('generate_sections_sections_metabox')) { ?>
 				.generate-sections-modal #custom-media-buttons > .sd-lable-shortcode-inserter {
 					display: inline;
 				}
 				<?php } ?>
-				<?php if ( function_exists( 'et_builder_is_tb_admin_screen' ) && et_builder_is_tb_admin_screen() ) { ?>
+				<?php if (function_exists('et_builder_is_tb_admin_screen') && et_builder_is_tb_admin_screen()) { ?>
 				body.divi_page_et_theme_builder div#TB_window.gd-tb-window{z-index:9999999}
 				<?php } ?>
 			</style>
 			<?php
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
+			if (class_exists('SiteOrigin_Panels')) {
 				echo "<script>" . self::siteorigin_js() . "</script>";
 			}
 			?>
 			<script>
 				<?php
-				if(! empty( $insert_shortcode_function )){
+				if (!empty($insert_shortcode_function)) {
 					echo $insert_shortcode_function;
-				}else{
+				} else {
 
 				/**
 				 * Function for super duper insert shortcode.
@@ -728,9 +728,9 @@ 
 					if ($shortcode) {
 						if (!$editor_id) {
 							<?php
-							if ( isset( $_REQUEST['et_fb'] ) ) {
+							if (isset($_REQUEST['et_fb'])) {
 								echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-							} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+							} elseif (isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor') {
 								echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
 							} else {
 								echo '$editor_id = "#wp-content-editor-container textarea";';
@@ -813,11 +813,11 @@ 
 							'shortcode': $short_code,
 							'attributes': 123,
 							'post_id': 321,
-							'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+							'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 						};
 
 						if (typeof ajaxurl === 'undefined') {
-							var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' );?>";
+							var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 						}
 
 						jQuery.post(ajaxurl, data, function (response) {
@@ -1016,11 +1016,11 @@ 
 					var data = {
 						'action': 'super_duper_get_picker',
 						'editor_id': $id,
-						'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_picker' );?>'
+						'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_picker'); ?>'
 					};
 
 					if (!ajaxurl) {
-						var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' ); ?>";
+						var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
 					}
 
 					jQuery.post(ajaxurl, data, function (response) {
@@ -1042,9 +1042,9 @@ 
 				 */
 				function sd_shortcode_button($id) {
 					if ($id) {
-						return '<?php echo self::shortcode_button( "\\''+\$id+'\\'" );?>';
+						return '<?php echo self::shortcode_button("\\''+\$id+'\\'"); ?>';
 					} else {
-						return '<?php echo self::shortcode_button();?>';
+						return '<?php echo self::shortcode_button(); ?>';
 					}
 				}
 			</script>
@@ -1058,11 +1058,11 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function widget_css( $advanced = true ) {
+		public function widget_css($advanced = true) {
 			ob_start();
 			?>
 			<style>
-				<?php if( $advanced ){ ?>
+				<?php if ($advanced) { ?>
 				.sd-advanced-setting {
 					display: none;
 				}
@@ -1106,10 +1106,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -1176,7 +1176,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 
-					var $button = '<button title="<?php _e( 'Advanced Settings', 'ayecode-connect' );?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
+					var $button = '<button title="<?php _e('Advanced Settings', 'ayecode-connect'); ?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
 					var form = $form ? $form : jQuery($this).parents('' + $selector + '');
 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -1267,7 +1267,7 @@ 
 					});
 
 				}
-				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
+				<?php do_action('wp_super_duper_widget_js', $this); ?>
 			</script>
 			<?php
 			$output = ob_get_clean();
@@ -1276,10 +1276,10 @@ 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
 
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 
@@ -1290,14 +1290,14 @@ 
 		 *
 		 * @return mixed
 		 */
-		private function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
+		private function add_name_from_key($options, $arguments = false) {
+			if (!empty($options['arguments'])) {
+				foreach ($options['arguments'] as $key => $val) {
+					$options['arguments'][$key]['name'] = $key;
 				}
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
-				foreach ( $options as $key => $val ) {
-					$options[ $key ]['name'] = $key;
+			} elseif ($arguments && is_array($options) && !empty($options)) {
+				foreach ($options as $key => $val) {
+					$options[$key]['name'] = $key;
 				}
 			}
 
@@ -1310,8 +1310,8 @@ 
 		 * @since 1.0.0
 		 */
 		public function register_shortcode() {
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( $this, 'render_shortcode' ) );
+			add_shortcode($this->base_id, array($this, 'shortcode_output'));
+			add_action('wp_ajax_super_duper_output_shortcode', array($this, 'render_shortcode'));
 		}
 
 		/**
@@ -1320,50 +1320,50 @@ 
 		 * @since 1.0.0
 		 */
 		public function render_shortcode() {
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-			if ( ! current_user_can( 'manage_options' ) ) {
+			check_ajax_referer('super_duper_output_shortcode', '_ajax_nonce', true);
+			if (!current_user_can('manage_options')) {
 				wp_die();
 			}
 
 			// we might need the $post value here so lets set it.
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
+			if (isset($_POST['post_id']) && $_POST['post_id']) {
+				$post_obj = get_post(absint($_POST['post_id']));
+				if (!empty($post_obj) && empty($post)) {
 					global $post;
 					$post = $post_obj;
 				}
 			}
 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
+			if (isset($_POST['shortcode']) && $_POST['shortcode']) {
 				$is_preview = $this->is_preview();
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+				$shortcode_name   = sanitize_title_with_dashes($_POST['shortcode']);
+				$attributes_array = isset($_POST['attributes']) && $_POST['attributes'] ? $_POST['attributes'] : array();
 				$attributes       = '';
-				if ( ! empty( $attributes_array ) ) {
-					foreach ( $attributes_array as $key => $value ) {
-						if ( is_array( $value ) ) {
-							$value = implode( ",", $value );
+				if (!empty($attributes_array)) {
+					foreach ($attributes_array as $key => $value) {
+						if (is_array($value)) {
+							$value = implode(",", $value);
 						}
 
-						if ( ! empty( $value ) ) {
-							$value = wp_unslash( $value );
+						if (!empty($value)) {
+							$value = wp_unslash($value);
 
 							// Encode [ and ].
-							if ( $is_preview ) {
-								$value = $this->encode_shortcodes( $value );
+							if ($is_preview) {
+								$value = $this->encode_shortcodes($value);
 							}
 						}
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . esc_attr( $value ) . "' ";
+						$attributes .= " " . sanitize_title_with_dashes($key) . "='" . esc_attr($value) . "' ";
 					}
 				}
 
 				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
 
-				$content = do_shortcode( $shortcode );
+				$content = do_shortcode($shortcode);
 
 				// Decode [ and ].
-				if ( ! empty( $content ) && $is_preview ) {
-					$content = $this->decode_shortcodes( $content );
+				if (!empty($content) && $is_preview) {
+					$content = $this->decode_shortcodes($content);
 				}
 
 				echo $content;
@@ -1379,21 +1379,21 @@ 
 		 *
 		 * @return string
 		 */
-		public function shortcode_output( $args = array(), $content = '' ) {
+		public function shortcode_output($args = array(), $content = '') {
 			$_instance = $args;
 
-			$args = $this->argument_values( $args );
+			$args = $this->argument_values($args);
 
 			// add extra argument so we know its a output to gutenberg
 			//$args
-			$args = $this->string_to_bool( $args );
+			$args = $this->string_to_bool($args);
 
 			// if we have a enclosed shortcode we add it to the special `html` argument
-			if ( ! empty( $content ) ) {
+			if (!empty($content)) {
 				$args['html'] = $content;
 			}
 
-			if ( ! $this->is_preview() ) {
+			if (!$this->is_preview()) {
 				/**
 				 * Filters the settings for a particular widget args.
 				 *
@@ -1404,40 +1404,40 @@ 
 				 *@since 1.0.28
 				 *
 				 */
-				$args = apply_filters( 'wp_super_duper_widget_display_callback', $args, $this, $_instance );
+				$args = apply_filters('wp_super_duper_widget_display_callback', $args, $this, $_instance);
 
-				if ( ! is_array( $args ) ) {
+				if (!is_array($args)) {
 					return $args;
 				}
 			}
 
-			$class = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
-			$class .= " sdel-".$this->get_instance_hash();
+			$class = isset($this->options['widget_ops']['classname']) ? esc_attr($this->options['widget_ops']['classname']) : '';
+			$class .= " sdel-" . $this->get_instance_hash();
 
-			$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this );
-			$class = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this );
+			$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this);
+			$class = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $class, $args, $this);
 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
+			$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
+			$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
 
 			$shortcode_args = array();
 			$output         = '';
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
-			if ( isset( $args['no_wrap'] ) && $args['no_wrap'] ) {
+			$no_wrap        = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
+			if (isset($args['no_wrap']) && $args['no_wrap']) {
 				$no_wrap = true;
 			}
-			$main_content = $this->output( $args, $shortcode_args, $content );
-			if ( $main_content && ! $no_wrap ) {
+			$main_content = $this->output($args, $shortcode_args, $content);
+			if ($main_content && !$no_wrap) {
 				// wrap the shortcode in a div with the same class as the widget
 				$output .= '<div class="' . $class . '" ' . $attrs . '>';
-				if ( ! empty( $args['title'] ) ) {
+				if (!empty($args['title'])) {
 					// if its a shortcode and there is a title try to grab the title wrappers
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
-					if ( empty( $instance ) ) {
+					$shortcode_args = array('before_title' => '', 'after_title' => '');
+					if (empty($instance)) {
 						global $wp_registered_sidebars;
-						if ( ! empty( $wp_registered_sidebars ) ) {
-							foreach ( $wp_registered_sidebars as $sidebar ) {
-								if ( ! empty( $sidebar['before_title'] ) ) {
+						if (!empty($wp_registered_sidebars)) {
+							foreach ($wp_registered_sidebars as $sidebar) {
+								if (!empty($sidebar['before_title'])) {
 									$shortcode_args['before_title'] = $sidebar['before_title'];
 									$shortcode_args['after_title']  = $sidebar['after_title'];
 									break;
@@ -1445,20 +1445,20 @@ 
 							}
 						}
 					}
-					$output .= $this->output_title( $shortcode_args, $args );
+					$output .= $this->output_title($shortcode_args, $args);
 				}
 				$output .= $main_content;
 				$output .= '</div>';
-			} elseif ( $main_content && $no_wrap ) {
+			} elseif ($main_content && $no_wrap) {
 				$output .= $main_content;
 			}
 
 			// if preview show a placeholder if empty
-			if ( $this->is_preview() && $output == '' ) {
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+			if ($this->is_preview() && $output == '') {
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
 			}
 
-			return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+			return apply_filters('wp_super_duper_widget_output', $output, $args, $shortcode_args, $this);
 		}
 
 		/**
@@ -1468,8 +1468,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf( __( 'Placeholder for: %s', 'ayecode-connect' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . wp_sprintf(__('Placeholder for: %s', 'ayecode-connect'), $name) . "</div>";
 		}
 
 		/**
@@ -1479,13 +1479,13 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function string_to_bool( $options ) {
+		public function string_to_bool($options) {
 			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
+			foreach ($options as $key => $val) {
+				if ($val == 'false') {
+					$options[$key] = false;
+				} elseif ($val == 'true') {
+					$options[$key] = true;
 				}
 			}
 
@@ -1501,26 +1501,26 @@ 
 		 *@since 1.0.12 Don't set checkbox default value if the value is empty.
 		 *
 		 */
-		public function argument_values( $instance ) {
+		public function argument_values($instance) {
 			$argument_values = array();
 
 			// set widget instance
 			$this->instance = $instance;
 
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->get_arguments();
 			}
 
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $key => $args) {
 					// set the input name from the key
 					$args['name'] = $key;
 					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
+					if ($args['type'] == 'checkbox' && $argument_values[$key] == '') {
 						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
+					} elseif ($argument_values[$key] == '' && isset($args['default'])) {
+						$argument_values[$key] = $args['default'];
 					}
 				}
 			}
@@ -1547,12 +1547,12 @@ 
 		 *
 		 */
 		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->set_arguments();
 			}
 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
 
 			return $this->arguments;
 		}
@@ -1564,7 +1564,7 @@ 
 		 * @param array $widget_args
 		 * @param string $content
 		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
+		public function output($args = array(), $widget_args = array(), $content = '') {
 
 		}
 
@@ -1572,9 +1572,9 @@ 
 		 * Add the dynamic block code inline when the wp-block in enqueued.
 		 */
 		public function register_block() {
-			wp_add_inline_script( 'wp-blocks', $this->block() );
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
+			wp_add_inline_script('wp-blocks', $this->block());
+			if (class_exists('SiteOrigin_Panels')) {
+				wp_add_inline_script('wp-blocks', $this->siteorigin_js());
 			}
 		}
 
@@ -1588,9 +1588,9 @@ 
 			$show      = false;
 			$arguments = $this->get_arguments();
 
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+			if (!empty($arguments)) {
+				foreach ($arguments as $argument) {
+					if (isset($argument['advanced']) && $argument['advanced']) {
 						$show = true;
 						break; // no need to continue if we know we have it
 					}
@@ -1608,19 +1608,19 @@ 
 		public function get_url() {
 			$url = $this->url;
 
-			if ( ! $url ) {
-				$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-				$content_url = untrailingslashit( WP_CONTENT_URL );
+			if (!$url) {
+				$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+				$content_url = untrailingslashit(WP_CONTENT_URL);
 
 				// Replace http:// to https://.
-				if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-					$content_url = str_replace( 'http://', 'https://', $content_url );
+				if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+					$content_url = str_replace('http://', 'https://', $content_url);
 				}
 
 				// Check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-				$url = str_replace( $content_dir, $content_url, $file_dir );
-				$url = trailingslashit( $url );
+				$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+				$url = str_replace($content_dir, $content_url, $file_dir);
+				$url = trailingslashit($url);
 				$this->url = $url;
 			}
 
@@ -1636,15 +1636,15 @@ 
 
 			$url = $this->url;
 
-			if ( ! $url ) {
+			if (!$url) {
 				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+				$file_dir = str_replace("/includes", "", dirname(__FILE__));
 
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
+				$dir_parts = explode("/wp-content/", $file_dir);
+				$url_parts = explode("/wp-content/", plugins_url());
 
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+				if (!empty($url_parts[0]) && !empty($dir_parts[1])) {
+					$url       = trailingslashit($url_parts[0] . "/wp-content/" . $dir_parts[1]);
 					$this->url = $url;
 				}
 			}
@@ -1665,45 +1665,45 @@ 
 		 * @return string
 		 *@since 1.1.0
 		 */
-		public function get_block_icon( $icon ) {
+		public function get_block_icon($icon) {
 
 			// check if we have a Font Awesome icon
 			$fa_type = '';
-			if ( substr( $icon, 0, 7 ) === "fas fa-" ) {
+			if (substr($icon, 0, 7) === "fas fa-") {
 				$fa_type = 'solid';
-			} elseif ( substr( $icon, 0, 7 ) === "far fa-" ) {
+			} elseif (substr($icon, 0, 7) === "far fa-") {
 				$fa_type = 'regular';
-			} elseif ( substr( $icon, 0, 7 ) === "fab fa-" ) {
+			} elseif (substr($icon, 0, 7) === "fab fa-") {
 				$fa_type = 'brands';
 			} else {
 				$icon = "'" . $icon . "'";
 			}
 
 			// set the icon if we found one
-			if ( $fa_type ) {
-				$fa_icon = str_replace( array( "fas fa-", "far fa-", "fab fa-" ), "", $icon );
+			if ($fa_type) {
+				$fa_icon = str_replace(array("fas fa-", "far fa-", "fab fa-"), "", $icon);
 				$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
 			}
 
 			return $icon;
 		}
 
-		public function group_arguments( $arguments ) {
-			if ( ! empty( $arguments ) ) {
+		public function group_arguments($arguments) {
+			if (!empty($arguments)) {
 				$temp_arguments = array();
-				$general        = __( "General", 'ayecode-connect' );
+				$general        = __("General", 'ayecode-connect');
 				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
+				foreach ($arguments as $key => $args) {
+					if (isset($args['group'])) {
+						$temp_arguments[$args['group']][$key] = $args;
 						$add_sections                             = true;
 					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
+						$temp_arguments[$general][$key] = $args;
 					}
 				}
 
 				// only add sections if more than one
-				if ( $add_sections ) {
+				if ($add_sections) {
 					$arguments = $temp_arguments;
 				}
 			}
@@ -1716,38 +1716,38 @@ 
 		 *
 		 * @since 1.1.17
 		 */
-		public function group_block_tabs( $tabs, $arguments ) {
-			if ( ! empty( $tabs ) && ! empty( $arguments ) ) {
+		public function group_block_tabs($tabs, $arguments) {
+			if (!empty($tabs) && !empty($arguments)) {
 				$has_sections = false;
 
-				foreach ( $this->arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
+				foreach ($this->arguments as $key => $args) {
+					if (isset($args['group'])) {
 						$has_sections = true;
 						break;
 					}
 				}
 
-				if ( ! $has_sections ) {
+				if (!$has_sections) {
 					return $tabs;
 				}
 
 				$new_tabs = array();
 
-				foreach ( $tabs as $tab_key => $tab ) {
+				foreach ($tabs as $tab_key => $tab) {
 					$new_groups = array();
 
-					if ( ! empty( $tab['groups'] ) && is_array( $tab['groups'] ) ) {
-						foreach ( $tab['groups'] as $group ) {
-							if ( isset( $arguments[ $group ] ) ) {
+					if (!empty($tab['groups']) && is_array($tab['groups'])) {
+						foreach ($tab['groups'] as $group) {
+							if (isset($arguments[$group])) {
 								$new_groups[] = $group;
 							}
 						}
 					}
 
-					if ( ! empty( $new_groups ) ) {
+					if (!empty($new_groups)) {
 						$tab['groups'] = $new_groups;
 
-						$new_tabs[ $tab_key ] = $tab;
+						$new_tabs[$tab_key] = $tab;
 					}
 				}
 
@@ -1774,7 +1774,7 @@ 
 			?>
 			<script>
 			<?php
-			if ( ! $sd_is_js_functions_loaded ) {
+			if (!$sd_is_js_functions_loaded) {
 				$sd_is_js_functions_loaded = true;
 			?>
 function sd_show_view_options($this){
@@ -2151,7 +2151,7 @@ 
 
 				// maybe use featured image.
 				if( $args['bg_image_use_featured'] !== undefined && $args['bg_image_use_featured'] ){
-					$bg_image = '<?php echo $this->get_url();?>icons/placeholder.png';
+					$bg_image = '<?php echo $this->get_url(); ?>icons/placeholder.png';
 				}
 
                 if( $bg_image !== undefined && $bg_image !== '' ){
@@ -2226,7 +2226,7 @@ 
                 $classes = [];
 
 				<?php
-				if($aui_bs5){
+				if ($aui_bs5) {
 					?>
 				$aui_bs5 = true;
 				$p_ml = 'ms-';
@@ -2235,7 +2235,7 @@ 
 				$p_pl = 'ps-';
 				$p_pr = 'pe-';
 					<?php
-				}else{
+				} else {
 						?>
 				$aui_bs5 = false;
 				$p_ml = 'ml-';
@@ -2420,7 +2420,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
@@ -2428,7 +2428,7 @@ 
 
             }
 
-			if(method_exists($this,'block_global_js')){
+			if (method_exists($this, 'block_global_js')) {
 					echo $this->block_global_js();
 			}
 			?>
@@ -2457,9 +2457,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;
 
 					/**
@@ -2474,20 +2474,20 @@ 
 					 * @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'] ) ) {
-								echo $this->array_to_attributes( $this->options['block-supports'] );
+							if (isset($this->options['block-supports'])) {
+								echo $this->array_to_attributes($this->options['block-supports']);
 							}
 							?>
 						},
 						<?php
-						if ( isset( $this->options['block-label'] ) ) {
+						if (isset($this->options['block-label'])) {
 						?>
 						__experimentalLabel( attributes, { context } ) {
                             return <?php echo $this->options['block-label']; ?>;
@@ -2495,8 +2495,8 @@ 
                         <?php
                         }
                         ?>
-						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.
@@ -2523,11 +2523,11 @@ 
                         }
 
 						// 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'] = '';
 						}
 
@@ -2541,10 +2541,10 @@ 
 						echo "  html: false";
 						echo "},";*/
 
-						if ( ! empty( $this->arguments ) ) {
+						if (!empty($this->arguments)) {
 							echo "attributes : {";
 
-							if ( $show_advanced ) {
+							if ($show_advanced) {
 								echo "show_advanced: {";
 								echo "	type: 'boolean',";
 								echo "  default: false,";
@@ -2552,56 +2552,56 @@ 
 							}
 
 							// block wrap element
-							if ( ! empty( $this->options['block-wrap'] ) ) { //@todo we should validate this?
+							if (!empty($this->options['block-wrap'])) { //@todo we should validate this?
 								echo "block_wrap: {";
 								echo "	type: 'string',";
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
+								echo "  default: '" . esc_attr($this->options['block-wrap']) . "',";
 								echo "},";
 							}
 
 
 
-							foreach ( $this->arguments as $key => $args ) {
+							foreach ($this->arguments as $key => $args) {
 
-								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 : {";
@@ -2613,7 +2613,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 . " : {";
@@ -2637,7 +2637,7 @@ 
 
 <?php
 // only include the drag/drop functions if required.
-if( $img_drag_drop ){
+if ($img_drag_drop) {
 
 ?>
 
@@ -2703,9 +2703,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) {
@@ -2729,7 +2729,7 @@ 
 	var $value = '';
 	<?php
 	// if we have a post_type and a category then link them
-	if( isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked']) ){
+	if (isset($this->arguments['post_type']) && isset($this->arguments['category']) && !empty($this->arguments['category']['post_type_linked'])) {
 	?>
 	if(typeof(prev_attributes[props.clientId]) != 'undefined'){
 		$pt = props.attributes.post_type;
@@ -2744,9 +2744,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 */
@@ -2754,15 +2754,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. */
@@ -2772,12 +2772,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. */
@@ -2785,7 +2785,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); ?>;
 				});
 			}
 		}
@@ -2797,12 +2797,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.
@@ -2817,12 +2817,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.
@@ -2830,7 +2830,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); ?>;
 				});
 			}
 		}
@@ -2838,9 +2838,9 @@ 
 	<?php } ?>
 <?php
 $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
-if(!empty($current_screen->base) && $current_screen->base==='widgets'){
+if (!empty($current_screen->base) && $current_screen->base === 'widgets') {
 	echo 'const { deviceType } = "";';
-}else{
+} else {
 ?>
 /** Get device type const. */
 const { deviceType } = wp.data.useSelect != 'undefined' ?  wp.data.useSelect(select => {
@@ -2869,13 +2869,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) {
@@ -2884,17 +2884,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;
@@ -2919,8 +2919,8 @@ 
 							}
 
                             <?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
                             }
 
 
@@ -2933,7 +2933,7 @@ 
 
 								el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-									<?php if($show_alignment){?>
+									<?php if ($show_alignment) {?>
 									el(
 										wp.blockEditor.AlignmentToolbar,
 										{
@@ -2951,9 +2951,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'}
@@ -2973,42 +2973,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;
 														}
 													}
@@ -3017,27 +3017,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,
@@ -3045,24 +3045,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);
 										}
 										?>
 									),
@@ -3076,11 +3076,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';
 								?>
@@ -3106,22 +3106,22 @@ 
 							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;}
 							?>
-							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
@@ -3140,7 +3140,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?
@@ -3170,7 +3170,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 ";";
@@ -3180,30 +3180,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")) {
@@ -3232,48 +3232,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
                                 }
                                 ?>
@@ -3281,17 +3281,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',
@@ -3300,36 +3300,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 "))";
 				}
 
@@ -3337,14 +3337,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'},
 
@@ -3353,81 +3353,81 @@ 
 									{
                                         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           = '';
-            $inside_elements   = '';
+            $inside_elements = '';
 			$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.
@@ -3435,20 +3435,20 @@ 
 			}
 
 			// require advanced
-			$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+			$require_advanced = !empty($args['advanced']) ? "props.attributes.show_advanced && " : "";
 
 			// element require
-			$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+			$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 
 
 			$onchange  = "props.setAttributes({ $key: $key } )";
-			$onchangecomplete  = "";
+			$onchangecomplete = "";
 			$value     = "props.attributes.$key";
-			$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx','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) : '' } )";
 				}
 			}
@@ -3469,12 +3469,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';
@@ -3536,11 +3536,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) {
@@ -3549,7 +3549,7 @@ 
                             $key: value
                         });
                     },";
-			}elseif ( $args['type'] == 'gradient' ) {
+			}elseif ($args['type'] == 'gradient') {
 				$type = 'GradientPicker';
 				$extra .= "gradients: [{
 			name: 'Vivid cyan blue to vivid purple',
@@ -3588,11 +3588,11 @@ 
 			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,{
-                            url:  props.attributes.{$key}_use_featured === true ? '".$this->get_url()."icons/placeholder.png'  : props.attributes.$key,
+                            url:  props.attributes.{$key}_use_featured === true ? '" . $this->get_url() . "icons/placeholder.png'  : 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,
                             onChange: function(focalPoint){
@@ -3650,7 +3650,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 = [];
@@ -3663,7 +3663,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);
@@ -3726,36 +3726,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(){
@@ -3767,7 +3767,7 @@ 
                                     'Clear'
                             ),";
 				}
-			} elseif ( $args['type'] == 'tagselect' ) {
+			} elseif ($args['type'] == 'tagselect') {
 //				$type = 'FormTokenField';
 //
 //				if ( ! empty( $args['options'] ) ) {
@@ -3802,19 +3802,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() {
@@ -3833,25 +3833,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
@@ -3863,22 +3863,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; ?>
 			}
@@ -3897,15 +3897,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',";
 					}
 				}
 
@@ -3923,112 +3923,112 @@ 
 		 *
 		 * @param $args
 		 */
-		public function block_element( $args, $save = false ) {
+		public function block_element($args, $save = false) {
 
 
-			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
                             }
 
 
@@ -4037,26 +4037,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) . "',";
 						}
 
 					}
@@ -4071,11 +4071,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;
@@ -4087,65 +4087,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;
 		}
@@ -4158,7 +4158,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;
 			}
 
@@ -4173,7 +4173,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;
 			}
 
@@ -4188,7 +4188,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;
 			}
 
@@ -4203,7 +4203,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 
@@ -4218,7 +4218,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 
@@ -4233,7 +4233,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;
 			}
 
@@ -4248,7 +4248,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;
 			}
 
@@ -4263,7 +4263,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;
 			}
 
@@ -4280,7 +4280,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;
 			}
 
@@ -4297,7 +4297,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;
 			}
 
@@ -4312,25 +4312,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;
 			}
 
@@ -4345,34 +4345,34 @@ 
 		 *
 		 * @return string
 		 */
-		public function output_title( $args, $instance = array() ) {
+		public function output_title($args, $instance = array()) {
 			$output = '';
-			if ( ! empty( $instance['title'] ) ) {
+			if (!empty($instance['title'])) {
 				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
+				$title = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
 
-				if(empty($instance['widget_title_tag'])){
+				if (empty($instance['widget_title_tag'])) {
 					$output = $args['before_title'] . $title . $args['after_title'];
-				}else{
-					$title_tag = esc_attr( $instance['widget_title_tag'] );
+				} else {
+					$title_tag = esc_attr($instance['widget_title_tag']);
 
 					// classes
 					$title_classes = array();
-					$title_classes[] = !empty( $instance['widget_title_size_class'] ) ? sanitize_html_class( $instance['widget_title_size_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_align_class'] ) ? sanitize_html_class( $instance['widget_title_align_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_color_class'] ) ? "text-".sanitize_html_class( $instance['widget_title_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_class'] ) ? sanitize_html_class( $instance['widget_title_border_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_border_color_class'] ) ? "border-".sanitize_html_class( $instance['widget_title_border_color_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mt_class'] ) ? "mt-".absint( $instance['widget_title_mt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mr_class'] ) ? "mr-".absint( $instance['widget_title_mr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_mb_class'] ) ? "mb-".absint( $instance['widget_title_mb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_ml_class'] ) ? "ml-".absint( $instance['widget_title_ml_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pt_class'] ) ? "pt-".absint( $instance['widget_title_pt_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pr_class'] ) ? "pr-".absint( $instance['widget_title_pr_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pb_class'] ) ? "pb-".absint( $instance['widget_title_pb_class'] ) : '';
-					$title_classes[] = !empty( $instance['widget_title_pl_class'] ) ? "pl-".absint( $instance['widget_title_pl_class'] ) : '';
-
-					$class = !empty( $title_classes ) ? implode(" ",$title_classes) : '';
+					$title_classes[] = !empty($instance['widget_title_size_class']) ? sanitize_html_class($instance['widget_title_size_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_align_class']) ? sanitize_html_class($instance['widget_title_align_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_color_class']) ? "text-" . sanitize_html_class($instance['widget_title_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_class']) ? sanitize_html_class($instance['widget_title_border_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_border_color_class']) ? "border-" . sanitize_html_class($instance['widget_title_border_color_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mt_class']) ? "mt-" . absint($instance['widget_title_mt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mr_class']) ? "mr-" . absint($instance['widget_title_mr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_mb_class']) ? "mb-" . absint($instance['widget_title_mb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_ml_class']) ? "ml-" . absint($instance['widget_title_ml_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pt_class']) ? "pt-" . absint($instance['widget_title_pt_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pr_class']) ? "pr-" . absint($instance['widget_title_pr_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pb_class']) ? "pb-" . absint($instance['widget_title_pb_class']) : '';
+					$title_classes[] = !empty($instance['widget_title_pl_class']) ? "pl-" . absint($instance['widget_title_pl_class']) : '';
+
+					$class = !empty($title_classes) ? implode(" ", $title_classes) : '';
 					$output = "<$title_tag class='$class' >$title</$title_tag>";
 				}
 
@@ -4386,7 +4386,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 
 			// set widget instance
 			$this->instance = $instance;
@@ -4394,20 +4394,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>
@@ -4417,26 +4417,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);
 					}
 				}
@@ -4444,28 +4444,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'>";
@@ -4473,10 +4473,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>";
@@ -4491,7 +4491,7 @@ 
 		public function widget_advanced_toggle() {
 
 			$output = '';
-			if ( $this->block_show_advanced() ) {
+			if ($this->block_show_advanced()) {
 				$val = 1;
 			} else {
 				$val = 0;
@@ -4511,14 +4511,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;
 		}
@@ -4529,48 +4529,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":
@@ -4580,33 +4580,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>";
 							}
@@ -4617,20 +4617,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:
@@ -4640,15 +4640,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>';
 			}
 		}
 
@@ -4660,14 +4660,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>';
 				}
 			}
 
@@ -4681,18 +4681,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']);
 				}
 			}
 
@@ -4707,11 +4707,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>';
@@ -4724,8 +4724,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(),
@@ -4735,7 +4735,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 
 		/**
@@ -4747,23 +4747,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';
 					}
 				}
 			}
@@ -4781,7 +4781,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;
 			}
 
@@ -4794,9 +4794,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);
 		}
 
 		/**
@@ -4807,14 +4807,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>";
@@ -4832,9 +4832,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;',
@@ -4845,7 +4845,7 @@ 
 				'&amp;gt;' => '&0gt;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'[' => '&#91;',
@@ -4856,7 +4856,7 @@ 
 				"'" => '&#39;',
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			return $content;
 		}
@@ -4870,8 +4870,8 @@ 
 		 *@since 1.0.28
 		 *
 		 */
-		public function decode_shortcodes( $content ) {
-			$trans   = array(
+		public function decode_shortcodes($content) {
+			$trans = array(
 				'&#91;' => '[',
 				'&#93;' => ']',
 				'&amp;#91;' => '[',
@@ -4884,7 +4884,7 @@ 
 				'&apos;' => "'",
 			);
 
-			$content = strtr( $content, $trans );
+			$content = strtr($content, $trans);
 
 			$trans   = array(
 				'&#091;' => '&#91;',
@@ -4897,31 +4897,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',
 									'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'
 									)
@@ -4930,15 +4930,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',
 										'options'     => sd_visibility_gd_field_options(),
 										'default'     => '',
@@ -4959,8 +4959,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',
 										'options'     => sd_visibility_field_condition_options(),
 										'default'     => '',
@@ -4982,9 +4982,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")'
@@ -4996,11 +4996,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">';
@@ -5024,14 +5024,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',
 					'options'     => sd_visibility_output_options(),
 					'default'     => '',
@@ -5050,8 +5050,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',
 					'options'         => sd_template_page_options(),
 					'default'         => '',
@@ -5066,8 +5066,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',
 					'options'     => sd_template_part_options(),
 					'default'     => '',
@@ -5085,8 +5085,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',
 					'options'          => sd_aui_colors(),
 					'default'          => '',
@@ -5109,7 +5109,7 @@ 
 					'name'            => 'bsvc_message',
 					'label'           => '',
 					'class'           => 'bsvc_message form-control-sm',
-					'placeholder'     => __( 'CUSTOM MESSAGE TO SHOW', 'ayecode-connect' ),
+					'placeholder'     => __('CUSTOM MESSAGE TO SHOW', 'ayecode-connect'),
 					'label_type'      => '',
 					'value'           => '',
 					'form_group_class' => ' ',

includes/api/class-getpaid-rest-date-based-controller.php

Spacing +84 added lines, -84 removed lines

@@ -7,7 +7,7 @@ 
  * @since   2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid REST date based controller class.
@@ -43,26 +43,26 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array The appropriate date range.
 	 */
-	public function get_date_range( $request ) {
+	public function get_date_range($request) {
 
 		// Check if the period is x_days.
-		if ( preg_match( '/^(\d+)_days$/', $request['period'], $matches ) ) {
-			$date_range = $this->get_x_days_date_range( absint( $matches[1] ) );
-		} elseif ( is_callable( array( $this, 'get_' . $request['period'] . '_date_range' ) ) ) {
-			$date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
+		if (preg_match('/^(\d+)_days$/', $request['period'], $matches)) {
+			$date_range = $this->get_x_days_date_range(absint($matches[1]));
+		} elseif (is_callable(array($this, 'get_' . $request['period'] . '_date_range'))) {
+			$date_range = call_user_func(array($this, 'get_' . $request['period'] . '_date_range'), $request);
 		} else {
 			$request['period'] = '7_days';
 			$date_range        = $this->get_x_days_date_range();
 		}
 
 		// 3 months max for day view.
-		$before = strtotime( $date_range['before'] );
-		$after  = strtotime( $date_range['after'] );
-		if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 2 ) {
+		$before = strtotime($date_range['before']);
+		$after  = strtotime($date_range['after']);
+		if (floor(($before - $after) / MONTH_IN_SECONDS) > 2) {
 			$this->groupby = 'month';
 		}
 
-		$this->prepare_interval( $date_range );
+		$this->prepare_interval($date_range);
 
 		return $date_range;
 
@@ -74,25 +74,25 @@ 
 	 * @param array $range Date range.
 	 * @return array The appropriate date range.
 	 */
-	public function prepare_interval( $range ) {
+	public function prepare_interval($range) {
 
-		$before = strtotime( $range['before'] );
-		$after  = strtotime( $range['after'] );
-		if ( 'day' === $this->groupby ) {
-			$difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
-			$this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
+		$before = strtotime($range['before']);
+		$after  = strtotime($range['after']);
+		if ('day' === $this->groupby) {
+			$difference     = max(DAY_IN_SECONDS, (DAY_IN_SECONDS + $before - $after)); // Prevent division by 0;
+			$this->interval = absint(ceil(max(1, $difference / DAY_IN_SECONDS)));
 			return;
 		}
 
 		$this->interval = 0;
-		$min_date       = strtotime( gmdate( 'Y-m-01', $after ) );
+		$min_date       = strtotime(gmdate('Y-m-01', $after));
 
-		while ( $min_date <= $before ) {
-			$this->interval ++;
-			$min_date = strtotime( '+1 MONTH', $min_date );
+		while ($min_date <= $before) {
+			$this->interval++;
+			$min_date = strtotime('+1 MONTH', $min_date);
 		}
 
-		$this->interval = max( 1, $this->interval );
+		$this->interval = max(1, $this->interval);
 
 	}
 
@@ -102,27 +102,27 @@ 
 	 * @param WP_REST_Request $request Request object.
 	 * @return array The appropriate date range.
 	 */
-	public function get_custom_date_range( $request ) {
+	public function get_custom_date_range($request) {
 
-		$after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
-		$before = gmdate( 'Y-m-d' );
+		$after  = max(strtotime('-20 years'), strtotime(sanitize_text_field($request['after'])));
+		$before = gmdate('Y-m-d');
 
-		if ( ! empty( $request['before'] ) ) {
-			$before  = min( strtotime( $before ), strtotime( sanitize_text_field( $request['before'] ) ) );
+		if (!empty($request['before'])) {
+			$before = min(strtotime($before), strtotime(sanitize_text_field($request['before'])));
 		}
 
 		// Set the previous date range.
 		$difference           = $before - $after;
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', $before - $difference - DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $after - $difference - DAY_IN_SECONDS ),
+			'before' => gmdate('Y-m-d', $before - $difference - DAY_IN_SECONDS),
+			'after'  => gmdate('Y-m-d', $after - $difference - DAY_IN_SECONDS),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => gmdate( 'Y-m-d', $before ),
-			'after'  => gmdate( 'Y-m-d', $after ),
+			'before' => gmdate('Y-m-d', $before),
+			'after'  => gmdate('Y-m-d', $after),
 		);
 
 	}
@@ -141,8 +141,8 @@ 
 
 		// Generate the report.
 		return array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d' ),
+			'before' => gmdate('Y-m-d'),
+			'after'  => gmdate('Y-m-d'),
 		);
 
 	}
@@ -157,14 +157,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
-			'after'  => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
+			'before' => gmdate('Y-m-d', strtotime('-2 days')),
+			'after'  => gmdate('Y-m-d', strtotime('-2 days')),
 		);
 
 		// Generate the report.
 		return array(
-			'before' => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
-			'after'  => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
+			'before' => gmdate('Y-m-d', strtotime('-1 day')),
+			'after'  => gmdate('Y-m-d', strtotime('-1 day')),
 		);
 
 	}
@@ -182,10 +182,10 @@ 
 		);
 
 		// Generate the report.
-		$week_starts = absint( get_option( 'start_of_week' ) );
+		$week_starts = absint(get_option('start_of_week'));
 		return array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d', strtotime( 'next Sunday -' . ( 7 - $week_starts ) . ' days' ) ),
+			'before' => gmdate('Y-m-d'),
+			'after'  => gmdate('Y-m-d', strtotime('next Sunday -' . (7 - $week_starts) . ' days')),
 		);
 	}
 
@@ -196,19 +196,19 @@ 
 	 */
 	public function get_last_week_date_range() {
 
-		$week_starts = absint( get_option( 'start_of_week' ) );
-		$week_starts = strtotime( 'last Sunday -' . ( 7 - $week_starts ) . ' days' );
+		$week_starts = absint(get_option('start_of_week'));
+		$week_starts = strtotime('last Sunday -' . (7 - $week_starts) . ' days');
 		$date_range  = array(
-			'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $week_starts ),
+			'before' => gmdate('Y-m-d', $week_starts + 6 * DAY_IN_SECONDS),
+			'after'  => gmdate('Y-m-d', $week_starts),
 		);
 
 		// Set the previous date range.
 		$week_starts          = $week_starts - 7 * DAY_IN_SECONDS;
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $week_starts ),
+			'before' => gmdate('Y-m-d', $week_starts + 6 * DAY_IN_SECONDS),
+			'after'  => gmdate('Y-m-d', $week_starts),
 		);
 
 		// Generate the report.
@@ -220,13 +220,13 @@ 
 	 *
 	 * @return array The appropriate date range.
 	 */
-	public function get_x_days_date_range( $days = 7 ) {
+	public function get_x_days_date_range($days = 7) {
 
 		$days--;
 
-		$date_range  = array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d', strtotime( "-$days days" ) ),
+		$date_range = array(
+			'before' => gmdate('Y-m-d'),
+			'after'  => gmdate('Y-m-d', strtotime("-$days days")),
 		);
 
 		$days++;
@@ -234,8 +234,8 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', strtotime( $date_range['before'] ) - $days * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', strtotime( $date_range['after'] ) - $days * DAY_IN_SECONDS ),
+			'before' => gmdate('Y-m-d', strtotime($date_range['before']) - $days * DAY_IN_SECONDS),
+			'after'  => gmdate('Y-m-d', strtotime($date_range['after']) - $days * DAY_IN_SECONDS),
 		);
 
 		// Generate the report.
@@ -256,8 +256,8 @@ 
 
 		// Generate the report.
 		return array(
-			'after'  => gmdate( 'Y-m-01' ),
-			'before' => gmdate( 'Y-m-t' ),
+			'after'  => gmdate('Y-m-01'),
+			'before' => gmdate('Y-m-t'),
 		);
 
 	}
@@ -272,14 +272,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'after'  => gmdate( 'Y-m-01', strtotime( '-2 months' ) ),
-			'before' => gmdate( 'Y-m-t', strtotime( '-2 months' ) ),
+			'after'  => gmdate('Y-m-01', strtotime('-2 months')),
+			'before' => gmdate('Y-m-t', strtotime('-2 months')),
 		);
 
 		// Generate the report.
 		return array(
-			'after'  => gmdate( 'Y-m-01', strtotime( 'last month' ) ),
-			'before' => gmdate( 'Y-m-t', strtotime( 'last month' ) ),
+			'after'  => gmdate('Y-m-01', strtotime('last month')),
+			'before' => gmdate('Y-m-t', strtotime('last month')),
 		);
 
 	}
@@ -291,7 +291,7 @@ 
 	 */
 	public function get_quarters() {
 
-		$year      = (int) gmdate( 'Y' );
+		$year      = (int) gmdate('Y');
 		$last_year = (int) $year - 1;
 		return array(
 
@@ -340,9 +340,9 @@ 
 	 */
 	public function get_quarter() {
 
-		$month    = (int) gmdate( 'n' );
-		$quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
-		return $quarters[ $month - 1 ];
+		$month    = (int) gmdate('n');
+		$quarters = array(1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4);
+		return $quarters[$month - 1];
 
 	}
 
@@ -361,7 +361,7 @@ 
 		// Generate the report.
 		$quarter  = $this->get_quarter();
 		$quarters = $this->get_quarters();
-		return $quarters[ $quarter + 1 ];
+		return $quarters[$quarter + 1];
 
 	}
 
@@ -377,12 +377,12 @@ 
 
 		// Set the previous date range.
 		$this->previous_range = array_merge(
-			$quarters[ $quarter - 1 ],
-			array( 'period' => 'custom' )
+			$quarters[$quarter - 1],
+			array('period' => 'custom')
 		);
 
 		// Generate the report.
-		return $quarters[ $quarter ];
+		return $quarters[$quarter];
 
 	}
 
@@ -400,8 +400,8 @@ 
 
 		// Generate the report.
 		return array(
-			'after'  => gmdate( 'Y-01-01' ),
-			'before' => gmdate( 'Y-12-31' ),
+			'after'  => gmdate('Y-01-01'),
+			'before' => gmdate('Y-12-31'),
 		);
 
 	}
@@ -416,14 +416,14 @@ 
 		// Set the previous date range.
 		$this->previous_range = array(
 			'period' => 'custom',
-			'after'  => gmdate( 'Y-01-01', strtotime( '-2 years' ) ),
-			'before' => gmdate( 'Y-12-31', strtotime( '-2 years' ) ),
+			'after'  => gmdate('Y-01-01', strtotime('-2 years')),
+			'before' => gmdate('Y-12-31', strtotime('-2 years')),
 		);
 
 		// Generate the report.
 		return array(
-			'after'  => gmdate( 'Y-01-01', strtotime( 'last year' ) ),
-			'before' => gmdate( 'Y-12-31', strtotime( 'last year' ) ),
+			'after'  => gmdate('Y-01-01', strtotime('last year')),
+			'before' => gmdate('Y-12-31', strtotime('last year')),
 		);
 
 	}
@@ -435,20 +435,20 @@ 
 	 * @param string $date_field The date field.
 	 * @return string The appropriate SQL.
 	 */
-	public function get_date_range_sql( $request, $date_field ) {
+	public function get_date_range_sql($request, $date_field) {
 		global $wpdb;
 
 		$sql = '1=1';
-		$range = $this->get_date_range( $request );
+		$range = $this->get_date_range($request);
 
-		if ( ! empty( $range['after'] ) ) {
+		if (!empty($range['after'])) {
 			$sql .= ' AND ' . $wpdb->prepare(
 				"$date_field >= %s",
 				$range['after']
 			);
 		}
 
-		if ( ! empty( $range['before'] ) ) {
+		if (!empty($range['before'])) {
 			$sql .= ' AND ' . $wpdb->prepare(
 				"$date_field <= %s",
 				$range['before']
@@ -465,9 +465,9 @@ 
 	 * @param string $date_field The date field.
 	 * @return string The appropriate SQL.
 	 */
-	public function get_group_by_sql( $date_field ) {
+	public function get_group_by_sql($date_field) {
 
-		if ( 'day' === $this->groupby ) {
+		if ('day' === $this->groupby) {
 			return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
 		}
 
@@ -481,30 +481,30 @@ 
 	 */
 	public function get_collection_params() {
 		return array(
-			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+			'context' => $this->get_context_param(array('default' => 'view')),
 			'period'  => array(
-				'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
+				'description'       => __('Limit to results of a specific period.', 'invoicing'),
 				'type'              => 'string',
-				'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
+				'enum'              => array('custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter'),
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
 				'default'           => '7_days',
 			),
 			'after'   => array(
 				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+				'description'       => sprintf(__('Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing'), 'YYYY-MM-DD'),
 				'type'              => 'string',
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => gmdate( 'Y-m-d', strtotime( '-7 days' ) ),
+				'default'           => gmdate('Y-m-d', strtotime('-7 days')),
 			),
 			'before'  => array(
 				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+				'description'       => sprintf(__('Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing'), 'YYYY-MM-DD'),
 				'type'              => 'string',
 				'validate_callback' => 'rest_validate_request_arg',
 				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => gmdate( 'Y-m-d' ),
+				'default'           => gmdate('Y-m-d'),
 			),
 		);
 	}

Indentation +491 added lines, -491 removed lines

@@ -16,496 +16,496 @@
  */
 class GetPaid_REST_Date_Based_Controller extends GetPaid_REST_Controller {
 
-	/**
-	 * Group response items by day or month.
-	 *
-	 * @var string
-	 */
-	public $groupby = 'day';
-
-	/**
-	 * Returns an array with arguments to request the previous report.
-	 *
-	 * @var array
-	 */
-	public $previous_range = array();
-
-	/**
-	 * The period interval.
-	 *
-	 * @var int
-	 */
-	public $interval;
-
-	/**
-	 * Retrieves the before and after dates.
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array The appropriate date range.
-	 */
-	public function get_date_range( $request ) {
-
-		// Check if the period is x_days.
-		if ( preg_match( '/^(\d+)_days$/', $request['period'], $matches ) ) {
-			$date_range = $this->get_x_days_date_range( absint( $matches[1] ) );
-		} elseif ( is_callable( array( $this, 'get_' . $request['period'] . '_date_range' ) ) ) {
-			$date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
-		} else {
-			$request['period'] = '7_days';
-			$date_range        = $this->get_x_days_date_range();
-		}
-
-		// 3 months max for day view.
-		$before = strtotime( $date_range['before'] );
-		$after  = strtotime( $date_range['after'] );
-		if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 2 ) {
-			$this->groupby = 'month';
-		}
-
-		$this->prepare_interval( $date_range );
-
-		return $date_range;
-
-	}
-
-	/**
-	 * Groups by month or days.
-	 *
-	 * @param array $range Date range.
-	 * @return array The appropriate date range.
-	 */
-	public function prepare_interval( $range ) {
-
-		$before = strtotime( $range['before'] );
-		$after  = strtotime( $range['after'] );
-		if ( 'day' === $this->groupby ) {
-			$difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
-			$this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
-			return;
-		}
-
-		$this->interval = 0;
-		$min_date       = strtotime( gmdate( 'Y-m-01', $after ) );
-
-		while ( $min_date <= $before ) {
-			$this->interval ++;
-			$min_date = strtotime( '+1 MONTH', $min_date );
-		}
-
-		$this->interval = max( 1, $this->interval );
-
-	}
-
-	/**
-	 * Retrieves a custom date range.
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @return array The appropriate date range.
-	 */
-	public function get_custom_date_range( $request ) {
-
-		$after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
-		$before = gmdate( 'Y-m-d' );
+    /**
+     * Group response items by day or month.
+     *
+     * @var string
+     */
+    public $groupby = 'day';
+
+    /**
+     * Returns an array with arguments to request the previous report.
+     *
+     * @var array
+     */
+    public $previous_range = array();
+
+    /**
+     * The period interval.
+     *
+     * @var int
+     */
+    public $interval;
+
+    /**
+     * Retrieves the before and after dates.
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array The appropriate date range.
+     */
+    public function get_date_range( $request ) {
+
+        // Check if the period is x_days.
+        if ( preg_match( '/^(\d+)_days$/', $request['period'], $matches ) ) {
+            $date_range = $this->get_x_days_date_range( absint( $matches[1] ) );
+        } elseif ( is_callable( array( $this, 'get_' . $request['period'] . '_date_range' ) ) ) {
+            $date_range = call_user_func( array( $this, 'get_' . $request['period'] . '_date_range' ), $request );
+        } else {
+            $request['period'] = '7_days';
+            $date_range        = $this->get_x_days_date_range();
+        }
+
+        // 3 months max for day view.
+        $before = strtotime( $date_range['before'] );
+        $after  = strtotime( $date_range['after'] );
+        if ( floor( ( $before - $after ) / MONTH_IN_SECONDS ) > 2 ) {
+            $this->groupby = 'month';
+        }
+
+        $this->prepare_interval( $date_range );
+
+        return $date_range;
+
+    }
+
+    /**
+     * Groups by month or days.
+     *
+     * @param array $range Date range.
+     * @return array The appropriate date range.
+     */
+    public function prepare_interval( $range ) {
+
+        $before = strtotime( $range['before'] );
+        $after  = strtotime( $range['after'] );
+        if ( 'day' === $this->groupby ) {
+            $difference     = max( DAY_IN_SECONDS, ( DAY_IN_SECONDS + $before - $after ) ); // Prevent division by 0;
+            $this->interval = absint( ceil( max( 1, $difference / DAY_IN_SECONDS ) ) );
+            return;
+        }
+
+        $this->interval = 0;
+        $min_date       = strtotime( gmdate( 'Y-m-01', $after ) );
+
+        while ( $min_date <= $before ) {
+            $this->interval ++;
+            $min_date = strtotime( '+1 MONTH', $min_date );
+        }
+
+        $this->interval = max( 1, $this->interval );
+
+    }
+
+    /**
+     * Retrieves a custom date range.
+     *
+     * @param WP_REST_Request $request Request object.
+     * @return array The appropriate date range.
+     */
+    public function get_custom_date_range( $request ) {
+
+        $after  = max( strtotime( '-20 years' ), strtotime( sanitize_text_field( $request['after'] ) ) );
+        $before = gmdate( 'Y-m-d' );
 		
-		if ( ! empty( $request['before'] ) ) {
-			$before  = min( strtotime( $before ), strtotime( sanitize_text_field( $request['before'] ) ) );
-		}
-
-		// Set the previous date range.
-		$difference           = $before - $after;
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', $before - $difference - DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $after - $difference - DAY_IN_SECONDS ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => gmdate( 'Y-m-d', $before ),
-			'after'  => gmdate( 'Y-m-d', $after ),
-		);
-
-	}
-
-	/**
-	 * Retrieves todays date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_today_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'yesterday',
-		);
-
-		// Generate the report.
-		return array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d' ),
-		);
-
-	}
-
-	/**
-	 * Retrieves yesterdays date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_yesterday_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
-			'after'  => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'before' => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
-			'after'  => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves this week's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_week_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_week',
-		);
-
-		// Generate the report.
-		$week_starts = absint( get_option( 'start_of_week' ) );
-		return array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d', strtotime( 'next Sunday -' . ( 7 - $week_starts ) . ' days' ) ),
-		);
-	}
-
-	/**
-	 * Retrieves last week's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_week_date_range() {
-
-		$week_starts = absint( get_option( 'start_of_week' ) );
-		$week_starts = strtotime( 'last Sunday -' . ( 7 - $week_starts ) . ' days' );
-		$date_range  = array(
-			'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $week_starts ),
-		);
-
-		// Set the previous date range.
-		$week_starts          = $week_starts - 7 * DAY_IN_SECONDS;
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', $week_starts ),
-		);
-
-		// Generate the report.
-		return $date_range;
-	}
-
-	/**
-	 * Retrieves last x days date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_x_days_date_range( $days = 7 ) {
-
-		$days--;
-
-		$date_range  = array(
-			'before' => gmdate( 'Y-m-d' ),
-			'after'  => gmdate( 'Y-m-d', strtotime( "-$days days" ) ),
-		);
-
-		$days++;
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'before' => gmdate( 'Y-m-d', strtotime( $date_range['before'] ) - $days * DAY_IN_SECONDS ),
-			'after'  => gmdate( 'Y-m-d', strtotime( $date_range['after'] ) - $days * DAY_IN_SECONDS ),
-		);
-
-		// Generate the report.
-		return $date_range;
-	}
-
-	/**
-	 * Retrieves this month date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_month_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_month',
-		);
-
-		// Generate the report.
-		return array(
-			'after'  => gmdate( 'Y-m-01' ),
-			'before' => gmdate( 'Y-m-t' ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last month's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_month_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'after'  => gmdate( 'Y-m-01', strtotime( '-2 months' ) ),
-			'before' => gmdate( 'Y-m-t', strtotime( '-2 months' ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'after'  => gmdate( 'Y-m-01', strtotime( 'last month' ) ),
-			'before' => gmdate( 'Y-m-t', strtotime( 'last month' ) ),
-		);
-
-	}
-
-	/**
-	 * Retrieves this quarter date range.
-	 *
-	 * @return array The available quarters.
-	 */
-	public function get_quarters() {
-
-		$year      = (int) gmdate( 'Y' );
-		$last_year = (int) $year - 1;
-		return array(
-
-			// Third quarter of previous year: July 1st to September 30th
-			array(
-				'before' => "{$last_year}-09-30",
-				'after'  => "{$last_year}-07-01",
-			),
-
-			// Last quarter of previous year: October 1st to December 31st
-			array(
-				'before' => "{$last_year}-12-31",
-        		'after'  => "{$last_year}-10-01",
-			),
-
-			// First quarter: January 1st to March 31st
-			array(
-				'before' => "{$year}-03-31",
-				'after'  => "{$year}-01-01",
-			),
-
-			// Second quarter: April 1st to June 30th
-			array(
-				'before' => "{$year}-06-30",
-				'after'  => "{$year}-04-01",
-			),
-
-			// Third quarter: July 1st to September 30th
-			array(
-				'before' => "{$year}-09-30",
-				'after'  => "{$year}-07-01",
-			),
-
-			// Fourth quarter: October 1st to December 31st
-			array(
-				'before' => "{$year}-12-31",
-				'after'  => "{$year}-10-01",
-			),
-		);
-	}
-
-	/**
-	 * Retrieves the current quater.
-	 *
-	 * @return int The current quarter.
-	 */
-	public function get_quarter() {
-
-		$month    = (int) gmdate( 'n' );
-		$quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
-		return $quarters[ $month - 1 ];
-
-	}
-
-	/**
-	 * Retrieves this quarter date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_quarter_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_quarter',
-		);
-
-		// Generate the report.
-		$quarter  = $this->get_quarter();
-		$quarters = $this->get_quarters();
-		return $quarters[ $quarter + 1 ];
-
-	}
-
-	/**
-	 * Retrieves last quarter's date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_quarter_date_range() {
-
-		$quarters = $this->get_quarters();
-		$quarter  = $this->get_quarter();
-
-		// Set the previous date range.
-		$this->previous_range = array_merge(
-			$quarters[ $quarter - 1 ],
-			array( 'period' => 'custom' )
-		);
-
-		// Generate the report.
-		return $quarters[ $quarter ];
-
-	}
-
-	/**
-	 * Retrieves this year date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_year_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'last_year',
-		);
-
-		// Generate the report.
-		return array(
-			'after'  => gmdate( 'Y-01-01' ),
-			'before' => gmdate( 'Y-12-31' ),
-		);
-
-	}
-
-	/**
-	 * Retrieves last year date range.
-	 *
-	 * @return array The appropriate date range.
-	 */
-	public function get_last_year_date_range() {
-
-		// Set the previous date range.
-		$this->previous_range = array(
-			'period' => 'custom',
-			'after'  => gmdate( 'Y-01-01', strtotime( '-2 years' ) ),
-			'before' => gmdate( 'Y-12-31', strtotime( '-2 years' ) ),
-		);
-
-		// Generate the report.
-		return array(
-			'after'  => gmdate( 'Y-01-01', strtotime( 'last year' ) ),
-			'before' => gmdate( 'Y-12-31', strtotime( 'last year' ) ),
-		);
-
-	}
-
-	/**
-	 * Prepare a the request date for SQL usage.
-	 *
-	 * @param WP_REST_Request $request Request object.
-	 * @param string $date_field The date field.
-	 * @return string The appropriate SQL.
-	 */
-	public function get_date_range_sql( $request, $date_field ) {
-		global $wpdb;
-
-		$sql = '1=1';
-		$range = $this->get_date_range( $request );
-
-		if ( ! empty( $range['after'] ) ) {
-			$sql .= ' AND ' . $wpdb->prepare(
-				"$date_field >= %s",
-				$range['after']
-			);
-		}
-
-		if ( ! empty( $range['before'] ) ) {
-			$sql .= ' AND ' . $wpdb->prepare(
-				"$date_field <= %s",
-				$range['before']
-			);
-		}
-
-		return $sql;
-
-	}
-
-	/**
-	 * Prepares a group by query.
-	 *
-	 * @param string $date_field The date field.
-	 * @return string The appropriate SQL.
-	 */
-	public function get_group_by_sql( $date_field ) {
-
-		if ( 'day' === $this->groupby ) {
-			return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
-		}
-
-		return "YEAR($date_field), MONTH($date_field)";
-	}
-
-	/**
-	 * Get the query params for collections.
-	 *
-	 * @return array
-	 */
-	public function get_collection_params() {
-		return array(
-			'context' => $this->get_context_param( array( 'default' => 'view' ) ),
-			'period'  => array(
-				'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
-				'type'              => 'string',
-				'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
-				'validate_callback' => 'rest_validate_request_arg',
-				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => '7_days',
-			),
-			'after'   => array(
-				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
-				'type'              => 'string',
-				'validate_callback' => 'rest_validate_request_arg',
-				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => gmdate( 'Y-m-d', strtotime( '-7 days' ) ),
-			),
-			'before'  => array(
-				/* translators: %s: date format */
-				'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
-				'type'              => 'string',
-				'validate_callback' => 'rest_validate_request_arg',
-				'sanitize_callback' => 'sanitize_text_field',
-				'default'           => gmdate( 'Y-m-d' ),
-			),
-		);
-	}
+        if ( ! empty( $request['before'] ) ) {
+            $before  = min( strtotime( $before ), strtotime( sanitize_text_field( $request['before'] ) ) );
+        }
+
+        // Set the previous date range.
+        $difference           = $before - $after;
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => gmdate( 'Y-m-d', $before - $difference - DAY_IN_SECONDS ),
+            'after'  => gmdate( 'Y-m-d', $after - $difference - DAY_IN_SECONDS ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => gmdate( 'Y-m-d', $before ),
+            'after'  => gmdate( 'Y-m-d', $after ),
+        );
+
+    }
+
+    /**
+     * Retrieves todays date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_today_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'yesterday',
+        );
+
+        // Generate the report.
+        return array(
+            'before' => gmdate( 'Y-m-d' ),
+            'after'  => gmdate( 'Y-m-d' ),
+        );
+
+    }
+
+    /**
+     * Retrieves yesterdays date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_yesterday_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
+            'after'  => gmdate( 'Y-m-d', strtotime( '-2 days' ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'before' => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
+            'after'  => gmdate( 'Y-m-d', strtotime( '-1 day' ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves this week's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_week_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_week',
+        );
+
+        // Generate the report.
+        $week_starts = absint( get_option( 'start_of_week' ) );
+        return array(
+            'before' => gmdate( 'Y-m-d' ),
+            'after'  => gmdate( 'Y-m-d', strtotime( 'next Sunday -' . ( 7 - $week_starts ) . ' days' ) ),
+        );
+    }
+
+    /**
+     * Retrieves last week's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_week_date_range() {
+
+        $week_starts = absint( get_option( 'start_of_week' ) );
+        $week_starts = strtotime( 'last Sunday -' . ( 7 - $week_starts ) . ' days' );
+        $date_range  = array(
+            'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
+            'after'  => gmdate( 'Y-m-d', $week_starts ),
+        );
+
+        // Set the previous date range.
+        $week_starts          = $week_starts - 7 * DAY_IN_SECONDS;
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => gmdate( 'Y-m-d', $week_starts + 6 * DAY_IN_SECONDS ),
+            'after'  => gmdate( 'Y-m-d', $week_starts ),
+        );
+
+        // Generate the report.
+        return $date_range;
+    }
+
+    /**
+     * Retrieves last x days date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_x_days_date_range( $days = 7 ) {
+
+        $days--;
+
+        $date_range  = array(
+            'before' => gmdate( 'Y-m-d' ),
+            'after'  => gmdate( 'Y-m-d', strtotime( "-$days days" ) ),
+        );
+
+        $days++;
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'before' => gmdate( 'Y-m-d', strtotime( $date_range['before'] ) - $days * DAY_IN_SECONDS ),
+            'after'  => gmdate( 'Y-m-d', strtotime( $date_range['after'] ) - $days * DAY_IN_SECONDS ),
+        );
+
+        // Generate the report.
+        return $date_range;
+    }
+
+    /**
+     * Retrieves this month date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_month_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_month',
+        );
+
+        // Generate the report.
+        return array(
+            'after'  => gmdate( 'Y-m-01' ),
+            'before' => gmdate( 'Y-m-t' ),
+        );
+
+    }
+
+    /**
+     * Retrieves last month's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_month_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'after'  => gmdate( 'Y-m-01', strtotime( '-2 months' ) ),
+            'before' => gmdate( 'Y-m-t', strtotime( '-2 months' ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'after'  => gmdate( 'Y-m-01', strtotime( 'last month' ) ),
+            'before' => gmdate( 'Y-m-t', strtotime( 'last month' ) ),
+        );
+
+    }
+
+    /**
+     * Retrieves this quarter date range.
+     *
+     * @return array The available quarters.
+     */
+    public function get_quarters() {
+
+        $year      = (int) gmdate( 'Y' );
+        $last_year = (int) $year - 1;
+        return array(
+
+            // Third quarter of previous year: July 1st to September 30th
+            array(
+                'before' => "{$last_year}-09-30",
+                'after'  => "{$last_year}-07-01",
+            ),
+
+            // Last quarter of previous year: October 1st to December 31st
+            array(
+                'before' => "{$last_year}-12-31",
+                'after'  => "{$last_year}-10-01",
+            ),
+
+            // First quarter: January 1st to March 31st
+            array(
+                'before' => "{$year}-03-31",
+                'after'  => "{$year}-01-01",
+            ),
+
+            // Second quarter: April 1st to June 30th
+            array(
+                'before' => "{$year}-06-30",
+                'after'  => "{$year}-04-01",
+            ),
+
+            // Third quarter: July 1st to September 30th
+            array(
+                'before' => "{$year}-09-30",
+                'after'  => "{$year}-07-01",
+            ),
+
+            // Fourth quarter: October 1st to December 31st
+            array(
+                'before' => "{$year}-12-31",
+                'after'  => "{$year}-10-01",
+            ),
+        );
+    }
+
+    /**
+     * Retrieves the current quater.
+     *
+     * @return int The current quarter.
+     */
+    public function get_quarter() {
+
+        $month    = (int) gmdate( 'n' );
+        $quarters = array( 1, 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4 );
+        return $quarters[ $month - 1 ];
+
+    }
+
+    /**
+     * Retrieves this quarter date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_quarter_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_quarter',
+        );
+
+        // Generate the report.
+        $quarter  = $this->get_quarter();
+        $quarters = $this->get_quarters();
+        return $quarters[ $quarter + 1 ];
+
+    }
+
+    /**
+     * Retrieves last quarter's date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_quarter_date_range() {
+
+        $quarters = $this->get_quarters();
+        $quarter  = $this->get_quarter();
+
+        // Set the previous date range.
+        $this->previous_range = array_merge(
+            $quarters[ $quarter - 1 ],
+            array( 'period' => 'custom' )
+        );
+
+        // Generate the report.
+        return $quarters[ $quarter ];
+
+    }
+
+    /**
+     * Retrieves this year date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_year_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'last_year',
+        );
+
+        // Generate the report.
+        return array(
+            'after'  => gmdate( 'Y-01-01' ),
+            'before' => gmdate( 'Y-12-31' ),
+        );
+
+    }
+
+    /**
+     * Retrieves last year date range.
+     *
+     * @return array The appropriate date range.
+     */
+    public function get_last_year_date_range() {
+
+        // Set the previous date range.
+        $this->previous_range = array(
+            'period' => 'custom',
+            'after'  => gmdate( 'Y-01-01', strtotime( '-2 years' ) ),
+            'before' => gmdate( 'Y-12-31', strtotime( '-2 years' ) ),
+        );
+
+        // Generate the report.
+        return array(
+            'after'  => gmdate( 'Y-01-01', strtotime( 'last year' ) ),
+            'before' => gmdate( 'Y-12-31', strtotime( 'last year' ) ),
+        );
+
+    }
+
+    /**
+     * Prepare a the request date for SQL usage.
+     *
+     * @param WP_REST_Request $request Request object.
+     * @param string $date_field The date field.
+     * @return string The appropriate SQL.
+     */
+    public function get_date_range_sql( $request, $date_field ) {
+        global $wpdb;
+
+        $sql = '1=1';
+        $range = $this->get_date_range( $request );
+
+        if ( ! empty( $range['after'] ) ) {
+            $sql .= ' AND ' . $wpdb->prepare(
+                "$date_field >= %s",
+                $range['after']
+            );
+        }
+
+        if ( ! empty( $range['before'] ) ) {
+            $sql .= ' AND ' . $wpdb->prepare(
+                "$date_field <= %s",
+                $range['before']
+            );
+        }
+
+        return $sql;
+
+    }
+
+    /**
+     * Prepares a group by query.
+     *
+     * @param string $date_field The date field.
+     * @return string The appropriate SQL.
+     */
+    public function get_group_by_sql( $date_field ) {
+
+        if ( 'day' === $this->groupby ) {
+            return "YEAR($date_field), MONTH($date_field), DAY($date_field)";
+        }
+
+        return "YEAR($date_field), MONTH($date_field)";
+    }
+
+    /**
+     * Get the query params for collections.
+     *
+     * @return array
+     */
+    public function get_collection_params() {
+        return array(
+            'context' => $this->get_context_param( array( 'default' => 'view' ) ),
+            'period'  => array(
+                'description'       => __( 'Limit to results of a specific period.', 'invoicing' ),
+                'type'              => 'string',
+                'enum'              => array( 'custom', 'today', 'yesterday', 'week', 'last_week', '7_days', '30_days', '60_days', '90_days', '180_days', 'month', 'last_month', 'quarter', 'last_quarter', 'year', 'last_year', 'quarter', 'last_quarter' ),
+                'validate_callback' => 'rest_validate_request_arg',
+                'sanitize_callback' => 'sanitize_text_field',
+                'default'           => '7_days',
+            ),
+            'after'   => array(
+                /* translators: %s: date format */
+                'description'       => sprintf( __( 'Limit to results after a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+                'type'              => 'string',
+                'validate_callback' => 'rest_validate_request_arg',
+                'sanitize_callback' => 'sanitize_text_field',
+                'default'           => gmdate( 'Y-m-d', strtotime( '-7 days' ) ),
+            ),
+            'before'  => array(
+                /* translators: %s: date format */
+                'description'       => sprintf( __( 'Limit to results before a specific date, the date needs to be in the %s format.', 'invoicing' ), 'YYYY-MM-DD' ),
+                'type'              => 'string',
+                'validate_callback' => 'rest_validate_request_arg',
+                'sanitize_callback' => 'sanitize_text_field',
+                'default'           => gmdate( 'Y-m-d' ),
+            ),
+        );
+    }
 }

includes/payments/class-getpaid-checkout.php

Indentation +310 added lines, -310 removed lines

@@ -12,185 +12,185 @@ 
  */
 class GetPaid_Checkout {
 
-	/**
-	 * @var GetPaid_Payment_Form_Submission
-	 */
-	protected $payment_form_submission;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param GetPaid_Payment_Form_Submission $submission
-	 */
-	public function __construct( $submission ) {
-		$this->payment_form_submission = $submission;
-	}
-
-	/**
-	 * Processes the checkout.
-	 *
-	 */
-	public function process_checkout() {
-
-		// Validate the submission.
-		$this->validate_submission();
-
-		// Prepare the invoice.
-		$items    = $this->get_submission_items();
-		$invoice  = $this->get_submission_invoice();
-		$invoice  = $this->process_submission_invoice( $invoice, $items );
-		$prepared = $this->prepare_submission_data_for_saving();
-
-		$this->prepare_billing_info( $invoice );
-
-		$shipping   = $this->prepare_shipping_info( $invoice );
-
-		// Save the invoice.
-		$invoice->set_is_viewed( true );
-		$invoice->recalculate_total();
+    /**
+     * @var GetPaid_Payment_Form_Submission
+     */
+    protected $payment_form_submission;
+
+    /**
+     * Class constructor.
+     *
+     * @param GetPaid_Payment_Form_Submission $submission
+     */
+    public function __construct( $submission ) {
+        $this->payment_form_submission = $submission;
+    }
+
+    /**
+     * Processes the checkout.
+     *
+     */
+    public function process_checkout() {
+
+        // Validate the submission.
+        $this->validate_submission();
+
+        // Prepare the invoice.
+        $items    = $this->get_submission_items();
+        $invoice  = $this->get_submission_invoice();
+        $invoice  = $this->process_submission_invoice( $invoice, $items );
+        $prepared = $this->prepare_submission_data_for_saving();
+
+        $this->prepare_billing_info( $invoice );
+
+        $shipping   = $this->prepare_shipping_info( $invoice );
+
+        // Save the invoice.
+        $invoice->set_is_viewed( true );
+        $invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+        do_action( 'getpaid_checkout_invoice_updated', $invoice );
 
-		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
-	}
+        // Send to the gateway.
+        $this->post_process_submission( $invoice, $prepared, $shipping );
+    }
 
-	/**
-	 * Validates the submission.
-	 *
-	 */
-	protected function validate_submission() {
+    /**
+     * Validates the submission.
+     *
+     */
+    protected function validate_submission() {
 
-		$submission = $this->payment_form_submission;
-		$data       = $submission->get_data();
+        $submission = $this->payment_form_submission;
+        $data       = $submission->get_data();
 
-		// Do we have an error?
+        // Do we have an error?
         if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+            wp_send_json_error( $submission->last_error );
         }
 
-		// We need a billing email.
+        // We need a billing email.
         if ( ! $submission->has_billing_email() ) {
             wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
-		}
+        }
 
-		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
-		}
+        // Non-recurring gateways should not be allowed to process recurring invoices.
+        if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+        }
 
-		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
-		}
+        // Ensure the gateway is active.
+        if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
+            wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
+        }
 
-		// Clear any existing errors.
-		wpinv_clear_errors();
+        // Clear any existing errors.
+        wpinv_clear_errors();
 
-		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+        // Allow themes and plugins to hook to errors
+        do_action( 'getpaid_checkout_error_checks', $submission );
 
-		// Do we have any errors?
+        // Do we have any errors?
         if ( wpinv_get_errors() ) {
             wp_send_json_error( getpaid_get_errors_html() );
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * Retrieves submission items.
-	 *
-	 * @return GetPaid_Form_Item[]
-	 */
-	protected function get_submission_items() {
+    /**
+     * Retrieves submission items.
+     *
+     * @return GetPaid_Form_Item[]
+     */
+    protected function get_submission_items() {
 
-		$items = $this->payment_form_submission->get_items();
+        $items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
         if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
             wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
-		}
-
-		return $items;
-	}
-
-	/**
-	 * Retrieves submission invoice.
-	 *
-	 * @return WPInv_Invoice
-	 */
-	protected function get_submission_invoice() {
-		$submission = $this->payment_form_submission;
-
-		if ( ! $submission->has_invoice() ) {
-			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
-			return $invoice;
         }
 
-		$invoice = $submission->get_invoice();
+        return $items;
+    }
+
+    /**
+     * Retrieves submission invoice.
+     *
+     * @return WPInv_Invoice
+     */
+    protected function get_submission_invoice() {
+        $submission = $this->payment_form_submission;
 
-		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
-		}
+        if ( ! $submission->has_invoice() ) {
+            $invoice = new WPInv_Invoice();
+            $invoice->set_created_via( 'payment_form' );
+            return $invoice;
+        }
 
-		return $invoice;
-	}
+        $invoice = $submission->get_invoice();
 
-	/**
-	 * Processes the submission invoice.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+        // Make sure that it is neither paid or refunded.
+        if ( $invoice->is_paid() || $invoice->is_refunded() ) {
+            wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+        }
 
-		$submission = $this->payment_form_submission;
+        return $invoice;
+    }
 
-		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_submission_id( $submission->id );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
+    /**
+     * Processes the submission invoice.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    protected function process_submission_invoice( $invoice, $items ) {
+
+        $submission = $this->payment_form_submission;
+
+        // Set-up the invoice details.
+        $invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
+        $invoice->set_user_id( $this->get_submission_customer() );
+        $invoice->set_submission_id( $submission->id );
+        $invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
         $invoice->set_items( $items );
         $invoice->set_fees( $submission->get_fees() );
         $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
-		$invoice->set_currency( $submission->get_currency() );
+        $invoice->set_discounts( $submission->get_discounts() );
+        $invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
+        $invoice->set_currency( $submission->get_currency() );
 
-		if ( $submission->has_shipping() ) {
-			$invoice->set_shipping( $submission->get_shipping() );
-		}
+        if ( $submission->has_shipping() ) {
+            $invoice->set_shipping( $submission->get_shipping() );
+        }
 
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
+        $address_confirmed = $submission->get_field( 'confirm-address' );
+        $invoice->set_address_confirmed( ! empty( $address_confirmed ) );
 
-		if ( $submission->has_discount_code() ) {
+        if ( $submission->has_discount_code() ) {
             $invoice->set_discount_code( $submission->get_discount_code() );
-		}
-
-		getpaid_maybe_add_default_address( $invoice );
-		return $invoice;
-	}
-
-	/**
-	 * Retrieves the submission's customer.
-	 *
-	 * @return int The customer id.
-	 */
-	protected function get_submission_customer() {
-		$submission = $this->payment_form_submission;
-
-		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
-			return $submission->get_invoice()->get_user_id();
-		}
-
-		// (Maybe) create the user.
+        }
+
+        getpaid_maybe_add_default_address( $invoice );
+        return $invoice;
+    }
+
+    /**
+     * Retrieves the submission's customer.
+     *
+     * @return int The customer id.
+     */
+    protected function get_submission_customer() {
+        $submission = $this->payment_form_submission;
+
+        // If this is an existing invoice...
+        if ( $submission->has_invoice() ) {
+            return $submission->get_invoice()->get_user_id();
+        }
+
+        // (Maybe) create the user.
         $user = get_current_user_id();
 
         if ( empty( $user ) ) {
@@ -198,16 +198,16 @@ 
         }
 
         if ( empty( $user ) ) {
-			$name = array( $submission->get_field( 'wpinv_first_name', 'billing' ), $submission->get_field( 'wpinv_last_name', 'billing' ) );
-			$name = implode( '', array_filter( $name ) );
+            $name = array( $submission->get_field( 'wpinv_first_name', 'billing' ), $submission->get_field( 'wpinv_last_name', 'billing' ) );
+            $name = implode( '', array_filter( $name ) );
             $user = wpinv_create_user( $submission->get_billing_email(), $name );
 
-			// (Maybe) send new user notification.
-			$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-			if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ), $user ) ) {
-				wp_send_new_user_notifications( $user, 'user' );
-			}
-		}
+            // (Maybe) send new user notification.
+            $should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
+            if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ), $user ) ) {
+                wp_send_new_user_notifications( $user, 'user' );
+            }
+        }
 
         if ( is_wp_error( $user ) ) {
             wp_send_json_error( $user->get_error_message() );
@@ -215,49 +215,49 @@ 
 
         if ( is_numeric( $user ) ) {
             return $user;
-		}
+        }
 
-		return $user->ID;
+        return $user->ID;
 
-	}
+    }
 
-	/**
+    /**
      * Prepares submission data for saving to the database.
      *
-	 * @return array
+     * @return array
      */
     public function prepare_submission_data_for_saving() {
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Prepared submission details.
+        // Prepared submission details.
         $prepared = array(
-			'all'  => array(),
-			'meta' => array(),
-		);
+            'all'  => array(),
+            'meta' => array(),
+        );
 
         // Raw submission details.
-		$data     = $submission->get_data();
+        $data     = $submission->get_data();
 
-		// Loop through the submitted details.
+        // Loop through the submitted details.
         foreach ( $submission->get_payment_form()->get_elements() as $field ) {
 
-			// Skip premade fields.
+            // Skip premade fields.
             if ( ! empty( $field['premade'] ) ) {
                 continue;
             }
 
-			// Ensure address is provided.
-			if ( 'address' === $field['type'] ) {
+            // Ensure address is provided.
+            if ( 'address' === $field['type'] ) {
                 $address_type = isset( $field['address_type'] ) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
 
-				foreach ( $field['fields'] as $address_field ) {
+                foreach ( $field['fields'] as $address_field ) {
 
-					if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-						wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
-					}
-			}
-		}
+                    if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+                        wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+                    }
+            }
+        }
 
             // If it is required and not set, abort.
             if ( ! $submission->is_required_field_set( $field ) ) {
@@ -267,31 +267,31 @@ 
             // Handle misc fields.
             if ( isset( $data[ $field['id'] ] ) ) {
 
-				// Uploads.
-				if ( 'file_upload' === $field['type'] ) {
-					$max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
+                // Uploads.
+                if ( 'file_upload' === $field['type'] ) {
+                    $max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
 
-					if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
-						wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
-					}
+                    if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
+                        wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
+                    }
 
-					$value = array();
+                    $value = array();
 
-					foreach ( $data[ $field['id'] ] as $url => $name ) {
-						$value[] = sprintf(
-							'<a href="%s" target="_blank">%s</a>',
-							esc_url_raw( $url ),
-							esc_html( $name )
-						);
-					}
+                    foreach ( $data[ $field['id'] ] as $url => $name ) {
+                        $value[] = sprintf(
+                            '<a href="%s" target="_blank">%s</a>',
+                            esc_url_raw( $url ),
+                            esc_html( $name )
+                        );
+                    }
 
-					$value = implode( ' | ', $value );
+                    $value = implode( ' | ', $value );
 
-				} elseif ( 'checkbox' === $field['type'] ) {
-					$value = ! empty( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
-				} else {
-					$value = wp_kses_post( $data[ $field['id'] ] );
-				}
+                } elseif ( 'checkbox' === $field['type'] ) {
+                    $value = ! empty( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
+                } else {
+                    $value = wp_kses_post( $data[ $field['id'] ] );
+                }
 
                 $label = $field['id'];
 
@@ -299,192 +299,192 @@ 
                     $label = $field['label'];
                 }
 
-				if ( ! empty( $field['add_meta'] ) ) {
-					$prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
-				}
-				$prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+                if ( ! empty( $field['add_meta'] ) ) {
+                    $prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+                }
+                $prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
 
             }
-		}
+        }
 
-		return $prepared;
+        return $prepared;
 
-	}
+    }
 
-	/**
+    /**
      * Retrieves address details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
-	 * @param string $type
+     * @return array
+     * @param WPInv_Invoice $invoice
+     * @param string $type
      */
     public function prepare_address_details( $invoice, $type = 'billing' ) {
 
-		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
-		$address  = array();
-		$prepared = array();
+        $data     = $this->payment_form_submission->get_data();
+        $type     = sanitize_key( $type );
+        $address  = array();
+        $prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
-		}
+        if ( ! empty( $data[ $type ] ) ) {
+            $address = $data[ $type ];
+        }
 
-		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key ] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
-		}
+        // Clean address details.
+        foreach ( $address as $key => $value ) {
+            $key             = sanitize_key( $key );
+            $key             = str_replace( 'wpinv_', '', $key );
+            $value           = wpinv_clean( $value );
+            $prepared[ $key ] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+        }
 
-		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+        // Filter address details.
+        $prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
 
-		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+        // Remove non-whitelisted values.
+        return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the billing details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_billing_info( &$invoice ) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+        $billing_address = $this->prepare_address_details( $invoice, 'billing' );
 
-		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+        // Update the invoice with the billing details.
+        $invoice->set_props( $billing_address );
 
-	}
+    }
 
-	/**
+    /**
      * Prepares the shipping details.
      *
-	 * @return array
-	 * @param WPInv_Invoice $invoice
+     * @return array
+     * @param WPInv_Invoice $invoice
      */
     protected function prepare_shipping_info( $invoice ) {
 
-		$data = $this->payment_form_submission->get_data();
+        $data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
-		}
+        if ( empty( $data['same-shipping-address'] ) ) {
+            return $this->prepare_address_details( $invoice, 'shipping' );
+        }
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+        return $this->prepare_address_details( $invoice, 'billing' );
 
-	}
+    }
 
-	/**
-	 * Confirms the submission is valid and send users to the gateway.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param array $prepared_payment_form_data
-	 * @param array $shipping
-	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+    /**
+     * Confirms the submission is valid and send users to the gateway.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param array $prepared_payment_form_data
+     * @param array $shipping
+     */
+    protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
 
-		// Ensure the invoice exists.
+        // Ensure the invoice exists.
         if ( ! $invoice->exists() ) {
             wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
         }
 
-		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
+        // Save payment form data.
+        $prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
         delete_post_meta( $invoice->get_id(), 'payment_form_data' );
-		delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
-		if ( ! empty( $prepared_payment_form_data ) ) {
+        delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
+        if ( ! empty( $prepared_payment_form_data ) ) {
 
-			if ( ! empty( $prepared_payment_form_data['all'] ) ) {
-				update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
-			}
+            if ( ! empty( $prepared_payment_form_data['all'] ) ) {
+                update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
+            }
 
-			if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
-				update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
-			}
-		}
+            if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
+                update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
+            }
+        }
 
-		// Save payment form data.
-		$shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
+        // Save payment form data.
+        $shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
         if ( ! empty( $shipping ) ) {
             update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
-		}
+        }
 
-		// Backwards compatibility.
+        // Backwards compatibility.
         add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
 
-		try {
-			$this->process_payment( $invoice );
-		} catch ( Exception $e ) {
-			wpinv_set_error( 'payment_error', $e->getMessage() );
-		}
+        try {
+            $this->process_payment( $invoice );
+        } catch ( Exception $e ) {
+            wpinv_set_error( 'payment_error', $e->getMessage() );
+        }
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+        wpinv_send_back_to_checkout( $invoice );
 
-	}
+    }
 
-	/**
-	 * Processes the actual payment.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_payment( $invoice ) {
+    /**
+     * Processes the actual payment.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_payment( $invoice ) {
 
-		// Clear any checkout errors.
-		wpinv_clear_errors();
+        // Clear any checkout errors.
+        wpinv_clear_errors();
 
-		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
-		}
+        // No need to send free invoices to the gateway.
+        if ( $invoice->is_free() ) {
+            $this->process_free_payment( $invoice );
+        }
 
-		$submission = $this->payment_form_submission;
+        $submission = $this->payment_form_submission;
 
-		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+        // Fires before sending to the gateway.
+        do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
 
-		// Allow the sumission data to be modified before it is sent to the gateway.
-		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+        // Allow the sumission data to be modified before it is sent to the gateway.
+        $submission_data    = $submission->get_data();
+        $submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
+        $submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
 
-		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency' );
-		}
+        // Validate the currency.
+        if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
+            wpinv_set_error( 'invalid_currency' );
+        }
 
-		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
-		}
+        // Check to see if we have any errors.
+        if ( wpinv_get_errors() ) {
+            wpinv_send_back_to_checkout( $invoice );
+        }
 
-		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+        // Send info to the gateway for payment processing
+        do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
 
-		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+        // Backwards compatibility.
+        wpinv_send_to_gateway( $submission_gateway, $invoice );
 
-	}
+    }
 
-	/**
-	 * Marks the invoice as paid in case the checkout is free.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 */
-	protected function process_free_payment( $invoice ) {
+    /**
+     * Marks the invoice as paid in case the checkout is free.
+     *
+     * @param WPInv_Invoice $invoice
+     */
+    protected function process_free_payment( $invoice ) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
-		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        $invoice->set_gateway( 'none' );
+        $invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+        $invoice->mark_paid();
+        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
 
-	}
+    }
 
-	/**
+    /**
      * Sends a redrect response to payment details.
      *
      */

Spacing +139 added lines, -139 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main Checkout Class.
@@ -22,7 +22,7 @@ 
 	 *
 	 * @param GetPaid_Payment_Form_Submission $submission
 	 */
-	public function __construct( $submission ) {
+	public function __construct($submission) {
 		$this->payment_form_submission = $submission;
 	}
 
@@ -38,22 +38,22 @@ 
 		// Prepare the invoice.
 		$items    = $this->get_submission_items();
 		$invoice  = $this->get_submission_invoice();
-		$invoice  = $this->process_submission_invoice( $invoice, $items );
+		$invoice  = $this->process_submission_invoice($invoice, $items);
 		$prepared = $this->prepare_submission_data_for_saving();
 
-		$this->prepare_billing_info( $invoice );
+		$this->prepare_billing_info($invoice);
 
-		$shipping   = $this->prepare_shipping_info( $invoice );
+		$shipping = $this->prepare_shipping_info($invoice);
 
 		// Save the invoice.
-		$invoice->set_is_viewed( true );
+		$invoice->set_is_viewed(true);
 		$invoice->recalculate_total();
         $invoice->save();
 
-		do_action( 'getpaid_checkout_invoice_updated', $invoice );
+		do_action('getpaid_checkout_invoice_updated', $invoice);
 
 		// Send to the gateway.
-		$this->post_process_submission( $invoice, $prepared, $shipping );
+		$this->post_process_submission($invoice, $prepared, $shipping);
 	}
 
 	/**
@@ -66,34 +66,34 @@ 
 		$data       = $submission->get_data();
 
 		// Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
-			wp_send_json_error( $submission->last_error );
+        if (!empty($submission->last_error)) {
+			wp_send_json_error($submission->last_error);
         }
 
 		// We need a billing email.
-        if ( ! $submission->has_billing_email() ) {
-            wp_send_json_error( __( 'Provide a valid billing email.', 'invoicing' ) );
+        if (!$submission->has_billing_email()) {
+            wp_send_json_error(__('Provide a valid billing email.', 'invoicing'));
 		}
 
 		// Non-recurring gateways should not be allowed to process recurring invoices.
-		if ( $submission->should_collect_payment_details() && $submission->has_recurring && ! wpinv_gateway_support_subscription( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway does not support subscription payments.', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && $submission->has_recurring && !wpinv_gateway_support_subscription($data['wpi-gateway'])) {
+			wp_send_json_error(__('The selected payment gateway does not support subscription payments.', 'invoicing'));
 		}
 
 		// Ensure the gateway is active.
-		if ( $submission->should_collect_payment_details() && ! wpinv_is_gateway_active( $data['wpi-gateway'] ) ) {
-			wp_send_json_error( __( 'The selected payment gateway is not active', 'invoicing' ) );
+		if ($submission->should_collect_payment_details() && !wpinv_is_gateway_active($data['wpi-gateway'])) {
+			wp_send_json_error(__('The selected payment gateway is not active', 'invoicing'));
 		}
 
 		// Clear any existing errors.
 		wpinv_clear_errors();
 
 		// Allow themes and plugins to hook to errors
-		do_action( 'getpaid_checkout_error_checks', $submission );
+		do_action('getpaid_checkout_error_checks', $submission);
 
 		// Do we have any errors?
-        if ( wpinv_get_errors() ) {
-            wp_send_json_error( getpaid_get_errors_html() );
+        if (wpinv_get_errors()) {
+            wp_send_json_error(getpaid_get_errors_html());
 		}
 
 	}
@@ -108,8 +108,8 @@ 
 		$items = $this->payment_form_submission->get_items();
 
         // Ensure that we have items.
-        if ( empty( $items ) && ! $this->payment_form_submission->has_fees() ) {
-            wp_send_json_error( __( 'Please provide at least one item or amount.', 'invoicing' ) );
+        if (empty($items) && !$this->payment_form_submission->has_fees()) {
+            wp_send_json_error(__('Please provide at least one item or amount.', 'invoicing'));
 		}
 
 		return $items;
@@ -123,17 +123,17 @@ 
 	protected function get_submission_invoice() {
 		$submission = $this->payment_form_submission;
 
-		if ( ! $submission->has_invoice() ) {
+		if (!$submission->has_invoice()) {
 			$invoice = new WPInv_Invoice();
-			$invoice->set_created_via( 'payment_form' );
+			$invoice->set_created_via('payment_form');
 			return $invoice;
         }
 
 		$invoice = $submission->get_invoice();
 
 		// Make sure that it is neither paid or refunded.
-		if ( $invoice->is_paid() || $invoice->is_refunded() ) {
-			wp_send_json_error( __( 'This invoice has already been paid for.', 'invoicing' ) );
+		if ($invoice->is_paid() || $invoice->is_refunded()) {
+			wp_send_json_error(__('This invoice has already been paid for.', 'invoicing'));
 		}
 
 		return $invoice;
@@ -146,34 +146,34 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	protected function process_submission_invoice( $invoice, $items ) {
+	protected function process_submission_invoice($invoice, $items) {
 
 		$submission = $this->payment_form_submission;
 
 		// Set-up the invoice details.
-		$invoice->set_email( sanitize_email( $submission->get_billing_email() ) );
-		$invoice->set_user_id( $this->get_submission_customer() );
-		$invoice->set_submission_id( $submission->id );
-		$invoice->set_payment_form( absint( $submission->get_payment_form()->get_id() ) );
-        $invoice->set_items( $items );
-        $invoice->set_fees( $submission->get_fees() );
-        $invoice->set_taxes( $submission->get_taxes() );
-		$invoice->set_discounts( $submission->get_discounts() );
-		$invoice->set_gateway( $submission->get_field( 'wpi-gateway' ) );
-		$invoice->set_currency( $submission->get_currency() );
-
-		if ( $submission->has_shipping() ) {
-			$invoice->set_shipping( $submission->get_shipping() );
+		$invoice->set_email(sanitize_email($submission->get_billing_email()));
+		$invoice->set_user_id($this->get_submission_customer());
+		$invoice->set_submission_id($submission->id);
+		$invoice->set_payment_form(absint($submission->get_payment_form()->get_id()));
+        $invoice->set_items($items);
+        $invoice->set_fees($submission->get_fees());
+        $invoice->set_taxes($submission->get_taxes());
+		$invoice->set_discounts($submission->get_discounts());
+		$invoice->set_gateway($submission->get_field('wpi-gateway'));
+		$invoice->set_currency($submission->get_currency());
+
+		if ($submission->has_shipping()) {
+			$invoice->set_shipping($submission->get_shipping());
 		}
 
-		$address_confirmed = $submission->get_field( 'confirm-address' );
-		$invoice->set_address_confirmed( ! empty( $address_confirmed ) );
+		$address_confirmed = $submission->get_field('confirm-address');
+		$invoice->set_address_confirmed(!empty($address_confirmed));
 
-		if ( $submission->has_discount_code() ) {
-            $invoice->set_discount_code( $submission->get_discount_code() );
+		if ($submission->has_discount_code()) {
+            $invoice->set_discount_code($submission->get_discount_code());
 		}
 
-		getpaid_maybe_add_default_address( $invoice );
+		getpaid_maybe_add_default_address($invoice);
 		return $invoice;
 	}
 
@@ -186,34 +186,34 @@ 
 		$submission = $this->payment_form_submission;
 
 		// If this is an existing invoice...
-		if ( $submission->has_invoice() ) {
+		if ($submission->has_invoice()) {
 			return $submission->get_invoice()->get_user_id();
 		}
 
 		// (Maybe) create the user.
         $user = get_current_user_id();
 
-        if ( empty( $user ) ) {
-            $user = get_user_by( 'email', $submission->get_billing_email() );
+        if (empty($user)) {
+            $user = get_user_by('email', $submission->get_billing_email());
         }
 
-        if ( empty( $user ) ) {
-			$name = array( $submission->get_field( 'wpinv_first_name', 'billing' ), $submission->get_field( 'wpinv_last_name', 'billing' ) );
-			$name = implode( '', array_filter( $name ) );
-            $user = wpinv_create_user( $submission->get_billing_email(), $name );
+        if (empty($user)) {
+			$name = array($submission->get_field('wpinv_first_name', 'billing'), $submission->get_field('wpinv_last_name', 'billing'));
+			$name = implode('', array_filter($name));
+            $user = wpinv_create_user($submission->get_billing_email(), $name);
 
 			// (Maybe) send new user notification.
-			$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-			if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ), $user ) ) {
-				wp_send_new_user_notifications( $user, 'user' );
+			$should_send_notification = wpinv_get_option('disable_new_user_emails');
+			if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification), $user)) {
+				wp_send_new_user_notifications($user, 'user');
 			}
 		}
 
-        if ( is_wp_error( $user ) ) {
-            wp_send_json_error( $user->get_error_message() );
+        if (is_wp_error($user)) {
+            wp_send_json_error($user->get_error_message());
         }
 
-        if ( is_numeric( $user ) ) {
+        if (is_numeric($user)) {
             return $user;
 		}
 
@@ -237,72 +237,72 @@ 
 		);
 
         // Raw submission details.
-		$data     = $submission->get_data();
+		$data = $submission->get_data();
 
 		// Loop through the submitted details.
-        foreach ( $submission->get_payment_form()->get_elements() as $field ) {
+        foreach ($submission->get_payment_form()->get_elements() as $field) {
 
 			// Skip premade fields.
-            if ( ! empty( $field['premade'] ) ) {
+            if (!empty($field['premade'])) {
                 continue;
             }
 
 			// Ensure address is provided.
-			if ( 'address' === $field['type'] ) {
-                $address_type = isset( $field['address_type'] ) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
+			if ('address' === $field['type']) {
+                $address_type = isset($field['address_type']) && 'shipping' === $field['address_type'] ? 'shipping' : 'billing';
 
-				foreach ( $field['fields'] as $address_field ) {
+				foreach ($field['fields'] as $address_field) {
 
-					if ( ! empty( $address_field['visible'] ) && ! empty( $address_field['required'] ) && '' === trim( $_POST[ $address_type ][ $address_field['name'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
-						wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+					if (!empty($address_field['visible']) && !empty($address_field['required']) && '' === trim($_POST[$address_type][$address_field['name']])) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
+						wp_send_json_error(__('Please fill all required fields.', 'invoicing'));
 					}
 			}
 		}
 
             // If it is required and not set, abort.
-            if ( ! $submission->is_required_field_set( $field ) ) {
-                wp_send_json_error( __( 'Please fill all required fields.', 'invoicing' ) );
+            if (!$submission->is_required_field_set($field)) {
+                wp_send_json_error(__('Please fill all required fields.', 'invoicing'));
             }
 
             // Handle misc fields.
-            if ( isset( $data[ $field['id'] ] ) ) {
+            if (isset($data[$field['id']])) {
 
 				// Uploads.
-				if ( 'file_upload' === $field['type'] ) {
-					$max_file_num = empty( $field['max_file_num'] ) ? 1 : absint( $field['max_file_num'] );
+				if ('file_upload' === $field['type']) {
+					$max_file_num = empty($field['max_file_num']) ? 1 : absint($field['max_file_num']);
 
-					if ( count( $data[ $field['id'] ] ) > $max_file_num ) {
-						wp_send_json_error( __( 'Maximum number of allowed files exceeded.', 'invoicing' ) );
+					if (count($data[$field['id']]) > $max_file_num) {
+						wp_send_json_error(__('Maximum number of allowed files exceeded.', 'invoicing'));
 					}
 
 					$value = array();
 
-					foreach ( $data[ $field['id'] ] as $url => $name ) {
+					foreach ($data[$field['id']] as $url => $name) {
 						$value[] = sprintf(
 							'<a href="%s" target="_blank">%s</a>',
-							esc_url_raw( $url ),
-							esc_html( $name )
+							esc_url_raw($url),
+							esc_html($name)
 						);
 					}
 
-					$value = implode( ' | ', $value );
+					$value = implode(' | ', $value);
 
-				} elseif ( 'checkbox' === $field['type'] ) {
-					$value = ! empty( $data[ $field['id'] ] ) ? __( 'Yes', 'invoicing' ) : __( 'No', 'invoicing' );
+				} elseif ('checkbox' === $field['type']) {
+					$value = !empty($data[$field['id']]) ? __('Yes', 'invoicing') : __('No', 'invoicing');
 				} else {
-					$value = wp_kses_post( $data[ $field['id'] ] );
+					$value = wp_kses_post($data[$field['id']]);
 				}
 
                 $label = $field['id'];
 
-                if ( isset( $field['label'] ) ) {
+                if (isset($field['label'])) {
                     $label = $field['label'];
                 }
 
-				if ( ! empty( $field['add_meta'] ) ) {
-					$prepared['meta'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+				if (!empty($field['add_meta'])) {
+					$prepared['meta'][wpinv_clean($label)] = wp_kses_post_deep($value);
 				}
-				$prepared['all'][ wpinv_clean( $label ) ] = wp_kses_post_deep( $value );
+				$prepared['all'][wpinv_clean($label)] = wp_kses_post_deep($value);
 
             }
 		}
@@ -318,30 +318,30 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @param string $type
      */
-    public function prepare_address_details( $invoice, $type = 'billing' ) {
+    public function prepare_address_details($invoice, $type = 'billing') {
 
 		$data     = $this->payment_form_submission->get_data();
-		$type     = sanitize_key( $type );
+		$type     = sanitize_key($type);
 		$address  = array();
 		$prepared = array();
 
-		if ( ! empty( $data[ $type ] ) ) {
-			$address = $data[ $type ];
+		if (!empty($data[$type])) {
+			$address = $data[$type];
 		}
 
 		// Clean address details.
-		foreach ( $address as $key => $value ) {
-			$key             = sanitize_key( $key );
-			$key             = str_replace( 'wpinv_', '', $key );
-			$value           = wpinv_clean( $value );
-			$prepared[ $key ] = apply_filters( "getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice );
+		foreach ($address as $key => $value) {
+			$key             = sanitize_key($key);
+			$key             = str_replace('wpinv_', '', $key);
+			$value           = wpinv_clean($value);
+			$prepared[$key] = apply_filters("getpaid_checkout_{$type}_address_$key", $value, $this->payment_form_submission, $invoice);
 		}
 
 		// Filter address details.
-		$prepared = apply_filters( "getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice );
+		$prepared = apply_filters("getpaid_checkout_{$type}_address", $prepared, $this->payment_form_submission, $invoice);
 
 		// Remove non-whitelisted values.
-		return array_filter( $prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY );
+		return array_filter($prepared, 'getpaid_is_address_field_whitelisted', ARRAY_FILTER_USE_KEY);
 
 	}
 
@@ -351,12 +351,12 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_billing_info( &$invoice ) {
+    protected function prepare_billing_info(&$invoice) {
 
-		$billing_address = $this->prepare_address_details( $invoice, 'billing' );
+		$billing_address = $this->prepare_address_details($invoice, 'billing');
 
 		// Update the invoice with the billing details.
-		$invoice->set_props( $billing_address );
+		$invoice->set_props($billing_address);
 
 	}
 
@@ -366,15 +366,15 @@ 
 	 * @return array
 	 * @param WPInv_Invoice $invoice
      */
-    protected function prepare_shipping_info( $invoice ) {
+    protected function prepare_shipping_info($invoice) {
 
 		$data = $this->payment_form_submission->get_data();
 
-		if ( empty( $data['same-shipping-address'] ) ) {
-			return $this->prepare_address_details( $invoice, 'shipping' );
+		if (empty($data['same-shipping-address'])) {
+			return $this->prepare_address_details($invoice, 'shipping');
 		}
 
-		return $this->prepare_address_details( $invoice, 'billing' );
+		return $this->prepare_address_details($invoice, 'billing');
 
 	}
 
@@ -385,45 +385,45 @@ 
 	 * @param array $prepared_payment_form_data
 	 * @param array $shipping
 	 */
-	protected function post_process_submission( $invoice, $prepared_payment_form_data, $shipping ) {
+	protected function post_process_submission($invoice, $prepared_payment_form_data, $shipping) {
 
 		// Ensure the invoice exists.
-        if ( ! $invoice->exists() ) {
-            wp_send_json_error( __( 'An error occured while saving your invoice. Please try again.', 'invoicing' ) );
+        if (!$invoice->exists()) {
+            wp_send_json_error(__('An error occured while saving your invoice. Please try again.', 'invoicing'));
         }
 
 		// Save payment form data.
-		$prepared_payment_form_data = apply_filters( 'getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice );
-        delete_post_meta( $invoice->get_id(), 'payment_form_data' );
-		delete_post_meta( $invoice->get_id(), 'additional_meta_data' );
-		if ( ! empty( $prepared_payment_form_data ) ) {
+		$prepared_payment_form_data = apply_filters('getpaid_prepared_payment_form_data', $prepared_payment_form_data, $invoice);
+        delete_post_meta($invoice->get_id(), 'payment_form_data');
+		delete_post_meta($invoice->get_id(), 'additional_meta_data');
+		if (!empty($prepared_payment_form_data)) {
 
-			if ( ! empty( $prepared_payment_form_data['all'] ) ) {
-				update_post_meta( $invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all'] );
+			if (!empty($prepared_payment_form_data['all'])) {
+				update_post_meta($invoice->get_id(), 'payment_form_data', $prepared_payment_form_data['all']);
 			}
 
-			if ( ! empty( $prepared_payment_form_data['meta'] ) ) {
-				update_post_meta( $invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta'] );
+			if (!empty($prepared_payment_form_data['meta'])) {
+				update_post_meta($invoice->get_id(), 'additional_meta_data', $prepared_payment_form_data['meta']);
 			}
 		}
 
 		// Save payment form data.
-		$shipping = apply_filters( 'getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission );
-        if ( ! empty( $shipping ) ) {
-            update_post_meta( $invoice->get_id(), 'shipping_address', $shipping );
+		$shipping = apply_filters('getpaid_checkout_shipping_details', $shipping, $this->payment_form_submission);
+        if (!empty($shipping)) {
+            update_post_meta($invoice->get_id(), 'shipping_address', $shipping);
 		}
 
 		// Backwards compatibility.
-        add_filter( 'wp_redirect', array( $this, 'send_redirect_response' ) );
+        add_filter('wp_redirect', array($this, 'send_redirect_response'));
 
 		try {
-			$this->process_payment( $invoice );
-		} catch ( Exception $e ) {
-			wpinv_set_error( 'payment_error', $e->getMessage() );
+			$this->process_payment($invoice);
+		} catch (Exception $e) {
+			wpinv_set_error('payment_error', $e->getMessage());
 		}
 
         // If we are here, there was an error.
-		wpinv_send_back_to_checkout( $invoice );
+		wpinv_send_back_to_checkout($invoice);
 
 	}
 
@@ -432,41 +432,41 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_payment( $invoice ) {
+	protected function process_payment($invoice) {
 
 		// Clear any checkout errors.
 		wpinv_clear_errors();
 
 		// No need to send free invoices to the gateway.
-		if ( $invoice->is_free() ) {
-			$this->process_free_payment( $invoice );
+		if ($invoice->is_free()) {
+			$this->process_free_payment($invoice);
 		}
 
 		$submission = $this->payment_form_submission;
 
 		// Fires before sending to the gateway.
-		do_action( 'getpaid_checkout_before_gateway', $invoice, $submission );
+		do_action('getpaid_checkout_before_gateway', $invoice, $submission);
 
 		// Allow the sumission data to be modified before it is sent to the gateway.
 		$submission_data    = $submission->get_data();
-		$submission_gateway = apply_filters( 'getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice );
-		$submission_data    = apply_filters( 'getpaid_gateway_submission_data', $submission_data, $submission, $invoice );
+		$submission_gateway = apply_filters('getpaid_gateway_submission_gateway', $invoice->get_gateway(), $submission, $invoice);
+		$submission_data    = apply_filters('getpaid_gateway_submission_data', $submission_data, $submission, $invoice);
 
 		// Validate the currency.
-		if ( ! apply_filters( "getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency() ) ) {
-			wpinv_set_error( 'invalid_currency' );
+		if (!apply_filters("getpaid_gateway_{$submission_gateway}_is_valid_for_currency", true, $invoice->get_currency())) {
+			wpinv_set_error('invalid_currency');
 		}
 
 		// Check to see if we have any errors.
-		if ( wpinv_get_errors() ) {
-			wpinv_send_back_to_checkout( $invoice );
+		if (wpinv_get_errors()) {
+			wpinv_send_back_to_checkout($invoice);
 		}
 
 		// Send info to the gateway for payment processing
-		do_action( "getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission );
+		do_action("getpaid_gateway_$submission_gateway", $invoice, $submission_data, $submission);
 
 		// Backwards compatibility.
-		wpinv_send_to_gateway( $submission_gateway, $invoice );
+		wpinv_send_to_gateway($submission_gateway, $invoice);
 
 	}
 
@@ -475,12 +475,12 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice
 	 */
-	protected function process_free_payment( $invoice ) {
+	protected function process_free_payment($invoice) {
 
-		$invoice->set_gateway( 'none' );
-		$invoice->add_note( __( "This is a free invoice and won't be sent to the payment gateway", 'invoicing' ), false, false, true );
+		$invoice->set_gateway('none');
+		$invoice->add_note(__("This is a free invoice and won't be sent to the payment gateway", 'invoicing'), false, false, true);
 		$invoice->mark_paid();
-		wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+		wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
 	}
 
@@ -488,9 +488,9 @@ 
      * Sends a redrect response to payment details.
      *
      */
-    public function send_redirect_response( $url ) {
-        $url = rawurlencode( $url );
-        wp_send_json_success( $url );
+    public function send_redirect_response($url) {
+        $url = rawurlencode($url);
+        wp_send_json_success($url);
     }
 
 }

includes/admin/register-settings.php

Indentation +369 added lines, -369 removed lines

@@ -25,8 +25,8 @@ 
                     $defaults[ $key ] = $setting['std'];
                 }
             }
-		}
-	}
+        }
+    }
 
     return $defaults;
 
@@ -144,7 +144,7 @@ 
  *
  */
 function wpinv_register_settings() {
-	do_action( 'getpaid_before_register_settings' );
+    do_action( 'getpaid_before_register_settings' );
 
     // Loop through all tabs.
     foreach ( wpinv_get_registered_settings() as $tab => $sections ) {
@@ -159,7 +159,7 @@ 
                 $settings = $sections;
             }
 
-			do_action( "getpaid_register_{$tab}_{$section}" );
+            do_action( "getpaid_register_{$tab}_{$section}" );
 
             // Register the setting section.
             add_settings_section(
@@ -180,7 +180,7 @@ 
     // Creates our settings in the options table.
     register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
 
-	do_action( 'getpaid_after_register_settings' );
+    do_action( 'getpaid_after_register_settings' );
 }
 add_action( 'admin_init', 'wpinv_register_settings' );
 
@@ -197,13 +197,13 @@ 
     $name       = isset( $option['name'] ) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+    $is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
-		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
-	}
+    if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
+        $tip   = wpinv_clean( $option['desc'] );
+        $name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
+        unset( $option['desc'] );
+    }
 
     // Loop through all tabs.
     add_settings_field(
@@ -230,9 +230,9 @@ 
             'faux'            => isset( $option['faux'] ) ? $option['faux'] : false,
             'onchange'        => isset( $option['onchange'] ) ? $option['onchange'] : '',
             'custom'          => isset( $option['custom'] ) ? $option['custom'] : '',
-			'default_content' => isset( $option['default_content'] ) ? $option['default_content'] : '',
-			'class'           => isset( $option['class'] ) ? $option['class'] : '',
-			'style'           => isset( $option['style'] ) ? $option['style'] : '',
+            'default_content' => isset( $option['default_content'] ) ? $option['default_content'] : '',
+            'class'           => isset( $option['class'] ) ? $option['class'] : '',
+            'style'           => isset( $option['style'] ) ? $option['style'] : '',
             'cols'            => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
             'rows'            => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
@@ -246,7 +246,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+    return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
 }
 
 /**
@@ -265,18 +265,18 @@ 
  */
 function wpinv_settings_sanitize( $input = array() ) {
 
-	$wpinv_options = wpinv_get_options();
-	$raw_referrer  = wp_get_raw_referer();
+    $wpinv_options = wpinv_get_options();
+    $raw_referrer  = wp_get_raw_referer();
 
     if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+        return array_merge( $wpinv_options, $input );
     }
 
     wp_parse_str( $raw_referrer, $referrer );
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
-	}
+    if ( in_array( 'gp-setup', $referrer ) ) {
+        return array_merge( $wpinv_options, $input );
+    }
 
     $settings = wpinv_get_registered_settings();
     $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
@@ -298,10 +298,10 @@ 
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+        $input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
 
-		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+        // Key specific filter.
+        $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
@@ -344,14 +344,14 @@ 
 
     foreach ( $new_rates as $rate ) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
-		$tax_rates[]     = $rate;
+        $rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
+        $rate['name']    = sanitize_text_field( $rate['name'] );
+        $rate['state']   = sanitize_text_field( $rate['state'] );
+        $rate['country'] = sanitize_text_field( $rate['country'] );
+        $rate['global']  = empty( $rate['state'] );
+        $tax_rates[]     = $rate;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rates', $tax_rates );
 
@@ -364,21 +364,21 @@ 
         return $input;
     }
 
-	if ( empty( $_POST['wpinv_tax_rules_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules' ) ) {
-		return $input;
-	}
+    if ( empty( $_POST['wpinv_tax_rules_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules' ) ) {
+        return $input;
+    }
 
     $new_rules = ! empty( $_POST['tax_rules'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rules'] ) ) : array();
     $tax_rules = array();
 
     foreach ( $new_rules as $rule ) {
 
-		$rule['key']      = sanitize_title_with_dashes( $rule['key'] );
-		$rule['label']    = sanitize_text_field( $rule['label'] );
-		$rule['tax_base'] = sanitize_text_field( $rule['tax_base'] );
-		$tax_rules[]      = $rule;
+        $rule['key']      = sanitize_title_with_dashes( $rule['key'] );
+        $rule['label']    = sanitize_text_field( $rule['label'] );
+        $rule['tax_base'] = sanitize_text_field( $rule['tax_base'] );
+        $tax_rules[]      = $rule;
 
-	}
+    }
 
     update_option( 'wpinv_tax_rules', $tax_rules );
 
@@ -391,11 +391,11 @@ 
     $tabs['general']  = __( 'General', 'invoicing' );
     $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
     $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['emails']   = __( 'Emails', 'invoicing' );
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
-	}
+    if ( count( getpaid_get_integration_settings() ) > 0 ) {
+        $tabs['integrations'] = __( 'Integrations', 'invoicing' );
+    }
 
     $tabs['privacy']  = __( 'Privacy', 'invoicing' );
     $tabs['misc']     = __( 'Misc', 'invoicing' );
@@ -426,53 +426,53 @@ 
         'general'      => apply_filters(
             'wpinv_settings_sections_general',
             array(
-				'main'             => __( 'General Settings', 'invoicing' ),
-				'page_section'     => __( 'Page Settings', 'invoicing' ),
-				'currency_section' => __( 'Currency Settings', 'invoicing' ),
-				'labels'           => __( 'Label Texts', 'invoicing' ),
+                'main'             => __( 'General Settings', 'invoicing' ),
+                'page_section'     => __( 'Page Settings', 'invoicing' ),
+                'currency_section' => __( 'Currency Settings', 'invoicing' ),
+                'labels'           => __( 'Label Texts', 'invoicing' ),
             )
         ),
         'gateways'     => apply_filters(
             'wpinv_settings_sections_gateways',
             array(
-				'main' => __( 'Gateway Settings', 'invoicing' ),
+                'main' => __( 'Gateway Settings', 'invoicing' ),
             )
         ),
         'taxes'        => apply_filters(
             'wpinv_settings_sections_taxes',
             array(
-				'main'  => __( 'Tax Settings', 'invoicing' ),
-				'rules' => __( 'Tax Rules', 'invoicing' ),
-				'rates' => __( 'Tax Rates', 'invoicing' ),
-				'vat'   => __( 'EU VAT Settings', 'invoicing' ),
+                'main'  => __( 'Tax Settings', 'invoicing' ),
+                'rules' => __( 'Tax Rules', 'invoicing' ),
+                'rates' => __( 'Tax Rates', 'invoicing' ),
+                'vat'   => __( 'EU VAT Settings', 'invoicing' ),
             )
         ),
         'emails'       => apply_filters(
             'wpinv_settings_sections_emails',
             array(
-				'main' => __( 'Email Settings', 'invoicing' ),
+                'main' => __( 'Email Settings', 'invoicing' ),
             )
         ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+        'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
 
         'privacy'      => apply_filters(
             'wpinv_settings_sections_privacy',
             array(
-				'main' => __( 'Privacy policy', 'invoicing' ),
+                'main' => __( 'Privacy policy', 'invoicing' ),
             )
         ),
         'misc'         => apply_filters(
             'wpinv_settings_sections_misc',
             array(
-				'main'       => __( 'Miscellaneous', 'invoicing' ),
-				'custom-css' => __( 'Custom CSS', 'invoicing' ),
+                'main'       => __( 'Miscellaneous', 'invoicing' ),
+                'custom-css' => __( 'Custom CSS', 'invoicing' ),
             )
         ),
         'tools'        => apply_filters(
             'wpinv_settings_sections_tools',
             array(
-				'main' => __( 'Diagnostic Tools', 'invoicing' ),
+                'main' => __( 'Diagnostic Tools', 'invoicing' ),
             )
         ),
     );
@@ -483,46 +483,46 @@ 
 }
 
 function wpinv_get_pages( $with_slug = false, $default_label = null ) {
-	$pages_options = array();
+    $pages_options = array();
 
-	if ( $default_label !== null && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
-	}
+    if ( $default_label !== null && $default_label !== false ) {
+        $pages_options = array( '' => $default_label ); // Blank option
+    }
 
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
             $pages_options[ $page->ID ] = $title;
-		}
-	}
+        }
+    }
 
-	return $pages_options;
+    return $pages_options;
 }
 
 function wpinv_header_callback( $args ) {
-	if ( ! empty( $args['desc'] ) ) {
+    if ( ! empty( $args['desc'] ) ) {
         echo wp_kses_post( $args['desc'] );
     }
 }
 
 function wpinv_hidden_callback( $args ) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	if ( isset( $args['set_value'] ) ) {
-		$value = $args['set_value'];
-	}
+    if ( isset( $args['set_value'] ) ) {
+        $value = $args['set_value'];
+    }
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$name  = '';
-	} else {
-		$name = 'wpinv_settings[' . esc_attr( $args['id'] ) . ']';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $name  = '';
+    } else {
+        $name = 'wpinv_settings[' . esc_attr( $args['id'] ) . ']';
+    }
 
-	echo '<input type="hidden" id="wpinv_settings[' . esc_attr( $args['id'] ) . ']" name="' . esc_attr( $name ) . '" value="' . esc_attr( stripslashes( $value ) ) . '" />';
+    echo '<input type="hidden" id="wpinv_settings[' . esc_attr( $args['id'] ) . ']" name="' . esc_attr( $name ) . '" value="' . esc_attr( stripslashes( $value ) ) . '" />';
 
 }
 
@@ -531,12 +531,12 @@ 
  */
 function wpinv_checkbox_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    $id  = esc_attr( $args['id'] );
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
-	?>
+    getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+    ?>
 		<label>
 			<input id="wpinv-settings-<?php echo esc_attr( $id ); ?>" name="wpinv_settings[<?php echo esc_attr( $id ); ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox" />
 			<?php echo wp_kses_post( $args['desc'] ); ?>
@@ -546,75 +546,75 @@ 
 
 function wpinv_multicheck_callback( $args ) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+    if ( ! empty( $args['options'] ) ) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+        $std     = isset( $args['std'] ) ? $args['std'] : array();
+        $value   = wpinv_get_option( $args['id'], $std );
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr( $sanitize_id . $class ) . '">';
+        echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr( $sanitize_id . $class ) . '">';
         foreach ( $args['options'] as $key => $option ) :
-			$sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
-			if ( in_array( $sanitize_key, $value ) ) {
-				$enabled = $sanitize_key;
-			} else {
-				$enabled = null;
-			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']">' . wp_kses_post( $option ) . '</label></div>';
-		endforeach;
-		echo '</div>';
-		echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            $sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
+            if ( in_array( $sanitize_key, $value ) ) {
+                $enabled = $sanitize_key;
+            } else {
+                $enabled = null;
+            }
+            echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
+            echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']">' . wp_kses_post( $option ) . '</label></div>';
+        endforeach;
+        echo '</div>';
+        echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 function wpinv_payment_icons_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false );
+    $value   = wpinv_get_option( $args['id'], false );
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach ( $args['options'] as $key => $option ) {
+    if ( ! empty( $args['options'] ) ) {
+        foreach ( $args['options'] as $key => $option ) {
             $sanitize_key = wpinv_sanitize_key( $key );
 
-			if ( empty( $value ) ) {
-				$enabled = $option;
-			} else {
-				$enabled = null;
-			}
-
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
-
-				echo '<input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
-
-				if ( wpinv_string_is_image_url( $key ) ) {
-				echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				} else {
-				$card = strtolower( str_replace( ' ', '', $option ) );
-
-				if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-					$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
-					} else {
-					$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
-					$content_dir = WP_CONTENT_DIR;
-
-					if ( function_exists( 'wp_normalize_path' ) ) {
-						// Replaces backslashes with forward slashes for Windows systems
-						$image = wp_normalize_path( $image );
-						$content_dir = wp_normalize_path( $content_dir );
-						}
-
-					$image = str_replace( $content_dir, content_url(), $image );
-					}
-
-				echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
-				}
-			echo wp_kses_post( $option ) . '</label>';
-		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
-	}
+            if ( empty( $value ) ) {
+                $enabled = $option;
+            } else {
+                $enabled = null;
+            }
+
+            echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+
+                echo '<input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+
+                if ( wpinv_string_is_image_url( $key ) ) {
+                echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                } else {
+                $card = strtolower( str_replace( ' ', '', $option ) );
+
+                if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
+                    $image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+                    } else {
+                    $image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+                    $content_dir = WP_CONTENT_DIR;
+
+                    if ( function_exists( 'wp_normalize_path' ) ) {
+                        // Replaces backslashes with forward slashes for Windows systems
+                        $image = wp_normalize_path( $image );
+                        $content_dir = wp_normalize_path( $content_dir );
+                        }
+
+                    $image = str_replace( $content_dir, content_url(), $image );
+                    }
+
+                echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+                }
+            echo wp_kses_post( $option ) . '</label>';
+        }
+        echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+    }
 }
 
 /**
@@ -622,9 +622,9 @@ 
  */
 function wpinv_radio_callback( $args ) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	?>
+    $std = isset( $args['std'] ) ? $args['std'] : '';
+    $std = wpinv_get_option( $args['id'], $std );
+    ?>
 		<fieldset>
 			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
 				<?php foreach ( $args['options'] as $key => $option ) : ?>
@@ -638,7 +638,7 @@ 
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+    getpaid_settings_description_callback( $args );
 }
 
 /**
@@ -646,10 +646,10 @@ 
  */
 function getpaid_settings_description_callback( $args ) {
 
-	if ( ! empty( $args['desc'] ) ) {
-		$description = $args['desc'];
-		echo wp_kses_post( "<p class='description'>$description</p>" );
-	}
+    if ( ! empty( $args['desc'] ) ) {
+        $description = $args['desc'];
+        echo wp_kses_post( "<p class='description'>$description</p>" );
+    }
 
 }
 
@@ -658,7 +658,7 @@ 
  */
 function wpinv_gateways_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -672,26 +672,26 @@ 
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
     $class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	echo '<select name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" class="' . esc_attr( $class ) . '" >';
+    echo '<select name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" class="' . esc_attr( $class ) . '" >';
 
-	foreach ( $args['options'] as $key => $option ) :
+    foreach ( $args['options'] as $key => $option ) :
 
-		echo '<option value="' . esc_attr( $key ) . '" ';
+        echo '<option value="' . esc_attr( $key ) . '" ';
 
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
+        if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
             selected( $key, $args['selected'] );
         } else {
             selected( $key, $value );
         }
 
-		echo '>' . esc_html( $option['admin_label'] ) . '</option>';
-	endforeach;
+        echo '>' . esc_html( $option['admin_label'] ) . '</option>';
+    endforeach;
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 }
 
 /**
@@ -702,38 +702,38 @@ 
  */
 function wpinv_settings_attrs_helper( $args ) {
 
-	$value = isset( $args['std'] ) ? $args['std'] : '';
-	$id    = esc_attr( $args['id'] );
-	$value = is_scalar( $value ) ? $value : '';
-
-	$attrs = array(
-		'name'     => ! empty( $args['faux'] ) ? false : "wpinv_settings[$id]",
-		'readonly' => ! empty( $args['faux'] ),
-		'value'    => ! empty( $args['faux'] ) ? $value : wpinv_get_option( $args['id'], $value ),
-		'id'       => 'wpinv-settings-' . $args['id'],
-		'style'    => $args['style'],
-		'class'    => $args['class'],
-		'placeholder' => $args['placeholder'],
-		'data-placeholder' => $args['placeholder'],
-	);
+    $value = isset( $args['std'] ) ? $args['std'] : '';
+    $id    = esc_attr( $args['id'] );
+    $value = is_scalar( $value ) ? $value : '';
+
+    $attrs = array(
+        'name'     => ! empty( $args['faux'] ) ? false : "wpinv_settings[$id]",
+        'readonly' => ! empty( $args['faux'] ),
+        'value'    => ! empty( $args['faux'] ) ? $value : wpinv_get_option( $args['id'], $value ),
+        'id'       => 'wpinv-settings-' . $args['id'],
+        'style'    => $args['style'],
+        'class'    => $args['class'],
+        'placeholder' => $args['placeholder'],
+        'data-placeholder' => $args['placeholder'],
+    );
 
-	if ( ! empty( $args['onchange'] ) ) {
-		$attrs['onchange'] = $args['onchange'];
-	}
+    if ( ! empty( $args['onchange'] ) ) {
+        $attrs['onchange'] = $args['onchange'];
+    }
 
-	foreach ( $attrs as $key => $value ) {
+    foreach ( $attrs as $key => $value ) {
 
-		if ( false === $value ) {
-			continue;
-		}
+        if ( false === $value ) {
+            continue;
+        }
 
-		if ( true === $value ) {
-			echo ' ' . esc_attr( $key );
-		} else {
-			echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
-		}
+        if ( true === $value ) {
+            echo ' ' . esc_attr( $key );
+        } else {
+            echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+        }
 
-	}
+    }
 
 }
 
@@ -742,7 +742,7 @@ 
  */
 function wpinv_text_callback( $args ) {
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="text" <?php wpinv_settings_attrs_helper( $args ); ?>>
 			<?php getpaid_settings_description_callback( $args ); ?>
@@ -756,7 +756,7 @@ 
  */
 function wpinv_number_callback( $args ) {
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<input type="number" step="<?php echo esc_attr( $args['step'] ); ?>" max="<?php echo intval( $args['max'] ); ?>" min="<?php echo intval( $args['min'] ); ?>" <?php wpinv_settings_attrs_helper( $args ); ?>>
 			<?php getpaid_settings_description_callback( $args ); ?>
@@ -768,34 +768,34 @@ 
 function wpinv_textarea_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
     $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
 
-	echo '<textarea class="' . esc_attr( $class ) . ' txtarea-' . esc_attr( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . esc_attr( $args['cols'] ) . '" rows="' . esc_attr( $args['rows'] ) . '" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	echo '<br /><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '<textarea class="' . esc_attr( $class ) . ' txtarea-' . esc_attr( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . esc_attr( $args['cols'] ) . '" rows="' . esc_attr( $args['rows'] ) . '" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    echo '<br /><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_password_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="password" class="' . esc_attr( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    echo '<input type="password" class="' . esc_attr( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_missing_callback( $args ) {
-	printf(
-		esc_html__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . esc_html( $args['id'] ) . '</strong>'
-	);
+    printf(
+        esc_html__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
+        '<strong>' . esc_html( $args['id'] ) . '</strong>'
+    );
 }
 
 /**
@@ -803,13 +803,13 @@ 
  */
 function wpinv_select_callback( $args ) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+    $desc   = wp_kses_post( $args['desc'] );
+    $desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
+    $value  = isset( $args['std'] ) ? $args['std'] : '';
+    $value  = wpinv_get_option( $args['id'], $value );
+    $rand   = uniqid( 'random_id' );
 
-	?>
+    ?>
 		<label style="width: 100%;">
 			<select <?php wpinv_settings_attrs_helper( $args ); ?> data-allow-clear="true">
 				<?php foreach ( $args['options'] as $option => $name ) : ?>
@@ -842,50 +842,50 @@ 
 function wpinv_color_select_callback( $args ) {
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+    echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $color['label'] ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $color ) {
+        echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $color['label'] ) . '</option>';
+    }
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_rich_editor_callback( $args ) {
-	global $wp_version;
+    global $wp_version;
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
-		$value = $std;
-	}
+    if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+        $value = $std;
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	echo '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
-		wp_editor(
+    echo '<div class="getpaid-settings-editor-input">';
+    if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+        wp_editor(
             stripslashes( $value ),
             'wpinv_settings_' . esc_attr( $args['id'] ),
             array(
-				'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']',
-				'textarea_rows' => absint( $rows ),
-				'media_buttons' => false,
+                'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']',
+                'textarea_rows' => absint( $rows ),
+                'media_buttons' => false,
             )
         );
-	} else {
-		echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	}
+    } else {
+        echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    }
 
-	echo '</div><br/><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</div><br/><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
@@ -893,51 +893,51 @@ 
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__( 'Upload File', 'invoicing' ) . '"/></span>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    echo '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__( 'Upload File', 'invoicing' ) . '"/></span>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_color_callback( $args ) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
+    $std         = isset( $args['std'] ) ? $args['std'] : '';
+    $value       = wpinv_get_option( $args['id'], $std );
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
 function wpinv_country_states_callback( $args ) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $std     = isset( $args['std'] ) ? $args['std'] : '';
+    $value   = wpinv_get_option( $args['id'], $std );
 
     $sanitize_id = wpinv_sanitize_key( $args['id'] );
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$states = wpinv_get_country_states();
+    $states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? 'wpinv-no-states' : 'wpi_select2';
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="' . esc_attr( $class ) . '" data-placeholder="' . esc_html( $placeholder ) . '"/>';
+    $class = empty( $states ) ? 'wpinv-no-states' : 'wpi_select2';
+    echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="' . esc_attr( $class ) . '" data-placeholder="' . esc_html( $placeholder ) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $states as $option => $name ) {
+        echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $name ) . '</option>';
+    }
 
-	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+    echo '</select>';
+    echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
 
 }
 
@@ -946,7 +946,7 @@ 
  */
 function wpinv_tax_rates_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -962,9 +962,9 @@ 
  */
 function wpinv_tax_rate_callback( $tax_rate, $key ) {
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+    $key                      = sanitize_key( $key );
+    $tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
+    include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
 
 }
 
@@ -973,7 +973,7 @@ 
  */
 function wpinv_tax_rules_callback() {
 
-	?>
+    ?>
 		</td>
 	</tr>
 	<tr class="bsui">
@@ -1011,14 +1011,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1030,14 +1030,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'refresh_permalinks' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'refresh_permalinks' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1049,14 +1049,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1068,14 +1068,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1088,14 +1088,14 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url(
-							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
-								'getpaid-nonce',
-								'getpaid-nonce'
-							)
-						);
-					?>
+                        echo esc_url(
+                            wp_nonce_url(
+                                add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+                                'getpaid-nonce',
+                                'getpaid-nonce'
+                            )
+                        );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1108,8 +1108,8 @@ 
                 <td>
 					<a href="
                     <?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
-					?>
+                        echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
+                    ?>
                     " class="button button-primary"><?php esc_html_e( 'Launch', 'invoicing' ); ?></a>
                 </td>
             </tr>
@@ -1123,19 +1123,19 @@ 
 
 
 function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+    echo wp_kses_post( $args['desc'] );
 }
 
 function wpinv_raw_html_callback( $args ) {
-	echo wp_kses( $args['desc'], getpaid_allowed_html() );
+    echo wp_kses( $args['desc'], getpaid_allowed_html() );
 }
 
 function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+    do_action( 'wpinv_' . $args['id'], $args );
 }
 
 function wpinv_set_settings_cap() {
-	return wpinv_get_capability();
+    return wpinv_get_capability();
 }
 add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
 
@@ -1161,47 +1161,47 @@ 
  * @return array
  */
 function wpinv_get_email_merge_tags( $subscription = false ) {
-	$merge_tags = array(
-		'{site_title}'           => __( 'Site Title', 'invoicing' ),
-		'{name}'                 => __( "Customer's full name", 'invoicing' ),
-		'{first_name}'           => __( "Customer's first name", 'invoicing' ),
-		'{last_name}'            => __( "Customer's last name", 'invoicing' ),
-		'{email}'                => __( "Customer's email address", 'invoicing' ),
-		'{invoice_number}'       => __( 'The invoice number', 'invoicing' ),
-		'{invoice_currency}'     => __( 'The invoice currency', 'invoicing' ),
-		'{invoice_total}'        => __( 'The invoice total', 'invoicing' ),
-		'{invoice_link}'         => __( 'The invoice link', 'invoicing' ),
-		'{invoice_pay_link}'     => __( 'The payment link', 'invoicing' ),
-		'{invoice_receipt_link}' => __( 'The receipt link', 'invoicing' ),
-		'{invoice_date}'         => __( 'The date the invoice was created', 'invoicing' ),
-		'{invoice_due_date}'     => __( 'The date the invoice is due', 'invoicing' ),
-		'{date}'                 => __( "Today's date", 'invoicing' ),
-		'{is_was}'               => __( 'If due date of invoice is past, displays "was" otherwise displays "is"', 'invoicing' ),
-		'{invoice_label}'        => __( 'Invoices/quotes singular name. Ex: Invoice/Quote', 'invoicing' ),
-		'{invoice_quote}'        => __( 'Invoices/quotes singular name in small letters. Ex: invoice/quote', 'invoicing' ),
-		'{invoice_description}'  => __( 'The description of the invoice', 'invoicing' ),
-	);
-
-	if ( $subscription ) {
-		$merge_tags = array_merge(
-			$merge_tags,
-			array(
-				'{subscription_renewal_date}'     => __( 'The next renewal date of the subscription', 'invoicing' ),
-				'{subscription_created}'          => __( "The subscription's creation date", 'invoicing' ),
-				'{subscription_status}'           => __( "The subscription's status", 'invoicing' ),
-				'{subscription_profile_id}'       => __( "The subscription's remote profile id", 'invoicing' ),
-				'{subscription_id}'               => __( "The subscription's id", 'invoicing' ),
-				'{subscription_recurring_amount}' => __( 'The renewal amount of the subscription', 'invoicing' ),
-				'{subscription_initial_amount}'   => __( 'The initial amount of the subscription', 'invoicing' ),
-				'{subscription_recurring_period}' => __( 'The recurring period of the subscription (e.g 1 year)', 'invoicing' ),
-				'{subscription_bill_times}'       => __( 'The maximum number of times the subscription can be renewed', 'invoicing' ),
-				'{subscription_url}'              => __( 'The URL to manage a subscription', 'invoicing' ),
-				'{subscription_name}'             => __( 'The name of the recurring item', 'invoicing' ),
-			)
-		);
-	}
-
-	return $merge_tags;
+    $merge_tags = array(
+        '{site_title}'           => __( 'Site Title', 'invoicing' ),
+        '{name}'                 => __( "Customer's full name", 'invoicing' ),
+        '{first_name}'           => __( "Customer's first name", 'invoicing' ),
+        '{last_name}'            => __( "Customer's last name", 'invoicing' ),
+        '{email}'                => __( "Customer's email address", 'invoicing' ),
+        '{invoice_number}'       => __( 'The invoice number', 'invoicing' ),
+        '{invoice_currency}'     => __( 'The invoice currency', 'invoicing' ),
+        '{invoice_total}'        => __( 'The invoice total', 'invoicing' ),
+        '{invoice_link}'         => __( 'The invoice link', 'invoicing' ),
+        '{invoice_pay_link}'     => __( 'The payment link', 'invoicing' ),
+        '{invoice_receipt_link}' => __( 'The receipt link', 'invoicing' ),
+        '{invoice_date}'         => __( 'The date the invoice was created', 'invoicing' ),
+        '{invoice_due_date}'     => __( 'The date the invoice is due', 'invoicing' ),
+        '{date}'                 => __( "Today's date", 'invoicing' ),
+        '{is_was}'               => __( 'If due date of invoice is past, displays "was" otherwise displays "is"', 'invoicing' ),
+        '{invoice_label}'        => __( 'Invoices/quotes singular name. Ex: Invoice/Quote', 'invoicing' ),
+        '{invoice_quote}'        => __( 'Invoices/quotes singular name in small letters. Ex: invoice/quote', 'invoicing' ),
+        '{invoice_description}'  => __( 'The description of the invoice', 'invoicing' ),
+    );
+
+    if ( $subscription ) {
+        $merge_tags = array_merge(
+            $merge_tags,
+            array(
+                '{subscription_renewal_date}'     => __( 'The next renewal date of the subscription', 'invoicing' ),
+                '{subscription_created}'          => __( "The subscription's creation date", 'invoicing' ),
+                '{subscription_status}'           => __( "The subscription's status", 'invoicing' ),
+                '{subscription_profile_id}'       => __( "The subscription's remote profile id", 'invoicing' ),
+                '{subscription_id}'               => __( "The subscription's id", 'invoicing' ),
+                '{subscription_recurring_amount}' => __( 'The renewal amount of the subscription', 'invoicing' ),
+                '{subscription_initial_amount}'   => __( 'The initial amount of the subscription', 'invoicing' ),
+                '{subscription_recurring_period}' => __( 'The recurring period of the subscription (e.g 1 year)', 'invoicing' ),
+                '{subscription_bill_times}'       => __( 'The maximum number of times the subscription can be renewed', 'invoicing' ),
+                '{subscription_url}'              => __( 'The URL to manage a subscription', 'invoicing' ),
+                '{subscription_name}'             => __( 'The name of the recurring item', 'invoicing' ),
+            )
+        );
+    }
+
+    return $merge_tags;
 }
 
 
@@ -1213,28 +1213,28 @@ 
  * @return string
  */
 function wpinv_get_merge_tags_help_text( $subscription = false ) {
-	$merge_tags = wpinv_get_email_merge_tags( $subscription );
+    $merge_tags = wpinv_get_email_merge_tags( $subscription );
 
-	$output = '<div class="bsui">';
+    $output = '<div class="bsui">';
 
-	$link = sprintf(
-		'<strong class="getpaid-merge-tags text-primary" role="button">%s</strong>',
-		esc_html__( 'View available merge tags.', 'invoicing' )
-	);
+    $link = sprintf(
+        '<strong class="getpaid-merge-tags text-primary" role="button">%s</strong>',
+        esc_html__( 'View available merge tags.', 'invoicing' )
+    );
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+    $description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
 	
-	$output .= "$description $link";
+    $output .= "$description $link";
 
-	$output .= '<div class="getpaid-merge-tags-content mt-2 p-1 d-none">';
-	$output .= '<p class="mb-2">' . esc_html__( 'The following wildcards can be used in email subjects, heading and content:', 'invoicing' ) . '</p>';
+    $output .= '<div class="getpaid-merge-tags-content mt-2 p-1 d-none">';
+    $output .= '<p class="mb-2">' . esc_html__( 'The following wildcards can be used in email subjects, heading and content:', 'invoicing' ) . '</p>';
 
-	$output .= '<ul class="p-0 m-0">';
-	foreach($merge_tags as $tag => $tag_description) {
-		$output .= "<li class='mb-2'><strong class='text-dark'>$tag</strong> &mdash; $tag_description</li>";
-	}
+    $output .= '<ul class="p-0 m-0">';
+    foreach($merge_tags as $tag => $tag_description) {
+        $output .= "<li class='mb-2'><strong class='text-dark'>$tag</strong> &mdash; $tag_description</li>";
+    }
 
-	$output .= '</ul></div></div>';
+    $output .= '</ul></div></div>';
 
-	return $output;
+    return $output;
 }

Spacing +420 added lines, -420 removed lines

@@ -6,7 +6,7 @@ 
  * @since   1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves all default settings.
@@ -16,13 +16,13 @@ 
 function wpinv_get_settings() {
     $defaults = array();
 
-    foreach ( array_values( wpinv_get_registered_settings() ) as $tab_settings ) {
+    foreach (array_values(wpinv_get_registered_settings()) as $tab_settings) {
 
-        foreach ( array_values( $tab_settings ) as $section_settings ) {
+        foreach (array_values($tab_settings) as $section_settings) {
 
-            foreach ( $section_settings as $key => $setting ) {
-                if ( isset( $setting['std'] ) ) {
-                    $defaults[ $key ] = $setting['std'];
+            foreach ($section_settings as $key => $setting) {
+                if (isset($setting['std'])) {
+                    $defaults[$key] = $setting['std'];
                 }
             }
 		}
@@ -41,12 +41,12 @@ 
     global $wpinv_options;
 
     // Try fetching the saved options.
-    if ( empty( $wpinv_options ) ) {
-        $wpinv_options = get_option( 'wpinv_settings' );
+    if (empty($wpinv_options)) {
+        $wpinv_options = get_option('wpinv_settings');
     }
 
     // If that fails, don't fetch the default settings to prevent a loop.
-    if ( ! is_array( $wpinv_options ) ) {
+    if (!is_array($wpinv_options)) {
         $wpinv_options = array();
     }
 
@@ -60,13 +60,13 @@ 
  * @param mixed $default The default value to use if the setting has not been set.
  * @return mixed
  */
-function wpinv_get_option( $key = '', $default = false ) {
+function wpinv_get_option($key = '', $default = false) {
 
     $options = wpinv_get_options();
-    $value   = isset( $options[ $key ] ) ? $options[ $key ] : $default;
-    $value   = apply_filters( 'wpinv_get_option', $value, $key, $default );
+    $value   = isset($options[$key]) ? $options[$key] : $default;
+    $value   = apply_filters('wpinv_get_option', $value, $key, $default);
 
-    return apply_filters( 'wpinv_get_option_' . $key, $value, $key, $default );
+    return apply_filters('wpinv_get_option_' . $key, $value, $key, $default);
 }
 
 /**
@@ -75,11 +75,11 @@ 
  * @param array $options the new options.
  * @return bool
  */
-function wpinv_update_options( $options ) {
+function wpinv_update_options($options) {
     global $wpinv_options;
 
     // update the option.
-    if ( is_array( $options ) && update_option( 'wpinv_settings', $options ) ) {
+    if (is_array($options) && update_option('wpinv_settings', $options)) {
         $wpinv_options = $options;
         return true;
     }
@@ -94,24 +94,24 @@ 
  * @param mixed $value The setting value.
  * @return bool
  */
-function wpinv_update_option( $key = '', $value = false ) {
+function wpinv_update_option($key = '', $value = false) {
 
     // If no key, exit.
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     // Maybe delete the option instead.
-    if ( is_null( $value ) ) {
-        return wpinv_delete_option( $key );
+    if (is_null($value)) {
+        return wpinv_delete_option($key);
     }
 
     // Prepare the new options.
     $options         = wpinv_get_options();
-    $options[ $key ] = apply_filters( 'wpinv_update_option', $value, $key );
+    $options[$key] = apply_filters('wpinv_update_option', $value, $key);
 
     // Save the new options.
-    return wpinv_update_options( $options );
+    return wpinv_update_options($options);
 
 }
 
@@ -121,18 +121,18 @@ 
  * @param string $key the setting key.
  * @return bool
  */
-function wpinv_delete_option( $key = '' ) {
+function wpinv_delete_option($key = '') {
 
     // If no key, exit
-    if ( empty( $key ) ) {
+    if (empty($key)) {
         return false;
     }
 
     $options = wpinv_get_options();
 
-    if ( isset( $options[ $key ] ) ) {
-        unset( $options[ $key ] );
-        return wpinv_update_options( $options );
+    if (isset($options[$key])) {
+        unset($options[$key]);
+        return wpinv_update_options($options);
     }
 
     return true;
@@ -144,22 +144,22 @@ 
  *
  */
 function wpinv_register_settings() {
-	do_action( 'getpaid_before_register_settings' );
+	do_action('getpaid_before_register_settings');
 
     // Loop through all tabs.
-    foreach ( wpinv_get_registered_settings() as $tab => $sections ) {
+    foreach (wpinv_get_registered_settings() as $tab => $sections) {
 
         // In each tab, loop through sections.
-        foreach ( $sections as $section => $settings ) {
+        foreach ($sections as $section => $settings) {
 
             // Check for backwards compatibility
-            $section_tabs = wpinv_get_settings_tab_sections( $tab );
-            if ( ! is_array( $section_tabs ) || ! array_key_exists( $section, $section_tabs ) ) {
+            $section_tabs = wpinv_get_settings_tab_sections($tab);
+            if (!is_array($section_tabs) || !array_key_exists($section, $section_tabs)) {
                 $section = 'main';
                 $settings = $sections;
             }
 
-			do_action( "getpaid_register_{$tab}_{$section}" );
+			do_action("getpaid_register_{$tab}_{$section}");
 
             // Register the setting section.
             add_settings_section(
@@ -169,20 +169,20 @@ 
                 'wpinv_settings_' . $tab . '_' . $section
             );
 
-            foreach ( $settings as $option ) {
-                if ( ! empty( $option['id'] ) ) {
-                    wpinv_register_settings_option( $tab, $section, $option );
+            foreach ($settings as $option) {
+                if (!empty($option['id'])) {
+                    wpinv_register_settings_option($tab, $section, $option);
                 }
             }
 }
     }
 
     // Creates our settings in the options table.
-    register_setting( 'wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize' );
+    register_setting('wpinv_settings', 'wpinv_settings', 'wpinv_settings_sanitize');
 
-	do_action( 'getpaid_after_register_settings' );
+	do_action('getpaid_after_register_settings');
 }
-add_action( 'admin_init', 'wpinv_register_settings' );
+add_action('admin_init', 'wpinv_register_settings');
 
 /**
  * Register a single settings option.
@@ -192,49 +192,49 @@ 
  * @param string $option
  *
  */
-function wpinv_register_settings_option( $tab, $section, $option ) {
+function wpinv_register_settings_option($tab, $section, $option) {
 
-    $name       = isset( $option['name'] ) ? $option['name'] : '';
+    $name       = isset($option['name']) ? $option['name'] : '';
     $cb         = "wpinv_{$option['type']}_callback";
     $section    = "wpinv_settings_{$tab}_$section";
-	$is_wizzard = is_admin() && isset( $_GET['page'] ) && 'gp-setup' == $_GET['page'];
+	$is_wizzard = is_admin() && isset($_GET['page']) && 'gp-setup' == $_GET['page'];
 
-	if ( isset( $option['desc'] ) && ( ! $is_wizzard && ! empty( $option['help-tip'] ) ) ) {
-		$tip   = wpinv_clean( $option['desc'] );
+	if (isset($option['desc']) && (!$is_wizzard && !empty($option['help-tip']))) {
+		$tip   = wpinv_clean($option['desc']);
 		$name .= "<span class='dashicons dashicons-editor-help wpi-help-tip' title='$tip'></span>";
-		unset( $option['desc'] );
+		unset($option['desc']);
 	}
 
     // Loop through all tabs.
     add_settings_field(
         'wpinv_settings[' . $option['id'] . ']',
         $name,
-        function_exists( $cb ) ? $cb : 'wpinv_missing_callback',
+        function_exists($cb) ? $cb : 'wpinv_missing_callback',
         $section,
         $section,
         array(
             'section'         => $section,
-            'id'              => isset( $option['id'] ) ? $option['id'] : uniqid( 'wpinv-' ),
-            'desc'            => isset( $option['desc'] ) ? $option['desc'] : '',
+            'id'              => isset($option['id']) ? $option['id'] : uniqid('wpinv-'),
+            'desc'            => isset($option['desc']) ? $option['desc'] : '',
             'name'            => $name,
-            'size'            => isset( $option['size'] ) ? $option['size'] : null,
-            'options'         => isset( $option['options'] ) ? $option['options'] : '',
-            'selected'        => isset( $option['selected'] ) ? $option['selected'] : null,
-            'std'             => isset( $option['std'] ) ? $option['std'] : '',
-            'min'             => isset( $option['min'] ) ? $option['min'] : 0,
-            'max'             => isset( $option['max'] ) ? $option['max'] : 999999,
-            'step'            => isset( $option['step'] ) ? $option['step'] : 1,
-            'placeholder'     => isset( $option['placeholder'] ) ? $option['placeholder'] : null,
-            'allow_blank'     => isset( $option['allow_blank'] ) ? $option['allow_blank'] : true,
-            'readonly'        => isset( $option['readonly'] ) ? $option['readonly'] : false,
-            'faux'            => isset( $option['faux'] ) ? $option['faux'] : false,
-            'onchange'        => isset( $option['onchange'] ) ? $option['onchange'] : '',
-            'custom'          => isset( $option['custom'] ) ? $option['custom'] : '',
-			'default_content' => isset( $option['default_content'] ) ? $option['default_content'] : '',
-			'class'           => isset( $option['class'] ) ? $option['class'] : '',
-			'style'           => isset( $option['style'] ) ? $option['style'] : '',
-            'cols'            => isset( $option['cols'] ) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
-            'rows'            => isset( $option['rows'] ) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
+            'size'            => isset($option['size']) ? $option['size'] : null,
+            'options'         => isset($option['options']) ? $option['options'] : '',
+            'selected'        => isset($option['selected']) ? $option['selected'] : null,
+            'std'             => isset($option['std']) ? $option['std'] : '',
+            'min'             => isset($option['min']) ? $option['min'] : 0,
+            'max'             => isset($option['max']) ? $option['max'] : 999999,
+            'step'            => isset($option['step']) ? $option['step'] : 1,
+            'placeholder'     => isset($option['placeholder']) ? $option['placeholder'] : null,
+            'allow_blank'     => isset($option['allow_blank']) ? $option['allow_blank'] : true,
+            'readonly'        => isset($option['readonly']) ? $option['readonly'] : false,
+            'faux'            => isset($option['faux']) ? $option['faux'] : false,
+            'onchange'        => isset($option['onchange']) ? $option['onchange'] : '',
+            'custom'          => isset($option['custom']) ? $option['custom'] : '',
+			'default_content' => isset($option['default_content']) ? $option['default_content'] : '',
+			'class'           => isset($option['class']) ? $option['class'] : '',
+			'style'           => isset($option['style']) ? $option['style'] : '',
+            'cols'            => isset($option['cols']) && (int) $option['cols'] > 0 ? (int) $option['cols'] : 50,
+            'rows'            => isset($option['rows']) && (int) $option['rows'] > 0 ? (int) $option['rows'] : 5,
         )
     );
 
@@ -246,7 +246,7 @@ 
  * @return array
  */
 function wpinv_get_registered_settings() {
-	return array_filter( apply_filters( 'wpinv_registered_settings', wpinv_get_data( 'admin-settings' ) ) );
+	return array_filter(apply_filters('wpinv_registered_settings', wpinv_get_data('admin-settings')));
 }
 
 /**
@@ -255,7 +255,7 @@ 
  * @return array
  */
 function getpaid_get_integration_settings() {
-    return apply_filters( 'getpaid_integration_settings', array() );
+    return apply_filters('getpaid_integration_settings', array());
 }
 
 /**
@@ -263,153 +263,153 @@ 
  *
  * @return array
  */
-function wpinv_settings_sanitize( $input = array() ) {
+function wpinv_settings_sanitize($input = array()) {
 
 	$wpinv_options = wpinv_get_options();
 	$raw_referrer  = wp_get_raw_referer();
 
-    if ( empty( $raw_referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+    if (empty($raw_referrer)) {
+		return array_merge($wpinv_options, $input);
     }
 
-    wp_parse_str( $raw_referrer, $referrer );
+    wp_parse_str($raw_referrer, $referrer);
 
-	if ( in_array( 'gp-setup', $referrer ) ) {
-		return array_merge( $wpinv_options, $input );
+	if (in_array('gp-setup', $referrer)) {
+		return array_merge($wpinv_options, $input);
 	}
 
     $settings = wpinv_get_registered_settings();
-    $tab      = isset( $referrer['tab'] ) ? $referrer['tab'] : 'general';
-    $section  = isset( $referrer['section'] ) ? $referrer['section'] : 'main';
+    $tab      = isset($referrer['tab']) ? $referrer['tab'] : 'general';
+    $section  = isset($referrer['section']) ? $referrer['section'] : 'main';
 
     $input = $input ? $input : array();
-    $input = apply_filters( 'wpinv_settings_tab_' . $tab . '_sanitize', $input );
-    $input = apply_filters( 'wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input );
+    $input = apply_filters('wpinv_settings_tab_' . $tab . '_sanitize', $input);
+    $input = apply_filters('wpinv_settings_' . $tab . '-' . $section . '_sanitize', $input);
 
     // Loop through each setting being saved and pass it through a sanitization filter
-    foreach ( $input as $key => $value ) {
+    foreach ($input as $key => $value) {
 
         // Get the setting type (checkbox, select, etc)
-        $type = isset( $settings[ $tab ][ $section ][ $key ]['type'] ) ? $settings[ $tab ][ $section ][ $key ]['type'] : false;
+        $type = isset($settings[$tab][$section][$key]['type']) ? $settings[$tab][$section][$key]['type'] : false;
 
-        if ( $type ) {
+        if ($type) {
             // Field type specific filter
-            $input[ $key ] = apply_filters( "wpinv_settings_sanitize_$type", $value, $key );
+            $input[$key] = apply_filters("wpinv_settings_sanitize_$type", $value, $key);
         }
 
         // General filter
-		$input[ $key ] = apply_filters( 'wpinv_settings_sanitize', $input[ $key ], $key );
+		$input[$key] = apply_filters('wpinv_settings_sanitize', $input[$key], $key);
 
 		// Key specific filter.
-		$input[ $key ] = apply_filters( "wpinv_settings_sanitize_$key", $input[ $key ] );
+		$input[$key] = apply_filters("wpinv_settings_sanitize_$key", $input[$key]);
     }
 
     // Loop through the whitelist and unset any that are empty for the tab being saved
-    $main_settings    = isset( $settings[ $tab ] ) ? $settings[ $tab ] : array(); // Check for extensions that aren't using new sections
-    $section_settings = ! empty( $settings[ $tab ][ $section ] ) ? $settings[ $tab ][ $section ] : array();
+    $main_settings    = isset($settings[$tab]) ? $settings[$tab] : array(); // Check for extensions that aren't using new sections
+    $section_settings = !empty($settings[$tab][$section]) ? $settings[$tab][$section] : array();
 
-    $found_settings   = array_merge( $main_settings, $section_settings );
+    $found_settings   = array_merge($main_settings, $section_settings);
 
-    if ( ! empty( $found_settings ) ) {
-        foreach ( $found_settings as $key => $value ) {
+    if (!empty($found_settings)) {
+        foreach ($found_settings as $key => $value) {
 
             // settings used to have numeric keys, now they have keys that match the option ID. This ensures both methods work
-            if ( is_numeric( $key ) ) {
+            if (is_numeric($key)) {
                 $key = $value['id'];
             }
 
-            if ( ! isset( $input[ $key ] ) && isset( $wpinv_options[ $key ] ) ) {
-                unset( $wpinv_options[ $key ] );
+            if (!isset($input[$key]) && isset($wpinv_options[$key])) {
+                unset($wpinv_options[$key]);
             }
         }
     }
 
     // Merge our new settings with the existing
-    $output = array_merge( $wpinv_options, $input );
+    $output = array_merge($wpinv_options, $input);
 
-    add_settings_error( 'wpinv-notices', '', __( 'Settings updated.', 'invoicing' ), 'updated' );
+    add_settings_error('wpinv-notices', '', __('Settings updated.', 'invoicing'), 'updated');
 
     return $output;
 }
-add_filter( 'wpinv_settings_sanitize_text', 'trim', 10, 1 );
-add_filter( 'wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount' );
+add_filter('wpinv_settings_sanitize_text', 'trim', 10, 1);
+add_filter('wpinv_settings_sanitize_tax_rate', 'wpinv_sanitize_amount');
 
-function wpinv_settings_sanitize_tax_rates( $input ) {
-    if ( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rates($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-    $new_rates = ! empty( $_POST['tax_rates'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rates'] ) ) : array();
+    $new_rates = !empty($_POST['tax_rates']) ? wp_kses_post_deep(array_values($_POST['tax_rates'])) : array();
     $tax_rates = array();
 
-    foreach ( $new_rates as $rate ) {
+    foreach ($new_rates as $rate) {
 
-		$rate['rate']    = wpinv_sanitize_amount( $rate['rate'] );
-		$rate['name']    = sanitize_text_field( $rate['name'] );
-		$rate['state']   = sanitize_text_field( $rate['state'] );
-		$rate['country'] = sanitize_text_field( $rate['country'] );
-		$rate['global']  = empty( $rate['state'] );
+		$rate['rate']    = wpinv_sanitize_amount($rate['rate']);
+		$rate['name']    = sanitize_text_field($rate['name']);
+		$rate['state']   = sanitize_text_field($rate['state']);
+		$rate['country'] = sanitize_text_field($rate['country']);
+		$rate['global']  = empty($rate['state']);
 		$tax_rates[]     = $rate;
 
 	}
 
-    update_option( 'wpinv_tax_rates', $tax_rates );
+    update_option('wpinv_tax_rates', $tax_rates);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates' );
+add_filter('wpinv_settings_taxes-rates_sanitize', 'wpinv_settings_sanitize_tax_rates');
 
-function wpinv_settings_sanitize_tax_rules( $input ) {
-    if ( ! wpinv_current_user_can_manage_invoicing() ) {
+function wpinv_settings_sanitize_tax_rules($input) {
+    if (!wpinv_current_user_can_manage_invoicing()) {
         return $input;
     }
 
-	if ( empty( $_POST['wpinv_tax_rules_nonce'] ) || ! wp_verify_nonce( $_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules' ) ) {
+	if (empty($_POST['wpinv_tax_rules_nonce']) || !wp_verify_nonce($_POST['wpinv_tax_rules_nonce'], 'wpinv_tax_rules')) {
 		return $input;
 	}
 
-    $new_rules = ! empty( $_POST['tax_rules'] ) ? wp_kses_post_deep( array_values( $_POST['tax_rules'] ) ) : array();
+    $new_rules = !empty($_POST['tax_rules']) ? wp_kses_post_deep(array_values($_POST['tax_rules'])) : array();
     $tax_rules = array();
 
-    foreach ( $new_rules as $rule ) {
+    foreach ($new_rules as $rule) {
 
-		$rule['key']      = sanitize_title_with_dashes( $rule['key'] );
-		$rule['label']    = sanitize_text_field( $rule['label'] );
-		$rule['tax_base'] = sanitize_text_field( $rule['tax_base'] );
+		$rule['key']      = sanitize_title_with_dashes($rule['key']);
+		$rule['label']    = sanitize_text_field($rule['label']);
+		$rule['tax_base'] = sanitize_text_field($rule['tax_base']);
 		$tax_rules[]      = $rule;
 
 	}
 
-    update_option( 'wpinv_tax_rules', $tax_rules );
+    update_option('wpinv_tax_rules', $tax_rules);
 
     return $input;
 }
-add_filter( 'wpinv_settings_taxes-rules_sanitize', 'wpinv_settings_sanitize_tax_rules' );
+add_filter('wpinv_settings_taxes-rules_sanitize', 'wpinv_settings_sanitize_tax_rules');
 
 function wpinv_get_settings_tabs() {
     $tabs             = array();
-    $tabs['general']  = __( 'General', 'invoicing' );
-    $tabs['gateways'] = __( 'Payment Gateways', 'invoicing' );
-    $tabs['taxes']    = __( 'Taxes', 'invoicing' );
-	$tabs['emails']   = __( 'Emails', 'invoicing' );
+    $tabs['general']  = __('General', 'invoicing');
+    $tabs['gateways'] = __('Payment Gateways', 'invoicing');
+    $tabs['taxes']    = __('Taxes', 'invoicing');
+	$tabs['emails'] = __('Emails', 'invoicing');
 
-	if ( count( getpaid_get_integration_settings() ) > 0 ) {
-		$tabs['integrations'] = __( 'Integrations', 'invoicing' );
+	if (count(getpaid_get_integration_settings()) > 0) {
+		$tabs['integrations'] = __('Integrations', 'invoicing');
 	}
 
-    $tabs['privacy']  = __( 'Privacy', 'invoicing' );
-    $tabs['misc']     = __( 'Misc', 'invoicing' );
-    $tabs['tools']    = __( 'Tools', 'invoicing' );
+    $tabs['privacy']  = __('Privacy', 'invoicing');
+    $tabs['misc']     = __('Misc', 'invoicing');
+    $tabs['tools']    = __('Tools', 'invoicing');
 
-    return apply_filters( 'wpinv_settings_tabs', $tabs );
+    return apply_filters('wpinv_settings_tabs', $tabs);
 }
 
-function wpinv_get_settings_tab_sections( $tab = false ) {
+function wpinv_get_settings_tab_sections($tab = false) {
     $tabs     = false;
     $sections = wpinv_get_registered_settings_sections();
 
-    if ( $tab && ! empty( $sections[ $tab ] ) ) {
-        $tabs = $sections[ $tab ];
+    if ($tab && !empty($sections[$tab])) {
+        $tabs = $sections[$tab];
     }
 
     return $tabs;
@@ -418,7 +418,7 @@ 
 function wpinv_get_registered_settings_sections() {
     static $sections = false;
 
-    if ( false !== $sections ) {
+    if (false !== $sections) {
         return $sections;
     }
 
@@ -426,229 +426,229 @@ 
         'general'      => apply_filters(
             'wpinv_settings_sections_general',
             array(
-				'main'             => __( 'General Settings', 'invoicing' ),
-				'page_section'     => __( 'Page Settings', 'invoicing' ),
-				'currency_section' => __( 'Currency Settings', 'invoicing' ),
-				'labels'           => __( 'Label Texts', 'invoicing' ),
+				'main'             => __('General Settings', 'invoicing'),
+				'page_section'     => __('Page Settings', 'invoicing'),
+				'currency_section' => __('Currency Settings', 'invoicing'),
+				'labels'           => __('Label Texts', 'invoicing'),
             )
         ),
         'gateways'     => apply_filters(
             'wpinv_settings_sections_gateways',
             array(
-				'main' => __( 'Gateway Settings', 'invoicing' ),
+				'main' => __('Gateway Settings', 'invoicing'),
             )
         ),
         'taxes'        => apply_filters(
             'wpinv_settings_sections_taxes',
             array(
-				'main'  => __( 'Tax Settings', 'invoicing' ),
-				'rules' => __( 'Tax Rules', 'invoicing' ),
-				'rates' => __( 'Tax Rates', 'invoicing' ),
-				'vat'   => __( 'EU VAT Settings', 'invoicing' ),
+				'main'  => __('Tax Settings', 'invoicing'),
+				'rules' => __('Tax Rules', 'invoicing'),
+				'rates' => __('Tax Rates', 'invoicing'),
+				'vat'   => __('EU VAT Settings', 'invoicing'),
             )
         ),
         'emails'       => apply_filters(
             'wpinv_settings_sections_emails',
             array(
-				'main' => __( 'Email Settings', 'invoicing' ),
+				'main' => __('Email Settings', 'invoicing'),
             )
         ),
 
-		'integrations' => wp_list_pluck( getpaid_get_integration_settings(), 'label', 'id' ),
+		'integrations' => wp_list_pluck(getpaid_get_integration_settings(), 'label', 'id'),
 
         'privacy'      => apply_filters(
             'wpinv_settings_sections_privacy',
             array(
-				'main' => __( 'Privacy policy', 'invoicing' ),
+				'main' => __('Privacy policy', 'invoicing'),
             )
         ),
         'misc'         => apply_filters(
             'wpinv_settings_sections_misc',
             array(
-				'main'       => __( 'Miscellaneous', 'invoicing' ),
-				'custom-css' => __( 'Custom CSS', 'invoicing' ),
+				'main'       => __('Miscellaneous', 'invoicing'),
+				'custom-css' => __('Custom CSS', 'invoicing'),
             )
         ),
         'tools'        => apply_filters(
             'wpinv_settings_sections_tools',
             array(
-				'main' => __( 'Diagnostic Tools', 'invoicing' ),
+				'main' => __('Diagnostic Tools', 'invoicing'),
             )
         ),
     );
 
-    $sections = apply_filters( 'wpinv_settings_sections', $sections );
+    $sections = apply_filters('wpinv_settings_sections', $sections);
 
     return $sections;
 }
 
-function wpinv_get_pages( $with_slug = false, $default_label = null ) {
+function wpinv_get_pages($with_slug = false, $default_label = null) {
 	$pages_options = array();
 
-	if ( $default_label !== null && $default_label !== false ) {
-		$pages_options = array( '' => $default_label ); // Blank option
+	if ($default_label !== null && $default_label !== false) {
+		$pages_options = array('' => $default_label); // Blank option
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
+	if ($pages) {
+		foreach ($pages as $page) {
 			$title = $with_slug ? $page->post_title . ' (' . $page->post_name . ')' : $page->post_title;
-            $pages_options[ $page->ID ] = $title;
+            $pages_options[$page->ID] = $title;
 		}
 	}
 
 	return $pages_options;
 }
 
-function wpinv_header_callback( $args ) {
-	if ( ! empty( $args['desc'] ) ) {
-        echo wp_kses_post( $args['desc'] );
+function wpinv_header_callback($args) {
+	if (!empty($args['desc'])) {
+        echo wp_kses_post($args['desc']);
     }
 }
 
-function wpinv_hidden_callback( $args ) {
+function wpinv_hidden_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	if ( isset( $args['set_value'] ) ) {
+	if (isset($args['set_value'])) {
 		$value = $args['set_value'];
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$name  = '';
+		$name = '';
 	} else {
-		$name = 'wpinv_settings[' . esc_attr( $args['id'] ) . ']';
+		$name = 'wpinv_settings[' . esc_attr($args['id']) . ']';
 	}
 
-	echo '<input type="hidden" id="wpinv_settings[' . esc_attr( $args['id'] ) . ']" name="' . esc_attr( $name ) . '" value="' . esc_attr( stripslashes( $value ) ) . '" />';
+	echo '<input type="hidden" id="wpinv_settings[' . esc_attr($args['id']) . ']" name="' . esc_attr($name) . '" value="' . esc_attr(stripslashes($value)) . '" />';
 
 }
 
 /**
  * Displays a checkbox settings callback.
  */
-function wpinv_checkbox_callback( $args ) {
+function wpinv_checkbox_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
-	$id  = esc_attr( $args['id'] );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
+	$id  = esc_attr($args['id']);
 
-	getpaid_hidden_field( "wpinv_settings[$id]", '0' );
+	getpaid_hidden_field("wpinv_settings[$id]", '0');
 	?>
 		<label>
-			<input id="wpinv-settings-<?php echo esc_attr( $id ); ?>" name="wpinv_settings[<?php echo esc_attr( $id ); ?>]" <?php checked( empty( $std ), false ); ?> value="1" type="checkbox" />
-			<?php echo wp_kses_post( $args['desc'] ); ?>
+			<input id="wpinv-settings-<?php echo esc_attr($id); ?>" name="wpinv_settings[<?php echo esc_attr($id); ?>]" <?php checked(empty($std), false); ?> value="1" type="checkbox" />
+			<?php echo wp_kses_post($args['desc']); ?>
 		</label>
 	<?php
 }
 
-function wpinv_multicheck_callback( $args ) {
+function wpinv_multicheck_callback($args) {
 
-	$sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
+	$sanitize_id = wpinv_sanitize_key($args['id']);
+	$class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
 
-	if ( ! empty( $args['options'] ) ) {
+	if (!empty($args['options'])) {
 
-		$std     = isset( $args['std'] ) ? $args['std'] : array();
-		$value   = wpinv_get_option( $args['id'], $std );
+		$std     = isset($args['std']) ? $args['std'] : array();
+		$value   = wpinv_get_option($args['id'], $std);
 
-		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr( $sanitize_id . $class ) . '">';
-        foreach ( $args['options'] as $key => $option ) :
-			$sanitize_key = esc_attr( wpinv_sanitize_key( $key ) );
-			if ( in_array( $sanitize_key, $value ) ) {
+		echo '<div class="wpi-mcheck-rows wpi-mcheck-' . esc_attr($sanitize_id . $class) . '">';
+        foreach ($args['options'] as $key => $option) :
+			$sanitize_key = esc_attr(wpinv_sanitize_key($key));
+			if (in_array($sanitize_key, $value)) {
 				$enabled = $sanitize_key;
 			} else {
 				$enabled = null;
 			}
-			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $sanitize_key ) . '" ' . checked( $sanitize_key, $enabled, false ) . '/>&nbsp;';
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']">' . wp_kses_post( $option ) . '</label></div>';
+			echo '<div class="wpi-mcheck-row"><input name="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" id="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" type="checkbox" value="' . esc_attr($sanitize_key) . '" ' . checked($sanitize_key, $enabled, false) . '/>&nbsp;';
+			echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']">' . wp_kses_post($option) . '</label></div>';
 		endforeach;
 		echo '</div>';
-		echo '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
-function wpinv_payment_icons_callback( $args ) {
+function wpinv_payment_icons_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$value   = wpinv_get_option( $args['id'], false );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$value = wpinv_get_option($args['id'], false);
 
-	if ( ! empty( $args['options'] ) ) {
-		foreach ( $args['options'] as $key => $option ) {
-            $sanitize_key = wpinv_sanitize_key( $key );
+	if (!empty($args['options'])) {
+		foreach ($args['options'] as $key => $option) {
+            $sanitize_key = wpinv_sanitize_key($key);
 
-			if ( empty( $value ) ) {
+			if (empty($value)) {
 				$enabled = $option;
 			} else {
 				$enabled = null;
 			}
 
-			echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
+			echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" style="margin-right:10px;line-height:16px;height:16px;display:inline-block;">';
 
-				echo '<input name="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" id="wpinv_settings[' . esc_attr( $sanitize_id ) . '][' . esc_attr( $sanitize_key ) . ']" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
+				echo '<input name="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" id="wpinv_settings[' . esc_attr($sanitize_id) . '][' . esc_attr($sanitize_key) . ']" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
 
-				if ( wpinv_string_is_image_url( $key ) ) {
-				echo '<img class="payment-icon" src="' . esc_url( $key ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				if (wpinv_string_is_image_url($key)) {
+				echo '<img class="payment-icon" src="' . esc_url($key) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				} else {
-				$card = strtolower( str_replace( ' ', '', $option ) );
+				$card = strtolower(str_replace(' ', '', $option));
 
-				if ( has_filter( 'wpinv_accepted_payment_' . $card . '_image' ) ) {
-					$image = apply_filters( 'wpinv_accepted_payment_' . $card . '_image', '' );
+				if (has_filter('wpinv_accepted_payment_' . $card . '_image')) {
+					$image = apply_filters('wpinv_accepted_payment_' . $card . '_image', '');
 					} else {
-					$image       = wpinv_locate_template( 'images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false );
+					$image       = wpinv_locate_template('images' . DIRECTORY_SEPARATOR . 'icons' . DIRECTORY_SEPARATOR . $card . '.gif', false);
 					$content_dir = WP_CONTENT_DIR;
 
-					if ( function_exists( 'wp_normalize_path' ) ) {
+					if (function_exists('wp_normalize_path')) {
 						// Replaces backslashes with forward slashes for Windows systems
-						$image = wp_normalize_path( $image );
-						$content_dir = wp_normalize_path( $content_dir );
+						$image = wp_normalize_path($image);
+						$content_dir = wp_normalize_path($content_dir);
 						}
 
-					$image = str_replace( $content_dir, content_url(), $image );
+					$image = str_replace($content_dir, content_url(), $image);
 					}
 
-				echo '<img class="payment-icon" src="' . esc_url( $image ) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
+				echo '<img class="payment-icon" src="' . esc_url($image) . '" style="width:32px;height:24px;position:relative;top:6px;margin-right:5px;"/>';
 				}
-			echo wp_kses_post( $option ) . '</label>';
+			echo wp_kses_post($option) . '</label>';
 		}
-		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post( $args['desc'] ) . '</p>';
+		echo '<p class="description" style="margin-top:16px;">' . wp_kses_post($args['desc']) . '</p>';
 	}
 }
 
 /**
  * Displays a radio settings field.
  */
-function wpinv_radio_callback( $args ) {
+function wpinv_radio_callback($args) {
 
-	$std = isset( $args['std'] ) ? $args['std'] : '';
-	$std = wpinv_get_option( $args['id'], $std );
+	$std = isset($args['std']) ? $args['std'] : '';
+	$std = wpinv_get_option($args['id'], $std);
 	?>
 		<fieldset>
-			<ul id="wpinv-settings-<?php echo esc_attr( $args['id'] ); ?>" style="margin-top: 0;">
-				<?php foreach ( $args['options'] as $key => $option ) : ?>
+			<ul id="wpinv-settings-<?php echo esc_attr($args['id']); ?>" style="margin-top: 0;">
+				<?php foreach ($args['options'] as $key => $option) : ?>
 					<li>
 						<label>
-							<input name="wpinv_settings[<?php echo esc_attr( $args['id'] ); ?>]" <?php checked( $std, $key ); ?> value="<?php echo esc_attr( $key ); ?>" type="radio">
-							<?php echo wp_kses_post( $option ); ?>
+							<input name="wpinv_settings[<?php echo esc_attr($args['id']); ?>]" <?php checked($std, $key); ?> value="<?php echo esc_attr($key); ?>" type="radio">
+							<?php echo wp_kses_post($option); ?>
 						</label>
 					</li>
 				<?php endforeach; ?>
 			</ul>
 		</fieldset>
 	<?php
-	getpaid_settings_description_callback( $args );
+	getpaid_settings_description_callback($args);
 }
 
 /**
  * Displays a description if available.
  */
-function getpaid_settings_description_callback( $args ) {
+function getpaid_settings_description_callback($args) {
 
-	if ( ! empty( $args['desc'] ) ) {
+	if (!empty($args['desc'])) {
 		$description = $args['desc'];
-		echo wp_kses_post( "<p class='description'>$description</p>" );
+		echo wp_kses_post("<p class='description'>$description</p>");
 	}
 
 }
@@ -663,35 +663,35 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-gateways-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-gateways-edit.php'; ?>
 
 	<?php
 }
 
-function wpinv_gateway_select_callback( $args ) {
+function wpinv_gateway_select_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-    $class = ! empty( $args['class'] ) ? ' ' . esc_attr( $args['class'] ) : '';
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+    $class = !empty($args['class']) ? ' ' . esc_attr($args['class']) : '';
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	echo '<select name="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" class="' . esc_attr( $class ) . '" >';
+	echo '<select name="wpinv_settings[' . esc_attr($sanitize_id) . ']"" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" class="' . esc_attr($class) . '" >';
 
-	foreach ( $args['options'] as $key => $option ) :
+	foreach ($args['options'] as $key => $option) :
 
-		echo '<option value="' . esc_attr( $key ) . '" ';
+		echo '<option value="' . esc_attr($key) . '" ';
 
-		if ( isset( $args['selected'] ) && $args['selected'] !== null && $args['selected'] !== false ) {
-            selected( $key, $args['selected'] );
+		if (isset($args['selected']) && $args['selected'] !== null && $args['selected'] !== false) {
+            selected($key, $args['selected']);
         } else {
-            selected( $key, $value );
+            selected($key, $value);
         }
 
-		echo '>' . esc_html( $option['admin_label'] ) . '</option>';
+		echo '>' . esc_html($option['admin_label']) . '</option>';
 	endforeach;
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 }
 
 /**
@@ -700,16 +700,16 @@ 
  * @param array $args
  * @return string
  */
-function wpinv_settings_attrs_helper( $args ) {
+function wpinv_settings_attrs_helper($args) {
 
-	$value = isset( $args['std'] ) ? $args['std'] : '';
-	$id    = esc_attr( $args['id'] );
-	$value = is_scalar( $value ) ? $value : '';
+	$value = isset($args['std']) ? $args['std'] : '';
+	$id    = esc_attr($args['id']);
+	$value = is_scalar($value) ? $value : '';
 
 	$attrs = array(
-		'name'     => ! empty( $args['faux'] ) ? false : "wpinv_settings[$id]",
-		'readonly' => ! empty( $args['faux'] ),
-		'value'    => ! empty( $args['faux'] ) ? $value : wpinv_get_option( $args['id'], $value ),
+		'name'     => !empty($args['faux']) ? false : "wpinv_settings[$id]",
+		'readonly' => !empty($args['faux']),
+		'value'    => !empty($args['faux']) ? $value : wpinv_get_option($args['id'], $value),
 		'id'       => 'wpinv-settings-' . $args['id'],
 		'style'    => $args['style'],
 		'class'    => $args['class'],
@@ -717,20 +717,20 @@ 
 		'data-placeholder' => $args['placeholder'],
 	);
 
-	if ( ! empty( $args['onchange'] ) ) {
+	if (!empty($args['onchange'])) {
 		$attrs['onchange'] = $args['onchange'];
 	}
 
-	foreach ( $attrs as $key => $value ) {
+	foreach ($attrs as $key => $value) {
 
-		if ( false === $value ) {
+		if (false === $value) {
 			continue;
 		}
 
-		if ( true === $value ) {
-			echo ' ' . esc_attr( $key );
+		if (true === $value) {
+			echo ' ' . esc_attr($key);
 		} else {
-			echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
+			echo ' ' . esc_attr($key) . '="' . esc_attr($value) . '"';
 		}
 
 	}
@@ -740,12 +740,12 @@ 
 /**
  * Displays a text input settings callback.
  */
-function wpinv_text_callback( $args ) {
+function wpinv_text_callback($args) {
 
 	?>
 		<label style="width: 100%;">
-			<input type="text" <?php wpinv_settings_attrs_helper( $args ); ?>>
-			<?php getpaid_settings_description_callback( $args ); ?>
+			<input type="text" <?php wpinv_settings_attrs_helper($args); ?>>
+			<?php getpaid_settings_description_callback($args); ?>
 		</label>
 	<?php
 
@@ -754,174 +754,174 @@ 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_number_callback( $args ) {
+function wpinv_number_callback($args) {
 
 	?>
 		<label style="width: 100%;">
-			<input type="number" step="<?php echo esc_attr( $args['step'] ); ?>" max="<?php echo intval( $args['max'] ); ?>" min="<?php echo intval( $args['min'] ); ?>" <?php wpinv_settings_attrs_helper( $args ); ?>>
-			<?php getpaid_settings_description_callback( $args ); ?>
+			<input type="number" step="<?php echo esc_attr($args['step']); ?>" max="<?php echo intval($args['max']); ?>" min="<?php echo intval($args['min']); ?>" <?php wpinv_settings_attrs_helper($args); ?>>
+			<?php getpaid_settings_description_callback($args); ?>
 		</label>
 	<?php
 
 }
 
-function wpinv_textarea_callback( $args ) {
+function wpinv_textarea_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-    $class = ( isset( $args['class'] ) && ! is_null( $args['class'] ) ) ? $args['class'] : 'large-text';
+    $size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+    $class = (isset($args['class']) && !is_null($args['class'])) ? $args['class'] : 'large-text';
 
-	echo '<textarea class="' . esc_attr( $class ) . ' txtarea-' . esc_attr( $size ) . ' wpi-' . esc_attr( sanitize_html_class( $sanitize_id ) ) . ' " cols="' . esc_attr( $args['cols'] ) . '" rows="' . esc_attr( $args['rows'] ) . '" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	echo '<br /><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<textarea class="' . esc_attr($class) . ' txtarea-' . esc_attr($size) . ' wpi-' . esc_attr(sanitize_html_class($sanitize_id)) . ' " cols="' . esc_attr($args['cols']) . '" rows="' . esc_attr($args['rows']) . '" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']">' . esc_textarea(stripslashes($value)) . '</textarea>';
+	echo '<br /><label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_password_callback( $args ) {
+function wpinv_password_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="password" class="' . esc_attr( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	echo '<input type="password" class="' . esc_attr($size) . '-text" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '"/>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_missing_callback( $args ) {
+function wpinv_missing_callback($args) {
 	printf(
-		esc_html__( 'The callback function used for the %s setting is missing.', 'invoicing' ),
-		'<strong>' . esc_html( $args['id'] ) . '</strong>'
+		esc_html__('The callback function used for the %s setting is missing.', 'invoicing'),
+		'<strong>' . esc_html($args['id']) . '</strong>'
 	);
 }
 
 /**
  * Displays a number input settings callback.
  */
-function wpinv_select_callback( $args ) {
+function wpinv_select_callback($args) {
 
-	$desc   = wp_kses_post( $args['desc'] );
-	$desc   = empty( $desc ) ? '' : "<p class='description'>$desc</p>";
-	$value  = isset( $args['std'] ) ? $args['std'] : '';
-	$value  = wpinv_get_option( $args['id'], $value );
-	$rand   = uniqid( 'random_id' );
+	$desc   = wp_kses_post($args['desc']);
+	$desc   = empty($desc) ? '' : "<p class='description'>$desc</p>";
+	$value  = isset($args['std']) ? $args['std'] : '';
+	$value  = wpinv_get_option($args['id'], $value);
+	$rand   = uniqid('random_id');
 
 	?>
 		<label style="width: 100%;">
-			<select <?php wpinv_settings_attrs_helper( $args ); ?> data-allow-clear="true">
-				<?php foreach ( $args['options'] as $option => $name ) : ?>
-					<option value="<?php echo esc_attr( $option ); ?>" <?php echo selected( $option, $value ); ?>><?php echo esc_html( $name ); ?></option>
+			<select <?php wpinv_settings_attrs_helper($args); ?> data-allow-clear="true">
+				<?php foreach ($args['options'] as $option => $name) : ?>
+					<option value="<?php echo esc_attr($option); ?>" <?php echo selected($option, $value); ?>><?php echo esc_html($name); ?></option>
 				<?php endforeach; ?>
 			</select>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && is_numeric( $value ) ) : ?>
-				<a href="<?php echo esc_url( get_edit_post_link( $value ) ); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php esc_html_e( 'Edit Page', 'invoicing' ); ?></a>
+			<?php if (substr($args['id'], -5) === '_page' && is_numeric($value)) : ?>
+				<a href="<?php echo esc_url(get_edit_post_link($value)); ?>" target="_blank" class="button getpaid-page-setting-edit"><?php esc_html_e('Edit Page', 'invoicing'); ?></a>
 			<?php endif; ?>
 
-			<?php if ( substr( $args['id'], -5 ) === '_page' && ! empty( $args['default_content'] ) ) : ?>
-				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo esc_attr( $rand ); ?>" class="button thickbox getpaid-page-setting-view-default"><?php esc_html_e( 'View Default Content', 'invoicing' ); ?></a>
-				<div id='<?php echo esc_attr( $rand ); ?>' style='display:none;'>
+			<?php if (substr($args['id'], -5) === '_page' && !empty($args['default_content'])) : ?>
+				&nbsp;<a href="#TB_inline?&width=400&height=550&inlineId=<?php echo esc_attr($rand); ?>" class="button thickbox getpaid-page-setting-view-default"><?php esc_html_e('View Default Content', 'invoicing'); ?></a>
+				<div id='<?php echo esc_attr($rand); ?>' style='display:none;'>
 					<div>
-						<h3><?php esc_html_e( 'Original Content', 'invoicing' ); ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo wp_kses_post( gepaid_trim_lines( $args['default_content'] ) ); ?></textarea>
-						<h3><?php esc_html_e( 'Current Content', 'invoicing' ); ?></h3>
-						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post( $value ); echo empty( $_post ) ? '' : wp_kses_post( gepaid_trim_lines( $_post->post_content ) ); ?></textarea>
+						<h3><?php esc_html_e('Original Content', 'invoicing'); ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php echo wp_kses_post(gepaid_trim_lines($args['default_content'])); ?></textarea>
+						<h3><?php esc_html_e('Current Content', 'invoicing'); ?></h3>
+						<textarea readonly onclick="this.select()" rows="8" style="width: 100%;"><?php $_post = get_post($value); echo empty($_post) ? '' : wp_kses_post(gepaid_trim_lines($_post->post_content)); ?></textarea>
 					</div>
 				</div>
 			<?php endif; ?>
 
-			<?php echo wp_kses_post( $desc ); ?>
+			<?php echo wp_kses_post($desc); ?>
 		</label>
 	<?php
 
 }
 
-function wpinv_color_select_callback( $args ) {
+function wpinv_color_select_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']"/>';
+	echo '<select id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']"/>';
 
-	foreach ( $args['options'] as $option => $color ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $color['label'] ) . '</option>';
+	foreach ($args['options'] as $option => $color) {
+		echo '<option value="' . esc_attr($option) . '" ' . selected($option, $value) . '>' . esc_html($color['label']) . '</option>';
 	}
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_rich_editor_callback( $args ) {
+function wpinv_rich_editor_callback($args) {
 	global $wp_version;
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	if ( ! empty( $args['allow_blank'] ) && empty( $value ) ) {
+	if (!empty($args['allow_blank']) && empty($value)) {
 		$value = $std;
 	}
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+	$rows = isset($args['size']) ? $args['size'] : 20;
 
 	echo '<div class="getpaid-settings-editor-input">';
-	if ( $wp_version >= 3.3 && function_exists( 'wp_editor' ) ) {
+	if ($wp_version >= 3.3 && function_exists('wp_editor')) {
 		wp_editor(
-            stripslashes( $value ),
-            'wpinv_settings_' . esc_attr( $args['id'] ),
+            stripslashes($value),
+            'wpinv_settings_' . esc_attr($args['id']),
             array(
-				'textarea_name' => 'wpinv_settings[' . esc_attr( $args['id'] ) . ']',
-				'textarea_rows' => absint( $rows ),
+				'textarea_name' => 'wpinv_settings[' . esc_attr($args['id']) . ']',
+				'textarea_rows' => absint($rows),
 				'media_buttons' => false,
             )
         );
 	} else {
-		echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="wpi-' . esc_attr( sanitize_html_class( $args['id'] ) ) . '">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+		echo '<textarea class="large-text" rows="10" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="wpi-' . esc_attr(sanitize_html_class($args['id'])) . '">' . esc_textarea(stripslashes($value)) . '</textarea>';
 	}
 
-	echo '</div><br/><label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '</div><br/><label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_upload_callback( $args ) {
+function wpinv_upload_callback($args) {
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	echo '<input type="text" class="' . sanitize_html_class( $size ) . '-text" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__( 'Upload File', 'invoicing' ) . '"/></span>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	$size = (isset($args['size']) && !is_null($args['size'])) ? $args['size'] : 'regular';
+	echo '<input type="text" class="' . sanitize_html_class($size) . '-text" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr(stripslashes($value)) . '"/>';
+	echo '<span>&nbsp;<input type="button" class="wpinv_settings_upload_button button-secondary" value="' . esc_attr__('Upload File', 'invoicing') . '"/></span>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_color_callback( $args ) {
+function wpinv_color_callback($args) {
 
-	$std         = isset( $args['std'] ) ? $args['std'] : '';
-	$value       = wpinv_get_option( $args['id'], $std );
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+	$std         = isset($args['std']) ? $args['std'] : '';
+	$value       = wpinv_get_option($args['id'], $std);
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '" data-default-color="' . esc_attr( $std ) . '" />';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<input type="text" class="wpinv-color-picker" id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '" data-default-color="' . esc_attr($std) . '" />';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
-function wpinv_country_states_callback( $args ) {
+function wpinv_country_states_callback($args) {
 
-	$std     = isset( $args['std'] ) ? $args['std'] : '';
-	$value   = wpinv_get_option( $args['id'], $std );
+	$std     = isset($args['std']) ? $args['std'] : '';
+	$value   = wpinv_get_option($args['id'], $std);
 
-    $sanitize_id = wpinv_sanitize_key( $args['id'] );
+    $sanitize_id = wpinv_sanitize_key($args['id']);
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
@@ -929,15 +929,15 @@ 
 
 	$states = wpinv_get_country_states();
 
-	$class = empty( $states ) ? 'wpinv-no-states' : 'wpi_select2';
-	echo '<select id="wpinv_settings[' . esc_attr( $sanitize_id ) . ']" name="wpinv_settings[' . esc_attr( $args['id'] ) . ']" class="' . esc_attr( $class ) . '" data-placeholder="' . esc_html( $placeholder ) . '"/>';
+	$class = empty($states) ? 'wpinv-no-states' : 'wpi_select2';
+	echo '<select id="wpinv_settings[' . esc_attr($sanitize_id) . ']" name="wpinv_settings[' . esc_attr($args['id']) . ']" class="' . esc_attr($class) . '" data-placeholder="' . esc_html($placeholder) . '"/>';
 
-	foreach ( $states as $option => $name ) {
-		echo '<option value="' . esc_attr( $option ) . '" ' . selected( $option, $value ) . '>' . esc_html( $name ) . '</option>';
+	foreach ($states as $option => $name) {
+		echo '<option value="' . esc_attr($option) . '" ' . selected($option, $value) . '>' . esc_html($name) . '</option>';
 	}
 
 	echo '</select>';
-	echo '<label for="wpinv_settings[' . esc_attr( $sanitize_id ) . ']"> ' . wp_kses_post( $args['desc'] ) . '</label>';
+	echo '<label for="wpinv_settings[' . esc_attr($sanitize_id) . ']"> ' . wp_kses_post($args['desc']) . '</label>';
 
 }
 
@@ -951,7 +951,7 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-tax-rates-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-tax-rates-edit.php'; ?>
 
 	<?php
 
@@ -960,11 +960,11 @@ 
 /**
  * Displays a tax rate' edit row.
  */
-function wpinv_tax_rate_callback( $tax_rate, $key ) {
+function wpinv_tax_rate_callback($tax_rate, $key) {
 
-	$key                      = sanitize_key( $key );
-	$tax_rate['reduced_rate'] = empty( $tax_rate['reduced_rate'] ) ? 0 : $tax_rate['reduced_rate'];
-	include plugin_dir_path( __FILE__ ) . 'views/html-tax-rate-edit.php';
+	$key                      = sanitize_key($key);
+	$tax_rate['reduced_rate'] = empty($tax_rate['reduced_rate']) ? 0 : $tax_rate['reduced_rate'];
+	include plugin_dir_path(__FILE__) . 'views/html-tax-rate-edit.php';
 
 }
 
@@ -978,177 +978,177 @@ 
 	</tr>
 	<tr class="bsui">
     	<td colspan="2" class="p-0">
-			<?php include plugin_dir_path( __FILE__ ) . 'views/html-tax-rules-edit.php'; ?>
+			<?php include plugin_dir_path(__FILE__) . 'views/html-tax-rules-edit.php'; ?>
 
 	<?php
 
 }
 
-function wpinv_tools_callback( $args ) {
+function wpinv_tools_callback($args) {
     ?>
     </td><tr>
     <td colspan="2" class="wpinv_tools_tdbox">
     <?php
-    if ( $args['desc'] ) {
+    if ($args['desc']) {
 ?>
-<p><?php echo wp_kses_post( $args['desc'] ); ?></p><?php } ?>
-    <?php do_action( 'wpinv_tools_before' ); ?>
+<p><?php echo wp_kses_post($args['desc']); ?></p><?php } ?>
+    <?php do_action('wpinv_tools_before'); ?>
     <table id="wpinv_tools_table" class="wp-list-table widefat fixed posts">
         <thead>
             <tr>
-                <th scope="col" class="wpinv-th-tool"><?php esc_html_e( 'Tool', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-desc"><?php esc_html_e( 'Description', 'invoicing' ); ?></th>
-                <th scope="col" class="wpinv-th-action"><?php esc_html_e( 'Action', 'invoicing' ); ?></th>
+                <th scope="col" class="wpinv-th-tool"><?php esc_html_e('Tool', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-desc"><?php esc_html_e('Description', 'invoicing'); ?></th>
+                <th scope="col" class="wpinv-th-action"><?php esc_html_e('Action', 'invoicing'); ?></th>
             </tr>
         </thead>
 
         <tbody>
 			<tr>
-                <td><?php esc_html_e( 'Check Pages', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Check Pages', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Creates any missing GetPaid pages.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Creates any missing GetPaid pages.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_pages' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_pages'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php esc_html_e( 'Refresh Permalinks', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Refresh Permalinks', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Might fix the page not found error when viewing an invoice.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Might fix the page not found error when viewing an invoice.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'refresh_permalinks' ),
+								add_query_arg('getpaid-admin-action', 'refresh_permalinks'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php esc_html_e( 'Repair Database Tables', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Repair Database Tables', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Run this tool to create any missing database tables.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Run this tool to create any missing database tables.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'create_missing_tables' ),
+								add_query_arg('getpaid-admin-action', 'create_missing_tables'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 			<tr>
-                <td><?php esc_html_e( 'Migrate old invoices', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Migrate old invoices', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('If your old invoices were not migrated after updating from Invoicing to GetPaid, you can use this tool to migrate them.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'migrate_old_invoices' ),
+								add_query_arg('getpaid-admin-action', 'migrate_old_invoices'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php esc_html_e( 'Recalculate Discounts', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Recalculate Discounts', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Recalculate discounts for existing invoices that have discount codes but are not discounted.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
 						echo esc_url(
 							wp_nonce_url(
-								add_query_arg( 'getpaid-admin-action', 'recalculate_discounts' ),
+								add_query_arg('getpaid-admin-action', 'recalculate_discounts'),
 								'getpaid-nonce',
 								'getpaid-nonce'
 							)
 						);
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Run', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Run', 'invoicing'); ?></a>
                 </td>
             </tr>
 
 			<tr>
-                <td><?php esc_html_e( 'Set-up Wizard', 'invoicing' ); ?></td>
+                <td><?php esc_html_e('Set-up Wizard', 'invoicing'); ?></td>
                 <td>
-                    <small><?php esc_html_e( 'Launch the quick set-up wizard.', 'invoicing' ); ?></small>
+                    <small><?php esc_html_e('Launch the quick set-up wizard.', 'invoicing'); ?></small>
                 </td>
                 <td>
 					<a href="
                     <?php
-						echo esc_url( admin_url( 'index.php?page=gp-setup' ) );
+						echo esc_url(admin_url('index.php?page=gp-setup'));
 					?>
-                    " class="button button-primary"><?php esc_html_e( 'Launch', 'invoicing' ); ?></a>
+                    " class="button button-primary"><?php esc_html_e('Launch', 'invoicing'); ?></a>
                 </td>
             </tr>
 
-			<?php do_action( 'wpinv_tools_row' ); ?>
+			<?php do_action('wpinv_tools_row'); ?>
         </tbody>
     </table>
-    <?php do_action( 'wpinv_tools_after' ); ?>
+    <?php do_action('wpinv_tools_after'); ?>
     <?php
 }
 
 
-function wpinv_descriptive_text_callback( $args ) {
-	echo wp_kses_post( $args['desc'] );
+function wpinv_descriptive_text_callback($args) {
+	echo wp_kses_post($args['desc']);
 }
 
-function wpinv_raw_html_callback( $args ) {
-	echo wp_kses( $args['desc'], getpaid_allowed_html() );
+function wpinv_raw_html_callback($args) {
+	echo wp_kses($args['desc'], getpaid_allowed_html());
 }
 
-function wpinv_hook_callback( $args ) {
-	do_action( 'wpinv_' . $args['id'], $args );
+function wpinv_hook_callback($args) {
+	do_action('wpinv_' . $args['id'], $args);
 }
 
 function wpinv_set_settings_cap() {
 	return wpinv_get_capability();
 }
-add_filter( 'option_page_capability_wpinv_settings', 'wpinv_set_settings_cap' );
+add_filter('option_page_capability_wpinv_settings', 'wpinv_set_settings_cap');
 
 
-function wpinv_on_update_settings( $old_value, $value, $option ) {
-    $old = ! empty( $old_value['remove_data_on_unistall'] ) ? 1 : '';
-    $new = ! empty( $value['remove_data_on_unistall'] ) ? 1 : '';
+function wpinv_on_update_settings($old_value, $value, $option) {
+    $old = !empty($old_value['remove_data_on_unistall']) ? 1 : '';
+    $new = !empty($value['remove_data_on_unistall']) ? 1 : '';
 
-    if ( $old != $new ) {
-        update_option( 'wpinv_remove_data_on_invoice_unistall', $new );
+    if ($old != $new) {
+        update_option('wpinv_remove_data_on_invoice_unistall', $new);
     }
 }
-add_action( 'update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3 );
+add_action('update_option_wpinv_settings', 'wpinv_on_update_settings', 10, 3);
 
 
 /**
@@ -1160,43 +1160,43 @@ 
  *
  * @return array
  */
-function wpinv_get_email_merge_tags( $subscription = false ) {
+function wpinv_get_email_merge_tags($subscription = false) {
 	$merge_tags = array(
-		'{site_title}'           => __( 'Site Title', 'invoicing' ),
-		'{name}'                 => __( "Customer's full name", 'invoicing' ),
-		'{first_name}'           => __( "Customer's first name", 'invoicing' ),
-		'{last_name}'            => __( "Customer's last name", 'invoicing' ),
-		'{email}'                => __( "Customer's email address", 'invoicing' ),
-		'{invoice_number}'       => __( 'The invoice number', 'invoicing' ),
-		'{invoice_currency}'     => __( 'The invoice currency', 'invoicing' ),
-		'{invoice_total}'        => __( 'The invoice total', 'invoicing' ),
-		'{invoice_link}'         => __( 'The invoice link', 'invoicing' ),
-		'{invoice_pay_link}'     => __( 'The payment link', 'invoicing' ),
-		'{invoice_receipt_link}' => __( 'The receipt link', 'invoicing' ),
-		'{invoice_date}'         => __( 'The date the invoice was created', 'invoicing' ),
-		'{invoice_due_date}'     => __( 'The date the invoice is due', 'invoicing' ),
-		'{date}'                 => __( "Today's date", 'invoicing' ),
-		'{is_was}'               => __( 'If due date of invoice is past, displays "was" otherwise displays "is"', 'invoicing' ),
-		'{invoice_label}'        => __( 'Invoices/quotes singular name. Ex: Invoice/Quote', 'invoicing' ),
-		'{invoice_quote}'        => __( 'Invoices/quotes singular name in small letters. Ex: invoice/quote', 'invoicing' ),
-		'{invoice_description}'  => __( 'The description of the invoice', 'invoicing' ),
+		'{site_title}'           => __('Site Title', 'invoicing'),
+		'{name}'                 => __("Customer's full name", 'invoicing'),
+		'{first_name}'           => __("Customer's first name", 'invoicing'),
+		'{last_name}'            => __("Customer's last name", 'invoicing'),
+		'{email}'                => __("Customer's email address", 'invoicing'),
+		'{invoice_number}'       => __('The invoice number', 'invoicing'),
+		'{invoice_currency}'     => __('The invoice currency', 'invoicing'),
+		'{invoice_total}'        => __('The invoice total', 'invoicing'),
+		'{invoice_link}'         => __('The invoice link', 'invoicing'),
+		'{invoice_pay_link}'     => __('The payment link', 'invoicing'),
+		'{invoice_receipt_link}' => __('The receipt link', 'invoicing'),
+		'{invoice_date}'         => __('The date the invoice was created', 'invoicing'),
+		'{invoice_due_date}'     => __('The date the invoice is due', 'invoicing'),
+		'{date}'                 => __("Today's date", 'invoicing'),
+		'{is_was}'               => __('If due date of invoice is past, displays "was" otherwise displays "is"', 'invoicing'),
+		'{invoice_label}'        => __('Invoices/quotes singular name. Ex: Invoice/Quote', 'invoicing'),
+		'{invoice_quote}'        => __('Invoices/quotes singular name in small letters. Ex: invoice/quote', 'invoicing'),
+		'{invoice_description}'  => __('The description of the invoice', 'invoicing'),
 	);
 
-	if ( $subscription ) {
+	if ($subscription) {
 		$merge_tags = array_merge(
 			$merge_tags,
 			array(
-				'{subscription_renewal_date}'     => __( 'The next renewal date of the subscription', 'invoicing' ),
-				'{subscription_created}'          => __( "The subscription's creation date", 'invoicing' ),
-				'{subscription_status}'           => __( "The subscription's status", 'invoicing' ),
-				'{subscription_profile_id}'       => __( "The subscription's remote profile id", 'invoicing' ),
-				'{subscription_id}'               => __( "The subscription's id", 'invoicing' ),
-				'{subscription_recurring_amount}' => __( 'The renewal amount of the subscription', 'invoicing' ),
-				'{subscription_initial_amount}'   => __( 'The initial amount of the subscription', 'invoicing' ),
-				'{subscription_recurring_period}' => __( 'The recurring period of the subscription (e.g 1 year)', 'invoicing' ),
-				'{subscription_bill_times}'       => __( 'The maximum number of times the subscription can be renewed', 'invoicing' ),
-				'{subscription_url}'              => __( 'The URL to manage a subscription', 'invoicing' ),
-				'{subscription_name}'             => __( 'The name of the recurring item', 'invoicing' ),
+				'{subscription_renewal_date}'     => __('The next renewal date of the subscription', 'invoicing'),
+				'{subscription_created}'          => __("The subscription's creation date", 'invoicing'),
+				'{subscription_status}'           => __("The subscription's status", 'invoicing'),
+				'{subscription_profile_id}'       => __("The subscription's remote profile id", 'invoicing'),
+				'{subscription_id}'               => __("The subscription's id", 'invoicing'),
+				'{subscription_recurring_amount}' => __('The renewal amount of the subscription', 'invoicing'),
+				'{subscription_initial_amount}'   => __('The initial amount of the subscription', 'invoicing'),
+				'{subscription_recurring_period}' => __('The recurring period of the subscription (e.g 1 year)', 'invoicing'),
+				'{subscription_bill_times}'       => __('The maximum number of times the subscription can be renewed', 'invoicing'),
+				'{subscription_url}'              => __('The URL to manage a subscription', 'invoicing'),
+				'{subscription_name}'             => __('The name of the recurring item', 'invoicing'),
 			)
 		);
 	}
@@ -1212,25 +1212,25 @@ 
  *
  * @return string
  */
-function wpinv_get_merge_tags_help_text( $subscription = false ) {
-	$merge_tags = wpinv_get_email_merge_tags( $subscription );
+function wpinv_get_merge_tags_help_text($subscription = false) {
+	$merge_tags = wpinv_get_email_merge_tags($subscription);
 
 	$output = '<div class="bsui">';
 
 	$link = sprintf(
 		'<strong class="getpaid-merge-tags text-primary" role="button">%s</strong>',
-		esc_html__( 'View available merge tags.', 'invoicing' )
+		esc_html__('View available merge tags.', 'invoicing')
 	);
 
-	$description = esc_html__( 'The content of the email (Merge Tags and HTML are allowed).', 'invoicing' );
+	$description = esc_html__('The content of the email (Merge Tags and HTML are allowed).', 'invoicing');
 	
 	$output .= "$description $link";
 
 	$output .= '<div class="getpaid-merge-tags-content mt-2 p-1 d-none">';
-	$output .= '<p class="mb-2">' . esc_html__( 'The following wildcards can be used in email subjects, heading and content:', 'invoicing' ) . '</p>';
+	$output .= '<p class="mb-2">' . esc_html__('The following wildcards can be used in email subjects, heading and content:', 'invoicing') . '</p>';
 
 	$output .= '<ul class="p-0 m-0">';
-	foreach($merge_tags as $tag => $tag_description) {
+	foreach ($merge_tags as $tag => $tag_description) {
 		$output .= "<li class='mb-2'><strong class='text-dark'>$tag</strong> &mdash; $tag_description</li>";
 	}