AyeCode / invoicing

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

Indentation +226 added lines, -226 removed lines

@@ -3,238 +3,238 @@
 class SD_Map 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'     => 'admin-site',
-			// Dash icon name for the block: https://developer.wordpress.org/resource/dashicons/#arrow-right
-			'block-category' => 'widgets',
-			// the category for the block, 'common', 'formatting', 'layout', 'widgets', 'embed'.
-			'block-keywords' => "['map','super','google']",
-			// used in the block search, MAX 3
-			'block-output'   => array( // the block visual output elements as an array
-				array(
-					'element'         => 'p',
-					'content'         => __( 'A Google API key is required to use this block, we recommend installing our plugin which makes it easy and sets it globally, or you can set a key in the block settings sidebar: ', 'super-duper' ),
-					//'element_require' => '"1"=='.get_option( 'rgmk_google_map_api_key', '"0"') ? '"0"' : '"1"',
-					'element_require' => get_option( 'rgmk_google_map_api_key', false ) ? '1==0' : '1==1 && [%api_key%]==""',
-				),
-				array(
-					'element'         => 'a',
-					'content'         => __( 'API KEY for Google Maps', 'super-duper' ),
-					'element_require' => get_option( 'rgmk_google_map_api_key', false ) ? '1==0' : '1==1 && [%api_key%]==""',
-					'href'            => 'https://wordpress.org/plugins/api-key-for-google-maps/',
-				),
-				array(
-					'element'         => 'img',
-					'class'           => '[%className%]',
-					//'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
-					'element_require' => '[%type%]=="image"',
-					'src'             => get_option( 'rgmk_google_map_api_key', false ) ? "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=" . get_option( 'rgmk_google_map_api_key' ) : "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=[%api_key%]"
-				),
-				array(
-					'element' => 'div',
-					'class'   => 'sd-map-iframe-cover',
-					'style'   => '{overflow:"hidden", position:"relative"}',
-					array(
-						'element'         => 'iframe',
-						'title'           => __( 'Placeholderx', 'super-duper' ),
-						'class'           => '[%className%]',
-						'width'           => '[%width%]',
-						'height'          => '[%height%]',
-						'frameborder'     => '0',
-						'allowfullscreen' => 'true',
-						'style'           => '{border:0}',
-						'element_require' => '[%type%]!="image"',
-						'src'             => get_option( 'rgmk_google_map_api_key', false ) ? "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=" . get_option( 'rgmk_google_map_api_key' ) : "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=[%api_key%]"
-					),
-				),
-				array(
-					'element'         => 'style',
-					'content'         => '.sd-map-iframe-cover:hover:before {background: #4a4a4a88; content: "' . __( "Click here, Settings are in the block settings sidebar", "super-duper" ) . '";} .sd-map-iframe-cover:before{cursor: pointer; content: ""; width: 100%; height: 100%; position: absolute; top: 0; bottom: 0;padding-top: 33%; text-align: center;  color: #fff; font-size: 20px; font-weight: bold;}',
-					'element_require' => '[%type%]!="image"',
-				),
-			),
-			'class_name'     => __CLASS__,
-			// The calling class name
-			'base_id'        => 'sd_map',
-			// this is used as the widget id and the shortcode id.
-			'name'           => __( 'Map', 'super-duper' ),
-			// the name of the widget/block
-			'widget_ops'     => array(
-				'classname'   => 'sd-map-class',
-				// widget class
-				'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world' ),
-				// widget description
-				'output'      => array( $this, 'output' )
-			),
-			'arguments'      => array( // these are the arguments that will be used in the widget, shortcode and block settings.
-				'type'          => array(
-					'title'    => __( 'Map Type:', 'geodirectory' ),
-					'desc'     => __( 'Select the map type to use.', 'geodirectory' ),
-					'type'     => 'select',
-					'options'  => array(
-						"image" => __( 'Static Image', 'geodirectory' ),
-						"place" => __( 'Place', 'geodirectory' ),
+    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'     => 'admin-site',
+            // Dash icon name for the block: https://developer.wordpress.org/resource/dashicons/#arrow-right
+            'block-category' => 'widgets',
+            // the category for the block, 'common', 'formatting', 'layout', 'widgets', 'embed'.
+            'block-keywords' => "['map','super','google']",
+            // used in the block search, MAX 3
+            'block-output'   => array( // the block visual output elements as an array
+                array(
+                    'element'         => 'p',
+                    'content'         => __( 'A Google API key is required to use this block, we recommend installing our plugin which makes it easy and sets it globally, or you can set a key in the block settings sidebar: ', 'super-duper' ),
+                    //'element_require' => '"1"=='.get_option( 'rgmk_google_map_api_key', '"0"') ? '"0"' : '"1"',
+                    'element_require' => get_option( 'rgmk_google_map_api_key', false ) ? '1==0' : '1==1 && [%api_key%]==""',
+                ),
+                array(
+                    'element'         => 'a',
+                    'content'         => __( 'API KEY for Google Maps', 'super-duper' ),
+                    'element_require' => get_option( 'rgmk_google_map_api_key', false ) ? '1==0' : '1==1 && [%api_key%]==""',
+                    'href'            => 'https://wordpress.org/plugins/api-key-for-google-maps/',
+                ),
+                array(
+                    'element'         => 'img',
+                    'class'           => '[%className%]',
+                    //'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
+                    'element_require' => '[%type%]=="image"',
+                    'src'             => get_option( 'rgmk_google_map_api_key', false ) ? "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=" . get_option( 'rgmk_google_map_api_key' ) : "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=[%api_key%]"
+                ),
+                array(
+                    'element' => 'div',
+                    'class'   => 'sd-map-iframe-cover',
+                    'style'   => '{overflow:"hidden", position:"relative"}',
+                    array(
+                        'element'         => 'iframe',
+                        'title'           => __( 'Placeholderx', 'super-duper' ),
+                        'class'           => '[%className%]',
+                        'width'           => '[%width%]',
+                        'height'          => '[%height%]',
+                        'frameborder'     => '0',
+                        'allowfullscreen' => 'true',
+                        'style'           => '{border:0}',
+                        'element_require' => '[%type%]!="image"',
+                        'src'             => get_option( 'rgmk_google_map_api_key', false ) ? "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=" . get_option( 'rgmk_google_map_api_key' ) : "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=[%api_key%]"
+                    ),
+                ),
+                array(
+                    'element'         => 'style',
+                    'content'         => '.sd-map-iframe-cover:hover:before {background: #4a4a4a88; content: "' . __( "Click here, Settings are in the block settings sidebar", "super-duper" ) . '";} .sd-map-iframe-cover:before{cursor: pointer; content: ""; width: 100%; height: 100%; position: absolute; top: 0; bottom: 0;padding-top: 33%; text-align: center;  color: #fff; font-size: 20px; font-weight: bold;}',
+                    'element_require' => '[%type%]!="image"',
+                ),
+            ),
+            'class_name'     => __CLASS__,
+            // The calling class name
+            'base_id'        => 'sd_map',
+            // this is used as the widget id and the shortcode id.
+            'name'           => __( 'Map', 'super-duper' ),
+            // the name of the widget/block
+            'widget_ops'     => array(
+                'classname'   => 'sd-map-class',
+                // widget class
+                'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world' ),
+                // widget description
+                'output'      => array( $this, 'output' )
+            ),
+            'arguments'      => array( // these are the arguments that will be used in the widget, shortcode and block settings.
+                'type'          => array(
+                    'title'    => __( 'Map Type:', 'geodirectory' ),
+                    'desc'     => __( 'Select the map type to use.', 'geodirectory' ),
+                    'type'     => 'select',
+                    'options'  => array(
+                        "image" => __( 'Static Image', 'geodirectory' ),
+                        "place" => __( 'Place', 'geodirectory' ),
 //						"directions" => __('Directions', 'geodirectory'),
 //						"search" => __('Search', 'geodirectory'),
 //						"view" => __('View', 'geodirectory'),
 //						"streetview" => __('Streetview', 'geodirectory'),
-					),
-					'default'  => 'image',
-					'desc_tip' => true,
-					'advanced' => false
-				),
-				'location'      => array(
-					'type'        => 'text',
-					'title'       => __( 'Location:', 'geodirectory' ),
-					'desc'        => __( 'Enter the location to show on the map, place, city, zip code or GPS.', 'geodirectory' ),
-					'placeholder' => 'Place, city, zip code or GPS',
-					'desc_tip'    => true,
-					'default'     => 'Ireland',
-					'advanced'    => false
-				),
-				'static_width'  => array(
-					'type'              => 'number',
-					'title'             => __( 'Width:', 'geodirectory' ),
-					'desc'              => __( 'This is the width of the map, for static maps you can only use px values.', 'geodirectory' ),
-					'placeholder'       => '600',
-					'desc_tip'          => true,
-					'default'           => '600',
-					'custom_attributes' => array(
-						'max' => '2000',
-						'min' => '100',
-					),
-					'element_require'   => '[%type%]=="image"',
-					'advanced'          => false
-				),
-				'static_height' => array(
-					'type'              => 'number',
-					'title'             => __( 'Height:', 'geodirectory' ),
-					'desc'              => __( 'This is the height of the map, for static maps you can only use px values.', 'geodirectory' ),
-					'placeholder'       => '400',
-					'desc_tip'          => true,
-					'default'           => '400',
-					'custom_attributes' => array(
-						'max'      => '2000',
-						'min'      => '100',
-						'required' => 'required',
-					),
-					'element_require'   => '[%type%]=="image"',
-					'advanced'          => false
-				),
-				'width'         => array(
-					'type'            => 'text',
-					'title'           => __( 'Width:', 'geodirectory' ),
-					'desc'            => __( 'This is the width of the map, you can use % or px here.', 'geodirectory' ),
-					'placeholder'     => '100%',
-					'desc_tip'        => true,
-					'default'         => '100%',
-					'element_require' => '[%type%]!="image"',
-					'advanced'        => false
-				),
-				'height'        => array(
-					'type'            => 'text',
-					'title'           => __( 'Height:', 'geodirectory' ),
-					'desc'            => __( 'This is the height of the map, you can use %, px or vh here.', 'geodirectory' ),
-					'placeholder'     => '425px',
-					'desc_tip'        => true,
-					'default'         => '425px',
-					'element_require' => '[%type%]!="image"',
-					'advanced'        => false
-				),
-				'maptype'       => array(
-					'type'     => 'select',
-					'title'    => __( 'Mapview:', 'geodirectory' ),
-					'desc'     => __( 'This is the type of map view that will be used by default.', 'geodirectory' ),
-					'options'  => array(
-						"roadmap"   => __( 'Road Map', 'geodirectory' ),
-						"satellite" => __( 'Satellite Map', 'geodirectory' ),
+                    ),
+                    'default'  => 'image',
+                    'desc_tip' => true,
+                    'advanced' => false
+                ),
+                'location'      => array(
+                    'type'        => 'text',
+                    'title'       => __( 'Location:', 'geodirectory' ),
+                    'desc'        => __( 'Enter the location to show on the map, place, city, zip code or GPS.', 'geodirectory' ),
+                    'placeholder' => 'Place, city, zip code or GPS',
+                    'desc_tip'    => true,
+                    'default'     => 'Ireland',
+                    'advanced'    => false
+                ),
+                'static_width'  => array(
+                    'type'              => 'number',
+                    'title'             => __( 'Width:', 'geodirectory' ),
+                    'desc'              => __( 'This is the width of the map, for static maps you can only use px values.', 'geodirectory' ),
+                    'placeholder'       => '600',
+                    'desc_tip'          => true,
+                    'default'           => '600',
+                    'custom_attributes' => array(
+                        'max' => '2000',
+                        'min' => '100',
+                    ),
+                    'element_require'   => '[%type%]=="image"',
+                    'advanced'          => false
+                ),
+                'static_height' => array(
+                    'type'              => 'number',
+                    'title'             => __( 'Height:', 'geodirectory' ),
+                    'desc'              => __( 'This is the height of the map, for static maps you can only use px values.', 'geodirectory' ),
+                    'placeholder'       => '400',
+                    'desc_tip'          => true,
+                    'default'           => '400',
+                    'custom_attributes' => array(
+                        'max'      => '2000',
+                        'min'      => '100',
+                        'required' => 'required',
+                    ),
+                    'element_require'   => '[%type%]=="image"',
+                    'advanced'          => false
+                ),
+                'width'         => array(
+                    'type'            => 'text',
+                    'title'           => __( 'Width:', 'geodirectory' ),
+                    'desc'            => __( 'This is the width of the map, you can use % or px here.', 'geodirectory' ),
+                    'placeholder'     => '100%',
+                    'desc_tip'        => true,
+                    'default'         => '100%',
+                    'element_require' => '[%type%]!="image"',
+                    'advanced'        => false
+                ),
+                'height'        => array(
+                    'type'            => 'text',
+                    'title'           => __( 'Height:', 'geodirectory' ),
+                    'desc'            => __( 'This is the height of the map, you can use %, px or vh here.', 'geodirectory' ),
+                    'placeholder'     => '425px',
+                    'desc_tip'        => true,
+                    'default'         => '425px',
+                    'element_require' => '[%type%]!="image"',
+                    'advanced'        => false
+                ),
+                'maptype'       => array(
+                    'type'     => 'select',
+                    'title'    => __( 'Mapview:', 'geodirectory' ),
+                    'desc'     => __( 'This is the type of map view that will be used by default.', 'geodirectory' ),
+                    'options'  => array(
+                        "roadmap"   => __( 'Road Map', 'geodirectory' ),
+                        "satellite" => __( 'Satellite Map', 'geodirectory' ),
 //						"hybrid"    => __( 'Hybrid Map', 'geodirectory' ),
 //						"terrain"   => __( 'Terrain Map', 'geodirectory' ),
-					),
-					'desc_tip' => true,
-					'default'  => 'roadmap',
-					'advanced' => true
-				),
-				'zoom'          => array(
-					'type'        => 'select',
-					'title'       => __( 'Zoom level:', 'geodirectory' ),
-					'desc'        => __( 'This is the zoom level of the map, `auto` is recommended.', 'geodirectory' ),
-					'options'     => range( 1, 19 ),
-					'placeholder' => '',
-					'desc_tip'    => true,
-					'default'     => '7',
-					'advanced'    => true
-				),
-				'api_key'       => array(
-					'type'            => 'text',
-					'title'           => __( 'Api Key:', 'geodirectory' ),
-					'desc'            => __( 'Enter your Google maps API key here.', 'geodirectory' ),
-					'placeholder'     => '',
-					'desc_tip'        => true,
-					'default'         => '',
-					'element_require' => get_option( 'rgmk_google_map_api_key', false ) ? '1==0' : '1==1',
-					'advanced'        => false
-				),
-			)
-		);
-
-		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 = '' ) {
-
-		// options
-		$defaults = array(
-			'type'          => 'image', // image, place
-			'location'      => 'Ireland',
-			'static_width'  => '600',
-			'static_height' => '400',
-			'width'         => '100%',
-			'height'        => '425px',
-			'maptype'       => 'roadmap',
-			'zoom'          => '7',
-			'api_key'       => 'AIzaSyBK3ZcmK0ljxl5agNyJNQh_G24Thq1btuE',
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-
-		// check if we have a global API key
-		$args['api_key'] = get_option( 'rgmk_google_map_api_key', false ) ? get_option( 'rgmk_google_map_api_key' ) : $args['api_key'];
-
-		if ( $args['type'] == 'image' ) {
-			$output .= "<img src='https://maps.googleapis.com/maps/api/staticmap?center=" . esc_attr( $args['location'] ) . "&maptype=" . esc_attr( $args['maptype'] ) . "&zoom=" . esc_attr( $args['zoom'] ) . "&size=" . esc_attr( $args['static_width'] ) . "x" . esc_attr( $args['static_height'] ) . "&key=" . esc_attr( $args['api_key'] ) . "' />";
-		} else {
-			$output .= "<iframe width='" . esc_attr( $args['width'] ) . "' height='" . esc_attr( $args['height'] ) . "' frameborder='0' allowfullscreen style='border:0;' src='https://www.google.com/maps/embed/v1/" . esc_attr( $args['type'] ) . "?q=" . esc_attr( $args['location'] ) . "&maptype=" . esc_attr( $args['maptype'] ) . "&zoom=" . esc_attr( $args['zoom'] ) . "&key=" . esc_attr( $args['api_key'] ) . "' ></iframe> ";
-		}
-
-		return $output;
-
-	}
+                    ),
+                    'desc_tip' => true,
+                    'default'  => 'roadmap',
+                    'advanced' => true
+                ),
+                'zoom'          => array(
+                    'type'        => 'select',
+                    'title'       => __( 'Zoom level:', 'geodirectory' ),
+                    'desc'        => __( 'This is the zoom level of the map, `auto` is recommended.', 'geodirectory' ),
+                    'options'     => range( 1, 19 ),
+                    'placeholder' => '',
+                    'desc_tip'    => true,
+                    'default'     => '7',
+                    'advanced'    => true
+                ),
+                'api_key'       => array(
+                    'type'            => 'text',
+                    'title'           => __( 'Api Key:', 'geodirectory' ),
+                    'desc'            => __( 'Enter your Google maps API key here.', 'geodirectory' ),
+                    'placeholder'     => '',
+                    'desc_tip'        => true,
+                    'default'         => '',
+                    'element_require' => get_option( 'rgmk_google_map_api_key', false ) ? '1==0' : '1==1',
+                    'advanced'        => false
+                ),
+            )
+        );
+
+        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 = '' ) {
+
+        // options
+        $defaults = array(
+            'type'          => 'image', // image, place
+            'location'      => 'Ireland',
+            'static_width'  => '600',
+            'static_height' => '400',
+            'width'         => '100%',
+            'height'        => '425px',
+            'maptype'       => 'roadmap',
+            'zoom'          => '7',
+            'api_key'       => 'AIzaSyBK3ZcmK0ljxl5agNyJNQh_G24Thq1btuE',
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        $output = '';
+
+
+        // check if we have a global API key
+        $args['api_key'] = get_option( 'rgmk_google_map_api_key', false ) ? get_option( 'rgmk_google_map_api_key' ) : $args['api_key'];
+
+        if ( $args['type'] == 'image' ) {
+            $output .= "<img src='https://maps.googleapis.com/maps/api/staticmap?center=" . esc_attr( $args['location'] ) . "&maptype=" . esc_attr( $args['maptype'] ) . "&zoom=" . esc_attr( $args['zoom'] ) . "&size=" . esc_attr( $args['static_width'] ) . "x" . esc_attr( $args['static_height'] ) . "&key=" . esc_attr( $args['api_key'] ) . "' />";
+        } else {
+            $output .= "<iframe width='" . esc_attr( $args['width'] ) . "' height='" . esc_attr( $args['height'] ) . "' frameborder='0' allowfullscreen style='border:0;' src='https://www.google.com/maps/embed/v1/" . esc_attr( $args['type'] ) . "?q=" . esc_attr( $args['location'] ) . "&maptype=" . esc_attr( $args['maptype'] ) . "&zoom=" . esc_attr( $args['zoom'] ) . "&key=" . esc_attr( $args['api_key'] ) . "' ></iframe> ";
+        }
+
+        return $output;
+
+    }
 
 }
 

Spacing +42 added lines, -42 removed lines

@@ -22,14 +22,14 @@ 
 			'block-output'   => array( // the block visual output elements as an array
 				array(
 					'element'         => 'p',
-					'content'         => __( 'A Google API key is required to use this block, we recommend installing our plugin which makes it easy and sets it globally, or you can set a key in the block settings sidebar: ', 'super-duper' ),
+					'content'         => __('A Google API key is required to use this block, we recommend installing our plugin which makes it easy and sets it globally, or you can set a key in the block settings sidebar: ', 'super-duper'),
 					//'element_require' => '"1"=='.get_option( 'rgmk_google_map_api_key', '"0"') ? '"0"' : '"1"',
-					'element_require' => get_option( 'rgmk_google_map_api_key', false ) ? '1==0' : '1==1 && [%api_key%]==""',
+					'element_require' => get_option('rgmk_google_map_api_key', false) ? '1==0' : '1==1 && [%api_key%]==""',
 				),
 				array(
 					'element'         => 'a',
-					'content'         => __( 'API KEY for Google Maps', 'super-duper' ),
-					'element_require' => get_option( 'rgmk_google_map_api_key', false ) ? '1==0' : '1==1 && [%api_key%]==""',
+					'content'         => __('API KEY for Google Maps', 'super-duper'),
+					'element_require' => get_option('rgmk_google_map_api_key', false) ? '1==0' : '1==1 && [%api_key%]==""',
 					'href'            => 'https://wordpress.org/plugins/api-key-for-google-maps/',
 				),
 				array(
@@ -37,7 +37,7 @@ 
 					'class'           => '[%className%]',
 					//'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
 					'element_require' => '[%type%]=="image"',
-					'src'             => get_option( 'rgmk_google_map_api_key', false ) ? "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=" . get_option( 'rgmk_google_map_api_key' ) : "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=[%api_key%]"
+					'src'             => get_option('rgmk_google_map_api_key', false) ? "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=" . get_option('rgmk_google_map_api_key') : "https://maps.googleapis.com/maps/api/staticmap?center=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&size=[%static_width%]x[%static_height%]&key=[%api_key%]"
 				),
 				array(
 					'element' => 'div',
@@ -45,7 +45,7 @@ 
 					'style'   => '{overflow:"hidden", position:"relative"}',
 					array(
 						'element'         => 'iframe',
-						'title'           => __( 'Placeholderx', 'super-duper' ),
+						'title'           => __('Placeholderx', 'super-duper'),
 						'class'           => '[%className%]',
 						'width'           => '[%width%]',
 						'height'          => '[%height%]',
@@ -53,12 +53,12 @@ 
 						'allowfullscreen' => 'true',
 						'style'           => '{border:0}',
 						'element_require' => '[%type%]!="image"',
-						'src'             => get_option( 'rgmk_google_map_api_key', false ) ? "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=" . get_option( 'rgmk_google_map_api_key' ) : "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=[%api_key%]"
+						'src'             => get_option('rgmk_google_map_api_key', false) ? "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=" . get_option('rgmk_google_map_api_key') : "https://www.google.com/maps/embed/v1/[%type%]?q=[%location%]&maptype=[%maptype%]&zoom=[%zoom%]&key=[%api_key%]"
 					),
 				),
 				array(
 					'element'         => 'style',
-					'content'         => '.sd-map-iframe-cover:hover:before {background: #4a4a4a88; content: "' . __( "Click here, Settings are in the block settings sidebar", "super-duper" ) . '";} .sd-map-iframe-cover:before{cursor: pointer; content: ""; width: 100%; height: 100%; position: absolute; top: 0; bottom: 0;padding-top: 33%; text-align: center;  color: #fff; font-size: 20px; font-weight: bold;}',
+					'content'         => '.sd-map-iframe-cover:hover:before {background: #4a4a4a88; content: "' . __("Click here, Settings are in the block settings sidebar", "super-duper") . '";} .sd-map-iframe-cover:before{cursor: pointer; content: ""; width: 100%; height: 100%; position: absolute; top: 0; bottom: 0;padding-top: 33%; text-align: center;  color: #fff; font-size: 20px; font-weight: bold;}',
 					'element_require' => '[%type%]!="image"',
 				),
 			),
@@ -66,23 +66,23 @@ 
 			// The calling class name
 			'base_id'        => 'sd_map',
 			// this is used as the widget id and the shortcode id.
-			'name'           => __( 'Map', 'super-duper' ),
+			'name'           => __('Map', 'super-duper'),
 			// the name of the widget/block
 			'widget_ops'     => array(
 				'classname'   => 'sd-map-class',
 				// widget class
-				'description' => esc_html__( 'This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world' ),
+				'description' => esc_html__('This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world'),
 				// widget description
-				'output'      => array( $this, 'output' )
+				'output'      => array($this, 'output')
 			),
 			'arguments'      => array( // these are the arguments that will be used in the widget, shortcode and block settings.
 				'type'          => array(
-					'title'    => __( 'Map Type:', 'geodirectory' ),
-					'desc'     => __( 'Select the map type to use.', 'geodirectory' ),
+					'title'    => __('Map Type:', 'geodirectory'),
+					'desc'     => __('Select the map type to use.', 'geodirectory'),
 					'type'     => 'select',
 					'options'  => array(
-						"image" => __( 'Static Image', 'geodirectory' ),
-						"place" => __( 'Place', 'geodirectory' ),
+						"image" => __('Static Image', 'geodirectory'),
+						"place" => __('Place', 'geodirectory'),
 //						"directions" => __('Directions', 'geodirectory'),
 //						"search" => __('Search', 'geodirectory'),
 //						"view" => __('View', 'geodirectory'),
@@ -94,8 +94,8 @@ 
 				),
 				'location'      => array(
 					'type'        => 'text',
-					'title'       => __( 'Location:', 'geodirectory' ),
-					'desc'        => __( 'Enter the location to show on the map, place, city, zip code or GPS.', 'geodirectory' ),
+					'title'       => __('Location:', 'geodirectory'),
+					'desc'        => __('Enter the location to show on the map, place, city, zip code or GPS.', 'geodirectory'),
 					'placeholder' => 'Place, city, zip code or GPS',
 					'desc_tip'    => true,
 					'default'     => 'Ireland',
@@ -103,8 +103,8 @@ 
 				),
 				'static_width'  => array(
 					'type'              => 'number',
-					'title'             => __( 'Width:', 'geodirectory' ),
-					'desc'              => __( 'This is the width of the map, for static maps you can only use px values.', 'geodirectory' ),
+					'title'             => __('Width:', 'geodirectory'),
+					'desc'              => __('This is the width of the map, for static maps you can only use px values.', 'geodirectory'),
 					'placeholder'       => '600',
 					'desc_tip'          => true,
 					'default'           => '600',
@@ -117,8 +117,8 @@ 
 				),
 				'static_height' => array(
 					'type'              => 'number',
-					'title'             => __( 'Height:', 'geodirectory' ),
-					'desc'              => __( 'This is the height of the map, for static maps you can only use px values.', 'geodirectory' ),
+					'title'             => __('Height:', 'geodirectory'),
+					'desc'              => __('This is the height of the map, for static maps you can only use px values.', 'geodirectory'),
 					'placeholder'       => '400',
 					'desc_tip'          => true,
 					'default'           => '400',
@@ -132,8 +132,8 @@ 
 				),
 				'width'         => array(
 					'type'            => 'text',
-					'title'           => __( 'Width:', 'geodirectory' ),
-					'desc'            => __( 'This is the width of the map, you can use % or px here.', 'geodirectory' ),
+					'title'           => __('Width:', 'geodirectory'),
+					'desc'            => __('This is the width of the map, you can use % or px here.', 'geodirectory'),
 					'placeholder'     => '100%',
 					'desc_tip'        => true,
 					'default'         => '100%',
@@ -142,8 +142,8 @@ 
 				),
 				'height'        => array(
 					'type'            => 'text',
-					'title'           => __( 'Height:', 'geodirectory' ),
-					'desc'            => __( 'This is the height of the map, you can use %, px or vh here.', 'geodirectory' ),
+					'title'           => __('Height:', 'geodirectory'),
+					'desc'            => __('This is the height of the map, you can use %, px or vh here.', 'geodirectory'),
 					'placeholder'     => '425px',
 					'desc_tip'        => true,
 					'default'         => '425px',
@@ -152,11 +152,11 @@ 
 				),
 				'maptype'       => array(
 					'type'     => 'select',
-					'title'    => __( 'Mapview:', 'geodirectory' ),
-					'desc'     => __( 'This is the type of map view that will be used by default.', 'geodirectory' ),
+					'title'    => __('Mapview:', 'geodirectory'),
+					'desc'     => __('This is the type of map view that will be used by default.', 'geodirectory'),
 					'options'  => array(
-						"roadmap"   => __( 'Road Map', 'geodirectory' ),
-						"satellite" => __( 'Satellite Map', 'geodirectory' ),
+						"roadmap"   => __('Road Map', 'geodirectory'),
+						"satellite" => __('Satellite Map', 'geodirectory'),
 //						"hybrid"    => __( 'Hybrid Map', 'geodirectory' ),
 //						"terrain"   => __( 'Terrain Map', 'geodirectory' ),
 					),
@@ -166,9 +166,9 @@ 
 				),
 				'zoom'          => array(
 					'type'        => 'select',
-					'title'       => __( 'Zoom level:', 'geodirectory' ),
-					'desc'        => __( 'This is the zoom level of the map, `auto` is recommended.', 'geodirectory' ),
-					'options'     => range( 1, 19 ),
+					'title'       => __('Zoom level:', 'geodirectory'),
+					'desc'        => __('This is the zoom level of the map, `auto` is recommended.', 'geodirectory'),
+					'options'     => range(1, 19),
 					'placeholder' => '',
 					'desc_tip'    => true,
 					'default'     => '7',
@@ -176,18 +176,18 @@ 
 				),
 				'api_key'       => array(
 					'type'            => 'text',
-					'title'           => __( 'Api Key:', 'geodirectory' ),
-					'desc'            => __( 'Enter your Google maps API key here.', 'geodirectory' ),
+					'title'           => __('Api Key:', 'geodirectory'),
+					'desc'            => __('Enter your Google maps API key here.', 'geodirectory'),
 					'placeholder'     => '',
 					'desc_tip'        => true,
 					'default'         => '',
-					'element_require' => get_option( 'rgmk_google_map_api_key', false ) ? '1==0' : '1==1',
+					'element_require' => get_option('rgmk_google_map_api_key', false) ? '1==0' : '1==1',
 					'advanced'        => false
 				),
 			)
 		);
 
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 
@@ -200,7 +200,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
+	public function output($args = array(), $widget_args = array(), $content = '') {
 
 		// options
 		$defaults = array(
@@ -218,18 +218,18 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$output = '';
 
 
 		// check if we have a global API key
-		$args['api_key'] = get_option( 'rgmk_google_map_api_key', false ) ? get_option( 'rgmk_google_map_api_key' ) : $args['api_key'];
+		$args['api_key'] = get_option('rgmk_google_map_api_key', false) ? get_option('rgmk_google_map_api_key') : $args['api_key'];
 
-		if ( $args['type'] == 'image' ) {
-			$output .= "<img src='https://maps.googleapis.com/maps/api/staticmap?center=" . esc_attr( $args['location'] ) . "&maptype=" . esc_attr( $args['maptype'] ) . "&zoom=" . esc_attr( $args['zoom'] ) . "&size=" . esc_attr( $args['static_width'] ) . "x" . esc_attr( $args['static_height'] ) . "&key=" . esc_attr( $args['api_key'] ) . "' />";
+		if ($args['type'] == 'image') {
+			$output .= "<img src='https://maps.googleapis.com/maps/api/staticmap?center=" . esc_attr($args['location']) . "&maptype=" . esc_attr($args['maptype']) . "&zoom=" . esc_attr($args['zoom']) . "&size=" . esc_attr($args['static_width']) . "x" . esc_attr($args['static_height']) . "&key=" . esc_attr($args['api_key']) . "' />";
 		} else {
-			$output .= "<iframe width='" . esc_attr( $args['width'] ) . "' height='" . esc_attr( $args['height'] ) . "' frameborder='0' allowfullscreen style='border:0;' src='https://www.google.com/maps/embed/v1/" . esc_attr( $args['type'] ) . "?q=" . esc_attr( $args['location'] ) . "&maptype=" . esc_attr( $args['maptype'] ) . "&zoom=" . esc_attr( $args['zoom'] ) . "&key=" . esc_attr( $args['api_key'] ) . "' ></iframe> ";
+			$output .= "<iframe width='" . esc_attr($args['width']) . "' height='" . esc_attr($args['height']) . "' frameborder='0' allowfullscreen style='border:0;' src='https://www.google.com/maps/embed/v1/" . esc_attr($args['type']) . "?q=" . esc_attr($args['location']) . "&maptype=" . esc_attr($args['maptype']) . "&zoom=" . esc_attr($args['zoom']) . "&key=" . esc_attr($args['api_key']) . "' ></iframe> ";
 		}
 
 		return $output;

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

Indentation +13 added lines, -13 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
  * @return mixed|void
  */
 function sd_pagenow_exclude() {
-	return apply_filters( 'sd_pagenow_exclude', array(
+	return apply_filters('sd_pagenow_exclude', array(
 		'upload.php',
 		'edit-comments.php',
 		'edit-tags.php',
@@ -22,7 +22,7 @@ 
 		'edit.php',
 		'themes.php',
 		'users.php',
-	) );
+	));
 }
 
 
@@ -34,5 +34,5 @@ 
  * @return mixed|void
  */
 function sd_widget_exclude() {
-	return apply_filters( 'sd_widget_exclude', array() );
+	return apply_filters('sd_widget_exclude', array());
 }

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

Spacing +5 added lines, -5 removed lines

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

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

Indentation +1238 added lines, -1238 removed lines

@@ -10,294 +10,294 @@ 
 // Ensure the class is only loaded once.
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
 
-	/**
-	 *
-	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
-	 *
-	 * View hello-world.php for example usage
-	 *
-	 * @since 1.0.0
-	 * @since 1.0.16 change log moved to file change-log.txt - CHANGED
-	 * @since 2.0.0 shortcode, widget and blocks moved into separate files - CHANGED
-	 * @version 2.0.0
-	 */
-	abstract class WP_Super_Duper {
-	
-		public $version = "2.0.0";
-		public $font_awesome_icon_version = "5.11.2";
-		public $block_code;
-		public $options;
-		public $base_id;
-		public $number;
-		public $settings_hash;
-		public $arguments = array();
-		public $instance = array();
-	
-		// prevent SDv1 errors if register_widget() function used
-		public $id_base;
-	
-		/**
-		 * @var array Contains an array of output types instances.
-		 */
-		public $output_types = array();
-	
-		/**
-		 * The relative url to the current folder.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-	
-		/**
-		 * Take the array options and use them to build.
-		 */
-		public function __construct( $options ) {
-			global $sd_widgets;
-	
-			$sd_widgets[ $options['base_id'] ] = array(
-				'name'       => $options['name'],
-				'class_name' => $options['class_name']
-			);
-			$this->base_id   = $options['base_id'];
-	
-			// Lets filter the options before we do anything.
-			$options = apply_filters( 'wp_super_duper_options', $options, $this );
-			$options = apply_filters( "wp_super_duper_options_{$this->base_id}", $options, $this );
-			$options = $this->add_name_from_key( $options );
-	
-			// Set args.
-			$this->options   = $options;
-			$this->base_id   = $options['base_id'];
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
-	
-			// Load output types.
-			$this->load_output_types();
-	
-			// add generator text to admin head
-			add_action( 'admin_head', array( $this, 'generator' ) );
-	
-			add_action( 'admin_init', array( __CLASS__, 'load_widgets_setting' ) );
-	
-			add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
-	
-			do_action( 'wp_super_duper_widget_init', $options, $this );
-	
-		}
-	
-		/**
-		 * Set the name from the argument key.
-		 *
-		 * @param array $options
-		 * @param bool $arguments
-		 *
-		 * @return mixed
-		 */
-		protected 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;
-		}
-	
-		/**
-		 * Output the version in the admin header.
-		 */
-		public function load_output_types() {
-	
-			$allowed_types = $this->get_output_types();
-			$output_types  = array( 'block', 'shortcode', 'widget' );
-	
-			// Check if this is being overidden by the widget.
-			$args = $this->get_arguments();
-			if ( isset( $args['output_types'] ) && is_array( $args['output_types'] ) ) {
-				$output_types  = $args['output_types'] ;
-			}
-	
-			if ( isset( $this->options['output_types'] ) && is_array( $this->options['output_types'] ) ) {
-				$output_types  = $this->options['output_types'] ;
-			}
-	
-			// Load each output type.
-			foreach ( $output_types as $output_type ) {
-	
-				// Ensure this is an allowed type.
-				if ( ! isset( $allowed_types[ $output_type ] ) ) {
-					continue;
-				}
-	
-				// If the class does not exist, try loading it.
-				if ( ! class_exists( $allowed_types[ $output_type ] ) ) {
-	
-					if ( file_exists( plugin_dir_path( __FILE__ ) . "type/$output_type.php" ) ) {
-						require_once( plugin_dir_path( __FILE__ ) . "type/$output_type.php" );
-					} else {
-						continue;
-					}
-	
-				}
-	
-				$output_class                       = $allowed_types[ $output_type ];
-				$this->output_types[ $output_type ] = new $output_class( $this );
-			}
-	
-		}
-	
-		/**
-		 * Retrieves an array of available SD types.
-		 *
-		 * @return array
-		 */
-		protected function get_output_types() {
-	
-			// Output type id and class.
-			$types = array(
-				'block'     => 'WP_Super_Duper_Block',
-				'shortcode' => 'WP_Super_Duper_Shortcode',
-				'widget'    => 'WP_Super_Duper_Widget',
-			);
-	
-			// Maybe disable widgets.
-			$disable_widget   = get_option( 'sd_load_widgets', 'auto' );
-	
-			if ( 'auto' === $disable_widget ) {
-				if ( !$this->widgets_required() ) {
-					unset( $types['widget'] );
-				}
-			}
-	
-			if ( 'no' === $disable_widget ) {
-				unset( $types['widget'] );
-			}
-	
-			return apply_filters( 'super_duper_types', $types, $this );
-		}
-	
-		/**
-		 * Check if we are required to load widgets.
-		 *
-		 * @return mixed|void
-		 */
-		protected function widgets_required(){
-			global $wp_version;
-	
-			$required = false;
-	
-	
-			// check wp version
-			if( version_compare( $wp_version, '5.8', '<' ) ){
-				$required = true;
-			}
-	
-			// Page builders that require widgets
-			if(
-			!$required && (
-			defined( 'ELEMENTOR_VERSION' ) // elementor
-			|| class_exists( 'Fusion_Element' ) // Fusion Builder (avada)
-			|| class_exists( 'SiteOrigin_Panels' ) // SiteOrigin Page builder
-			|| defined( 'WPB_VC_VERSION' ) // WPBakery page builder
-			|| defined( 'CT_VERSION' ) // Oxygen Builder
-			|| defined( 'FL_BUILDER_VERSION' ) // Beaver Builder
-			|| defined( 'FL_THEME_BUILDER_VERSION' ) // Beaver Themer
-			)
-			){
-				$required = true;
-			}
-	
-			// Theme has active widgets
-			if( !$required && !empty( $this->has_active_widgets() )  ){
-				$required = true;
-			}
-	
-	
-			return apply_filters( 'sd_widgets_required' , $required );
-		}
-	
-		/**
-		 * Check if the current site has any active old style widgets.
-		 *
-		 * @return bool
-		 */
-		protected function has_active_widgets(){
-			global $sd_has_active_widgets;
-	
-			// have we already done this?
-			if(!is_null($sd_has_active_widgets)){
-				return $sd_has_active_widgets;
-			}
-	
-			$result = false;
-			$sidebars_widgets = get_option('sidebars_widgets');
-	
-			if(is_array($sidebars_widgets)){
-	
-				foreach ($sidebars_widgets as $key => $value) {
-	
-	
-	
-					if( $key != 'wp_inactive_widgets' ) {
-	
-						if(!empty($value) && is_array($value)){
-							foreach($value as $widget){
-								if($widget && substr( $widget, 0, 6 ) !== "block-"){
-									$result = true;
-								}
-							}
-						}
-	
-					}
-				}
-			}
-	
-			$sd_has_active_widgets = $result;
-	
-			return $result;
-		}
-	
-		/**
-		 * Get arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Get arguments.
-		 */
-		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->set_arguments();
-			}
-	
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
-	
-			return $this->arguments;
-		}
-	
-		/**
-		 * Set arguments in super duper.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @return array Set arguments.
-		 */
-		public function set_arguments() {
-			return $this->arguments;
-		}
-	
-		/**
-		 * Makes SD work with the siteOrigin page builder.
-		 *
-		 * @since 1.0.6
-		 * @return mixed
-		 */
-		public static function siteorigin_js() {
-			ob_start();
-			?>
+    /**
+     *
+     * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
+     *
+     * View hello-world.php for example usage
+     *
+     * @since 1.0.0
+     * @since 1.0.16 change log moved to file change-log.txt - CHANGED
+     * @since 2.0.0 shortcode, widget and blocks moved into separate files - CHANGED
+     * @version 2.0.0
+     */
+    abstract class WP_Super_Duper {
+	
+        public $version = "2.0.0";
+        public $font_awesome_icon_version = "5.11.2";
+        public $block_code;
+        public $options;
+        public $base_id;
+        public $number;
+        public $settings_hash;
+        public $arguments = array();
+        public $instance = array();
+	
+        // prevent SDv1 errors if register_widget() function used
+        public $id_base;
+	
+        /**
+         * @var array Contains an array of output types instances.
+         */
+        public $output_types = array();
+	
+        /**
+         * The relative url to the current folder.
+         *
+         * @var string
+         */
+        public $url = '';
+	
+        /**
+         * Take the array options and use them to build.
+         */
+        public function __construct( $options ) {
+            global $sd_widgets;
+	
+            $sd_widgets[ $options['base_id'] ] = array(
+                'name'       => $options['name'],
+                'class_name' => $options['class_name']
+            );
+            $this->base_id   = $options['base_id'];
+	
+            // Lets filter the options before we do anything.
+            $options = apply_filters( 'wp_super_duper_options', $options, $this );
+            $options = apply_filters( "wp_super_duper_options_{$this->base_id}", $options, $this );
+            $options = $this->add_name_from_key( $options );
+	
+            // Set args.
+            $this->options   = $options;
+            $this->base_id   = $options['base_id'];
+            $this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
+	
+            // Load output types.
+            $this->load_output_types();
+	
+            // add generator text to admin head
+            add_action( 'admin_head', array( $this, 'generator' ) );
+	
+            add_action( 'admin_init', array( __CLASS__, 'load_widgets_setting' ) );
+	
+            add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+	
+            do_action( 'wp_super_duper_widget_init', $options, $this );
+	
+        }
+	
+        /**
+         * Set the name from the argument key.
+         *
+         * @param array $options
+         * @param bool $arguments
+         *
+         * @return mixed
+         */
+        protected 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;
+        }
+	
+        /**
+         * Output the version in the admin header.
+         */
+        public function load_output_types() {
+	
+            $allowed_types = $this->get_output_types();
+            $output_types  = array( 'block', 'shortcode', 'widget' );
+	
+            // Check if this is being overidden by the widget.
+            $args = $this->get_arguments();
+            if ( isset( $args['output_types'] ) && is_array( $args['output_types'] ) ) {
+                $output_types  = $args['output_types'] ;
+            }
+	
+            if ( isset( $this->options['output_types'] ) && is_array( $this->options['output_types'] ) ) {
+                $output_types  = $this->options['output_types'] ;
+            }
+	
+            // Load each output type.
+            foreach ( $output_types as $output_type ) {
+	
+                // Ensure this is an allowed type.
+                if ( ! isset( $allowed_types[ $output_type ] ) ) {
+                    continue;
+                }
+	
+                // If the class does not exist, try loading it.
+                if ( ! class_exists( $allowed_types[ $output_type ] ) ) {
+	
+                    if ( file_exists( plugin_dir_path( __FILE__ ) . "type/$output_type.php" ) ) {
+                        require_once( plugin_dir_path( __FILE__ ) . "type/$output_type.php" );
+                    } else {
+                        continue;
+                    }
+	
+                }
+	
+                $output_class                       = $allowed_types[ $output_type ];
+                $this->output_types[ $output_type ] = new $output_class( $this );
+            }
+	
+        }
+	
+        /**
+         * Retrieves an array of available SD types.
+         *
+         * @return array
+         */
+        protected function get_output_types() {
+	
+            // Output type id and class.
+            $types = array(
+                'block'     => 'WP_Super_Duper_Block',
+                'shortcode' => 'WP_Super_Duper_Shortcode',
+                'widget'    => 'WP_Super_Duper_Widget',
+            );
+	
+            // Maybe disable widgets.
+            $disable_widget   = get_option( 'sd_load_widgets', 'auto' );
+	
+            if ( 'auto' === $disable_widget ) {
+                if ( !$this->widgets_required() ) {
+                    unset( $types['widget'] );
+                }
+            }
+	
+            if ( 'no' === $disable_widget ) {
+                unset( $types['widget'] );
+            }
+	
+            return apply_filters( 'super_duper_types', $types, $this );
+        }
+	
+        /**
+         * Check if we are required to load widgets.
+         *
+         * @return mixed|void
+         */
+        protected function widgets_required(){
+            global $wp_version;
+	
+            $required = false;
+	
+	
+            // check wp version
+            if( version_compare( $wp_version, '5.8', '<' ) ){
+                $required = true;
+            }
+	
+            // Page builders that require widgets
+            if(
+            !$required && (
+            defined( 'ELEMENTOR_VERSION' ) // elementor
+            || class_exists( 'Fusion_Element' ) // Fusion Builder (avada)
+            || class_exists( 'SiteOrigin_Panels' ) // SiteOrigin Page builder
+            || defined( 'WPB_VC_VERSION' ) // WPBakery page builder
+            || defined( 'CT_VERSION' ) // Oxygen Builder
+            || defined( 'FL_BUILDER_VERSION' ) // Beaver Builder
+            || defined( 'FL_THEME_BUILDER_VERSION' ) // Beaver Themer
+            )
+            ){
+                $required = true;
+            }
+	
+            // Theme has active widgets
+            if( !$required && !empty( $this->has_active_widgets() )  ){
+                $required = true;
+            }
+	
+	
+            return apply_filters( 'sd_widgets_required' , $required );
+        }
+	
+        /**
+         * Check if the current site has any active old style widgets.
+         *
+         * @return bool
+         */
+        protected function has_active_widgets(){
+            global $sd_has_active_widgets;
+	
+            // have we already done this?
+            if(!is_null($sd_has_active_widgets)){
+                return $sd_has_active_widgets;
+            }
+	
+            $result = false;
+            $sidebars_widgets = get_option('sidebars_widgets');
+	
+            if(is_array($sidebars_widgets)){
+	
+                foreach ($sidebars_widgets as $key => $value) {
+	
+	
+	
+                    if( $key != 'wp_inactive_widgets' ) {
+	
+                        if(!empty($value) && is_array($value)){
+                            foreach($value as $widget){
+                                if($widget && substr( $widget, 0, 6 ) !== "block-"){
+                                    $result = true;
+                                }
+                            }
+                        }
+	
+                    }
+                }
+            }
+	
+            $sd_has_active_widgets = $result;
+	
+            return $result;
+        }
+	
+        /**
+         * Get arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Get arguments.
+         */
+        public function get_arguments() {
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->set_arguments();
+            }
+	
+            $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
+            $this->arguments = $this->add_name_from_key( $this->arguments, true );
+	
+            return $this->arguments;
+        }
+	
+        /**
+         * Set arguments in super duper.
+         *
+         * @since 1.0.0
+         *
+         * @return array Set arguments.
+         */
+        public function set_arguments() {
+            return $this->arguments;
+        }
+	
+        /**
+         * Makes SD work with the siteOrigin page builder.
+         *
+         * @since 1.0.6
+         * @return mixed
+         */
+        public static function siteorigin_js() {
+            ob_start();
+            ?>
 			<script>
 				/**
 				 * Check a form to see what items should be shown or hidden.
@@ -375,50 +375,50 @@ 
 				});
 			</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 );
-		}
-	
-		/**
-		 * 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;
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
+	
+        /**
+         * A function to ge the shortcode builder picker html.
+         *
+         * @param string $editor_id
+         *
+         * @return string
+         */
+        public static function get_picker( $editor_id = '' ) {
+	
+            ob_start();
+            if ( isset( $_POST['editor_id'] ) ) {
+                $editor_id = esc_attr( $_POST['editor_id'] );
+            } elseif ( isset( $_REQUEST['et_fb'] ) ) {
+                $editor_id = 'main_content_content_vb_tiny_mce';
+            }
+	
+            global $sd_widgets;
+            ?>
 	
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
-				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
-					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
-					}
-					echo "</select>";
-	
-				}
-				?>
+                ksort( $sd_widgets );
+                //				print_r($sd_widgets);exit;
+                if ( ! empty( $sd_widgets ) ) {
+                    echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
+                    echo "<option>" . __( 'Select shortcode' ) . "</option>";
+                    foreach ( $sd_widgets as $shortcode => $class ) {
+                        echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+                    }
+                    echo "</select>";
+	
+                }
+                ?>
 				<div class="sd-shortcode-settings"></div>
 	
 			</div>
@@ -429,8 +429,8 @@ 
 					<?php if ( $editor_id != '' ) { ?>
 						<button class="button sd-insert-shortcode-button"
 								onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
-									echo "'" . $editor_id . "'";
-								} ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+                                    echo "'" . $editor_id . "'";
+                                } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
 					<?php } ?>
 					<button class="button"
 							onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
@@ -438,44 +438,44 @@ 
 			</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 '';
 	
-		}
+        }
 	
-		/**
-		 * Returns the JS used to render the widget/shortcode settings form.
-		 *
-		 * @return string
-		 */
-		public static function widget_js() {
-			ob_start();
-			?>
+        /**
+         * Returns the JS used to render the widget/shortcode settings form.
+         *
+         * @return string
+         */
+        public static function widget_js() {
+            ob_start();
+            ?>
 			<script>
 	
 				/**
@@ -633,28 +633,28 @@ 
 			</script>
 	
 			<?php
-				$output = ob_get_clean();
+                $output = ob_get_clean();
 	
-				/*
+                /*
 				* We only add the <script> tags for code highlighting, so we strip them from the output.
 				*/
 	
-				return str_replace( array(
-					'<script>',
-					'</script>'
-				), '', $output );
-		}
-	
-		/**
-		 * Returns the CSS used to render the widget/shortcode settings form.
-		 *
-		 * @param bool $advanced If we should include advanced CSS.
-		 *
-		 * @return mixed
-		 */
-		public static function widget_css( $advanced = true ) {
-			ob_start();
-			?>
+                return str_replace( array(
+                    '<script>',
+                    '</script>'
+                ), '', $output );
+        }
+	
+        /**
+         * Returns the CSS used to render the widget/shortcode settings form.
+         *
+         * @param bool $advanced If we should include advanced CSS.
+         *
+         * @return mixed
+         */
+        public static function widget_css( $advanced = true ) {
+            ob_start();
+            ?>
 	
 			<style>
 				<?php if ( $advanced ) : ?>
@@ -695,45 +695,45 @@ 
 			</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 );
-		}
-	
-		/**
-		 * Registers the widgets loading settings.
-		 */
-		public static function load_widgets_setting() {
-			register_setting( 'general', 'sd_load_widgets', 'esc_attr' );
-	
-			add_settings_field(
-				'sd_load_widgets',
-				'<label for="sd_load_widgets">' . __( 'Load Super Duper Widgets' ) . '</label>',
-				'WP_Super_Duper::load_widgets_setting_html',
-				'general'
-			);
-	
-		}
-	
-		/**
-		 * Displays the widgets settings HTML.
-		 */
-		public static function load_widgets_setting_html() {
-			$available_options = array(
-				'yes'  => __( 'Yes' ),
-				'no'   => __( 'No' ),
-				'auto' => __( 'Auto' ),
-			);
-			$selected_option   = get_option( 'sd_load_widgets', 'auto' );
-	
-			?>
+                return str_replace( array(
+                    '<style>',
+                    '</style>'
+                ), '', $output );
+        }
+	
+        /**
+         * Registers the widgets loading settings.
+         */
+        public static function load_widgets_setting() {
+            register_setting( 'general', 'sd_load_widgets', 'esc_attr' );
+	
+            add_settings_field(
+                'sd_load_widgets',
+                '<label for="sd_load_widgets">' . __( 'Load Super Duper Widgets' ) . '</label>',
+                'WP_Super_Duper::load_widgets_setting_html',
+                'general'
+            );
+	
+        }
+	
+        /**
+         * Displays the widgets settings HTML.
+         */
+        public static function load_widgets_setting_html() {
+            $available_options = array(
+                'yes'  => __( 'Yes' ),
+                'no'   => __( 'No' ),
+                'auto' => __( 'Auto' ),
+            );
+            $selected_option   = get_option( 'sd_load_widgets', 'auto' );
+	
+            ?>
 				<select name="sd_load_widgets" id="sd_load_widgets">
 					<?php foreach ( $available_options as $key => $label ) : ?>
 						<option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $selected_option ); ?>><?php echo esc_html( $label ); ?></option>
@@ -741,558 +741,558 @@ 
 				</select>
 				<p class="description"><?php _e( 'This option allows you to disable Super Duper widgets and instead only load the blocks and shortcodes.' ); ?></p>
 			<?php
-		}
-	
-		/**
-		 * prevent SDv1 errors if register_widget() function used
-		 */
-		public function _register(){
-			// backwards compatibility
-		}
-	
-		/**
-		 * Output the version in the admin header.
-		 */
-		public function generator() {
-	
-			// We want to set this once.
-			if ( empty( $GLOBALS['SD_SET_GENERATOR'] ) ) {
-				echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
-				$GLOBALS['SD_SET_GENERATOR'] = 1;
-			}
-	
-		}
-	
-		/**
-		 * 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 = '' ) {
-			echo call_user_func( $this->options['widget_ops']['output'], $args, $widget_args, $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;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
-		}
-	
-		/**
-		 * Sometimes booleans values can be turned to strings, so we fix that.
-		 *
-		 * @param $options
-		 *
-		 * @return mixed
-		 */
-		public function string_to_bool( $options ) {
-			// convert bool strings to booleans
-			foreach ( $options as $key => $val ) {
-				if ( $val == 'false' ) {
-					$options[ $key ] = false;
-				} elseif ( $val == 'true' ) {
-					$options[ $key ] = true;
-				}
-			}
-	
-			return $options;
-		}
-	
-		/**
-		 * Get the argument values that are also filterable.
-		 *
-		 * @param $instance
-		 *
-		 * @since 1.0.12 Don't set checkbox default value if the value is empty.
-		 *
-		 * @return array
-		 */
-		public function argument_values( $instance ) {
-			$argument_values = array();
-	
-			// set widget instance
-			$this->instance = $instance;
-	
-			if ( empty( $this->arguments ) ) {
-				$this->arguments = $this->get_arguments();
-			}
-	
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
-					// set the input name from the key
-					$args['name'] = $key;
-					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
-						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
-					}
-				}
-			}
-	
-			return $argument_values;
-		}
-	
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-			$url = $this->url;
-	
-			if ( ! $url ) {
-				// check if we are inside a plugin
-				$file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
-	
-				$dir_parts = explode( "/wp-content/", $file_dir );
-				$url_parts = explode( "/wp-content/", plugins_url() );
-	
-				if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
-					$url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
-					$this->url = $url;
-				}
-			}
-	
-			return $url;
-		}
-	
-		/**
-		 * General function to check if we are in a preview situation.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_preview() {
-			return $this->is_divi_preview() || $this->is_elementor_preview() || $this->is_beaver_preview() || $this->is_siteorigin_preview() || $this->is_cornerstone_preview() || $this->is_fusion_preview() || $this->is_oxygen_preview() || $this->is_block_content_call();
-		}
-	
-		/**
-		 * Tests if the current output is inside a Divi preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_divi_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
-				$result = true;
-			}
-	
-			return $result;
-		}
-	
-		/**
-		 * Tests if the current output is inside a elementor preview.
-		 *
-		 * @since 1.0.4
-		 * @return bool
-		 */
-		public function is_elementor_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
-				$result = true;
-			}
-	
-			return $result;
-		}
-	
-		/**
-		 * Tests if the current output is inside a Beaver builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_beaver_preview() {
-			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
-				$result = true;
-			}
-	
-			return $result;
-		}
-	
-		/**
-		 * Tests if the current output is inside a siteorigin builder preview.
-		 *
-		 * @since 1.0.6
-		 * @return bool
-		 */
-		public function is_siteorigin_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
-				$result = true;
-			}
-	
-			return $result;
-		}
-	
-		/**
-		 * Tests if the current output is inside a cornerstone builder preview.
-		 *
-		 * @since 1.0.8
-		 * @return bool
-		 */
-		public function is_cornerstone_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
-				$result = true;
-			}
-	
-			return $result;
-		}
-	
-		/**
-		 * Tests if the current output is inside a fusion builder preview.
-		 *
-		 * @since 1.1.0
-		 * @return bool
-		 */
-		public function is_fusion_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
-				$result = true;
-			}
-	
-			return $result;
-		}
-	
-		/**
-		 * Tests if the current output is inside a Oxygen builder preview.
-		 *
-		 * @since 1.0.18
-		 * @return bool
-		 */
-		public function is_oxygen_preview() {
-			$result = false;
-			if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
-				$result = true;
-			}
-	
-			return $result;
-		}
-	
-		/**
-		* Checks if the current call is a ajax call to get the block content.
-		*
-		* This can be used in your widget to return different content as the block content.
-		*
-		* @since 1.0.3
-		* @return bool
-		*/
-		public function is_block_content_call() {
-			$result = false;
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
-				$result = true;
-			}
-	
-			return $result;
-		}
-	
-		/**
-		 * Outputs the options form inputs for the widget/shortcode.
-		 *
-		 * @param array $instance The widget options.
-		 */
-		public function form( $instance ) {
-	
-			// Set widget instance.
-			$this->instance = $instance;
-	
-			// Set it as a SD widget.
-			echo $this->widget_advanced_toggle();
-	
-			// Display description.
-			printf( '<p>%s</p>', esc_html( $this->options['widget_ops']['description'] ) );
-	
-			// Prepare arguments.
-			$arguments_raw = $this->get_arguments();
-	
-		if ( is_array( $arguments_raw ) ) {
-	
-			$arguments = $this->group_arguments( $arguments_raw );
-	
-			// Do we have sections?
-			if ( $arguments != $arguments_raw ) {
-	
-					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
-	
-						$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='" . esc_attr( $icon_class ) . "'></i></button>";
-						echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
-	
-						foreach ( $args as $k => $a ) {
-	
-							$this->widget_inputs_row_start($k, $a);
-							$this->widget_inputs( $a, $instance );
-							$this->widget_inputs_row_end($k, $a);
-	
-						}
-	
-						echo "</div>";
-	
-						$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);
-					}
-	
-				}
-	
-			}
-		}
-	
-		/**
-		 * Get the hidden input that when added makes the advanced button show on widget settings.
-		 *
-		 * @return string
-		 */
-		public function widget_advanced_toggle() {
-	
-			return sprintf(
-				'<input type="hidden"  class="sd-show-advanced" value="%s" />',
-				(int) $this->block_show_advanced()
-			);
-	
-		}
-	
-		/**
-		 * Check if we need to show advanced options.
-		 *
-		 * @return bool
-		 */
-		public function block_show_advanced() {
-			$show      = false;
-			$arguments = $this->get_arguments();
-	
-			if ( ! empty( $arguments ) ) {
-				foreach ( $arguments as $argument ) {
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
-						$show = true;
-						break; // no need to continue if we know we have it
-					}
-				}
-			}
-	
-			return $show;
-		}
-	
-		/**
-		 * Groups widget arguments.
-		 *
-		 * @param array $arguments
-		 *
-		 * @return array
-		 */
-		public function group_arguments( $arguments ) {
-	
-			if ( ! empty( $arguments ) ) {
-				$temp_arguments = array();
-				$general        = __( "General" );
-				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
-						$add_sections                             = true;
-					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
-					}
-				}
-	
-				// only add sections if more than one
-				if ( $add_sections ) {
-					$arguments = $temp_arguments;
-				}
-			}
-	
-			return $arguments;
-		}
-	
-		public function widget_inputs_row_start($key, $args){
-			if(!empty($args['row'])){
-				// maybe open
-				if(!empty($args['row']['open'])){
-					?>
+        }
+	
+        /**
+         * prevent SDv1 errors if register_widget() function used
+         */
+        public function _register(){
+            // backwards compatibility
+        }
+	
+        /**
+         * Output the version in the admin header.
+         */
+        public function generator() {
+	
+            // We want to set this once.
+            if ( empty( $GLOBALS['SD_SET_GENERATOR'] ) ) {
+                echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
+                $GLOBALS['SD_SET_GENERATOR'] = 1;
+            }
+	
+        }
+	
+        /**
+         * 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 = '' ) {
+            echo call_user_func( $this->options['widget_ops']['output'], $args, $widget_args, $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;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+        }
+	
+        /**
+         * Sometimes booleans values can be turned to strings, so we fix that.
+         *
+         * @param $options
+         *
+         * @return mixed
+         */
+        public function string_to_bool( $options ) {
+            // convert bool strings to booleans
+            foreach ( $options as $key => $val ) {
+                if ( $val == 'false' ) {
+                    $options[ $key ] = false;
+                } elseif ( $val == 'true' ) {
+                    $options[ $key ] = true;
+                }
+            }
+	
+            return $options;
+        }
+	
+        /**
+         * Get the argument values that are also filterable.
+         *
+         * @param $instance
+         *
+         * @since 1.0.12 Don't set checkbox default value if the value is empty.
+         *
+         * @return array
+         */
+        public function argument_values( $instance ) {
+            $argument_values = array();
+	
+            // set widget instance
+            $this->instance = $instance;
+	
+            if ( empty( $this->arguments ) ) {
+                $this->arguments = $this->get_arguments();
+            }
+	
+            if ( ! empty( $this->arguments ) ) {
+                foreach ( $this->arguments as $key => $args ) {
+                    // set the input name from the key
+                    $args['name'] = $key;
+                    //
+                    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
+                    if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+                        // don't set default for an empty checkbox
+                    } elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
+                        $argument_values[ $key ] = $args['default'];
+                    }
+                }
+            }
+	
+            return $argument_values;
+        }
+	
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+            $url = $this->url;
+	
+            if ( ! $url ) {
+                // check if we are inside a plugin
+                $file_dir = str_replace( "/includes", "", dirname( __FILE__ ) );
+	
+                $dir_parts = explode( "/wp-content/", $file_dir );
+                $url_parts = explode( "/wp-content/", plugins_url() );
+	
+                if ( ! empty( $url_parts[0] ) && ! empty( $dir_parts[1] ) ) {
+                    $url       = trailingslashit( $url_parts[0] . "/wp-content/" . $dir_parts[1] );
+                    $this->url = $url;
+                }
+            }
+	
+            return $url;
+        }
+	
+        /**
+         * General function to check if we are in a preview situation.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_preview() {
+            return $this->is_divi_preview() || $this->is_elementor_preview() || $this->is_beaver_preview() || $this->is_siteorigin_preview() || $this->is_cornerstone_preview() || $this->is_fusion_preview() || $this->is_oxygen_preview() || $this->is_block_content_call();
+        }
+	
+        /**
+         * Tests if the current output is inside a Divi preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_divi_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
+                $result = true;
+            }
+	
+            return $result;
+        }
+	
+        /**
+         * Tests if the current output is inside a elementor preview.
+         *
+         * @since 1.0.4
+         * @return bool
+         */
+        public function is_elementor_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) || ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor_ajax' ) ) {
+                $result = true;
+            }
+	
+            return $result;
+        }
+	
+        /**
+         * Tests if the current output is inside a Beaver builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_beaver_preview() {
+            $result = false;
+            if ( isset( $_REQUEST['fl_builder'] ) ) {
+                $result = true;
+            }
+	
+            return $result;
+        }
+	
+        /**
+         * Tests if the current output is inside a siteorigin builder preview.
+         *
+         * @since 1.0.6
+         * @return bool
+         */
+        public function is_siteorigin_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+                $result = true;
+            }
+	
+            return $result;
+        }
+	
+        /**
+         * Tests if the current output is inside a cornerstone builder preview.
+         *
+         * @since 1.0.8
+         * @return bool
+         */
+        public function is_cornerstone_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['cornerstone_preview'] ) || basename( $_SERVER['REQUEST_URI'] ) == 'cornerstone-endpoint' ) {
+                $result = true;
+            }
+	
+            return $result;
+        }
+	
+        /**
+         * Tests if the current output is inside a fusion builder preview.
+         *
+         * @since 1.1.0
+         * @return bool
+         */
+        public function is_fusion_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['fb-edit'] ) || ! empty( $_REQUEST['fusion_load_nonce'] ) ) {
+                $result = true;
+            }
+	
+            return $result;
+        }
+	
+        /**
+         * Tests if the current output is inside a Oxygen builder preview.
+         *
+         * @since 1.0.18
+         * @return bool
+         */
+        public function is_oxygen_preview() {
+            $result = false;
+            if ( ! empty( $_REQUEST['ct_builder'] ) || ( ! empty( $_REQUEST['action'] ) && ( substr( $_REQUEST['action'], 0, 11 ) === "oxy_render_" || substr( $_REQUEST['action'], 0, 10 ) === "ct_render_" ) ) ) {
+                $result = true;
+            }
+	
+            return $result;
+        }
+	
+        /**
+         * Checks if the current call is a ajax call to get the block content.
+         *
+         * This can be used in your widget to return different content as the block content.
+         *
+         * @since 1.0.3
+         * @return bool
+         */
+        public function is_block_content_call() {
+            $result = false;
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
+                $result = true;
+            }
+	
+            return $result;
+        }
+	
+        /**
+         * Outputs the options form inputs for the widget/shortcode.
+         *
+         * @param array $instance The widget options.
+         */
+        public function form( $instance ) {
+	
+            // Set widget instance.
+            $this->instance = $instance;
+	
+            // Set it as a SD widget.
+            echo $this->widget_advanced_toggle();
+	
+            // Display description.
+            printf( '<p>%s</p>', esc_html( $this->options['widget_ops']['description'] ) );
+	
+            // Prepare arguments.
+            $arguments_raw = $this->get_arguments();
+	
+        if ( is_array( $arguments_raw ) ) {
+	
+            $arguments = $this->group_arguments( $arguments_raw );
+	
+            // Do we have sections?
+            if ( $arguments != $arguments_raw ) {
+	
+                    $panel_count = 0;
+                    foreach ( $arguments as $key => $args ) {
+	
+                        $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='" . esc_attr( $icon_class ) . "'></i></button>";
+                        echo "<div class='sd-toggle-group sd-input-group-" . sanitize_title_with_dashes( $key ) . "' $hide>";
+	
+                        foreach ( $args as $k => $a ) {
+	
+                            $this->widget_inputs_row_start($k, $a);
+                            $this->widget_inputs( $a, $instance );
+                            $this->widget_inputs_row_end($k, $a);
+	
+                        }
+	
+                        echo "</div>";
+	
+                        $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);
+                    }
+	
+                }
+	
+            }
+        }
+	
+        /**
+         * Get the hidden input that when added makes the advanced button show on widget settings.
+         *
+         * @return string
+         */
+        public function widget_advanced_toggle() {
+	
+            return sprintf(
+                '<input type="hidden"  class="sd-show-advanced" value="%s" />',
+                (int) $this->block_show_advanced()
+            );
+	
+        }
+	
+        /**
+         * Check if we need to show advanced options.
+         *
+         * @return bool
+         */
+        public function block_show_advanced() {
+            $show      = false;
+            $arguments = $this->get_arguments();
+	
+            if ( ! empty( $arguments ) ) {
+                foreach ( $arguments as $argument ) {
+                    if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
+                        $show = true;
+                        break; // no need to continue if we know we have it
+                    }
+                }
+            }
+	
+            return $show;
+        }
+	
+        /**
+         * Groups widget arguments.
+         *
+         * @param array $arguments
+         *
+         * @return array
+         */
+        public function group_arguments( $arguments ) {
+	
+            if ( ! empty( $arguments ) ) {
+                $temp_arguments = array();
+                $general        = __( "General" );
+                $add_sections   = false;
+                foreach ( $arguments as $key => $args ) {
+                    if ( isset( $args['group'] ) ) {
+                        $temp_arguments[ $args['group'] ][ $key ] = $args;
+                        $add_sections                             = true;
+                    } else {
+                        $temp_arguments[ $general ][ $key ] = $args;
+                    }
+                }
+	
+                // only add sections if more than one
+                if ( $add_sections ) {
+                    $arguments = $temp_arguments;
+                }
+            }
+	
+            return $arguments;
+        }
+	
+        public function widget_inputs_row_start($key, $args){
+            if(!empty($args['row'])){
+                // maybe open
+                if(!empty($args['row']['open'])){
+                    ?>
 					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php if ( !empty($args['row']['element_require'])) {
-						echo $this->convert_element_require( $args['row']['element_require'] );
-					} ?>'>
+                        echo $this->convert_element_require( $args['row']['element_require'] );
+                    } ?>'>
 					<?php if(!empty($args['row']['title'])){ ?>
 					<label class="mb-0 "><?php echo esc_attr( $args['row']['title'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
 					<?php }?>
 					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
-					echo "<div class='col pl-0'>";
-				}else{
-					echo "<div class='col pl-0 pr-2'>";
-				}
-			}
-		}
-	
-		/**
-		 * Convert require element.
-		 *
-		 * @since 1.0.0
-		 *
-		 * @param string $input Input element.
-		 *
-		 * @return string $output
-		 */
-		public function convert_element_require( $input ) {
-	
-			$input = str_replace( "'", '"', $input );// we only want double quotes
-	
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
-				"jQuery(form).find('[data-argument=\"",
-				"\"]').find('input,select,textarea').val()"
-			), $input ) );
-	
-			return $output;
-		}
-	
-		/**
-		 * Get the widget input description html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 * @todo, need to make its own tooltip script
-		 */
-		public function widget_field_desc( $args ) {
-	
-			$description = '';
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
-					$description = $this->desc_tip( $args['desc'] );
-				} else {
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
-				}
-			}
-	
-			return $description;
-		}
-	
-		/**
-		 * Get the tool tip html.
-		 *
-		 * @param $tip
-		 * @param bool $allow_html
-		 *
-		 * @return string
-		 */
-		public function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
-			} else {
-				$tip = esc_attr( $tip );
-			}
-	
-			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
-		}
-	
-		/**
-		 * Sanitize a string destined to be a tooltip.
-		 *
-		 * @param string $var
-		 *
-		 * @return string
-		 */
-		public function sanitize_tooltip( $var ) {
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
-				'br'     => array(),
-				'em'     => array(),
-				'strong' => array(),
-				'small'  => array(),
-				'span'   => array(),
-				'ul'     => array(),
-				'li'     => array(),
-				'ol'     => array(),
-				'p'      => array(),
-			) ) );
-		}
-	
-		/**
-		 * Builds the inputs for the widget options.
-		 *
-		 * @param $args
-		 * @param $instance
-		 */
-		public function widget_inputs( $args, $instance ) {
-	
-			$class             = "";
-			$element_require   = "";
-			$custom_attributes = "";
-	
-			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
-			} else {
-				$value = '';
-			}
-	
-			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
-			} else {
-				$placeholder = '';
-			}
-	
-			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
-				$class .= " sd-advanced-setting ";
-			}
-	
-			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
-				$element_require = $args['element_require'];
-			}
-	
-			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
-			}
-	
-	
-			// before wrapper
-			?>
+                }elseif(!empty($args['row']['close'])){
+                    echo "<div class='col pl-0'>";
+                }else{
+                    echo "<div class='col pl-0 pr-2'>";
+                }
+            }
+        }
+	
+        /**
+         * Convert require element.
+         *
+         * @since 1.0.0
+         *
+         * @param string $input Input element.
+         *
+         * @return string $output
+         */
+        public function convert_element_require( $input ) {
+	
+            $input = str_replace( "'", '"', $input );// we only want double quotes
+	
+            $output = esc_attr( str_replace( array( "[%", "%]" ), array(
+                "jQuery(form).find('[data-argument=\"",
+                "\"]').find('input,select,textarea').val()"
+            ), $input ) );
+	
+            return $output;
+        }
+	
+        /**
+         * Get the widget input description html.
+         *
+         * @param $args
+         *
+         * @return string
+         * @todo, need to make its own tooltip script
+         */
+        public function widget_field_desc( $args ) {
+	
+            $description = '';
+            if ( isset( $args['desc'] ) && $args['desc'] ) {
+                if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
+                    $description = $this->desc_tip( $args['desc'] );
+                } else {
+                    $description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
+                }
+            }
+	
+            return $description;
+        }
+	
+        /**
+         * Get the tool tip html.
+         *
+         * @param $tip
+         * @param bool $allow_html
+         *
+         * @return string
+         */
+        public function desc_tip( $tip, $allow_html = false ) {
+            if ( $allow_html ) {
+                $tip = $this->sanitize_tooltip( $tip );
+            } else {
+                $tip = esc_attr( $tip );
+            }
+	
+            return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
+        }
+	
+        /**
+         * Sanitize a string destined to be a tooltip.
+         *
+         * @param string $var
+         *
+         * @return string
+         */
+        public function sanitize_tooltip( $var ) {
+            return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
+                'br'     => array(),
+                'em'     => array(),
+                'strong' => array(),
+                'small'  => array(),
+                'span'   => array(),
+                'ul'     => array(),
+                'li'     => array(),
+                'ol'     => array(),
+                'p'      => array(),
+            ) ) );
+        }
+	
+        /**
+         * Builds the inputs for the widget options.
+         *
+         * @param $args
+         * @param $instance
+         */
+        public function widget_inputs( $args, $instance ) {
+	
+            $class             = "";
+            $element_require   = "";
+            $custom_attributes = "";
+	
+            // get value
+            if ( isset( $instance[ $args['name'] ] ) ) {
+                $value = $instance[ $args['name'] ];
+            } elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
+                $value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+            } else {
+                $value = '';
+            }
+	
+            // get placeholder
+            if ( ! empty( $args['placeholder'] ) ) {
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+            } else {
+                $placeholder = '';
+            }
+	
+            // get if advanced
+            if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+                $class .= " sd-advanced-setting ";
+            }
+	
+            // element_require
+            if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+                $element_require = $args['element_require'];
+            }
+	
+            // custom_attributes
+            if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
+                $custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+            }
+	
+	
+            // before wrapper
+            ?>
 			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
 			data-argument='<?php echo esc_attr( $args['name'] ); ?>'
 			data-element_require='<?php if ( $element_require ) {
-				echo $this->convert_element_require( $element_require );
-			} ?>'
+                echo $this->convert_element_require( $element_require );
+            } ?>'
 			>
 			<?php
 	
 	
-			switch ( $args['type'] ) {
-				//array('text','password','number','email','tel','url','color')
-				case "text":
-				case "password":
-				case "number":
-				case "email":
-				case "tel":
-				case "url":
-				case "color":
-					?>
+            switch ( $args['type'] ) {
+                //array('text','password','number','email','tel','url','color')
+                case "text":
+                case "password":
+                case "number":
+                case "email":
+                case "tel":
+                case "url":
+                case "color":
+                    ?>
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat"
@@ -1303,47 +1303,47 @@ 
 													   value="<?php echo esc_attr( $value ); ?>">
 					<?php
 	
-					break;
-				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
-							$value = array();
-						}
-					}
-					?>
+                    break;
+                case "select":
+                    $multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
+                    if ( $multiple ) {
+                        if ( empty( $value ) ) {
+                            $value = array();
+                        }
+                    }
+                    ?>
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
 														id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 														name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-														if ( $multiple ) {
-															echo "[]";
-														} ?>"
+                                                        if ( $multiple ) {
+                                                            echo "[]";
+                                                        } ?>"
 						<?php if ( $multiple ) {
-							echo "multiple";
-						} //@todo not implemented yet due to gutenberg not supporting it
-						?>
+                            echo "multiple";
+                        } //@todo not implemented yet due to gutenberg not supporting it
+                        ?>
 					>
 						<?php
 	
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
-								} else {
-									$selected = selected( $value, $val, false );
-								}
-								echo "<option value='$val' " . $selected . ">$label</option>";
-							}
-						}
-						?>
+                        if ( ! empty( $args['options'] ) ) {
+                            foreach ( $args['options'] as $val => $label ) {
+                                if ( $multiple ) {
+                                    $selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+                                } else {
+                                    $selected = selected( $value, $val, false );
+                                }
+                                echo "<option value='$val' " . $selected . ">$label</option>";
+                            }
+                        }
+                        ?>
 					</select>
 					<?php
-					break;
-				case "checkbox":
-					?>
+                    break;
+                case "checkbox":
+                    ?>
 					<input <?php echo $placeholder; ?>
 						<?php checked( 1, $value, true ) ?>
 						<?php echo $custom_attributes; ?>
@@ -1353,9 +1353,9 @@ 
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<?php
-					break;
-				case "textarea":
-					?>
+                    break;
+                case "textarea":
+                    ?>
 					<label
 						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat"
@@ -1365,218 +1365,218 @@ 
 					><?php echo esc_attr( $value ); ?></textarea>
 					<?php
 	
-					break;
-				case "hidden":
-					?>
+                    break;
+                case "hidden":
+                    ?>
 					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
 						   name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
 						   value="<?php echo esc_attr( $value ); ?>">
 					<?php
-					break;
-				default:
-					echo "No input type found!"; // @todo we need to add more input types.
-			}
+                    break;
+                default:
+                    echo "No input type found!"; // @todo we need to add more input types.
+            }
 	
-			// after wrapper
-			?>
+            // after wrapper
+            ?>
 			</p>
 			<?php
-		}
-	
-		/**
-		 * Convert an array of attributes to JS object or HTML attributes string.
-		 *
-		 * @todo there is prob a faster way to do this, also we could add some validation here.
-		 *
-		 * @param $attributes
-		 *
-		 * @return string
-		 */
-		public function array_to_attributes( $attributes, $html = false ) {
-	
-			if ( ! is_array( $attributes ) ) {
-				return '';
-			}
-	
-			$output = '';
-			foreach ( $attributes as $name => $value ) {
-	
-				if ( $html ) {
-	
-					if ( true === $value ) {
-						$output .= esc_html( $name ) . ' ';
-					} else if ( false !== $value ) {
-						$output .= sprintf( '%s="%s" ', esc_html( $name ), trim( esc_attr( $value ) ) );
-					}
-	
-				} else {
-					$output .= sprintf( "'%s': '%s',", esc_js( $name ), is_bool( $value ) ? $value : trim( esc_js( $value ) ) );
-				}
-	
-			}
-	
-			return $output;
-		}
-	
-		/**
-		 * Constructs id attributes for use in WP_Widget::form() fields.
-		 *
-		 * This function should be used in form() methods to create id attributes
-		 * for fields to be saved by WP_Widget::update().
-		 *
-		 * @since 2.8.0
-		 * @since 4.4.0 Array format field IDs are now accepted.
-		 *
-		 * @param string $field_name Field name.
-		 *
-		 * @return string ID attribute for `$field_name`.
-		 */
-		public function get_field_id( $field_name ) {
-	
-			$field_name = str_replace( array( '[]', '[', ']' ), array( '', '-', '' ), $field_name );
-			$field_name = trim( $field_name, '-' );
-	
-			return 'widget-' . $this->base_id . '-' . $this->get_number() . '-' . $field_name;
-		}
-	
-		/**
-		 * Returns the instance number.
-		 *
-		 * @return int
-		 */
-		public function get_number() {
-			static $number = 1;
-	
-			if ( isset( $this->output_types['widget'] ) ) {
-				return $this->output_types['widget']->number;
-			}
-	
-			if ( empty( $this->number ) ) {
-				$this->number = $number;
-				$number ++;
-			}
-	
-			return $this->number;
-		}
-	
-		/**
-		 * Get the widget input title html.
-		 *
-		 * @param $args
-		 *
-		 * @return string
-		 */
-		public function widget_field_title( $args ) {
-	
-			$title = '';
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = $this->get_widget_icon( $args['icon'], $args['title']  );
-				} else {
-					$title = esc_attr($args['title']);
-				}
-			}
-	
-			return $title;
-		}
-	
-		/**
-		 * Retrieves the icon to use for widgets / blocks.
-		 *
-		 * @return array
-		 */
-		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>';
-			}
-		}
-	
-		/**
-		 * Constructs name attributes for use in form() fields
-		 *
-		 * This function should be used in form() methods to create name attributes for fields
-		 * to be saved by update()
-		 *
-		 * @since 2.8.0
-		 * @since 4.4.0 Array format field names are now accepted.
-		 *
-		 * @param string $field_name Field name.
-		 *
-		 * @return string Name attribute for `$field_name`.
-		 */
-		public function get_field_name( $field_name ) {
-			$pos = strpos( $field_name, '[' );
-	
-			if ( false !== $pos ) {
-				// Replace the first occurrence of '[' with ']['.
-				$field_name = '[' . substr_replace( $field_name, '][', $pos, strlen( '[' ) );
-			} else {
-				$field_name = '[' . $field_name . ']';
-			}
-	
-			return 'widget-' . $this->base_id . '[' . $this->get_number() . ']' . $field_name;
-		}
-	
-		public function widget_inputs_row_end($key, $args){
-			if(!empty($args['row'])){
-				// maybe close
-				if(!empty($args['row']['close'])){
-					echo "</div></div>";
-				}
-	
-				echo "</div>";
-			}
-		}
-	
-		/**
-		 * Generate and return inline styles from CSS rules that will match the unique class of the instance.
-		 *
-		 * @param array $rules
-		 *
-		 * @since 1.0.20
-		 * @return string
-		 */
-		public function get_instance_style($rules = array()){
-			$css = '';
-	
-			if(!empty($rules)){
-				$rules = array_unique($rules);
-				$instance_hash = $this->get_instance_hash();
-				$css .= "<style>";
-				foreach($rules as $rule){
-					$css .= ".sdel-$instance_hash $rule";
-				}
-				$css .= "</style>";
-			}
-	
-			return $css;
-		}
-	
-		/**
-		 * Get an instance hash that will be unique to the type and settings.
-		 *
-		 * @since 1.0.20
-		 * @return string
-		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id . serialize( $this->instance );
-			return hash( 'crc32b', $instance_string );
-		}
-	
-		/**
-		 * Get the conditional fields JavaScript.
-		 *
-		 * @return mixed
-		 */
-		public function conditional_fields_js() {
-			ob_start();
-			?>
+        }
+	
+        /**
+         * Convert an array of attributes to JS object or HTML attributes string.
+         *
+         * @todo there is prob a faster way to do this, also we could add some validation here.
+         *
+         * @param $attributes
+         *
+         * @return string
+         */
+        public function array_to_attributes( $attributes, $html = false ) {
+	
+            if ( ! is_array( $attributes ) ) {
+                return '';
+            }
+	
+            $output = '';
+            foreach ( $attributes as $name => $value ) {
+	
+                if ( $html ) {
+	
+                    if ( true === $value ) {
+                        $output .= esc_html( $name ) . ' ';
+                    } else if ( false !== $value ) {
+                        $output .= sprintf( '%s="%s" ', esc_html( $name ), trim( esc_attr( $value ) ) );
+                    }
+	
+                } else {
+                    $output .= sprintf( "'%s': '%s',", esc_js( $name ), is_bool( $value ) ? $value : trim( esc_js( $value ) ) );
+                }
+	
+            }
+	
+            return $output;
+        }
+	
+        /**
+         * Constructs id attributes for use in WP_Widget::form() fields.
+         *
+         * This function should be used in form() methods to create id attributes
+         * for fields to be saved by WP_Widget::update().
+         *
+         * @since 2.8.0
+         * @since 4.4.0 Array format field IDs are now accepted.
+         *
+         * @param string $field_name Field name.
+         *
+         * @return string ID attribute for `$field_name`.
+         */
+        public function get_field_id( $field_name ) {
+	
+            $field_name = str_replace( array( '[]', '[', ']' ), array( '', '-', '' ), $field_name );
+            $field_name = trim( $field_name, '-' );
+	
+            return 'widget-' . $this->base_id . '-' . $this->get_number() . '-' . $field_name;
+        }
+	
+        /**
+         * Returns the instance number.
+         *
+         * @return int
+         */
+        public function get_number() {
+            static $number = 1;
+	
+            if ( isset( $this->output_types['widget'] ) ) {
+                return $this->output_types['widget']->number;
+            }
+	
+            if ( empty( $this->number ) ) {
+                $this->number = $number;
+                $number ++;
+            }
+	
+            return $this->number;
+        }
+	
+        /**
+         * Get the widget input title html.
+         *
+         * @param $args
+         *
+         * @return string
+         */
+        public function widget_field_title( $args ) {
+	
+            $title = '';
+            if ( isset( $args['title'] ) && $args['title'] ) {
+                if ( isset( $args['icon'] ) && $args['icon'] ) {
+                    $title = $this->get_widget_icon( $args['icon'], $args['title']  );
+                } else {
+                    $title = esc_attr($args['title']);
+                }
+            }
+	
+            return $title;
+        }
+	
+        /**
+         * Retrieves the icon to use for widgets / blocks.
+         *
+         * @return array
+         */
+        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>';
+            }
+        }
+	
+        /**
+         * Constructs name attributes for use in form() fields
+         *
+         * This function should be used in form() methods to create name attributes for fields
+         * to be saved by update()
+         *
+         * @since 2.8.0
+         * @since 4.4.0 Array format field names are now accepted.
+         *
+         * @param string $field_name Field name.
+         *
+         * @return string Name attribute for `$field_name`.
+         */
+        public function get_field_name( $field_name ) {
+            $pos = strpos( $field_name, '[' );
+	
+            if ( false !== $pos ) {
+                // Replace the first occurrence of '[' with ']['.
+                $field_name = '[' . substr_replace( $field_name, '][', $pos, strlen( '[' ) );
+            } else {
+                $field_name = '[' . $field_name . ']';
+            }
+	
+            return 'widget-' . $this->base_id . '[' . $this->get_number() . ']' . $field_name;
+        }
+	
+        public function widget_inputs_row_end($key, $args){
+            if(!empty($args['row'])){
+                // maybe close
+                if(!empty($args['row']['close'])){
+                    echo "</div></div>";
+                }
+	
+                echo "</div>";
+            }
+        }
+	
+        /**
+         * Generate and return inline styles from CSS rules that will match the unique class of the instance.
+         *
+         * @param array $rules
+         *
+         * @since 1.0.20
+         * @return string
+         */
+        public function get_instance_style($rules = array()){
+            $css = '';
+	
+            if(!empty($rules)){
+                $rules = array_unique($rules);
+                $instance_hash = $this->get_instance_hash();
+                $css .= "<style>";
+                foreach($rules as $rule){
+                    $css .= ".sdel-$instance_hash $rule";
+                }
+                $css .= "</style>";
+            }
+	
+            return $css;
+        }
+	
+        /**
+         * Get an instance hash that will be unique to the type and settings.
+         *
+         * @since 1.0.20
+         * @return string
+         */
+        public function get_instance_hash(){
+            $instance_string = $this->base_id . serialize( $this->instance );
+            return hash( 'crc32b', $instance_string );
+        }
+	
+        /**
+         * Get the conditional fields JavaScript.
+         *
+         * @return mixed
+         */
+        public function conditional_fields_js() {
+            ob_start();
+            ?>
 			<script>
 			/**
 			* Conditional Fields
@@ -2078,57 +2078,57 @@ 
 			<?php do_action( 'wp_super_duper_conditional_fields_js', $this ); ?>
 			</script>
 						<?php
-						$output = ob_get_clean();
-	
-						return str_replace( array( '<script>', '</script>' ), '', trim( $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->base_id );
-	
-				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'] ) : '';
-					$title_classes   = array_filter( $title_classes );
-	
-					$class  = ! empty( $title_classes ) ? implode( ' ', $title_classes ) : '';
-					$output = "<$title_tag class='$class' >$title</$title_tag>";
-				}
-	
-			}
-	
-			return $output;
-		}
-	
-	}
+                        $output = ob_get_clean();
+	
+                        return str_replace( array( '<script>', '</script>' ), '', trim( $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->base_id );
+	
+                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'] ) : '';
+                    $title_classes   = array_filter( $title_classes );
+	
+                    $class  = ! empty( $title_classes ) ? implode( ' ', $title_classes ) : '';
+                    $output = "<$title_tag class='$class' >$title</$title_tag>";
+                }
+	
+            }
+	
+            return $output;
+        }
+	
+    }
 
 }

Spacing +293 added lines, -293 removed lines

@@ -5,10 +5,10 @@ 
  * @since 1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Ensure the class is only loaded once.
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
+if (!class_exists('WP_Super_Duper')) {
 
 	/**
 	 *
@@ -51,36 +51,36 @@ 
 		/**
 		 * Take the array options and use them to build.
 		 */
-		public function __construct( $options ) {
+		public function __construct($options) {
 			global $sd_widgets;
 	
-			$sd_widgets[ $options['base_id'] ] = array(
+			$sd_widgets[$options['base_id']] = array(
 				'name'       => $options['name'],
 				'class_name' => $options['class_name']
 			);
-			$this->base_id   = $options['base_id'];
+			$this->base_id = $options['base_id'];
 	
 			// Lets filter the options before we do anything.
-			$options = apply_filters( 'wp_super_duper_options', $options, $this );
-			$options = apply_filters( "wp_super_duper_options_{$this->base_id}", $options, $this );
-			$options = $this->add_name_from_key( $options );
+			$options = apply_filters('wp_super_duper_options', $options, $this);
+			$options = apply_filters("wp_super_duper_options_{$this->base_id}", $options, $this);
+			$options = $this->add_name_from_key($options);
 	
 			// Set args.
 			$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();
 	
 			// Load output types.
 			$this->load_output_types();
 	
 			// add generator text to admin head
-			add_action( 'admin_head', array( $this, 'generator' ) );
+			add_action('admin_head', array($this, 'generator'));
 	
-			add_action( 'admin_init', array( __CLASS__, 'load_widgets_setting' ) );
+			add_action('admin_init', array(__CLASS__, 'load_widgets_setting'));
 	
-			add_action( 'wp_ajax_super_duper_get_picker', array( __CLASS__, 'get_picker' ) );
+			add_action('wp_ajax_super_duper_get_picker', array(__CLASS__, 'get_picker'));
 	
-			do_action( 'wp_super_duper_widget_init', $options, $this );
+			do_action('wp_super_duper_widget_init', $options, $this);
 	
 		}
 	
@@ -92,14 +92,14 @@ 
 		 *
 		 * @return mixed
 		 */
-		protected function add_name_from_key( $options, $arguments = false ) {
-			if ( ! empty( $options['arguments'] ) ) {
-				foreach ( $options['arguments'] as $key => $val ) {
-					$options['arguments'][ $key ]['name'] = $key;
+		protected 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;
 				}
 			}
 	
@@ -112,39 +112,39 @@ 
 		public function load_output_types() {
 	
 			$allowed_types = $this->get_output_types();
-			$output_types  = array( 'block', 'shortcode', 'widget' );
+			$output_types  = array('block', 'shortcode', 'widget');
 	
 			// Check if this is being overidden by the widget.
 			$args = $this->get_arguments();
-			if ( isset( $args['output_types'] ) && is_array( $args['output_types'] ) ) {
-				$output_types  = $args['output_types'] ;
+			if (isset($args['output_types']) && is_array($args['output_types'])) {
+				$output_types = $args['output_types'];
 			}
 	
-			if ( isset( $this->options['output_types'] ) && is_array( $this->options['output_types'] ) ) {
-				$output_types  = $this->options['output_types'] ;
+			if (isset($this->options['output_types']) && is_array($this->options['output_types'])) {
+				$output_types = $this->options['output_types'];
 			}
 	
 			// Load each output type.
-			foreach ( $output_types as $output_type ) {
+			foreach ($output_types as $output_type) {
 	
 				// Ensure this is an allowed type.
-				if ( ! isset( $allowed_types[ $output_type ] ) ) {
+				if (!isset($allowed_types[$output_type])) {
 					continue;
 				}
 	
 				// If the class does not exist, try loading it.
-				if ( ! class_exists( $allowed_types[ $output_type ] ) ) {
+				if (!class_exists($allowed_types[$output_type])) {
 	
-					if ( file_exists( plugin_dir_path( __FILE__ ) . "type/$output_type.php" ) ) {
-						require_once( plugin_dir_path( __FILE__ ) . "type/$output_type.php" );
+					if (file_exists(plugin_dir_path(__FILE__) . "type/$output_type.php")) {
+						require_once(plugin_dir_path(__FILE__) . "type/$output_type.php");
 					} else {
 						continue;
 					}
 	
 				}
 	
-				$output_class                       = $allowed_types[ $output_type ];
-				$this->output_types[ $output_type ] = new $output_class( $this );
+				$output_class                       = $allowed_types[$output_type];
+				$this->output_types[$output_type] = new $output_class($this);
 			}
 	
 		}
@@ -164,19 +164,19 @@ 
 			);
 	
 			// Maybe disable widgets.
-			$disable_widget   = get_option( 'sd_load_widgets', 'auto' );
+			$disable_widget = get_option('sd_load_widgets', 'auto');
 	
-			if ( 'auto' === $disable_widget ) {
-				if ( !$this->widgets_required() ) {
-					unset( $types['widget'] );
+			if ('auto' === $disable_widget) {
+				if (!$this->widgets_required()) {
+					unset($types['widget']);
 				}
 			}
 	
-			if ( 'no' === $disable_widget ) {
-				unset( $types['widget'] );
+			if ('no' === $disable_widget) {
+				unset($types['widget']);
 			}
 	
-			return apply_filters( 'super_duper_types', $types, $this );
+			return apply_filters('super_duper_types', $types, $this);
 		}
 	
 		/**
@@ -184,39 +184,39 @@ 
 		 *
 		 * @return mixed|void
 		 */
-		protected function widgets_required(){
+		protected function widgets_required() {
 			global $wp_version;
 	
 			$required = false;
 	
 	
 			// check wp version
-			if( version_compare( $wp_version, '5.8', '<' ) ){
+			if (version_compare($wp_version, '5.8', '<')) {
 				$required = true;
 			}
 	
 			// Page builders that require widgets
-			if(
+			if (
 			!$required && (
-			defined( 'ELEMENTOR_VERSION' ) // elementor
-			|| class_exists( 'Fusion_Element' ) // Fusion Builder (avada)
-			|| class_exists( 'SiteOrigin_Panels' ) // SiteOrigin Page builder
-			|| defined( 'WPB_VC_VERSION' ) // WPBakery page builder
-			|| defined( 'CT_VERSION' ) // Oxygen Builder
-			|| defined( 'FL_BUILDER_VERSION' ) // Beaver Builder
-			|| defined( 'FL_THEME_BUILDER_VERSION' ) // Beaver Themer
+			defined('ELEMENTOR_VERSION') // elementor
+			|| class_exists('Fusion_Element') // Fusion Builder (avada)
+			|| class_exists('SiteOrigin_Panels') // SiteOrigin Page builder
+			|| defined('WPB_VC_VERSION') // WPBakery page builder
+			|| defined('CT_VERSION') // Oxygen Builder
+			|| defined('FL_BUILDER_VERSION') // Beaver Builder
+			|| defined('FL_THEME_BUILDER_VERSION') // Beaver Themer
 			)
-			){
+			) {
 				$required = true;
 			}
 	
 			// Theme has active widgets
-			if( !$required && !empty( $this->has_active_widgets() )  ){
+			if (!$required && !empty($this->has_active_widgets())) {
 				$required = true;
 			}
 	
 	
-			return apply_filters( 'sd_widgets_required' , $required );
+			return apply_filters('sd_widgets_required', $required);
 		}
 	
 		/**
@@ -224,28 +224,28 @@ 
 		 *
 		 * @return bool
 		 */
-		protected function has_active_widgets(){
+		protected function has_active_widgets() {
 			global $sd_has_active_widgets;
 	
 			// have we already done this?
-			if(!is_null($sd_has_active_widgets)){
+			if (!is_null($sd_has_active_widgets)) {
 				return $sd_has_active_widgets;
 			}
 	
 			$result = false;
 			$sidebars_widgets = get_option('sidebars_widgets');
 	
-			if(is_array($sidebars_widgets)){
+			if (is_array($sidebars_widgets)) {
 	
 				foreach ($sidebars_widgets as $key => $value) {
 	
 	
 	
-					if( $key != 'wp_inactive_widgets' ) {
+					if ($key != 'wp_inactive_widgets') {
 	
-						if(!empty($value) && is_array($value)){
-							foreach($value as $widget){
-								if($widget && substr( $widget, 0, 6 ) !== "block-"){
+						if (!empty($value) && is_array($value)) {
+							foreach ($value as $widget) {
+								if ($widget && substr($widget, 0, 6) !== "block-") {
 									$result = true;
 								}
 							}
@@ -268,12 +268,12 @@ 
 		 * @return array Get arguments.
 		 */
 		public function get_arguments() {
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->set_arguments();
 			}
 	
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
 	
 			return $this->arguments;
 		}
@@ -344,7 +344,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 	
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_so_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 	
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -380,10 +380,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);
 		}
 	
 		/**
@@ -393,12 +393,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';
 			}
 	
@@ -407,13 +407,13 @@ 
 	
 			<div class="sd-shortcode-left-wrap">
 				<?php
-				ksort( $sd_widgets );
+				ksort($sd_widgets);
 				//				print_r($sd_widgets);exit;
-				if ( ! empty( $sd_widgets ) ) {
+				if (!empty($sd_widgets)) {
 					echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
-					echo "<option>" . __( 'Select shortcode' ) . "</option>";
-					foreach ( $sd_widgets as $shortcode => $class ) {
-						echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
+					echo "<option>" . __('Select shortcode') . "</option>";
+					foreach ($sd_widgets as $shortcode => $class) {
+						echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
 					}
 					echo "</select>";
 	
@@ -426,37 +426,37 @@ 
 			<div class="sd-shortcode-right-wrap">
 				<textarea id='sd-shortcode-output' disabled></textarea>
 				<div id='sd-shortcode-output-actions'>
-					<?php if ( $editor_id != '' ) { ?>
+					<?php if ($editor_id != '') { ?>
 						<button class="button sd-insert-shortcode-button"
-								onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
+								onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) {
 									echo "'" . $editor_id . "'";
-								} ?>)"><?php _e( 'Insert shortcode' ); ?></button>
+								} ?>)"><?php _e('Insert shortcode'); ?></button>
 					<?php } ?>
 					<button class="button"
-							onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
+							onclick="sd_copy_to_clipboard()"><?php _e('Copy shortcode'); ?></button>
 				</div>
 			</div>
 			<?php
 	
 			$html = ob_get_clean();
 	
-			if ( wp_doing_ajax() ) {
+			if (wp_doing_ajax()) {
 				echo $html;
 				$should_die = true;
 	
 				// some builder get the editor via ajax so we should not die on those occasions
 				$dont_die = array(
-					'parent_tag',// WP Bakery
+					'parent_tag', // WP Bakery
 					'avia_request' // enfold
 				);
 	
-				foreach ( $dont_die as $request ) {
-					if ( isset( $_REQUEST[ $request ] ) ) {
+				foreach ($dont_die as $request) {
+					if (isset($_REQUEST[$request])) {
 						$should_die = false;
 					}
 				}
 	
-				if ( $should_die ) {
+				if ($should_die) {
 					wp_die();
 				}
 	
@@ -535,7 +535,7 @@ 
 						jQuery($this).data('sd-widget-enabled', true);
 					}
 	
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" style="line-height: 28px;" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><span class="dashicons dashicons-admin-settings" style="width: 28px;font-size: 28px;"></span></button>';
 					var form = jQuery($this).parents('' + $selector + '');
 	
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
@@ -629,7 +629,7 @@ 
 						});
 	
 					}
-					<?php do_action( 'wp_super_duper_widget_js' ); ?>
+					<?php do_action('wp_super_duper_widget_js'); ?>
 			</script>
 	
 			<?php
@@ -639,10 +639,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);
 		}
 	
 		/**
@@ -652,12 +652,12 @@ 
 		 *
 		 * @return mixed
 		 */
-		public static function widget_css( $advanced = true ) {
+		public static function widget_css($advanced = true) {
 			ob_start();
 			?>
 	
 			<style>
-				<?php if ( $advanced ) : ?>
+				<?php if ($advanced) : ?>
 					.sd-advanced-setting {
 						display: none;
 					}
@@ -701,21 +701,21 @@ 
 				* 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);
 		}
 	
 		/**
 		 * Registers the widgets loading settings.
 		 */
 		public static function load_widgets_setting() {
-			register_setting( 'general', 'sd_load_widgets', 'esc_attr' );
+			register_setting('general', 'sd_load_widgets', 'esc_attr');
 	
 			add_settings_field(
 				'sd_load_widgets',
-				'<label for="sd_load_widgets">' . __( 'Load Super Duper Widgets' ) . '</label>',
+				'<label for="sd_load_widgets">' . __('Load Super Duper Widgets') . '</label>',
 				'WP_Super_Duper::load_widgets_setting_html',
 				'general'
 			);
@@ -727,26 +727,26 @@ 
 		 */
 		public static function load_widgets_setting_html() {
 			$available_options = array(
-				'yes'  => __( 'Yes' ),
-				'no'   => __( 'No' ),
-				'auto' => __( 'Auto' ),
+				'yes'  => __('Yes'),
+				'no'   => __('No'),
+				'auto' => __('Auto'),
 			);
-			$selected_option   = get_option( 'sd_load_widgets', 'auto' );
+			$selected_option = get_option('sd_load_widgets', 'auto');
 	
 			?>
 				<select name="sd_load_widgets" id="sd_load_widgets">
-					<?php foreach ( $available_options as $key => $label ) : ?>
-						<option value="<?php echo esc_attr( $key ); ?>" <?php selected( $key, $selected_option ); ?>><?php echo esc_html( $label ); ?></option>
+					<?php foreach ($available_options as $key => $label) : ?>
+						<option value="<?php echo esc_attr($key); ?>" <?php selected($key, $selected_option); ?>><?php echo esc_html($label); ?></option>
 					<?php endforeach; ?>
 				</select>
-				<p class="description"><?php _e( 'This option allows you to disable Super Duper widgets and instead only load the blocks and shortcodes.' ); ?></p>
+				<p class="description"><?php _e('This option allows you to disable Super Duper widgets and instead only load the blocks and shortcodes.'); ?></p>
 			<?php
 		}
 	
 		/**
 		 * prevent SDv1 errors if register_widget() function used
 		 */
-		public function _register(){
+		public function _register() {
 			// backwards compatibility
 		}
 	
@@ -756,7 +756,7 @@ 
 		public function generator() {
 	
 			// We want to set this once.
-			if ( empty( $GLOBALS['SD_SET_GENERATOR'] ) ) {
+			if (empty($GLOBALS['SD_SET_GENERATOR'])) {
 				echo '<meta name="generator" content="WP Super Duper v' . $this->version . '" />';
 				$GLOBALS['SD_SET_GENERATOR'] = 1;
 			}
@@ -770,8 +770,8 @@ 
 		 * @param array $widget_args
 		 * @param string $content
 		 */
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
-			echo call_user_func( $this->options['widget_ops']['output'], $args, $widget_args, $content );
+		public function output($args = array(), $widget_args = array(), $content = '') {
+			echo call_user_func($this->options['widget_ops']['output'], $args, $widget_args, $content);
 		}
 	
 		/**
@@ -781,8 +781,8 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_placeholder_text( $name = '' ) {
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
+		public function preview_placeholder_text($name = '') {
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf(__('Placeholder for: %s'), $name) . "</div>";
 		}
 	
 		/**
@@ -792,13 +792,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;
 				}
 			}
 	
@@ -814,26 +814,26 @@ 
 		 *
 		 * @return array
 		 */
-		public function argument_values( $instance ) {
+		public function argument_values($instance) {
 			$argument_values = array();
 	
 			// set widget instance
 			$this->instance = $instance;
 	
-			if ( empty( $this->arguments ) ) {
+			if (empty($this->arguments)) {
 				$this->arguments = $this->get_arguments();
 			}
 	
-			if ( ! empty( $this->arguments ) ) {
-				foreach ( $this->arguments as $key => $args ) {
+			if (!empty($this->arguments)) {
+				foreach ($this->arguments as $key => $args) {
 					// set the input name from the key
 					$args['name'] = $key;
 					//
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
-					if ( $args['type'] == 'checkbox' && $argument_values[ $key ] == '' ) {
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
+					if ($args['type'] == 'checkbox' && $argument_values[$key] == '') {
 						// don't set default for an empty checkbox
-					} elseif ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
-						$argument_values[ $key ] = $args['default'];
+					} elseif ($argument_values[$key] == '' && isset($args['default'])) {
+						$argument_values[$key] = $args['default'];
 					}
 				}
 			}
@@ -849,15 +849,15 @@ 
 		public function get_url() {
 			$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;
 				}
 			}
@@ -883,7 +883,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;
 			}
 	
@@ -898,7 +898,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;
 			}
 	
@@ -913,7 +913,7 @@ 
 		 */
 		public function is_beaver_preview() {
 			$result = false;
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
+			if (isset($_REQUEST['fl_builder'])) {
 				$result = true;
 			}
 	
@@ -928,7 +928,7 @@ 
 		 */
 		public function is_siteorigin_preview() {
 			$result = false;
-			if ( ! empty( $_REQUEST['siteorigin_panels_live_editor'] ) ) {
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
 				$result = true;
 			}
 	
@@ -943,7 +943,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;
 			}
 	
@@ -958,7 +958,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;
 			}
 	
@@ -973,7 +973,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;
 			}
 	
@@ -990,7 +990,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;
 			}
 	
@@ -1002,7 +1002,7 @@ 
 		 *
 		 * @param array $instance The widget options.
 		 */
-		public function form( $instance ) {
+		public function form($instance) {
 	
 			// Set widget instance.
 			$this->instance = $instance;
@@ -1011,45 +1011,45 @@ 
 			echo $this->widget_advanced_toggle();
 	
 			// Display description.
-			printf( '<p>%s</p>', esc_html( $this->options['widget_ops']['description'] ) );
+			printf('<p>%s</p>', esc_html($this->options['widget_ops']['description']));
 	
 			// Prepare arguments.
 			$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?
-			if ( $arguments != $arguments_raw ) {
+			if ($arguments != $arguments_raw) {
 	
 					$panel_count = 0;
-					foreach ( $arguments as $key => $args ) {
+					foreach ($arguments as $key => $args) {
 	
 						$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='" . esc_attr( $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='" . esc_attr($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);
 					}
 	
@@ -1081,9 +1081,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
 					}
@@ -1100,23 +1100,23 @@ 
 		 *
 		 * @return array
 		 */
-		public function group_arguments( $arguments ) {
+		public function group_arguments($arguments) {
 	
-			if ( ! empty( $arguments ) ) {
+			if (!empty($arguments)) {
 				$temp_arguments = array();
-				$general        = __( "General" );
+				$general        = __("General");
 				$add_sections   = false;
-				foreach ( $arguments as $key => $args ) {
-					if ( isset( $args['group'] ) ) {
-						$temp_arguments[ $args['group'] ][ $key ] = $args;
+				foreach ($arguments as $key => $args) {
+					if (isset($args['group'])) {
+						$temp_arguments[$args['group']][$key] = $args;
 						$add_sections                             = true;
 					} else {
-						$temp_arguments[ $general ][ $key ] = $args;
+						$temp_arguments[$general][$key] = $args;
 					}
 				}
 	
 				// only add sections if more than one
-				if ( $add_sections ) {
+				if ($add_sections) {
 					$arguments = $temp_arguments;
 				}
 			}
@@ -1124,23 +1124,23 @@ 
 			return $arguments;
 		}
 	
-		public function widget_inputs_row_start($key, $args){
-			if(!empty($args['row'])){
+		public function widget_inputs_row_start($key, $args) {
+			if (!empty($args['row'])) {
 				// maybe open
-				if(!empty($args['row']['open'])){
+				if (!empty($args['row']['open'])) {
 					?>
-					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr( $args['row']['key'] ); ?>' data-element_require='<?php if ( !empty($args['row']['element_require'])) {
-						echo $this->convert_element_require( $args['row']['element_require'] );
+					<div class='bsui sd-argument ' data-argument='<?php echo esc_attr($args['row']['key']); ?>' data-element_require='<?php if (!empty($args['row']['element_require'])) {
+						echo $this->convert_element_require($args['row']['element_require']);
 					} ?>'>
-					<?php if(!empty($args['row']['title'])){ ?>
-					<label class="mb-0 "><?php echo esc_attr( $args['row']['title'] ); ?><?php echo $this->widget_field_desc( $args['row'] ); ?></label>
+					<?php if (!empty($args['row']['title'])) { ?>
+					<label class="mb-0 "><?php echo esc_attr($args['row']['title']); ?><?php echo $this->widget_field_desc($args['row']); ?></label>
 					<?php }?>
-					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
+					<div class='row <?php if (!empty($args['row']['class'])) { echo esc_attr($args['row']['class']); } ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
+				}elseif (!empty($args['row']['close'])) {
 					echo "<div class='col pl-0'>";
-				}else{
+				} else {
 					echo "<div class='col pl-0 pr-2'>";
 				}
 			}
@@ -1155,14 +1155,14 @@ 
 		 *
 		 * @return string $output
 		 */
-		public function convert_element_require( $input ) {
+		public function convert_element_require($input) {
 	
-			$input = str_replace( "'", '"', $input );// we only want double quotes
+			$input = str_replace("'", '"', $input); // we only want double quotes
 	
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
+			$output = esc_attr(str_replace(array("[%", "%]"), array(
 				"jQuery(form).find('[data-argument=\"",
 				"\"]').find('input,select,textarea').val()"
-			), $input ) );
+			), $input));
 	
 			return $output;
 		}
@@ -1175,14 +1175,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>';
 				}
 			}
 	
@@ -1197,11 +1197,11 @@ 
 		 *
 		 * @return string
 		 */
-		public function desc_tip( $tip, $allow_html = false ) {
-			if ( $allow_html ) {
-				$tip = $this->sanitize_tooltip( $tip );
+		public 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>';
@@ -1214,8 +1214,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(),
@@ -1225,7 +1225,7 @@ 
 				'li'     => array(),
 				'ol'     => array(),
 				'p'      => array(),
-			) ) );
+			)));
 		}
 	
 		/**
@@ -1234,56 +1234,56 @@ 
 		 * @param $args
 		 * @param $instance
 		 */
-		public function widget_inputs( $args, $instance ) {
+		public function widget_inputs($args, $instance) {
 	
 			$class             = "";
 			$element_require   = "";
 			$custom_attributes = "";
 	
 			// get value
-			if ( isset( $instance[ $args['name'] ] ) ) {
-				$value = $instance[ $args['name'] ];
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
+			if (isset($instance[$args['name']])) {
+				$value = $instance[$args['name']];
+			} elseif (!isset($instance[$args['name']]) && !empty($args['default'])) {
+				$value = is_array($args['default']) ? array_map("esc_html", $args['default']) : esc_html($args['default']);
 			} else {
 				$value = '';
 			}
 	
 			// get placeholder
-			if ( ! empty( $args['placeholder'] ) ) {
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
+			if (!empty($args['placeholder'])) {
+				$placeholder = "placeholder='" . esc_html($args['placeholder']) . "'";
 			} else {
 				$placeholder = '';
 			}
 	
 			// get if advanced
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
+			if (isset($args['advanced']) && $args['advanced']) {
 				$class .= " sd-advanced-setting ";
 			}
 	
 			// element_require
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
+			if (isset($args['element_require']) && $args['element_require']) {
 				$element_require = $args['element_require'];
 			}
 	
 			// custom_attributes
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
+			if (isset($args['custom_attributes']) && $args['custom_attributes']) {
+				$custom_attributes = $this->array_to_attributes($args['custom_attributes'], true);
 			}
 	
 	
 			// before wrapper
 			?>
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
-			data-argument='<?php echo esc_attr( $args['name'] ); ?>'
-			data-element_require='<?php if ( $element_require ) {
-				echo $this->convert_element_require( $element_require );
+			<p class="sd-argument <?php echo esc_attr($class); ?>"
+			data-argument='<?php echo esc_attr($args['name']); ?>'
+			data-element_require='<?php if ($element_require) {
+				echo $this->convert_element_require($element_require);
 			} ?>'
 			>
 			<?php
 	
 	
-			switch ( $args['type'] ) {
+			switch ($args['type']) {
 				//array('text','password','number','email','tel','url','color')
 				case "text":
 				case "password":
@@ -1294,46 +1294,46 @@ 
 				case "color":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<input <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-													   id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-													   name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-													   type="<?php echo esc_attr( $args['type'] ); ?>"
-													   value="<?php echo esc_attr( $value ); ?>">
+													   id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+													   name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+													   type="<?php echo esc_attr($args['type']); ?>"
+													   value="<?php echo esc_attr($value); ?>">
 					<?php
 	
 					break;
 				case "select":
-					$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
-					if ( $multiple ) {
-						if ( empty( $value ) ) {
+					$multiple = isset($args['multiple']) && $args['multiple'] ? true : false;
+					if ($multiple) {
+						if (empty($value)) {
 							$value = array();
 						}
 					}
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<select <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-														id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-														name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
-														if ( $multiple ) {
+														id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+														name="<?php echo esc_attr($this->get_field_name($args['name']));
+														if ($multiple) {
 															echo "[]";
 														} ?>"
-						<?php if ( $multiple ) {
+						<?php if ($multiple) {
 							echo "multiple";
 						} //@todo not implemented yet due to gutenberg not supporting it
 						?>
 					>
 						<?php
 	
-						if ( ! empty( $args['options'] ) ) {
-							foreach ( $args['options'] as $val => $label ) {
-								if ( $multiple ) {
-									$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
+						if (!empty($args['options'])) {
+							foreach ($args['options'] as $val => $label) {
+								if ($multiple) {
+									$selected = in_array($val, $value) ? 'selected="selected"' : '';
 								} else {
-									$selected = selected( $value, $val, false );
+									$selected = selected($value, $val, false);
 								}
 								echo "<option value='$val' " . $selected . ">$label</option>";
 							}
@@ -1345,32 +1345,32 @@ 
 				case "checkbox":
 					?>
 					<input <?php echo $placeholder; ?>
-						<?php checked( 1, $value, true ) ?>
+						<?php checked(1, $value, true) ?>
 						<?php echo $custom_attributes; ?>
-						class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox"
+						class="widefat" id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="checkbox"
 						value="1">
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args );?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<?php
 					break;
 				case "textarea":
 					?>
 					<label
-						for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo $this->widget_field_title( $args ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
+						for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo $this->widget_field_title($args); ?><?php echo $this->widget_field_desc($args); ?></label>
 					<textarea <?php echo $placeholder; ?> class="widefat"
 						<?php echo $custom_attributes; ?>
-														  id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-														  name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
-					><?php echo esc_attr( $value ); ?></textarea>
+														  id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+														  name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
+					><?php echo esc_attr($value); ?></textarea>
 					<?php
 	
 					break;
 				case "hidden":
 					?>
-					<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
-						   name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
-						   value="<?php echo esc_attr( $value ); ?>">
+					<input id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
+						   name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="hidden"
+						   value="<?php echo esc_attr($value); ?>">
 					<?php
 					break;
 				default:
@@ -1392,25 +1392,25 @@ 
 		 *
 		 * @return string
 		 */
-		public function array_to_attributes( $attributes, $html = false ) {
+		public function array_to_attributes($attributes, $html = false) {
 	
-			if ( ! is_array( $attributes ) ) {
+			if (!is_array($attributes)) {
 				return '';
 			}
 	
 			$output = '';
-			foreach ( $attributes as $name => $value ) {
+			foreach ($attributes as $name => $value) {
 	
-				if ( $html ) {
+				if ($html) {
 	
-					if ( true === $value ) {
-						$output .= esc_html( $name ) . ' ';
-					} else if ( false !== $value ) {
-						$output .= sprintf( '%s="%s" ', esc_html( $name ), trim( esc_attr( $value ) ) );
+					if (true === $value) {
+						$output .= esc_html($name) . ' ';
+					} else if (false !== $value) {
+						$output .= sprintf('%s="%s" ', esc_html($name), trim(esc_attr($value)));
 					}
 	
 				} else {
-					$output .= sprintf( "'%s': '%s',", esc_js( $name ), is_bool( $value ) ? $value : trim( esc_js( $value ) ) );
+					$output .= sprintf("'%s': '%s',", esc_js($name), is_bool($value) ? $value : trim(esc_js($value)));
 				}
 	
 			}
@@ -1431,10 +1431,10 @@ 
 		 *
 		 * @return string ID attribute for `$field_name`.
 		 */
-		public function get_field_id( $field_name ) {
+		public function get_field_id($field_name) {
 	
-			$field_name = str_replace( array( '[]', '[', ']' ), array( '', '-', '' ), $field_name );
-			$field_name = trim( $field_name, '-' );
+			$field_name = str_replace(array('[]', '[', ']'), array('', '-', ''), $field_name);
+			$field_name = trim($field_name, '-');
 	
 			return 'widget-' . $this->base_id . '-' . $this->get_number() . '-' . $field_name;
 		}
@@ -1447,13 +1447,13 @@ 
 		public function get_number() {
 			static $number = 1;
 	
-			if ( isset( $this->output_types['widget'] ) ) {
+			if (isset($this->output_types['widget'])) {
 				return $this->output_types['widget']->number;
 			}
 	
-			if ( empty( $this->number ) ) {
+			if (empty($this->number)) {
 				$this->number = $number;
-				$number ++;
+				$number++;
 			}
 	
 			return $this->number;
@@ -1466,12 +1466,12 @@ 
 		 *
 		 * @return string
 		 */
-		public function widget_field_title( $args ) {
+		public function widget_field_title($args) {
 	
 			$title = '';
-			if ( isset( $args['title'] ) && $args['title'] ) {
-				if ( isset( $args['icon'] ) && $args['icon'] ) {
-					$title = $this->get_widget_icon( $args['icon'], $args['title']  );
+			if (isset($args['title']) && $args['title']) {
+				if (isset($args['icon']) && $args['icon']) {
+					$title = $this->get_widget_icon($args['icon'], $args['title']);
 				} else {
 					$title = esc_attr($args['title']);
 				}
@@ -1485,15 +1485,15 @@ 
 		 *
 		 * @return array
 		 */
-		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>';
 			}
 		}
 	
@@ -1510,12 +1510,12 @@ 
 		 *
 		 * @return string Name attribute for `$field_name`.
 		 */
-		public function get_field_name( $field_name ) {
-			$pos = strpos( $field_name, '[' );
+		public function get_field_name($field_name) {
+			$pos = strpos($field_name, '[');
 	
-			if ( false !== $pos ) {
+			if (false !== $pos) {
 				// Replace the first occurrence of '[' with ']['.
-				$field_name = '[' . substr_replace( $field_name, '][', $pos, strlen( '[' ) );
+				$field_name = '[' . substr_replace($field_name, '][', $pos, strlen('['));
 			} else {
 				$field_name = '[' . $field_name . ']';
 			}
@@ -1523,10 +1523,10 @@ 
 			return 'widget-' . $this->base_id . '[' . $this->get_number() . ']' . $field_name;
 		}
 	
-		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>";
 				}
 	
@@ -1542,14 +1542,14 @@ 
 		 * @since 1.0.20
 		 * @return string
 		 */
-		public function get_instance_style($rules = array()){
+		public function get_instance_style($rules = array()) {
 			$css = '';
 	
-			if(!empty($rules)){
+			if (!empty($rules)) {
 				$rules = array_unique($rules);
 				$instance_hash = $this->get_instance_hash();
 				$css .= "<style>";
-				foreach($rules as $rule){
+				foreach ($rules as $rule) {
 					$css .= ".sdel-$instance_hash $rule";
 				}
 				$css .= "</style>";
@@ -1564,9 +1564,9 @@ 
 		 * @since 1.0.20
 		 * @return string
 		 */
-		public function get_instance_hash(){
-			$instance_string = $this->base_id . serialize( $this->instance );
-			return hash( 'crc32b', $instance_string );
+		public function get_instance_hash() {
+			$instance_string = $this->base_id . serialize($this->instance);
+			return hash('crc32b', $instance_string);
 		}
 	
 		/**
@@ -2075,12 +2075,12 @@ 
 					}
 				});
 			}
-			<?php do_action( 'wp_super_duper_conditional_fields_js', $this ); ?>
+			<?php do_action('wp_super_duper_conditional_fields_js', $this); ?>
 			</script>
 						<?php
 						$output = ob_get_clean();
 	
-						return str_replace( array( '<script>', '</script>' ), '', trim( $output ) );
+						return str_replace(array('<script>', '</script>'), '', trim($output));
 			}
 	
 		/**
@@ -2091,36 +2091,36 @@ 
 		 *
 		 * @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->base_id );
+				$title = apply_filters('widget_title', $instance['title'], $instance, $this->base_id);
 	
-				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'] );
+					$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'] ) : '';
-					$title_classes   = array_filter( $title_classes );
-	
-					$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']) : '';
+					$title_classes   = array_filter($title_classes);
+	
+					$class  = !empty($title_classes) ? implode(' ', $title_classes) : '';
 					$output = "<$title_tag class='$class' >$title</$title_tag>";
 				}
 	

Braces +5 added lines, -5 removed lines

@@ -1138,9 +1138,9 @@ 
 					<div class='row <?php if(!empty($args['row']['class'])){ echo esc_attr($args['row']['class']);} ?>'>
 					<div class='col pr-2'>
 					<?php
-				}elseif(!empty($args['row']['close'])){
+				} elseif(!empty($args['row']['close'])){
 					echo "<div class='col pl-0'>";
-				}else{
+				} else{
 					echo "<div class='col pl-0 pr-2'>";
 				}
 			}
@@ -1488,11 +1488,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>';
 			}
 		}

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

Indentation +546 added lines, -546 removed lines

@@ -17,103 +17,103 @@ 
  */
 class WP_Super_Duper_Block {
 
-	/**
-	 * @var WP_Super_Duper
-	 */
-	protected $sd;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param WP_Super_Duper $super_duper
-	 */
-	public function __construct( $super_duper ) {
-
-		$this->sd = $super_duper;
-
-		// Process the SD shortcode preview.
-		add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-		add_action( 'admin_footer-post.php', array( $this, 'enqueue_editor_assets' ) );
-		add_action( 'admin_footer-post-new.php', array( $this, 'enqueue_editor_assets' ) );
-	}
-
-	/**
-	 * Render the shortcode via ajax so we can return it to Gutenberg.
-	 *
-	 * @since 1.0.0
-	 */
-	public static function render_shortcode() {
-
-		// Verify nonce.
-		check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
-
-		// And permissions.
-		if ( ! current_user_can( 'manage_options' ) ) {
-			wp_die();
-		}
-
-		// Ensure a shortcode is provided.
-		if ( empty( $_POST['shortcode'] ) ) {
-			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;
-			}
-		}
-
-		// Prepare args.
-		$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
-		$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
-		$attributes       = '';
-
-		// Convert attributes array into a string.
-		if ( ! empty( $attributes_array ) ) {
-			foreach ( $attributes_array as $key => $value ) {
-				if ( is_array( $value ) ) {
-					$value = implode( ',', $value );
-				}
-				$key   = sanitize_title_with_dashes( $key );
-				$value = wp_slash( $value );
-				$attributes .= " $key='$value' ";
-			}
-		}
-
-		echo do_shortcode( "[$shortcode_name $attributes]" );
-		exit;
-
-	}
-
-	/**
-	 * 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', WP_Super_Duper::siteorigin_js() );
-		}
-	}
-
-	/**
-	 * Output the JS for building the dynamic Guntenberg block.
-	 *
-	 * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
-	 * @since 1.0.9 Save numbers as numbers and not strings.
-	 * @since 1.1.0 Font Awesome classes can be used for icons.
-	 * @return mixed
-	 */
-	public function block() {
-		ob_start();
-
-		$block_name    = str_replace( '_', '-', sanitize_title_with_dashes( $this->sd->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->sd->options['class_name'] ) );
-		$show_advanced = $this->sd->block_show_advanced();
-		$id            = $this->sd->base_id . '-' . $this->sd->get_number();
-		?>
+    /**
+     * @var WP_Super_Duper
+     */
+    protected $sd;
+
+    /**
+     * Class constructor.
+     *
+     * @param WP_Super_Duper $super_duper
+     */
+    public function __construct( $super_duper ) {
+
+        $this->sd = $super_duper;
+
+        // Process the SD shortcode preview.
+        add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
+        add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
+        add_action( 'admin_footer-post.php', array( $this, 'enqueue_editor_assets' ) );
+        add_action( 'admin_footer-post-new.php', array( $this, 'enqueue_editor_assets' ) );
+    }
+
+    /**
+     * Render the shortcode via ajax so we can return it to Gutenberg.
+     *
+     * @since 1.0.0
+     */
+    public static function render_shortcode() {
+
+        // Verify nonce.
+        check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
+
+        // And permissions.
+        if ( ! current_user_can( 'manage_options' ) ) {
+            wp_die();
+        }
+
+        // Ensure a shortcode is provided.
+        if ( empty( $_POST['shortcode'] ) ) {
+            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;
+            }
+        }
+
+        // Prepare args.
+        $shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
+        $attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
+        $attributes       = '';
+
+        // Convert attributes array into a string.
+        if ( ! empty( $attributes_array ) ) {
+            foreach ( $attributes_array as $key => $value ) {
+                if ( is_array( $value ) ) {
+                    $value = implode( ',', $value );
+                }
+                $key   = sanitize_title_with_dashes( $key );
+                $value = wp_slash( $value );
+                $attributes .= " $key='$value' ";
+            }
+        }
+
+        echo do_shortcode( "[$shortcode_name $attributes]" );
+        exit;
+
+    }
+
+    /**
+     * 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', WP_Super_Duper::siteorigin_js() );
+        }
+    }
+
+    /**
+     * Output the JS for building the dynamic Guntenberg block.
+     *
+     * @since 1.0.4 Added block_wrap property which will set the block wrapping output element ie: div, span, p or empty for no wrap.
+     * @since 1.0.9 Save numbers as numbers and not strings.
+     * @since 1.1.0 Font Awesome classes can be used for icons.
+     * @return mixed
+     */
+    public function block() {
+        ob_start();
+
+        $block_name    = str_replace( '_', '-', sanitize_title_with_dashes( $this->sd->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->sd->options['class_name'] ) );
+        $show_advanced = $this->sd->block_show_advanced();
+        $id            = $this->sd->base_id . '-' . $this->sd->get_number();
+        ?>
 		<script>
 			/**
 			 * BLOCK: Basic
@@ -136,10 +136,10 @@ 
 
 				var term_query_type = '';
 				var post_type_rest_slugs = <?php if ( ! empty( $this->sd->arguments ) && isset( $this->sd->arguments['post_type']['onchange_rest']['values'] ) ) {
-					echo "[" . json_encode( $this->sd->arguments['post_type']['onchange_rest']['values'] ) . "]";
-				} else {
-					echo "[]";
-				} ?>;
+                    echo "[" . json_encode( $this->sd->arguments['post_type']['onchange_rest']['values'] ) . "]";
+                } else {
+                    echo "[]";
+                } ?>;
 				const taxonomies_<?php echo str_replace( "-", "_", $id );?> = [{label: "Please wait", value: 0}];
 				const sort_by_<?php echo str_replace( "-", "_", $id );?> = [{label: "Please wait", value: 0}];
 
@@ -161,89 +161,89 @@ 
 					icon: <?php echo $this->get_block_icon( $this->sd->options['block-icon'] );?>,//'<?php echo isset( $this->sd->options['block-icon'] ) ? esc_attr( $this->sd->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 					supports: {
 						<?php
-						if ( isset( $this->sd->options['block-supports'] ) ) {
-							echo $this->sd->array_to_attributes( $this->sd->options['block-supports'] );
-						}
-						?>
+                        if ( isset( $this->sd->options['block-supports'] ) ) {
+                            echo $this->sd->array_to_attributes( $this->sd->options['block-supports'] );
+                        }
+                        ?>
 					},
 					category: '<?php echo isset( $this->sd->options['block-category'] ) ? esc_attr( $this->sd->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
 					<?php if ( isset( $this->sd->options['block-keywords'] ) ) {
-					echo "keywords : " . $this->sd->options['block-keywords'] . ",";
-				}?>
+                    echo "keywords : " . $this->sd->options['block-keywords'] . ",";
+                }?>
 
 					<?php
 
-					// maybe set no_wrap
-					$no_wrap = isset( $this->sd->options['no_wrap'] ) && $this->sd->options['no_wrap'] ? true : false;
-					if ( isset( $this->sd->arguments['no_wrap'] ) && $this->sd->arguments['no_wrap'] ) {
-						$no_wrap = true;
-					}
-					if ( $no_wrap ) {
-						$this->sd->options['block-wrap'] = '';
-					}
-
-					$show_alignment = false;
-
-					if ( ! empty( $this->sd->arguments ) ) {
-						echo "attributes : {";
-
-						if ( $show_advanced ) {
-							echo "show_advanced: {";
-							echo "	type: 'boolean',";
-							echo "  default: false,";
-							echo "},";
-						}
-
-						// block wrap element
-						if ( ! empty( $this->sd->options['block-wrap'] ) ) { //@todo we should validate this?
-							echo "block_wrap: {";
-							echo "	type: 'string',";
-							echo "  default: '" . esc_attr( $this->sd->options['block-wrap'] ) . "',";
-							echo "},";
-						}
-
-						foreach ( $this->sd->arguments as $key => $args ) {
-
-							// set if we should show alignment
-							if ( $key == 'alignment' ) {
-								$show_alignment = true;
-							}
-
-							$extra = '';
-
-							if ( $args['type'] == 'checkbox' ) {
-								$type    = 'boolean';
-								$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-							} elseif ( $args['type'] == 'number' ) {
-								$type    = 'number';
-								$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-							} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
-								$type = 'array';
-								if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-									$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
-								} else {
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-								}
-							} elseif ( $args['type'] == 'multiselect' ) {
-								$type    = 'array';
-								$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-							} else {
-								$type    = 'string';
-								$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-							}
-							echo str_replace( '-','__', $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 "},";
-
-					}
-
-					?>
+                    // maybe set no_wrap
+                    $no_wrap = isset( $this->sd->options['no_wrap'] ) && $this->sd->options['no_wrap'] ? true : false;
+                    if ( isset( $this->sd->arguments['no_wrap'] ) && $this->sd->arguments['no_wrap'] ) {
+                        $no_wrap = true;
+                    }
+                    if ( $no_wrap ) {
+                        $this->sd->options['block-wrap'] = '';
+                    }
+
+                    $show_alignment = false;
+
+                    if ( ! empty( $this->sd->arguments ) ) {
+                        echo "attributes : {";
+
+                        if ( $show_advanced ) {
+                            echo "show_advanced: {";
+                            echo "	type: 'boolean',";
+                            echo "  default: false,";
+                            echo "},";
+                        }
+
+                        // block wrap element
+                        if ( ! empty( $this->sd->options['block-wrap'] ) ) { //@todo we should validate this?
+                            echo "block_wrap: {";
+                            echo "	type: 'string',";
+                            echo "  default: '" . esc_attr( $this->sd->options['block-wrap'] ) . "',";
+                            echo "},";
+                        }
+
+                        foreach ( $this->sd->arguments as $key => $args ) {
+
+                            // set if we should show alignment
+                            if ( $key == 'alignment' ) {
+                                $show_alignment = true;
+                            }
+
+                            $extra = '';
+
+                            if ( $args['type'] == 'checkbox' ) {
+                                $type    = 'boolean';
+                                $default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
+                            } elseif ( $args['type'] == 'number' ) {
+                                $type    = 'number';
+                                $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                            } elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+                                $type = 'array';
+                                if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
+                                    $default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+                                } else {
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                                }
+                            } elseif ( $args['type'] == 'multiselect' ) {
+                                $type    = 'array';
+                                $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                            } else {
+                                $type    = 'string';
+                                $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+                            }
+                            echo str_replace( '-','__', $key ) . " : {";
+                            echo "type : '$type',";
+                            echo "default : $default,";
+                            echo "},";
+                        }
+
+                        echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
+                        echo "className: { type: 'string', default: '' },";
+                        echo "},";
+
+                    }
+
+                    ?>
 
 					// The "edit" property must be a valid function.
 					edit: function (props) {
@@ -251,9 +251,9 @@ 
 
 						var $value = '';
 						<?php
-						// if we have a post_type and a category then link them
-						if( isset( $this->sd->arguments['post_type'] ) && isset( $this->sd->arguments['category'] ) && ! empty( $this->sd->arguments['category']['post_type_linked'] ) ){
-						?>
+                        // if we have a post_type and a category then link them
+                        if( isset( $this->sd->arguments['post_type'] ) && isset( $this->sd->arguments['category'] ) && ! empty( $this->sd->arguments['category']['post_type_linked'] ) ){
+                        ?>
 						if (typeof(prev_attributes[props.id]) != 'undefined') {
 							$pt = props.attributes.post_type;
 							if (post_type_rest_slugs.length) {
@@ -270,10 +270,10 @@ 
 							if ($value && 'post_type' in prev_attributes[props.id] && 'category' in prev_attributes[props.id] && run) {
 								wp.apiFetch({
 									path: "<?php if ( isset( $this->sd->arguments['post_type']['onchange_rest']['path'] ) ) {
-										echo $this->sd->arguments['post_type']['onchange_rest']['path'];
-									} else {
-										'/wp/v2/"+$value+"/categories/?per_page=100';
-									} ?>"
+                                        echo $this->sd->arguments['post_type']['onchange_rest']['path'];
+                                    } else {
+                                        '/wp/v2/"+$value+"/categories/?per_page=100';
+                                    } ?>"
 								}).then(terms => {
 									while (taxonomies_<?php echo str_replace( "-", "_", $id );?>.length
 							)
@@ -348,10 +348,10 @@ 
 									'shortcode': '<?php echo $this->sd->options['base_id'];?>',
 									'attributes': props.attributes,
 									'post_id': <?php global $post; if ( isset( $post->ID ) ) {
-									echo $post->ID;
-								} else {
-									echo '0';
-								}?>,
+                                    echo $post->ID;
+                                } else {
+                                    echo '0';
+                                }?>,
 									'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
 								};
 
@@ -403,10 +403,10 @@ 
 
 								<?php
 
-								if(! empty( $this->sd->arguments )){
+                                if(! empty( $this->sd->arguments )){
 
-								if ( $show_advanced ) {
-								?>
+                                if ( $show_advanced ) {
+                                ?>
 								el('div', {
 										style: {'padding-left': '16px', 'padding-right': '16px'}
 									},
@@ -424,78 +424,78 @@ 
 								,
 								<?php
 
-								}
+                                }
 
-								$arguments = $this->sd->group_arguments( $this->sd->arguments );
+                                $arguments = $this->sd->group_arguments( $this->sd->arguments );
 
-								// Do we have sections?
-								$has_sections = $arguments == $this->sd->arguments ? false : true;
+                                // Do we have sections?
+                                $has_sections = $arguments == $this->sd->arguments ? false : true;
 
 
-								if($has_sections){
-								$panel_count = 0;
-								foreach($arguments as $key => $args){
-								?>
+                                if($has_sections){
+                                $panel_count = 0;
+                                foreach($arguments as $key => $args){
+                                ?>
 								el(wp.components.PanelBody, {
 										title: '<?php esc_attr_e( $key ); ?>',
 										initialOpen: <?php if ( $panel_count ) {
-										echo "false";
-									} else {
-										echo "true";
-									}?>
+                                        echo "false";
+                                    } else {
+                                        echo "true";
+                                    }?>
 									},
 									<?php
 
-									foreach ( $args as $k => $a ) {
-										$k = str_replace('-','__', $k);
-										$this->block_row_start( $k, $a );
-										$this->build_block_arguments( $k, $a );
-										$this->block_row_end( $k, $a );
-									}
-									?>
+                                    foreach ( $args as $k => $a ) {
+                                        $k = str_replace('-','__', $k);
+                                        $this->block_row_start( $k, $a );
+                                        $this->build_block_arguments( $k, $a );
+                                        $this->block_row_end( $k, $a );
+                                    }
+                                    ?>
 								),
 								<?php
-								$panel_count ++;
+                                $panel_count ++;
 
-								}
-								}else {
-								?>
+                                }
+                                }else {
+                                ?>
 								el(wp.components.PanelBody, {
 										title: '<?php esc_attr_e( "Settings" ); ?>',
 										initialOpen: true
 									},
 									<?php
-									foreach ( $this->sd->arguments as $key => $args ) {
-										$key = str_replace('-','__', $key);
-										$this->block_row_start( $key, $args );
-										$this->build_block_arguments( $key, $args );
-										$this->block_row_end( $key, $args );
-									}
-									?>
+                                    foreach ( $this->sd->arguments as $key => $args ) {
+                                        $key = str_replace('-','__', $key);
+                                        $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->sd->options['block-output'] ) ) {
-							$this->block_element( $this->sd->options['block-output'] );
-						}else{
-							// if no block-output is set then we try and get the shortcode html output via ajax.
-							?>
+                            // If the user sets block-output array then build it
+                            if ( ! empty( $this->sd->options['block-output'] ) ) {
+                            $this->block_element( $this->sd->options['block-output'] );
+                        }else{
+                            // if no block-output is set then we try and get the shortcode html output via ajax.
+                            ?>
 							el('div', {
 								dangerouslySetInnerHTML: {__html: onChangeContent()},
 								className: props.className,
 								style: {'minHeight': '30px'}
 							})
 							<?php
-							}
-							?>
+                            }
+                            ?>
 						]; // end return
 					},
 
@@ -539,11 +539,11 @@ 
 						$html = '';
 						<?php
 
-						if(! empty( $this->sd->arguments )){
+                        if(! empty( $this->sd->arguments )){
 
-						foreach($this->sd->arguments as $key => $args){
-						$key = str_replace('-','__', $key);
-						?>
+                        foreach($this->sd->arguments as $key => $args){
+                        $key = str_replace('-','__', $key);
+                        ?>
 						if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
 							if ('<?php echo esc_attr( $key );?>' == 'html') {
 								$html = attr.<?php echo esc_attr( $key );?>;
@@ -552,10 +552,10 @@ 
 							}
 						}
 						<?php
-						}
-						}
+                        }
+                        }
 
-						?>
+                        ?>
 						content += "]";
 
 						// if has html element
@@ -578,20 +578,20 @@ 
 						}
 
 						<?php
-						if(isset( $this->sd->options['block-wrap'] ) && $this->sd->options['block-wrap'] == ''){
-						?>
+                        if(isset( $this->sd->options['block-wrap'] ) && $this->sd->options['block-wrap'] == ''){
+                        ?>
 						return content;
 						<?php
-						}else{
-						?>
+                        }else{
+                        ?>
 						var block_wrap = 'div';
 						if (attr.hasOwnProperty("block_wrap")) {
 							block_wrap = attr.block_wrap;
 						}
 						return el(block_wrap, {dangerouslySetInnerHTML: {__html: content}, className: align});
 						<?php
-						}
-						?>
+                        }
+                        ?>
 
 
 					}
@@ -599,62 +599,62 @@ 
 			})();
 		</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 );
-	}
-
-	/**
-	 * Generate the block icon.
-	 *
-	 * Enables the use of Font Awesome icons.
-	 *
-	 * @note xlink:href is actually deprecated but href is not supported by all so we use both.
-	 *
-	 * @param $icon
-	 *
-	 * @since 1.1.0
-	 * @return string
-	 */
-	public function get_block_icon( $icon ) {
-
-		// check if we have a Font Awesome icon
-		$fa_type = '';
-		if ( substr( $icon, 0, 7 ) === 'fas fa-' ) {
-			$fa_type = 'solid';
-		} elseif ( substr( $icon, 0, 7 ) === 'far fa-' ) {
-			$fa_type = 'regular';
-		} elseif ( substr( $icon, 0, 7 ) === 'fab fa-' ) {
-			$fa_type = 'brands';
-		} else {
-			$icon = sprintf( "'%s'", esc_js( $icon ) );
-		}
-
-		// set the icon if we found one
-		if ( $fa_type ) {
-			$fa_icon = substr( $icon, 7 );
-			$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->sd->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->sd->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
-		}
-
-		return $icon;
-	}
-
-	public function block_row_start( $key, $args ) {
-		// check for row
-		if ( ! empty( $args['row'] ) ) {
-			if ( ! empty( $args['row']['open'] ) ) {
-				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-				echo $element_require;
-			if ( false ){
-				?>
+        return str_replace( array(
+            '<script>',
+            '</script>'
+        ), '', $output );
+    }
+
+    /**
+     * Generate the block icon.
+     *
+     * Enables the use of Font Awesome icons.
+     *
+     * @note xlink:href is actually deprecated but href is not supported by all so we use both.
+     *
+     * @param $icon
+     *
+     * @since 1.1.0
+     * @return string
+     */
+    public function get_block_icon( $icon ) {
+
+        // check if we have a Font Awesome icon
+        $fa_type = '';
+        if ( substr( $icon, 0, 7 ) === 'fas fa-' ) {
+            $fa_type = 'solid';
+        } elseif ( substr( $icon, 0, 7 ) === 'far fa-' ) {
+            $fa_type = 'regular';
+        } elseif ( substr( $icon, 0, 7 ) === 'fab fa-' ) {
+            $fa_type = 'brands';
+        } else {
+            $icon = sprintf( "'%s'", esc_js( $icon ) );
+        }
+
+        // set the icon if we found one
+        if ( $fa_type ) {
+            $fa_icon = substr( $icon, 7 );
+            $icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->sd->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->sd->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
+        }
+
+        return $icon;
+    }
+
+    public function block_row_start( $key, $args ) {
+        // check for row
+        if ( ! empty( $args['row'] ) ) {
+            if ( ! empty( $args['row']['open'] ) ) {
+                // element require
+                $element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+                echo $element_require;
+            if ( false ){
+                ?>
 				<script><?php }?>
 					el('div', {
 							className: 'bsui components-base-control',
@@ -679,8 +679,8 @@ 
 							'div',
 							{
 								className: 'row mb-n2 <?php if ( ! empty( $args['row']['class'] ) ) {
-									echo esc_attr( $args['row']['class'] );
-								} ?>',
+                                    echo esc_attr( $args['row']['class'] );
+                                } ?>',
 							},
 							el(
 								'div',
@@ -688,11 +688,11 @@ 
 									className: 'col pr-2',
 								},
 					<?php
-					if ( false ){
-					?></script><?php }
-			} elseif ( ! empty( $args['row']['close'] ) ) {
-			if ( false ){
-				?>
+                    if ( false ){
+                    ?></script><?php }
+            } elseif ( ! empty( $args['row']['close'] ) ) {
+            if ( false ){
+                ?>
 				<script><?php }?>
 					el(
 						'div',
@@ -700,11 +700,11 @@ 
 							className: 'col pl-0',
 						},
 					<?php
-					if ( false ){
-					?></script><?php }
-			} else {
-			if ( false ){
-				?>
+                    if ( false ){
+                    ?></script><?php }
+            } else {
+            if ( false ){
+                ?>
 				<script><?php }?>
 					el(
 						'div',
@@ -712,255 +712,255 @@ 
 							className: 'col pl-0 pr-2',
 						},
 					<?php
-					if ( false ){
-					?></script><?php }
-			}
-		}
-	}
-
-	/**
-	 * Replace block attributes placeholders with the proper naming.
-	 *
-	 * @param $string
-	 *
-	 * @return mixed
-	 */
-	public function block_props_replace( $string, $no_wrap = false ) {
-
-		if ( $no_wrap ) {
-			$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
-		} else {
-			$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
-		}
-
-		return $string;
-	}
-
-	public function build_block_arguments( $key, $args ) {
-		$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->sd->array_to_attributes( $args['custom_attributes'] ) : '';
-		$options           = '';
-		$key               = sanitize_key( $key );
-		$extra             = "key: '$key',";
-
-		// `content` is a protected and Gutenberg special argument
-		if ( $key == 'content' ) {
-			return;
-		}
-
-		// icon
-		$icon = '';
-		if ( ! empty( $args['icon'] ) ) {
-			$icon .= "el('div', {";
-			$icon .= "dangerouslySetInnerHTML: {__html: '" . $this->sd->get_widget_icon( esc_attr( $args['icon'] ) ) . "'},";
-			$icon .= "className: 'text-center',";
-			$icon .= "title: '" . addslashes( $args['title'] ) . "',";
-			$icon .= "}),";
-			// blank title as its added to the icon.
-			$args['title'] = '';
-		}
-
-		// require advanced
-		$require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
-
-		// element require
-		$element_require  = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
-		$onchange         = "props.setAttributes({ $key: $key } )";
-		$onchangecomplete = "";
-		$value            = "props.attributes.$key";
-		$text_type        = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
-		if ( in_array( $args['type'], $text_type ) ) {
-			$type = 'TextControl';
-			// Save numbers as numbers and not strings
-			if ( $args['type'] == 'number' ) {
-				$onchange = "props.setAttributes({ $key: Number($key) } )";
-			}
-		} elseif ( $args['type'] == 'color' ) {
-			$type     = 'ColorPicker';
-			$onchange = "";
-			$extra .= "color: $value,";
-			if ( ! empty( $args['disable_alpha'] ) ) {
-				$extra .= "disableAlpha: true,";
-			}
-			$onchangecomplete = "onChangeComplete: function($key) {
+                    if ( false ){
+                    ?></script><?php }
+            }
+        }
+    }
+
+    /**
+     * Replace block attributes placeholders with the proper naming.
+     *
+     * @param $string
+     *
+     * @return mixed
+     */
+    public function block_props_replace( $string, $no_wrap = false ) {
+
+        if ( $no_wrap ) {
+            $string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+        } else {
+            $string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+        }
+
+        return $string;
+    }
+
+    public function build_block_arguments( $key, $args ) {
+        $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->sd->array_to_attributes( $args['custom_attributes'] ) : '';
+        $options           = '';
+        $key               = sanitize_key( $key );
+        $extra             = "key: '$key',";
+
+        // `content` is a protected and Gutenberg special argument
+        if ( $key == 'content' ) {
+            return;
+        }
+
+        // icon
+        $icon = '';
+        if ( ! empty( $args['icon'] ) ) {
+            $icon .= "el('div', {";
+            $icon .= "dangerouslySetInnerHTML: {__html: '" . $this->sd->get_widget_icon( esc_attr( $args['icon'] ) ) . "'},";
+            $icon .= "className: 'text-center',";
+            $icon .= "title: '" . addslashes( $args['title'] ) . "',";
+            $icon .= "}),";
+            // blank title as its added to the icon.
+            $args['title'] = '';
+        }
+
+        // require advanced
+        $require_advanced = ! empty( $args['advanced'] ) ? "props.attributes.show_advanced && " : "";
+
+        // element require
+        $element_require  = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+        $onchange         = "props.setAttributes({ $key: $key } )";
+        $onchangecomplete = "";
+        $value            = "props.attributes.$key";
+        $text_type        = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
+        if ( in_array( $args['type'], $text_type ) ) {
+            $type = 'TextControl';
+            // Save numbers as numbers and not strings
+            if ( $args['type'] == 'number' ) {
+                $onchange = "props.setAttributes({ $key: Number($key) } )";
+            }
+        } elseif ( $args['type'] == 'color' ) {
+            $type     = 'ColorPicker';
+            $onchange = "";
+            $extra .= "color: $value,";
+            if ( ! empty( $args['disable_alpha'] ) ) {
+                $extra .= "disableAlpha: true,";
+            }
+            $onchangecomplete = "onChangeComplete: function($key) {
 			value =  $key.rgb.a && $key.rgb.a < 1 ? \"rgba(\"+$key.rgb.r+\",\"+$key.rgb.g+\",\"+$key.rgb.b+\",\"+$key.rgb.a+\")\" : $key.hex;
                         props.setAttributes({
                             $key: value
                         });
                     },";
-		} elseif ( $args['type'] == 'checkbox' ) {
-			$type = 'CheckboxControl';
-			$extra .= "checked: props.attributes.$key,";
-			$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
-		} elseif ( $args['type'] == 'textarea' ) {
-			$type = 'TextareaControl';
-		} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
-			$type = 'SelectControl';
-			if ( $args['name'] == 'category' && ! empty( $args['post_type_linked'] ) ) {
-				$options .= "options: taxonomies_" . str_replace( "-", "_", $this->sd->base_id . '_' . $this->sd->get_number() ) . ",";
-			} elseif ( $args['name'] == 'sort_by' && ! empty( $args['post_type_linked'] ) ) {
-				$options .= "options: sort_by_" . str_replace( "-", "_", $this->sd->base_id . '_' . $this->sd->get_number() ) . ",";
-			} else {
-				if ( ! empty( $args['options'] ) ) {
-					$options .= "options: [";
-					foreach ( $args['options'] as $option_val => $option_label ) {
-						$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
-					}
-					$options .= "],";
-				}
-			}
-			if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
-				$extra .= ' multiple: true, ';
-			}
-		} elseif ( $args['type'] == 'alignment' ) {
-			$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-		} elseif ( $args['type'] == 'margins' ) {
-		} else {
-			return;// if we have not implemented the control then don't break the JS.
-		}
-
-		// color input does not show the labels so we add them
-		if ( $args['type'] == 'color' ) {
-			// add show only if advanced
-			echo $require_advanced;
-			// add setting require if defined
-			echo $element_require;
-			echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes( $args['title'] ) . "'),";
-		}
-
-		// add show only if advanced
-		echo $require_advanced;
-		// add setting require if defined
-		echo $element_require;
-
-		// icon
-		echo $icon;
-		?>
+        } elseif ( $args['type'] == 'checkbox' ) {
+            $type = 'CheckboxControl';
+            $extra .= "checked: props.attributes.$key,";
+            $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
+        } elseif ( $args['type'] == 'textarea' ) {
+            $type = 'TextareaControl';
+        } elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
+            $type = 'SelectControl';
+            if ( $args['name'] == 'category' && ! empty( $args['post_type_linked'] ) ) {
+                $options .= "options: taxonomies_" . str_replace( "-", "_", $this->sd->base_id . '_' . $this->sd->get_number() ) . ",";
+            } elseif ( $args['name'] == 'sort_by' && ! empty( $args['post_type_linked'] ) ) {
+                $options .= "options: sort_by_" . str_replace( "-", "_", $this->sd->base_id . '_' . $this->sd->get_number() ) . ",";
+            } else {
+                if ( ! empty( $args['options'] ) ) {
+                    $options .= "options: [";
+                    foreach ( $args['options'] as $option_val => $option_label ) {
+                        $options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
+                    }
+                    $options .= "],";
+                }
+            }
+            if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+                $extra .= ' multiple: true, ';
+            }
+        } elseif ( $args['type'] == 'alignment' ) {
+            $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
+        } elseif ( $args['type'] == 'margins' ) {
+        } else {
+            return;// if we have not implemented the control then don't break the JS.
+        }
+
+        // color input does not show the labels so we add them
+        if ( $args['type'] == 'color' ) {
+            // add show only if advanced
+            echo $require_advanced;
+            // add setting require if defined
+            echo $element_require;
+            echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes( $args['title'] ) . "'),";
+        }
+
+        // add show only if advanced
+        echo $require_advanced;
+        // add setting require if defined
+        echo $element_require;
+
+        // icon
+        echo $icon;
+        ?>
 		el( wp.components.<?php echo $type; ?>, {
 		label: '<?php echo addslashes( $args['title'] ); ?>',
 		help: '<?php if ( isset( $args['desc'] ) ) {
-			echo addslashes( $args['desc'] );
-		} ?>',
+            echo addslashes( $args['desc'] );
+        } ?>',
 		value: <?php echo $value; ?>,
 		<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-			echo "type: '" . addslashes( $args['type'] ) . "',";
-		} ?>
+            echo "type: '" . addslashes( $args['type'] ) . "',";
+        } ?>
 		<?php if ( ! empty( $args['placeholder'] ) ) {
-			echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
-		}
-		echo $options;
-		echo $extra;
-		echo $custom_attributes;
-		echo $onchangecomplete . "\n"; ?>
+            echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
+        }
+        echo $options;
+        echo $extra;
+        echo $custom_attributes;
+        echo $onchangecomplete . "\n"; ?>
 		onChange: function ( <?php echo $key; ?> ) {<?php echo $onchange; ?>}
 		} ),
 		<?php
-	}
-
-	public function block_row_end( $key, $args ) {
-		if ( ! empty( $args['row'] ) ) {
-			// maybe close
-			if ( ! empty( $args['row']['close'] ) ) {
-				echo "))";
-			}
-			echo "),";
-		}
-	}
-
-	/**
-	 * 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 ) {
-
-		// Make sure we have args.
-		if ( ! empty( $args ) ) {
-
-			// For each argument...
-			foreach ( $args as $element => $new_args ) {
-
-				// Check if its an element.
-				if ( is_array( $new_args ) ) {
-					if ( isset( $new_args['element'] ) ) {
-						if ( isset( $new_args['element_require'] ) ) {
-							echo str_replace( array(
-									"'+",
-									"+'"
-								), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
-							unset( $new_args['element_require'] );
-						}
-
-						echo "\n el( '" . $new_args['element'] . "', {";
-
-						// get the attributes
-						foreach ( $new_args as $new_key => $new_value ) {
-							if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
-								// do nothing
-							} else {
-								echo $this->block_element( array( $new_key => $new_value ) );
-							}
-						}
-
-						echo "key: '$element'},";// end attributes
-
-						// get the content
-						$first_item = 0;
-						foreach ( $new_args as $new_key => $new_value ) {
-							if ( $new_key === 'content' || is_array( $new_value ) ) {
-								if ( $new_key === 'content' ) {
-									echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
-								}
-
-								if ( is_array( $new_value ) ) {
-									if ( isset( $new_value['element_require'] ) ) {
-										echo str_replace( array(
-												"'+",
-												"+'"
-											), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
-										unset( $new_value['element_require'] );
-									}
-
-									if ( isset( $new_value['element_repeat'] ) ) {
-										$x = 1;
-										while ( $x <= absint( $new_value['element_repeat'] ) ) {
-											$this->block_element( array( '' => $new_value ) );
-											$x ++;
-										}
-									} else {
-										$this->block_element( array( '' => $new_value ) );
-									}
-								}
-								$first_item ++;
-							}
-						}
-						echo ")";// end content
-						echo ", \n";
-					}
-
-					// Or an attribute.
-				} else {
-					if ( substr( $element, 0, 3 ) === 'if_' ) {
-						echo str_replace( 'if_', '', $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-					} elseif ( $element == 'style' ) {
-						echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
-					} else {
-						echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
-					}
-				}
-			}
-
-		}
-	}
-
-	/**
-	 * Enqueue CSS assets in the editor if defined
-	 */
-	public function enqueue_editor_assets() {
-		if ( isset( $this->sd->options['block-editor-style'] ) ) {
-			echo "<link rel='stylesheet' id='glossary-shortcode' href='" . $this->sd->options['block-editor-style'] . "'/>";
-		}
-	}
+    }
+
+    public function block_row_end( $key, $args ) {
+        if ( ! empty( $args['row'] ) ) {
+            // maybe close
+            if ( ! empty( $args['row']['close'] ) ) {
+                echo "))";
+            }
+            echo "),";
+        }
+    }
+
+    /**
+     * 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 ) {
+
+        // Make sure we have args.
+        if ( ! empty( $args ) ) {
+
+            // For each argument...
+            foreach ( $args as $element => $new_args ) {
+
+                // Check if its an element.
+                if ( is_array( $new_args ) ) {
+                    if ( isset( $new_args['element'] ) ) {
+                        if ( isset( $new_args['element_require'] ) ) {
+                            echo str_replace( array(
+                                    "'+",
+                                    "+'"
+                                ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
+                            unset( $new_args['element_require'] );
+                        }
+
+                        echo "\n el( '" . $new_args['element'] . "', {";
+
+                        // get the attributes
+                        foreach ( $new_args as $new_key => $new_value ) {
+                            if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+                                // do nothing
+                            } else {
+                                echo $this->block_element( array( $new_key => $new_value ) );
+                            }
+                        }
+
+                        echo "key: '$element'},";// end attributes
+
+                        // get the content
+                        $first_item = 0;
+                        foreach ( $new_args as $new_key => $new_value ) {
+                            if ( $new_key === 'content' || is_array( $new_value ) ) {
+                                if ( $new_key === 'content' ) {
+                                    echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+                                }
+
+                                if ( is_array( $new_value ) ) {
+                                    if ( isset( $new_value['element_require'] ) ) {
+                                        echo str_replace( array(
+                                                "'+",
+                                                "+'"
+                                            ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
+                                        unset( $new_value['element_require'] );
+                                    }
+
+                                    if ( isset( $new_value['element_repeat'] ) ) {
+                                        $x = 1;
+                                        while ( $x <= absint( $new_value['element_repeat'] ) ) {
+                                            $this->block_element( array( '' => $new_value ) );
+                                            $x ++;
+                                        }
+                                    } else {
+                                        $this->block_element( array( '' => $new_value ) );
+                                    }
+                                }
+                                $first_item ++;
+                            }
+                        }
+                        echo ")";// end content
+                        echo ", \n";
+                    }
+
+                    // Or an attribute.
+                } else {
+                    if ( substr( $element, 0, 3 ) === 'if_' ) {
+                        echo str_replace( 'if_', '', $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
+                    } elseif ( $element == 'style' ) {
+                        echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+                    } else {
+                        echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+                    }
+                }
+            }
+
+        }
+    }
+
+    /**
+     * Enqueue CSS assets in the editor if defined
+     */
+    public function enqueue_editor_assets() {
+        if ( isset( $this->sd->options['block-editor-style'] ) ) {
+            echo "<link rel='stylesheet' id='glossary-shortcode' href='" . $this->sd->options['block-editor-style'] . "'/>";
+        }
+    }
 
 }

Spacing +217 added lines, -217 removed lines

@@ -5,7 +5,7 @@ 
  * @since 2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  *
@@ -27,15 +27,15 @@ 
 	 *
 	 * @param WP_Super_Duper $super_duper
 	 */
-	public function __construct( $super_duper ) {
+	public function __construct($super_duper) {
 
 		$this->sd = $super_duper;
 
 		// Process the SD shortcode preview.
-		add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
-		add_action( 'admin_footer-post.php', array( $this, 'enqueue_editor_assets' ) );
-		add_action( 'admin_footer-post-new.php', array( $this, 'enqueue_editor_assets' ) );
+		add_action('wp_ajax_super_duper_output_shortcode', array(__CLASS__, 'render_shortcode'));
+		add_action('admin_enqueue_scripts', array($this, 'register_block'));
+		add_action('admin_footer-post.php', array($this, 'enqueue_editor_assets'));
+		add_action('admin_footer-post-new.php', array($this, 'enqueue_editor_assets'));
 	}
 
 	/**
@@ -46,45 +46,45 @@ 
 	public static function render_shortcode() {
 
 		// Verify nonce.
-		check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
+		check_ajax_referer('super_duper_output_shortcode', '_ajax_nonce', true);
 
 		// And permissions.
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if (!current_user_can('manage_options')) {
 			wp_die();
 		}
 
 		// Ensure a shortcode is provided.
-		if ( empty( $_POST['shortcode'] ) ) {
+		if (empty($_POST['shortcode'])) {
 			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;
 			}
 		}
 
 		// Prepare args.
-		$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       = '';
 
 		// Convert attributes array into a string.
-		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);
 				}
-				$key   = sanitize_title_with_dashes( $key );
-				$value = wp_slash( $value );
+				$key   = sanitize_title_with_dashes($key);
+				$value = wp_slash($value);
 				$attributes .= " $key='$value' ";
 			}
 		}
 
-		echo do_shortcode( "[$shortcode_name $attributes]" );
+		echo do_shortcode("[$shortcode_name $attributes]");
 		exit;
 
 	}
@@ -93,9 +93,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', WP_Super_Duper::siteorigin_js() );
+		wp_add_inline_script('wp-blocks', $this->block());
+		if (class_exists('SiteOrigin_Panels')) {
+			wp_add_inline_script('wp-blocks', WP_Super_Duper::siteorigin_js());
 		}
 	}
 
@@ -110,7 +110,7 @@ 
 	public function block() {
 		ob_start();
 
-		$block_name    = str_replace( '_', '-', sanitize_title_with_dashes( $this->sd->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->sd->options['class_name'] ) );
+		$block_name    = str_replace('_', '-', sanitize_title_with_dashes($this->sd->options['textdomain']) . '/' . sanitize_title_with_dashes($this->sd->options['class_name']));
 		$show_advanced = $this->sd->block_show_advanced();
 		$id            = $this->sd->base_id . '-' . $this->sd->get_number();
 		?>
@@ -135,13 +135,13 @@ 
 				var prev_attributes = [];
 
 				var term_query_type = '';
-				var post_type_rest_slugs = <?php if ( ! empty( $this->sd->arguments ) && isset( $this->sd->arguments['post_type']['onchange_rest']['values'] ) ) {
-					echo "[" . json_encode( $this->sd->arguments['post_type']['onchange_rest']['values'] ) . "]";
+				var post_type_rest_slugs = <?php if (!empty($this->sd->arguments) && isset($this->sd->arguments['post_type']['onchange_rest']['values'])) {
+					echo "[" . json_encode($this->sd->arguments['post_type']['onchange_rest']['values']) . "]";
 				} else {
 					echo "[]";
 				} ?>;
-				const taxonomies_<?php echo str_replace( "-", "_", $id );?> = [{label: "Please wait", value: 0}];
-				const sort_by_<?php echo str_replace( "-", "_", $id );?> = [{label: "Please wait", value: 0}];
+				const taxonomies_<?php echo str_replace("-", "_", $id); ?> = [{label: "Please wait", value: 0}];
+				const sort_by_<?php echo str_replace("-", "_", $id); ?> = [{label: "Please wait", value: 0}];
 
 				/**
 				 * Register Basic Block.
@@ -155,39 +155,39 @@ 
 				 * @return {?WPBlock}          The block, if it has been successfully
 				 *                             registered; otherwise `undefined`.
 				 */
-				registerBlockType('<?php echo $block_name;  ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
-					title: '<?php echo addslashes( $this->sd->options['name'] ); ?>', // Block title.
-					description: '<?php echo addslashes( $this->sd->options['widget_ops']['description'] )?>', // Block title.
-					icon: <?php echo $this->get_block_icon( $this->sd->options['block-icon'] );?>,//'<?php echo isset( $this->sd->options['block-icon'] ) ? esc_attr( $this->sd->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
+				registerBlockType('<?php echo $block_name; ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
+					title: '<?php echo addslashes($this->sd->options['name']); ?>', // Block title.
+					description: '<?php echo addslashes($this->sd->options['widget_ops']['description'])?>', // Block title.
+					icon: <?php echo $this->get_block_icon($this->sd->options['block-icon']); ?>,//'<?php echo isset($this->sd->options['block-icon']) ? esc_attr($this->sd->options['block-icon']) : 'shield-alt'; ?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
 					supports: {
 						<?php
-						if ( isset( $this->sd->options['block-supports'] ) ) {
-							echo $this->sd->array_to_attributes( $this->sd->options['block-supports'] );
+						if (isset($this->sd->options['block-supports'])) {
+							echo $this->sd->array_to_attributes($this->sd->options['block-supports']);
 						}
 						?>
 					},
-					category: '<?php echo isset( $this->sd->options['block-category'] ) ? esc_attr( $this->sd->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
-					<?php if ( isset( $this->sd->options['block-keywords'] ) ) {
+					category: '<?php echo isset($this->sd->options['block-category']) ? esc_attr($this->sd->options['block-category']) : 'common'; ?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+					<?php if (isset($this->sd->options['block-keywords'])) {
 					echo "keywords : " . $this->sd->options['block-keywords'] . ",";
 				}?>
 
 					<?php
 
 					// maybe set no_wrap
-					$no_wrap = isset( $this->sd->options['no_wrap'] ) && $this->sd->options['no_wrap'] ? true : false;
-					if ( isset( $this->sd->arguments['no_wrap'] ) && $this->sd->arguments['no_wrap'] ) {
+					$no_wrap = isset($this->sd->options['no_wrap']) && $this->sd->options['no_wrap'] ? true : false;
+					if (isset($this->sd->arguments['no_wrap']) && $this->sd->arguments['no_wrap']) {
 						$no_wrap = true;
 					}
-					if ( $no_wrap ) {
+					if ($no_wrap) {
 						$this->sd->options['block-wrap'] = '';
 					}
 
 					$show_alignment = false;
 
-					if ( ! empty( $this->sd->arguments ) ) {
+					if (!empty($this->sd->arguments)) {
 						echo "attributes : {";
 
-						if ( $show_advanced ) {
+						if ($show_advanced) {
 							echo "show_advanced: {";
 							echo "	type: 'boolean',";
 							echo "  default: false,";
@@ -195,43 +195,43 @@ 
 						}
 
 						// block wrap element
-						if ( ! empty( $this->sd->options['block-wrap'] ) ) { //@todo we should validate this?
+						if (!empty($this->sd->options['block-wrap'])) { //@todo we should validate this?
 							echo "block_wrap: {";
 							echo "	type: 'string',";
-							echo "  default: '" . esc_attr( $this->sd->options['block-wrap'] ) . "',";
+							echo "  default: '" . esc_attr($this->sd->options['block-wrap']) . "',";
 							echo "},";
 						}
 
-						foreach ( $this->sd->arguments as $key => $args ) {
+						foreach ($this->sd->arguments as $key => $args) {
 
 							// set if we should show alignment
-							if ( $key == 'alignment' ) {
+							if ($key == 'alignment') {
 								$show_alignment = true;
 							}
 
 							$extra = '';
 
-							if ( $args['type'] == 'checkbox' ) {
+							if ($args['type'] == 'checkbox') {
 								$type    = 'boolean';
-								$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
-							} elseif ( $args['type'] == 'number' ) {
+								$default = isset($args['default']) && $args['default'] ? 'true' : 'false';
+							} elseif ($args['type'] == 'number') {
 								$type    = 'number';
-								$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
-							} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
+								$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
+							} elseif ($args['type'] == 'select' && !empty($args['multiple'])) {
 								$type = 'array';
-								if ( isset( $args['default'] ) && is_array( $args['default'] ) ) {
-									$default = ! empty( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
+								if (isset($args['default']) && is_array($args['default'])) {
+									$default = !empty($args['default']) ? "['" . implode("','", $args['default']) . "']" : "[]";
 								} else {
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 								}
-							} elseif ( $args['type'] == 'multiselect' ) {
+							} elseif ($args['type'] == 'multiselect') {
 								$type    = 'array';
-								$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+								$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 							} else {
 								$type    = 'string';
-								$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
+								$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
 							}
-							echo str_replace( '-','__', $key ) . " : {";
+							echo str_replace('-', '__', $key) . " : {";
 							echo "type : '$type',";
 							echo "default : $default,";
 							echo "},";
@@ -252,7 +252,7 @@ 
 						var $value = '';
 						<?php
 						// if we have a post_type and a category then link them
-						if( isset( $this->sd->arguments['post_type'] ) && isset( $this->sd->arguments['category'] ) && ! empty( $this->sd->arguments['category']['post_type_linked'] ) ){
+						if (isset($this->sd->arguments['post_type']) && isset($this->sd->arguments['category']) && !empty($this->sd->arguments['category']['post_type_linked'])) {
 						?>
 						if (typeof(prev_attributes[props.id]) != 'undefined') {
 							$pt = props.attributes.post_type;
@@ -269,20 +269,20 @@ 
 							// taxonomies
 							if ($value && 'post_type' in prev_attributes[props.id] && 'category' in prev_attributes[props.id] && run) {
 								wp.apiFetch({
-									path: "<?php if ( isset( $this->sd->arguments['post_type']['onchange_rest']['path'] ) ) {
+									path: "<?php if (isset($this->sd->arguments['post_type']['onchange_rest']['path'])) {
 										echo $this->sd->arguments['post_type']['onchange_rest']['path'];
 									} else {
 										'/wp/v2/"+$value+"/categories/?per_page=100';
 									} ?>"
 								}).then(terms => {
-									while (taxonomies_<?php echo str_replace( "-", "_", $id );?>.length
+									while (taxonomies_<?php echo str_replace("-", "_", $id); ?>.length
 							)
 								{
-									taxonomies_<?php echo str_replace("-","_", $id);?>.pop();
+									taxonomies_<?php echo str_replace("-", "_", $id); ?>.pop();
 								}
-								taxonomies_<?php echo str_replace("-","_", $id);?>.push({label: "All", value: 0});
+								taxonomies_<?php echo str_replace("-", "_", $id); ?>.push({label: "All", value: 0});
 								jQuery.each(terms, function (key, val) {
-									taxonomies_<?php echo str_replace("-","_", $id);?>.push({
+									taxonomies_<?php echo str_replace("-", "_", $id); ?>.push({
 										label: val.name,
 										value: val.id
 									});
@@ -293,7 +293,7 @@ 
 								props.setAttributes({category: [0]});
 								props.setAttributes({category: $old_cat_value});
 
-								return taxonomies_<?php echo str_replace( "-", "_", $id );?>;
+								return taxonomies_<?php echo str_replace("-", "_", $id); ?>;
 							})
 							};
 
@@ -305,12 +305,12 @@ 
 								};
 								jQuery.post(ajaxurl, data, function (response) {
 									response = JSON.parse(response);
-									while (sort_by_<?php echo str_replace( "-", "_", $id );?>.length) {
-										sort_by_<?php echo str_replace("-","_", $id);?>.pop();
+									while (sort_by_<?php echo str_replace("-", "_", $id); ?>.length) {
+										sort_by_<?php echo str_replace("-", "_", $id); ?>.pop();
 									}
 
 									jQuery.each(response, function (key, val) {
-										sort_by_<?php echo str_replace("-","_", $id);?>.push({label: val, value: key});
+										sort_by_<?php echo str_replace("-", "_", $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.
@@ -318,7 +318,7 @@ 
 									props.setAttributes({sort_by: [0]});
 									props.setAttributes({sort_by: $old_sort_by_value});
 
-									return sort_by_<?php echo str_replace( "-", "_", $id );?>;
+									return sort_by_<?php echo str_replace("-", "_", $id); ?>;
 								});
 
 							}
@@ -345,14 +345,14 @@ 
 								is_fetching = true;
 								var data = {
 									'action': 'super_duper_output_shortcode',
-									'shortcode': '<?php echo $this->sd->options['base_id'];?>',
+									'shortcode': '<?php echo $this->sd->options['base_id']; ?>',
 									'attributes': props.attributes,
-									'post_id': <?php global $post; if ( isset( $post->ID ) ) {
+									'post_id': <?php global $post; if (isset($post->ID)) {
 									echo $post->ID;
 								} else {
 									echo '0';
 								}?>,
-									'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
+									'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
 								};
 
 								jQuery.post(ajaxurl, data, function (response) {
@@ -361,7 +361,7 @@ 
 
 									// if the content is empty then we place some placeholder text
 									if (env == '') {
-										env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e( 'Placeholder for: ' );?>" + props.name + "</div>";
+										env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for: '); ?>" + props.name + "</div>";
 									}
 
 									props.setAttributes({content: env});
@@ -385,7 +385,7 @@ 
 
 							el(wp.blockEditor.BlockControls, {key: 'controls'},
 
-								<?php if($show_alignment){?>
+								<?php if ($show_alignment) {?>
 								el(
 									wp.blockEditor.AlignmentToolbar,
 									{
@@ -403,9 +403,9 @@ 
 
 								<?php
 
-								if(! empty( $this->sd->arguments )){
+								if (!empty($this->sd->arguments)) {
 
-								if ( $show_advanced ) {
+								if ($show_advanced) {
 								?>
 								el('div', {
 										style: {'padding-left': '16px', 'padding-right': '16px'}
@@ -426,19 +426,19 @@ 
 
 								}
 
-								$arguments = $this->sd->group_arguments( $this->sd->arguments );
+								$arguments = $this->sd->group_arguments($this->sd->arguments);
 
 								// Do we have sections?
 								$has_sections = $arguments == $this->sd->arguments ? false : true;
 
 
-								if($has_sections){
+								if ($has_sections) {
 								$panel_count = 0;
-								foreach($arguments as $key => $args){
+								foreach ($arguments as $key => $args) {
 								?>
 								el(wp.components.PanelBody, {
-										title: '<?php esc_attr_e( $key ); ?>',
-										initialOpen: <?php if ( $panel_count ) {
+										title: '<?php esc_attr_e($key); ?>',
+										initialOpen: <?php if ($panel_count) {
 										echo "false";
 									} else {
 										echo "true";
@@ -446,30 +446,30 @@ 
 									},
 									<?php
 
-									foreach ( $args as $k => $a ) {
-										$k = str_replace('-','__', $k);
-										$this->block_row_start( $k, $a );
-										$this->build_block_arguments( $k, $a );
-										$this->block_row_end( $k, $a );
+									foreach ($args as $k => $a) {
+										$k = str_replace('-', '__', $k);
+										$this->block_row_start($k, $a);
+										$this->build_block_arguments($k, $a);
+										$this->block_row_end($k, $a);
 									}
 									?>
 								),
 								<?php
-								$panel_count ++;
+								$panel_count++;
 
 								}
-								}else {
+								} else {
 								?>
 								el(wp.components.PanelBody, {
-										title: '<?php esc_attr_e( "Settings" ); ?>',
+										title: '<?php esc_attr_e("Settings"); ?>',
 										initialOpen: true
 									},
 									<?php
-									foreach ( $this->sd->arguments as $key => $args ) {
-										$key = str_replace('-','__', $key);
-										$this->block_row_start( $key, $args );
-										$this->build_block_arguments( $key, $args );
-										$this->block_row_end( $key, $args );
+									foreach ($this->sd->arguments as $key => $args) {
+										$key = str_replace('-', '__', $key);
+										$this->block_row_start($key, $args);
+										$this->build_block_arguments($key, $args);
+										$this->block_row_end($key, $args);
 									}
 									?>
 								),
@@ -483,9 +483,9 @@ 
 
 							<?php
 							// If the user sets block-output array then build it
-							if ( ! empty( $this->sd->options['block-output'] ) ) {
-							$this->block_element( $this->sd->options['block-output'] );
-						}else{
+							if (!empty($this->sd->options['block-output'])) {
+							$this->block_element($this->sd->options['block-output']);
+						} else {
 							// if no block-output is set then we try and get the shortcode html output via ajax.
 							?>
 							el('div', {
@@ -514,12 +514,12 @@ 
 										return false;
 									}
 
-									return idBase === "<?php echo $this->sd->options['base_id'];?>";
+									return idBase === "<?php echo $this->sd->options['base_id']; ?>";
 								},
 								transform: function transform(attributes) {
 									var instance = attributes.instance;
 
-									return wp.blocks.createBlock("<?php echo $block_name;?>", instance.raw);
+									return wp.blocks.createBlock("<?php echo $block_name; ?>", instance.raw);
 								}
 							}
 						]
@@ -535,20 +535,20 @@ 
 						var align = '';
 
 						// build the shortcode.
-						var content = "[<?php echo $this->sd->options['base_id'];?>";
+						var content = "[<?php echo $this->sd->options['base_id']; ?>";
 						$html = '';
 						<?php
 
-						if(! empty( $this->sd->arguments )){
+						if (!empty($this->sd->arguments)) {
 
-						foreach($this->sd->arguments as $key => $args){
-						$key = str_replace('-','__', $key);
+						foreach ($this->sd->arguments as $key => $args) {
+						$key = str_replace('-', '__', $key);
 						?>
-						if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
-							if ('<?php echo esc_attr( $key );?>' == 'html') {
-								$html = attr.<?php echo esc_attr( $key );?>;
+						if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
+							if ('<?php echo esc_attr($key); ?>' == 'html') {
+								$html = attr.<?php echo esc_attr($key); ?>;
 							} else {
-								content += " <?php echo str_replace( '__','-', esc_attr( $key ) );?>='" + attr.<?php echo esc_attr( $key );?>+ "' ";
+								content += " <?php echo str_replace('__', '-', esc_attr($key)); ?>='" + attr.<?php echo esc_attr($key); ?>+ "' ";
 							}
 						}
 						<?php
@@ -560,7 +560,7 @@ 
 
 						// if has html element
 						if ($html) {
-							content += $html + "[/<?php echo $this->sd->options['base_id'];?>]";
+							content += $html + "[/<?php echo $this->sd->options['base_id']; ?>]";
 						}
 
 
@@ -578,11 +578,11 @@ 
 						}
 
 						<?php
-						if(isset( $this->sd->options['block-wrap'] ) && $this->sd->options['block-wrap'] == ''){
+						if (isset($this->sd->options['block-wrap']) && $this->sd->options['block-wrap'] == '') {
 						?>
 						return content;
 						<?php
-						}else{
+						} else {
 						?>
 						var block_wrap = 'div';
 						if (attr.hasOwnProperty("block_wrap")) {
@@ -605,10 +605,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);
 	}
 
 	/**
@@ -623,63 +623,63 @@ 
 	 * @since 1.1.0
 	 * @return string
 	 */
-	public function get_block_icon( $icon ) {
+	public function get_block_icon($icon) {
 
 		// check if we have a Font Awesome icon
 		$fa_type = '';
-		if ( substr( $icon, 0, 7 ) === 'fas fa-' ) {
+		if (substr($icon, 0, 7) === 'fas fa-') {
 			$fa_type = 'solid';
-		} elseif ( substr( $icon, 0, 7 ) === 'far fa-' ) {
+		} elseif (substr($icon, 0, 7) === 'far fa-') {
 			$fa_type = 'regular';
-		} elseif ( substr( $icon, 0, 7 ) === 'fab fa-' ) {
+		} elseif (substr($icon, 0, 7) === 'fab fa-') {
 			$fa_type = 'brands';
 		} else {
-			$icon = sprintf( "'%s'", esc_js( $icon ) );
+			$icon = sprintf("'%s'", esc_js($icon));
 		}
 
 		// set the icon if we found one
-		if ( $fa_type ) {
-			$fa_icon = substr( $icon, 7 );
+		if ($fa_type) {
+			$fa_icon = substr($icon, 7);
 			$icon    = "el('svg',{width: 20, height: 20, viewBox: '0 0 20 20'},el('use', {'xlink:href': '" . $this->sd->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "','href': '" . $this->sd->get_url() . "icons/" . $fa_type . ".svg#" . $fa_icon . "'}))";
 		}
 
 		return $icon;
 	}
 
-	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']['open'] ) ) {
+		if (!empty($args['row'])) {
+			if (!empty($args['row']['open'])) {
 				// element require
-				$element_require = ! empty( $args['element_require'] ) ? $this->block_props_replace( $args['element_require'], true ) . " && " : "";
+				$element_require = !empty($args['element_require']) ? $this->block_props_replace($args['element_require'], true) . " && " : "";
 				echo $element_require;
-			if ( false ){
+			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',
-								key: '<?php esc_attr( $key )?>-title'
+								key: '<?php esc_attr($key)?>-title'
 							},
-							'<?php echo addslashes( $args['row']['title'] ); ?>'
+							'<?php echo addslashes($args['row']['title']); ?>'
 						),
 						<?php }?>
-						<?php if(! empty( $args['row']['desc'] )){ ?>
+						<?php if (!empty($args['row']['desc'])) { ?>
 						el('p', {
 								className: 'components-base-control__help mb-0',
-								key: '<?php esc_attr( $key )?>-desc'
+								key: '<?php esc_attr($key)?>-desc'
 							},
-							'<?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(
@@ -688,10 +688,10 @@ 
 									className: 'col pr-2',
 								},
 					<?php
-					if ( false ){
+					if (false) {
 					?></script><?php }
-			} elseif ( ! empty( $args['row']['close'] ) ) {
-			if ( false ){
+			} elseif (!empty($args['row']['close'])) {
+			if (false) {
 				?>
 				<script><?php }?>
 					el(
@@ -700,10 +700,10 @@ 
 							className: 'col pl-0',
 						},
 					<?php
-					if ( false ){
+					if (false) {
 					?></script><?php }
 			} else {
-			if ( false ){
+			if (false) {
 				?>
 				<script><?php }?>
 					el(
@@ -712,7 +712,7 @@ 
 							className: 'col pl-0 pr-2',
 						},
 					<?php
-					if ( false ){
+					if (false) {
 					?></script><?php }
 			}
 		}
@@ -725,60 +725,60 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function block_props_replace( $string, $no_wrap = false ) {
+	public function block_props_replace($string, $no_wrap = false) {
 
-		if ( $no_wrap ) {
-			$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
+		if ($no_wrap) {
+			$string = str_replace(array("[%", "%]"), array("props.attributes.", ""), $string);
 		} else {
-			$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
+			$string = str_replace(array("[%", "%]"), array("'+props.attributes.", "+'"), $string);
 		}
 
 		return $string;
 	}
 
-	public function build_block_arguments( $key, $args ) {
-		$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->sd->array_to_attributes( $args['custom_attributes'] ) : '';
+	public function build_block_arguments($key, $args) {
+		$custom_attributes = !empty($args['custom_attributes']) ? $this->sd->array_to_attributes($args['custom_attributes']) : '';
 		$options           = '';
-		$key               = sanitize_key( $key );
+		$key               = sanitize_key($key);
 		$extra             = "key: '$key',";
 
 		// `content` is a protected and Gutenberg special argument
-		if ( $key == 'content' ) {
+		if ($key == 'content') {
 			return;
 		}
 
 		// icon
 		$icon = '';
-		if ( ! empty( $args['icon'] ) ) {
+		if (!empty($args['icon'])) {
 			$icon .= "el('div', {";
-			$icon .= "dangerouslySetInnerHTML: {__html: '" . $this->sd->get_widget_icon( esc_attr( $args['icon'] ) ) . "'},";
+			$icon .= "dangerouslySetInnerHTML: {__html: '" . $this->sd->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.
 			$args['title'] = '';
 		}
 
 		// 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 = "";
 		$value            = "props.attributes.$key";
-		$text_type        = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'colorx' );
-		if ( in_array( $args['type'], $text_type ) ) {
+		$text_type        = array('text', 'password', 'number', 'email', 'tel', 'url', 'colorx');
+		if (in_array($args['type'], $text_type)) {
 			$type = 'TextControl';
 			// Save numbers as numbers and not strings
-			if ( $args['type'] == 'number' ) {
+			if ($args['type'] == 'number') {
 				$onchange = "props.setAttributes({ $key: Number($key) } )";
 			}
-		} 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) {
@@ -787,44 +787,44 @@ 
                             $key: value
                         });
                     },";
-		} 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->sd->base_id . '_' . $this->sd->get_number() ) . ",";
-			} elseif ( $args['name'] == 'sort_by' && ! empty( $args['post_type_linked'] ) ) {
-				$options .= "options: sort_by_" . str_replace( "-", "_", $this->sd->base_id . '_' . $this->sd->get_number() ) . ",";
+			if ($args['name'] == 'category' && !empty($args['post_type_linked'])) {
+				$options .= "options: taxonomies_" . str_replace("-", "_", $this->sd->base_id . '_' . $this->sd->get_number()) . ",";
+			} elseif ($args['name'] == 'sort_by' && !empty($args['post_type_linked'])) {
+				$options .= "options: sort_by_" . str_replace("-", "_", $this->sd->base_id . '_' . $this->sd->get_number()) . ",";
 			} else {
-				if ( ! empty( $args['options'] ) ) {
+				if (!empty($args['options'])) {
 					$options .= "options: [";
-					foreach ( $args['options'] as $option_val => $option_label ) {
-						$options .= "{ value: '" . esc_attr( $option_val ) . "', label: '" . addslashes( $option_label ) . "' },";
+					foreach ($args['options'] as $option_val => $option_label) {
+						$options .= "{ value: '" . esc_attr($option_val) . "', label: '" . addslashes($option_label) . "' },";
 					}
 					$options .= "],";
 				}
 			}
-			if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
+			if (isset($args['multiple']) && $args['multiple']) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
 				$extra .= ' multiple: true, ';
 			}
-		} elseif ( $args['type'] == 'alignment' ) {
+		} elseif ($args['type'] == 'alignment') {
 			$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
-		} elseif ( $args['type'] == 'margins' ) {
+		} elseif ($args['type'] == 'margins') {
 		} else {
-			return;// if we have not implemented the control then don't break the JS.
+			return; // if we have not implemented the control then don't break the JS.
 		}
 
 		// color input does not show the labels so we add them
-		if ( $args['type'] == 'color' ) {
+		if ($args['type'] == 'color') {
 			// add show only if advanced
 			echo $require_advanced;
 			// add setting require if defined
 			echo $element_require;
-			echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes( $args['title'] ) . "'),";
+			echo "el('div', {style: {'marginBottom': '8px'}}, '" . addslashes($args['title']) . "'),";
 		}
 
 		// add show only if advanced
@@ -836,16 +836,16 @@ 
 		echo $icon;
 		?>
 		el( wp.components.<?php echo $type; ?>, {
-		label: '<?php echo addslashes( $args['title'] ); ?>',
-		help: '<?php if ( isset( $args['desc'] ) ) {
-			echo addslashes( $args['desc'] );
+		label: '<?php echo addslashes($args['title']); ?>',
+		help: '<?php if (isset($args['desc'])) {
+			echo addslashes($args['desc']);
 		} ?>',
 		value: <?php echo $value; ?>,
-		<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
-			echo "type: '" . addslashes( $args['type'] ) . "',";
+		<?php if ($type == 'TextControl' && $args['type'] != 'text') {
+			echo "type: '" . addslashes($args['type']) . "',";
 		} ?>
-		<?php if ( ! empty( $args['placeholder'] ) ) {
-			echo "placeholder: '" . addslashes( $args['placeholder'] ) . "',";
+		<?php if (!empty($args['placeholder'])) {
+			echo "placeholder: '" . addslashes($args['placeholder']) . "',";
 		}
 		echo $options;
 		echo $extra;
@@ -856,10 +856,10 @@ 
 		<?php
 	}
 
-	public function block_row_end( $key, $args ) {
-		if ( ! empty( $args['row'] ) ) {
+	public function block_row_end($key, $args) {
+		if (!empty($args['row'])) {
 			// maybe close
-			if ( ! empty( $args['row']['close'] ) ) {
+			if (!empty($args['row']['close'])) {
 				echo "))";
 			}
 			echo "),";
@@ -873,80 +873,80 @@ 
 	 *
 	 * @param $args
 	 */
-	public function block_element( $args ) {
+	public function block_element($args) {
 
 		// Make sure we have args.
-		if ( ! empty( $args ) ) {
+		if (!empty($args)) {
 
 			// For each argument...
-			foreach ( $args as $element => $new_args ) {
+			foreach ($args as $element => $new_args) {
 
 				// Check if its an element.
-				if ( is_array( $new_args ) ) {
-					if ( isset( $new_args['element'] ) ) {
-						if ( isset( $new_args['element_require'] ) ) {
-							echo str_replace( array(
+				if (is_array($new_args)) {
+					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'] );
+								), '', $this->block_props_replace($new_args['element_require'])) . " &&  ";
+							unset($new_args['element_require']);
 						}
 
 						echo "\n el( '" . $new_args['element'] . "', {";
 
 						// get the attributes
-						foreach ( $new_args as $new_key => $new_value ) {
-							if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
+						foreach ($new_args as $new_key => $new_value) {
+							if ($new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array($new_value)) {
 								// do nothing
 							} else {
-								echo $this->block_element( array( $new_key => $new_value ) );
+								echo $this->block_element(array($new_key => $new_value));
 							}
 						}
 
-						echo "key: '$element'},";// end attributes
+						echo "key: '$element'},"; // end attributes
 
 						// get the content
 						$first_item = 0;
-						foreach ( $new_args as $new_key => $new_value ) {
-							if ( $new_key === 'content' || is_array( $new_value ) ) {
-								if ( $new_key === 'content' ) {
-									echo "'" . $this->block_props_replace( wp_slash( $new_value ) ) . "'";
+						foreach ($new_args as $new_key => $new_value) {
+							if ($new_key === 'content' || is_array($new_value)) {
+								if ($new_key === 'content') {
+									echo "'" . $this->block_props_replace(wp_slash($new_value)) . "'";
 								}
 
-								if ( is_array( $new_value ) ) {
-									if ( isset( $new_value['element_require'] ) ) {
-										echo str_replace( array(
+								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'] );
+											), '', $this->block_props_replace($new_value['element_require'])) . " &&  ";
+										unset($new_value['element_require']);
 									}
 
-									if ( isset( $new_value['element_repeat'] ) ) {
+									if (isset($new_value['element_repeat'])) {
 										$x = 1;
-										while ( $x <= absint( $new_value['element_repeat'] ) ) {
-											$this->block_element( array( '' => $new_value ) );
-											$x ++;
+										while ($x <= absint($new_value['element_repeat'])) {
+											$this->block_element(array('' => $new_value));
+											$x++;
 										}
 									} else {
-										$this->block_element( array( '' => $new_value ) );
+										$this->block_element(array('' => $new_value));
 									}
 								}
-								$first_item ++;
+								$first_item++;
 							}
 						}
-						echo ")";// end content
+						echo ")"; // end content
 						echo ", \n";
 					}
 
 					// Or an attribute.
 				} else {
-					if ( substr( $element, 0, 3 ) === 'if_' ) {
-						echo str_replace( 'if_', '', $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
-					} elseif ( $element == 'style' ) {
-						echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
+					if (substr($element, 0, 3) === 'if_') {
+						echo str_replace('if_', '', $element) . ": " . $this->block_props_replace($new_args, true) . ",";
+					} elseif ($element == 'style') {
+						echo $element . ": " . $this->block_props_replace($new_args) . ",";
 					} else {
-						echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
+						echo $element . ": '" . $this->block_props_replace($new_args) . "',";
 					}
 				}
 			}
@@ -958,7 +958,7 @@ 
 	 * Enqueue CSS assets in the editor if defined
 	 */
 	public function enqueue_editor_assets() {
-		if ( isset( $this->sd->options['block-editor-style'] ) ) {
+		if (isset($this->sd->options['block-editor-style'])) {
 			echo "<link rel='stylesheet' id='glossary-shortcode' href='" . $this->sd->options['block-editor-style'] . "'/>";
 		}
 	}

Braces +3 added lines, -3 removed lines

@@ -458,7 +458,7 @@ 
 								$panel_count ++;
 
 								}
-								}else {
+								} else {
 								?>
 								el(wp.components.PanelBody, {
 										title: '<?php esc_attr_e( "Settings" ); ?>',
@@ -485,7 +485,7 @@ 
 							// If the user sets block-output array then build it
 							if ( ! empty( $this->sd->options['block-output'] ) ) {
 							$this->block_element( $this->sd->options['block-output'] );
-						}else{
+						} else{
 							// if no block-output is set then we try and get the shortcode html output via ajax.
 							?>
 							el('div', {
@@ -582,7 +582,7 @@ 
 						?>
 						return content;
 						<?php
-						}else{
+						} else{
 						?>
 						var block_wrap = 'div';
 						if (attr.hasOwnProperty("block_wrap")) {

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

Indentation +189 added lines, -189 removed lines

@@ -17,194 +17,194 @@
  */
 class WP_Super_Duper_Widget extends WP_Widget {
 
-	/**
-	 * @var WP_Super_Duper
-	 */
-	protected $sd;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param WP_Super_Duper $super_duper
-	 */
-	public function __construct( $super_duper ) {
-		$this->sd = $super_duper;
-
-		// Register widget.
-		$widget_ops = $super_duper->options['widget_ops'];
-
-		// Only overwrite if not set already.
-		if ( ! isset( $widget_ops['show_instance_in_rest'] ) ) {
-			$widget_ops['show_instance_in_rest'] = true;
-		}
-
-		parent::__construct( $super_duper->options['base_id'], $super_duper->options['name'], $widget_ops );
-
-		if ( did_action( 'widgets_init' ) || doing_action( 'widgets_init' ) ) {
-			$this->register_widget();
-		} else {
-			add_action( 'widgets_init', array( $this, 'register_widget' ) );
-		}
-
-		add_action( 'wp_enqueue_scripts', array( __CLASS__, 'enqueue_scripts' ) );
-		add_action( 'elementor/editor/after_enqueue_styles', array( __CLASS__, 'elementor_editor_styles' ) );
-		add_filter( 'widget_types_to_hide_from_legacy_widget_block', array( $this, 'hide_widget' ) );
-
-	}
-
-	/**
-	 * Registers the widget.
-	 */
-	public function register_widget() {
-		register_widget( $this );
-	}
-
-	/**
-	 * Enqeues scripts.
-	 *
-	 * @param WP_Super_Duper $super_duper
-	 */
-	public static function enqueue_scripts() {
-		wp_add_inline_script( 'admin-widgets', WP_Super_Duper::widget_js() );
-		wp_add_inline_script( 'customize-controls', WP_Super_Duper::widget_js() );
-		wp_add_inline_style( 'widgets', WP_Super_Duper::widget_css() );
-	}
-
-	/**
-	 * Add our widget CSS to elementor editor.
-	 */
-	public static function elementor_editor_styles() {
-		wp_add_inline_style( 'elementor-editor', WP_Super_Duper::widget_css( false ) );
-	}
-
-	/**
-	 * Outputs the content of the widget
-	 *
-	 * @param array $args
-	 * @param array $instance
-	 */
-	public function widget( $args, $instance ) {
-
-		// Prepare output args.
-		$argument_values = $this->sd->argument_values( $instance );
-		$argument_values = $this->sd->string_to_bool( $argument_values );
-		$output          = $this->sd->output( $argument_values, $args );
-		$no_wrap         = ! empty( $argument_values['no_wrap'] );
-
-		ob_start();
-		if ( $output && ! $no_wrap ) {
-
-			$class_original = $this->sd->options['widget_ops']['classname'];
-			$class          = $this->sd->options['widget_ops']['classname'] . ' sdel-' . $this->sd->get_instance_hash();
-
-			// Before widget
-			$before_widget = $args['before_widget'];
-			$before_widget = str_replace( $class_original, $class, $before_widget );
-			$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-			$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->sd->base_id, $before_widget, $args, $instance, $this );
-
-			// After widget
-			$after_widget = $args['after_widget'];
-			$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-			$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->sd->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->sd, $this );
-				$class = apply_filters( 'wp_super_duper_div_classname_' . $this->sd->base_id, $class, $args, $this->sd, $this );
-
-				$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this->sd, $this );
-				$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->sd->base_id, $attrs, $args, $this->sd, $this );
-
-				echo "<span class='" . esc_attr( $class ) . "' " . $attrs . ">";
-			}
-
-			echo $this->sd->output_title( $args, $instance );
-			echo $output;
-			if ( $this->is_elementor_widget_output() ) {
-				echo "</span>";
-			}
-
-			echo $after_widget;
-		} elseif ( $this->sd->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-			$output = $this->sd->preview_placeholder_text( "{{" . $this->base_id . "}}" );
-			echo $output;
-		} elseif ( $output && $no_wrap ) {
-			echo $output;
-		}
-		$output = ob_get_clean();
-
-		$output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
-
-		echo $output;
-	}
-
-	/**
-	 * Tests if the current output is inside a elementor container.
-	 *
-	 * @since 1.0.4
-	 * @return bool
-	 */
-	public function is_elementor_widget_output() {
-		return defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID';
-	}
-
-	/**
-	 * Outputs the options form inputs for the widget.
-	 *
-	 * @param array $instance The widget options.
-	 */
-	public function form( $instance ) {
-		$this->sd->form( $instance );
-	}
-
-	/**
-	 * 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->sd->instance = $instance;
-
-		if ( empty( $this->arguments ) ) {
-			$this->sd->get_arguments();
-		}
-
-		// check for checkboxes
-		if ( ! empty( $this->sd->arguments ) ) {
-			foreach ( $this->sd->arguments as $argument ) {
-				if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-					$instance[ $argument['name'] ] = '0';
-				}
-			}
-		}
-
-		return $instance;
-	}
-
-	/**
-	 * Hides this widget from the block widgets inserter function.
-	 *
-	 * @param array $widget_types List of hidden widgets.
-	 *
-	 * @return array
-	 */
-	public function hide_widget( $widget_types ) {
-		$widget_types[] = $this->id_base;
-
-		return $widget_types;
-	}
+    /**
+     * @var WP_Super_Duper
+     */
+    protected $sd;
+
+    /**
+     * Class constructor.
+     *
+     * @param WP_Super_Duper $super_duper
+     */
+    public function __construct( $super_duper ) {
+        $this->sd = $super_duper;
+
+        // Register widget.
+        $widget_ops = $super_duper->options['widget_ops'];
+
+        // Only overwrite if not set already.
+        if ( ! isset( $widget_ops['show_instance_in_rest'] ) ) {
+            $widget_ops['show_instance_in_rest'] = true;
+        }
+
+        parent::__construct( $super_duper->options['base_id'], $super_duper->options['name'], $widget_ops );
+
+        if ( did_action( 'widgets_init' ) || doing_action( 'widgets_init' ) ) {
+            $this->register_widget();
+        } else {
+            add_action( 'widgets_init', array( $this, 'register_widget' ) );
+        }
+
+        add_action( 'wp_enqueue_scripts', array( __CLASS__, 'enqueue_scripts' ) );
+        add_action( 'elementor/editor/after_enqueue_styles', array( __CLASS__, 'elementor_editor_styles' ) );
+        add_filter( 'widget_types_to_hide_from_legacy_widget_block', array( $this, 'hide_widget' ) );
+
+    }
+
+    /**
+     * Registers the widget.
+     */
+    public function register_widget() {
+        register_widget( $this );
+    }
+
+    /**
+     * Enqeues scripts.
+     *
+     * @param WP_Super_Duper $super_duper
+     */
+    public static function enqueue_scripts() {
+        wp_add_inline_script( 'admin-widgets', WP_Super_Duper::widget_js() );
+        wp_add_inline_script( 'customize-controls', WP_Super_Duper::widget_js() );
+        wp_add_inline_style( 'widgets', WP_Super_Duper::widget_css() );
+    }
+
+    /**
+     * Add our widget CSS to elementor editor.
+     */
+    public static function elementor_editor_styles() {
+        wp_add_inline_style( 'elementor-editor', WP_Super_Duper::widget_css( false ) );
+    }
+
+    /**
+     * Outputs the content of the widget
+     *
+     * @param array $args
+     * @param array $instance
+     */
+    public function widget( $args, $instance ) {
+
+        // Prepare output args.
+        $argument_values = $this->sd->argument_values( $instance );
+        $argument_values = $this->sd->string_to_bool( $argument_values );
+        $output          = $this->sd->output( $argument_values, $args );
+        $no_wrap         = ! empty( $argument_values['no_wrap'] );
+
+        ob_start();
+        if ( $output && ! $no_wrap ) {
+
+            $class_original = $this->sd->options['widget_ops']['classname'];
+            $class          = $this->sd->options['widget_ops']['classname'] . ' sdel-' . $this->sd->get_instance_hash();
+
+            // Before widget
+            $before_widget = $args['before_widget'];
+            $before_widget = str_replace( $class_original, $class, $before_widget );
+            $before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
+            $before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->sd->base_id, $before_widget, $args, $instance, $this );
+
+            // After widget
+            $after_widget = $args['after_widget'];
+            $after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
+            $after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->sd->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->sd, $this );
+                $class = apply_filters( 'wp_super_duper_div_classname_' . $this->sd->base_id, $class, $args, $this->sd, $this );
+
+                $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this->sd, $this );
+                $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->sd->base_id, $attrs, $args, $this->sd, $this );
+
+                echo "<span class='" . esc_attr( $class ) . "' " . $attrs . ">";
+            }
+
+            echo $this->sd->output_title( $args, $instance );
+            echo $output;
+            if ( $this->is_elementor_widget_output() ) {
+                echo "</span>";
+            }
+
+            echo $after_widget;
+        } elseif ( $this->sd->is_preview() && $output == '' ) {// if preview show a placeholder if empty
+            $output = $this->sd->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+            echo $output;
+        } elseif ( $output && $no_wrap ) {
+            echo $output;
+        }
+        $output = ob_get_clean();
+
+        $output = apply_filters( 'wp_super_duper_widget_output', $output, $instance, $args, $this );
+
+        echo $output;
+    }
+
+    /**
+     * Tests if the current output is inside a elementor container.
+     *
+     * @since 1.0.4
+     * @return bool
+     */
+    public function is_elementor_widget_output() {
+        return defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID';
+    }
+
+    /**
+     * Outputs the options form inputs for the widget.
+     *
+     * @param array $instance The widget options.
+     */
+    public function form( $instance ) {
+        $this->sd->form( $instance );
+    }
+
+    /**
+     * 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->sd->instance = $instance;
+
+        if ( empty( $this->arguments ) ) {
+            $this->sd->get_arguments();
+        }
+
+        // check for checkboxes
+        if ( ! empty( $this->sd->arguments ) ) {
+            foreach ( $this->sd->arguments as $argument ) {
+                if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
+                    $instance[ $argument['name'] ] = '0';
+                }
+            }
+        }
+
+        return $instance;
+    }
+
+    /**
+     * Hides this widget from the block widgets inserter function.
+     *
+     * @param array $widget_types List of hidden widgets.
+     *
+     * @return array
+     */
+    public function hide_widget( $widget_types ) {
+        $widget_types[] = $this->id_base;
+
+        return $widget_types;
+    }
 
 }

Spacing +48 added lines, -48 removed lines

@@ -5,7 +5,7 @@ 
  * @since 2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  *
@@ -27,28 +27,28 @@ 
 	 *
 	 * @param WP_Super_Duper $super_duper
 	 */
-	public function __construct( $super_duper ) {
+	public function __construct($super_duper) {
 		$this->sd = $super_duper;
 
 		// Register widget.
 		$widget_ops = $super_duper->options['widget_ops'];
 
 		// Only overwrite if not set already.
-		if ( ! isset( $widget_ops['show_instance_in_rest'] ) ) {
+		if (!isset($widget_ops['show_instance_in_rest'])) {
 			$widget_ops['show_instance_in_rest'] = true;
 		}
 
-		parent::__construct( $super_duper->options['base_id'], $super_duper->options['name'], $widget_ops );
+		parent::__construct($super_duper->options['base_id'], $super_duper->options['name'], $widget_ops);
 
-		if ( did_action( 'widgets_init' ) || doing_action( 'widgets_init' ) ) {
+		if (did_action('widgets_init') || doing_action('widgets_init')) {
 			$this->register_widget();
 		} else {
-			add_action( 'widgets_init', array( $this, 'register_widget' ) );
+			add_action('widgets_init', array($this, 'register_widget'));
 		}
 
-		add_action( 'wp_enqueue_scripts', array( __CLASS__, 'enqueue_scripts' ) );
-		add_action( 'elementor/editor/after_enqueue_styles', array( __CLASS__, 'elementor_editor_styles' ) );
-		add_filter( 'widget_types_to_hide_from_legacy_widget_block', array( $this, 'hide_widget' ) );
+		add_action('wp_enqueue_scripts', array(__CLASS__, 'enqueue_scripts'));
+		add_action('elementor/editor/after_enqueue_styles', array(__CLASS__, 'elementor_editor_styles'));
+		add_filter('widget_types_to_hide_from_legacy_widget_block', array($this, 'hide_widget'));
 
 	}
 
@@ -56,7 +56,7 @@ 
 	 * Registers the widget.
 	 */
 	public function register_widget() {
-		register_widget( $this );
+		register_widget($this);
 	}
 
 	/**
@@ -65,16 +65,16 @@ 
 	 * @param WP_Super_Duper $super_duper
 	 */
 	public static function enqueue_scripts() {
-		wp_add_inline_script( 'admin-widgets', WP_Super_Duper::widget_js() );
-		wp_add_inline_script( 'customize-controls', WP_Super_Duper::widget_js() );
-		wp_add_inline_style( 'widgets', WP_Super_Duper::widget_css() );
+		wp_add_inline_script('admin-widgets', WP_Super_Duper::widget_js());
+		wp_add_inline_script('customize-controls', WP_Super_Duper::widget_js());
+		wp_add_inline_style('widgets', WP_Super_Duper::widget_css());
 	}
 
 	/**
 	 * Add our widget CSS to elementor editor.
 	 */
 	public static function elementor_editor_styles() {
-		wp_add_inline_style( 'elementor-editor', WP_Super_Duper::widget_css( false ) );
+		wp_add_inline_style('elementor-editor', WP_Super_Duper::widget_css(false));
 	}
 
 	/**
@@ -83,61 +83,61 @@ 
 	 * @param array $args
 	 * @param array $instance
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		// Prepare output args.
-		$argument_values = $this->sd->argument_values( $instance );
-		$argument_values = $this->sd->string_to_bool( $argument_values );
-		$output          = $this->sd->output( $argument_values, $args );
-		$no_wrap         = ! empty( $argument_values['no_wrap'] );
+		$argument_values = $this->sd->argument_values($instance);
+		$argument_values = $this->sd->string_to_bool($argument_values);
+		$output          = $this->sd->output($argument_values, $args);
+		$no_wrap         = !empty($argument_values['no_wrap']);
 
 		ob_start();
-		if ( $output && ! $no_wrap ) {
+		if ($output && !$no_wrap) {
 
 			$class_original = $this->sd->options['widget_ops']['classname'];
 			$class          = $this->sd->options['widget_ops']['classname'] . ' sdel-' . $this->sd->get_instance_hash();
 
 			// Before widget
 			$before_widget = $args['before_widget'];
-			$before_widget = str_replace( $class_original, $class, $before_widget );
-			$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
-			$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->sd->base_id, $before_widget, $args, $instance, $this );
+			$before_widget = str_replace($class_original, $class, $before_widget);
+			$before_widget = apply_filters('wp_super_duper_before_widget', $before_widget, $args, $instance, $this);
+			$before_widget = apply_filters('wp_super_duper_before_widget_' . $this->sd->base_id, $before_widget, $args, $instance, $this);
 
 			// After widget
 			$after_widget = $args['after_widget'];
-			$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
-			$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->sd->base_id, $after_widget, $args, $instance, $this );
+			$after_widget = apply_filters('wp_super_duper_after_widget', $after_widget, $args, $instance, $this);
+			$after_widget = apply_filters('wp_super_duper_after_widget_' . $this->sd->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->sd, $this );
-				$class = apply_filters( 'wp_super_duper_div_classname_' . $this->sd->base_id, $class, $args, $this->sd, $this );
+				$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this->sd, $this);
+				$class = apply_filters('wp_super_duper_div_classname_' . $this->sd->base_id, $class, $args, $this->sd, $this);
 
-				$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this->sd, $this );
-				$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->sd->base_id, $attrs, $args, $this->sd, $this );
+				$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this->sd, $this);
+				$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->sd->base_id, $attrs, $args, $this->sd, $this);
 
-				echo "<span class='" . esc_attr( $class ) . "' " . $attrs . ">";
+				echo "<span class='" . esc_attr($class) . "' " . $attrs . ">";
 			}
 
-			echo $this->sd->output_title( $args, $instance );
+			echo $this->sd->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->sd->is_preview() && $output == '' ) {// if preview show a placeholder if empty
-			$output = $this->sd->preview_placeholder_text( "{{" . $this->base_id . "}}" );
+		} elseif ($this->sd->is_preview() && $output == '') {// if preview show a placeholder if empty
+			$output = $this->sd->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;
 	}
@@ -149,7 +149,7 @@ 
 	 * @return bool
 	 */
 	public function is_elementor_widget_output() {
-		return defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID';
+		return defined('ELEMENTOR_VERSION') && isset($this->number) && $this->number == 'REPLACE_TO_ID';
 	}
 
 	/**
@@ -157,8 +157,8 @@ 
 	 *
 	 * @param array $instance The widget options.
 	 */
-	public function form( $instance ) {
-		$this->sd->form( $instance );
+	public function form($instance) {
+		$this->sd->form($instance);
 	}
 
 	/**
@@ -170,23 +170,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->sd->instance = $instance;
 
-		if ( empty( $this->arguments ) ) {
+		if (empty($this->arguments)) {
 			$this->sd->get_arguments();
 		}
 
 		// check for checkboxes
-		if ( ! empty( $this->sd->arguments ) ) {
-			foreach ( $this->sd->arguments as $argument ) {
-				if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
-					$instance[ $argument['name'] ] = '0';
+		if (!empty($this->sd->arguments)) {
+			foreach ($this->sd->arguments as $argument) {
+				if (isset($argument['type']) && $argument['type'] == 'checkbox' && !isset($new_instance[$argument['name']])) {
+					$instance[$argument['name']] = '0';
 				}
 			}
 		}
@@ -201,7 +201,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function hide_widget( $widget_types ) {
+	public function hide_widget($widget_types) {
 		$widget_types[] = $this->id_base;
 
 		return $widget_types;

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

Indentation +321 added lines, -321 removed lines

@@ -17,268 +17,268 @@ 
  */
 class WP_Super_Duper_Shortcode {
 
-	/**
-	 * @var WP_Super_Duper
-	 */
-	protected $sd;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @param WP_Super_Duper $super_duper
-	 */
-	public function __construct( $super_duper ) {
-
-		$this->sd = $super_duper;
-
-		// Registers the shortcode.
-		add_shortcode( $this->sd->base_id, array( $this, 'shortcode_output' ) );
-
-		// This makes the insert button work for cornerstone.
-		add_action( 'wp_print_footer_scripts', array( $this, 'maybe_cornerstone_builder' ) );
-
-		// Fusion Builder (avada) support
-		if ( function_exists( 'fusion_builder_map' ) ) {
-			add_action( 'init', array( $this, 'register_fusion_element' ) );
-		}
-
-		// Add shortcode insert button once
-		add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
-		add_action( 'wp_ajax_super_duper_get_widget_settings', array( $this, 'get_widget_settings' ) );
-
-		// generatepress theme sections compatibility
-		if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-			add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
-		}
-
-		if ( $this->sd->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
-		}
-
-	}
-
-	/**
-	 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
-	 *
-	 * @since 1.0.0
-	 *
-	 * @param string $editor_id Optional. Shortcode editor id. Default null.
-	 * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
-	 */
-	public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
-		global $shortcode_insert_button_once;
-		if ( $shortcode_insert_button_once ) {
-			return;
-		}
-		add_thickbox();
-
-		/**
-		 * Cornerstone makes us play dirty tricks :/
-		 * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
-		 */
-		if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-			echo '<span id="insert-media-button">';
-		}
-
-		echo self::shortcode_button( 'this', 'true' );
-
-		// see opening note
-		if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
-			echo '</span>'; // end #insert-media-button
-		}
-
-		// Add separate script for generatepress theme sections
-		if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
-		} else {
-			self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
-		}
-
-		$shortcode_insert_button_once = true;
-	}
-
-	/**
-	 * Output the shortcode.
-	 *
-	 * @param array $args
-	 * @param string $content
-	 *
-	 * @return string
-	 */
-	public function shortcode_output( $args = array(), $content = '' ) {
-		$args = $this->sd->argument_values( $args );
-
-		// Clean booleans.
-		$args = $this->sd->string_to_bool( $args );
-
-		// if we have a enclosed shortcode we add it to the special `html` argument
-		if ( ! empty( $content ) ) {
-			$args['html'] = $content;
-		}
-
-		$class = isset( $this->sd->options['widget_ops']['classname'] ) ? esc_attr( $this->sd->options['widget_ops']['classname'] ) : '';
-		$class .= " sdel-" . $this->sd->get_instance_hash();
-
-		$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this->sd, $this );
-		$class = apply_filters( 'wp_super_duper_div_classname_' . $this->sd->base_id, $class, $args, $this->sd, $this );
-
-		$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this->sd, $this );
-		$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->sd->base_id, $attrs, $args, $this->sd, $this );
-
-		$shortcode_args = array();
-		$output         = '';
-		$no_wrap        = ! empty( $this->sd->options['no_wrap'] ) || ! empty( $args['no_wrap'] );
-
-		$main_content = $this->sd->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="' . esc_attr( $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->sd->output_title( $shortcode_args, $args );
-			}
-			$output .= $main_content;
-			$output .= '</div>';
-		} elseif ( $main_content && $no_wrap ) {
-			$output .= $main_content;
-		}
-
-		// if preview, show a placeholder if empty
-		if ( $this->sd->is_preview() && $output == '' ) {
-			$output = $this->sd->preview_placeholder_text( "{{" . $this->sd->base_id . "}}" );
-		}
-
-		return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
-	}
-
-	public function register_fusion_element() {
-		$options = $this->sd->options;
-
-		if ( $this->sd->base_id ) {
-
-			$params = $this->get_fusion_params();
-
-			$args = array(
-				'name'            => $options['name'],
-				'shortcode'       => $this->sd->base_id,
-				'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
-				'allow_generator' => true,
-			);
-
-			if ( ! empty( $params ) ) {
-				$args['params'] = $params;
-			}
-
-			fusion_builder_map( $args );
-		}
-	}
-
-	protected function get_fusion_params() {
-		$params    = array();
-		$arguments = $this->sd->get_arguments();
-
-		if ( ! empty( $arguments ) ) {
-			foreach ( $arguments as $key => $val ) {
-				$param = array();
-				// type
-				$param['type'] = str_replace(
-					array(
-						"text",
-						"number",
-						"email",
-						"color",
-						"checkbox"
-					),
-					array(
-						"textfield",
-						"textfield",
-						"textfield",
-						"colorpicker",
-						"select",
-					),
-					$val['type'] );
-
-				// multiselect
-				if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
-					$param['type']     = 'multiple_select';
-					$param['multiple'] = true;
-				}
-
-				// heading
-				$param['heading'] = $val['title'];
-
-				// description
-				$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
-
-				// param_name
-				$param['param_name'] = $key;
-
-				// Default
-				$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
-
-				// Group
-				if ( isset( $val['group'] ) ) {
-					$param['group'] = $val['group'];
-				}
-
-				// value
-				if ( $val['type'] == 'checkbox' ) {
-					if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-						unset( $param['default'] );
-					}
-					$param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
-				} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-					$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
-				} else {
-					$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
-				}
-
-				// setup the param
-				$params[] = $param;
-
-			}
-		}
-
-		return $params;
-	}
-
-	/**
-	 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
-	 */
-	public function maybe_cornerstone_builder() {
-		if ( did_action( 'cornerstone_before_boot_app' ) ) {
-			self::shortcode_insert_button_script();
-		}
-	}
-
-	/**
-	 * Output the JS and CSS for the shortcode insert button.
-	 *
-	 * @since 1.0.6
-	 *
-	 * @param string $editor_id
-	 * @param string $insert_shortcode_function
-	 */
-	public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
-		?>
+    /**
+     * @var WP_Super_Duper
+     */
+    protected $sd;
+
+    /**
+     * Class constructor.
+     *
+     * @param WP_Super_Duper $super_duper
+     */
+    public function __construct( $super_duper ) {
+
+        $this->sd = $super_duper;
+
+        // Registers the shortcode.
+        add_shortcode( $this->sd->base_id, array( $this, 'shortcode_output' ) );
+
+        // This makes the insert button work for cornerstone.
+        add_action( 'wp_print_footer_scripts', array( $this, 'maybe_cornerstone_builder' ) );
+
+        // Fusion Builder (avada) support
+        if ( function_exists( 'fusion_builder_map' ) ) {
+            add_action( 'init', array( $this, 'register_fusion_element' ) );
+        }
+
+        // Add shortcode insert button once
+        add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
+        add_action( 'wp_ajax_super_duper_get_widget_settings', array( $this, 'get_widget_settings' ) );
+
+        // generatepress theme sections compatibility
+        if ( function_exists( 'generate_sections_sections_metabox' ) ) {
+            add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+        }
+
+        if ( $this->sd->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
+        }
+
+    }
+
+    /**
+     * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
+     *
+     * @since 1.0.0
+     *
+     * @param string $editor_id Optional. Shortcode editor id. Default null.
+     * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
+     */
+    public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+        global $shortcode_insert_button_once;
+        if ( $shortcode_insert_button_once ) {
+            return;
+        }
+        add_thickbox();
+
+        /**
+         * Cornerstone makes us play dirty tricks :/
+         * All media_buttons are removed via JS unless they are two specific id's so we wrap our content in this ID so it is not removed.
+         */
+        if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+            echo '<span id="insert-media-button">';
+        }
+
+        echo self::shortcode_button( 'this', 'true' );
+
+        // see opening note
+        if ( function_exists( 'cornerstone_plugin_init' ) && ! is_admin() ) {
+            echo '</span>'; // end #insert-media-button
+        }
+
+        // Add separate script for generatepress theme sections
+        if ( function_exists( 'generate_sections_sections_metabox' ) && did_action( 'generate_sections_metabox' ) ) {
+        } else {
+            self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
+        }
+
+        $shortcode_insert_button_once = true;
+    }
+
+    /**
+     * Output the shortcode.
+     *
+     * @param array $args
+     * @param string $content
+     *
+     * @return string
+     */
+    public function shortcode_output( $args = array(), $content = '' ) {
+        $args = $this->sd->argument_values( $args );
+
+        // Clean booleans.
+        $args = $this->sd->string_to_bool( $args );
+
+        // if we have a enclosed shortcode we add it to the special `html` argument
+        if ( ! empty( $content ) ) {
+            $args['html'] = $content;
+        }
+
+        $class = isset( $this->sd->options['widget_ops']['classname'] ) ? esc_attr( $this->sd->options['widget_ops']['classname'] ) : '';
+        $class .= " sdel-" . $this->sd->get_instance_hash();
+
+        $class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this->sd, $this );
+        $class = apply_filters( 'wp_super_duper_div_classname_' . $this->sd->base_id, $class, $args, $this->sd, $this );
+
+        $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this->sd, $this );
+        $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->sd->base_id, $attrs, $args, $this->sd, $this );
+
+        $shortcode_args = array();
+        $output         = '';
+        $no_wrap        = ! empty( $this->sd->options['no_wrap'] ) || ! empty( $args['no_wrap'] );
+
+        $main_content = $this->sd->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="' . esc_attr( $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->sd->output_title( $shortcode_args, $args );
+            }
+            $output .= $main_content;
+            $output .= '</div>';
+        } elseif ( $main_content && $no_wrap ) {
+            $output .= $main_content;
+        }
+
+        // if preview, show a placeholder if empty
+        if ( $this->sd->is_preview() && $output == '' ) {
+            $output = $this->sd->preview_placeholder_text( "{{" . $this->sd->base_id . "}}" );
+        }
+
+        return apply_filters( 'wp_super_duper_widget_output', $output, $args, $shortcode_args, $this );
+    }
+
+    public function register_fusion_element() {
+        $options = $this->sd->options;
+
+        if ( $this->sd->base_id ) {
+
+            $params = $this->get_fusion_params();
+
+            $args = array(
+                'name'            => $options['name'],
+                'shortcode'       => $this->sd->base_id,
+                'icon'            => $options['block-icon'] ? $options['block-icon'] : 'far fa-square',
+                'allow_generator' => true,
+            );
+
+            if ( ! empty( $params ) ) {
+                $args['params'] = $params;
+            }
+
+            fusion_builder_map( $args );
+        }
+    }
+
+    protected function get_fusion_params() {
+        $params    = array();
+        $arguments = $this->sd->get_arguments();
+
+        if ( ! empty( $arguments ) ) {
+            foreach ( $arguments as $key => $val ) {
+                $param = array();
+                // type
+                $param['type'] = str_replace(
+                    array(
+                        "text",
+                        "number",
+                        "email",
+                        "color",
+                        "checkbox"
+                    ),
+                    array(
+                        "textfield",
+                        "textfield",
+                        "textfield",
+                        "colorpicker",
+                        "select",
+                    ),
+                    $val['type'] );
+
+                // multiselect
+                if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+                    $param['type']     = 'multiple_select';
+                    $param['multiple'] = true;
+                }
+
+                // heading
+                $param['heading'] = $val['title'];
+
+                // description
+                $param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+
+                // param_name
+                $param['param_name'] = $key;
+
+                // Default
+                $param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+
+                // Group
+                if ( isset( $val['group'] ) ) {
+                    $param['group'] = $val['group'];
+                }
+
+                // value
+                if ( $val['type'] == 'checkbox' ) {
+                    if ( isset( $val['default'] ) && $val['default'] == '0' ) {
+                        unset( $param['default'] );
+                    }
+                    $param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
+                } elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
+                    $param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+                } else {
+                    $param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+                }
+
+                // setup the param
+                $params[] = $param;
+
+            }
+        }
+
+        return $params;
+    }
+
+    /**
+     * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
+     */
+    public function maybe_cornerstone_builder() {
+        if ( did_action( 'cornerstone_before_boot_app' ) ) {
+            self::shortcode_insert_button_script();
+        }
+    }
+
+    /**
+     * Output the JS and CSS for the shortcode insert button.
+     *
+     * @since 1.0.6
+     *
+     * @param string $editor_id
+     * @param string $insert_shortcode_function
+     */
+    public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+        ?>
 		<style>
 			.sd-shortcode-left-wrap {
 				float: left;
@@ -404,35 +404,35 @@ 
 			<?php } ?>
 		</style>
 		<?php
-		if ( class_exists( 'SiteOrigin_Panels' ) ) {
-			echo "<script>" . WP_Super_Duper::siteorigin_js() . "</script>";
-		}
-		?>
+        if ( class_exists( 'SiteOrigin_Panels' ) ) {
+            echo "<script>" . WP_Super_Duper::siteorigin_js() . "</script>";
+        }
+        ?>
 		<script>
 			<?php
-			if(! empty( $insert_shortcode_function )){
-				echo $insert_shortcode_function;
-			} else {
-
-			/**
-			 * Function for super duper insert shortcode.
-			 *
-			 * @since 1.0.0
-			 */
-			?>
+            if(! empty( $insert_shortcode_function )){
+                echo $insert_shortcode_function;
+            } else {
+
+            /**
+             * Function for super duper insert shortcode.
+             *
+             * @since 1.0.0
+             */
+            ?>
 			function sd_insert_shortcode($editor_id) {
 				$shortcode = jQuery('#TB_ajaxContent #sd-shortcode-output').val();
 				if ($shortcode) {
 					if (!$editor_id) {
 						<?php
-						if ( isset( $_REQUEST['et_fb'] ) ) {
-							echo '$editor_id = "#main_content_content_vb_tiny_mce";';
-						} elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
-							echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
-						} else {
-							echo '$editor_id = "#wp-content-editor-container textarea";';
-						}
-						?>
+                        if ( isset( $_REQUEST['et_fb'] ) ) {
+                            echo '$editor_id = "#main_content_content_vb_tiny_mce";';
+                        } elseif ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) {
+                            echo '$editor_id = "#elementor-controls .wp-editor-container textarea";';
+                        } else {
+                            echo '$editor_id = "#wp-content-editor-container textarea";';
+                        }
+                        ?>
 					} else {
 						$editor_id = '#' + $editor_id;
 					}
@@ -731,24 +731,24 @@ 
 			}
 		</script>
 		<?php
-	}
-
-	/**
-	 * 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>
@@ -759,34 +759,34 @@ 
 		</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 ) );
+    }
 
-	/**
-	 * Get widget settings.
-	 *
-	 * @since 1.0.0
-	 */
-	public function get_widget_settings() {
+    /**
+     * Get widget settings.
+     *
+     * @since 1.0.0
+     */
+    public function get_widget_settings() {
 
-		if ( isset( $_REQUEST['shortcode'] ) && $this->sd->base_id == sanitize_title_with_dashes( $_REQUEST['shortcode'] ) ) {
+        if ( isset( $_REQUEST['shortcode'] ) && $this->sd->base_id == sanitize_title_with_dashes( $_REQUEST['shortcode'] ) ) {
 
-			$shortcode = sanitize_title_with_dashes( $_REQUEST['shortcode'] );
+            $shortcode = sanitize_title_with_dashes( $_REQUEST['shortcode'] );
 
-			ob_start();
-			$this->sd->form( array() );
-			$form = ob_get_clean();
+            ob_start();
+            $this->sd->form( array() );
+            $form = ob_get_clean();
 
-			echo "<form id='$shortcode'>" . $form . "<div class='widget-control-save'></div></form>";
-			echo "<style>" . WP_Super_Duper::widget_css() . "</style>";
-			echo "<script>" . WP_Super_Duper::widget_js() . "</script>";
-			exit;
+            echo "<form id='$shortcode'>" . $form . "<div class='widget-control-save'></div></form>";
+            echo "<style>" . WP_Super_Duper::widget_css() . "</style>";
+            echo "<script>" . WP_Super_Duper::widget_js() . "</script>";
+            exit;
 
-		}
+        }
 
-	}
+    }
 
 }

Spacing +80 added lines, -80 removed lines

@@ -5,7 +5,7 @@ 
  * @since 2.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  *
@@ -27,37 +27,37 @@ 
 	 *
 	 * @param WP_Super_Duper $super_duper
 	 */
-	public function __construct( $super_duper ) {
+	public function __construct($super_duper) {
 
 		$this->sd = $super_duper;
 
 		// Registers the shortcode.
-		add_shortcode( $this->sd->base_id, array( $this, 'shortcode_output' ) );
+		add_shortcode($this->sd->base_id, array($this, 'shortcode_output'));
 
 		// This makes the insert button work for cornerstone.
-		add_action( 'wp_print_footer_scripts', array( $this, 'maybe_cornerstone_builder' ) );
+		add_action('wp_print_footer_scripts', array($this, 'maybe_cornerstone_builder'));
 
 		// 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'));
 		}
 
 		// Add shortcode insert button once
-		add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
-		add_action( 'wp_ajax_super_duper_get_widget_settings', array( $this, 'get_widget_settings' ) );
+		add_action('media_buttons', array($this, 'shortcode_insert_button'));
+		add_action('wp_ajax_super_duper_get_widget_settings', array($this, 'get_widget_settings'));
 
 		// generatepress theme sections compatibility
-		if ( function_exists( 'generate_sections_sections_metabox' ) ) {
-			add_action( 'generate_sections_metabox', array( $this, 'shortcode_insert_button_script' ) );
+		if (function_exists('generate_sections_sections_metabox')) {
+			add_action('generate_sections_metabox', array($this, 'shortcode_insert_button_script'));
 		}
 
-		if ( $this->sd->is_preview() ) {
-			add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
+		if ($this->sd->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
 		}
 
 	}
@@ -70,9 +70,9 @@ 
 	 * @param string $editor_id Optional. Shortcode editor id. Default null.
 	 * @param string $insert_shortcode_function Optional. Insert shortcode function. Default null.
 	 */
-	public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
+	public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
 		global $shortcode_insert_button_once;
-		if ( $shortcode_insert_button_once ) {
+		if ($shortcode_insert_button_once) {
 			return;
 		}
 		add_thickbox();
@@ -81,21 +81,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;
@@ -109,43 +109,43 @@ 
 	 *
 	 * @return string
 	 */
-	public function shortcode_output( $args = array(), $content = '' ) {
-		$args = $this->sd->argument_values( $args );
+	public function shortcode_output($args = array(), $content = '') {
+		$args = $this->sd->argument_values($args);
 
 		// Clean booleans.
-		$args = $this->sd->string_to_bool( $args );
+		$args = $this->sd->string_to_bool($args);
 
 		// if we have a enclosed shortcode we add it to the special `html` argument
-		if ( ! empty( $content ) ) {
+		if (!empty($content)) {
 			$args['html'] = $content;
 		}
 
-		$class = isset( $this->sd->options['widget_ops']['classname'] ) ? esc_attr( $this->sd->options['widget_ops']['classname'] ) : '';
+		$class = isset($this->sd->options['widget_ops']['classname']) ? esc_attr($this->sd->options['widget_ops']['classname']) : '';
 		$class .= " sdel-" . $this->sd->get_instance_hash();
 
-		$class = apply_filters( 'wp_super_duper_div_classname', $class, $args, $this->sd, $this );
-		$class = apply_filters( 'wp_super_duper_div_classname_' . $this->sd->base_id, $class, $args, $this->sd, $this );
+		$class = apply_filters('wp_super_duper_div_classname', $class, $args, $this->sd, $this);
+		$class = apply_filters('wp_super_duper_div_classname_' . $this->sd->base_id, $class, $args, $this->sd, $this);
 
-		$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this->sd, $this );
-		$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->sd->base_id, $attrs, $args, $this->sd, $this );
+		$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this->sd, $this);
+		$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->sd->base_id, $attrs, $args, $this->sd, $this);
 
 		$shortcode_args = array();
 		$output         = '';
-		$no_wrap        = ! empty( $this->sd->options['no_wrap'] ) || ! empty( $args['no_wrap'] );
+		$no_wrap        = !empty($this->sd->options['no_wrap']) || !empty($args['no_wrap']);
 
-		$main_content = $this->sd->output( $args, $shortcode_args, $content );
+		$main_content = $this->sd->output($args, $shortcode_args, $content);
 
-		if ( $main_content && ! $no_wrap ) {
+		if ($main_content && !$no_wrap) {
 			// wrap the shortcode in a div with the same class as the widget
-			$output .= '<div class="' . esc_attr( $class ) . '" ' . $attrs . '>';
-			if ( ! empty( $args['title'] ) ) {
+			$output .= '<div class="' . esc_attr($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 ) ) {
+				$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;
@@ -153,26 +153,26 @@ 
 						}
 					}
 				}
-				$output .= $this->sd->output_title( $shortcode_args, $args );
+				$output .= $this->sd->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->sd->is_preview() && $output == '' ) {
-			$output = $this->sd->preview_placeholder_text( "{{" . $this->sd->base_id . "}}" );
+		if ($this->sd->is_preview() && $output == '') {
+			$output = $this->sd->preview_placeholder_text("{{" . $this->sd->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);
 	}
 
 	public function register_fusion_element() {
 		$options = $this->sd->options;
 
-		if ( $this->sd->base_id ) {
+		if ($this->sd->base_id) {
 
 			$params = $this->get_fusion_params();
 
@@ -183,11 +183,11 @@ 
 				'allow_generator' => true,
 			);
 
-			if ( ! empty( $params ) ) {
+			if (!empty($params)) {
 				$args['params'] = $params;
 			}
 
-			fusion_builder_map( $args );
+			fusion_builder_map($args);
 		}
 	}
 
@@ -195,8 +195,8 @@ 
 		$params    = array();
 		$arguments = $this->sd->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(
@@ -217,7 +217,7 @@ 
 					$val['type'] );
 
 				// multiselect
-				if ( $val['type'] == 'multiselect' || ( ( $param['type'] == 'select' || $val['type'] == 'select' ) && ! empty( $val['multiple'] ) ) ) {
+				if ($val['type'] == 'multiselect' || (($param['type'] == 'select' || $val['type'] == 'select') && !empty($val['multiple']))) {
 					$param['type']     = 'multiple_select';
 					$param['multiple'] = true;
 				}
@@ -226,29 +226,29 @@ 
 				$param['heading'] = $val['title'];
 
 				// description
-				$param['description'] = isset( $val['desc'] ) ? $val['desc'] : '';
+				$param['description'] = isset($val['desc']) ? $val['desc'] : '';
 
 				// param_name
 				$param['param_name'] = $key;
 
 				// Default
-				$param['default'] = isset( $val['default'] ) ? $val['default'] : '';
+				$param['default'] = isset($val['default']) ? $val['default'] : '';
 
 				// Group
-				if ( isset( $val['group'] ) ) {
+				if (isset($val['group'])) {
 					$param['group'] = $val['group'];
 				}
 
 				// value
-				if ( $val['type'] == 'checkbox' ) {
-					if ( isset( $val['default'] ) && $val['default'] == '0' ) {
-						unset( $param['default'] );
+				if ($val['type'] == 'checkbox') {
+					if (isset($val['default']) && $val['default'] == '0') {
+						unset($param['default']);
 					}
-					$param['value'] = array( '' => __( "No" ), '1' => __( "Yes" ) );
-				} elseif ( $param['type'] == 'select' || $param['type'] == 'multiple_select' ) {
-					$param['value'] = isset( $val['options'] ) ? $val['options'] : array();
+					$param['value'] = array('' => __("No"), '1' => __("Yes"));
+				} elseif ($param['type'] == 'select' || $param['type'] == 'multiple_select') {
+					$param['value'] = isset($val['options']) ? $val['options'] : array();
 				} else {
-					$param['value'] = isset( $val['default'] ) ? $val['default'] : '';
+					$param['value'] = isset($val['default']) ? $val['default'] : '';
 				}
 
 				// setup the param
@@ -264,7 +264,7 @@ 
 	 * Maybe insert the shortcode inserter button in the footer if we are in the cornerstone builder
 	 */
 	public function maybe_cornerstone_builder() {
-		if ( did_action( 'cornerstone_before_boot_app' ) ) {
+		if (did_action('cornerstone_before_boot_app')) {
 			self::shortcode_insert_button_script();
 		}
 	}
@@ -277,7 +277,7 @@ 
 	 * @param string $editor_id
 	 * @param string $insert_shortcode_function
 	 */
-	public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
+	public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
 		?>
 		<style>
 			.sd-shortcode-left-wrap {
@@ -396,7 +396,7 @@ 
 				width: 100%;
 			}
 
-			<?php if ( function_exists( 'generate_sections_sections_metabox' ) ) { ?>
+			<?php if (function_exists('generate_sections_sections_metabox')) { ?>
 			.generate-sections-modal #custom-media-buttons > .sd-lable-shortcode-inserter {
 				display: inline;
 			}
@@ -404,13 +404,13 @@ 
 			<?php } ?>
 		</style>
 		<?php
-		if ( class_exists( 'SiteOrigin_Panels' ) ) {
+		if (class_exists('SiteOrigin_Panels')) {
 			echo "<script>" . WP_Super_Duper::siteorigin_js() . "</script>";
 		}
 		?>
 		<script>
 			<?php
-			if(! empty( $insert_shortcode_function )){
+			if (!empty($insert_shortcode_function)) {
 				echo $insert_shortcode_function;
 			} else {
 
@@ -425,9 +425,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";';
@@ -509,11 +509,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) {
@@ -699,11 +699,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) {
@@ -724,9 +724,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>
@@ -741,12 +741,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">
@@ -762,7 +762,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));
 	}
 
 	/**
@@ -772,12 +772,12 @@ 
 	 */
 	public function get_widget_settings() {
 
-		if ( isset( $_REQUEST['shortcode'] ) && $this->sd->base_id == sanitize_title_with_dashes( $_REQUEST['shortcode'] ) ) {
+		if (isset($_REQUEST['shortcode']) && $this->sd->base_id == sanitize_title_with_dashes($_REQUEST['shortcode'])) {
 
-			$shortcode = sanitize_title_with_dashes( $_REQUEST['shortcode'] );
+			$shortcode = sanitize_title_with_dashes($_REQUEST['shortcode']);
 
 			ob_start();
-			$this->sd->form( array() );
+			$this->sd->form(array());
 			$form = ob_get_clean();
 
 			echo "<form id='$shortcode'>" . $form . "<div class='widget-control-save'></div></form>";

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

Indentation +107 added lines, -107 removed lines

@@ -2,101 +2,101 @@ 
 
 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', 'hello-world' ),
-					'class'   => '[%className%]',
-					'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
-				)
-			),
-			'output_types'   => array( 'block', 'shortcode' ),
-			// Sample showing how to disable widgets for a given SD instance.
-			'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', 'hello-world' ),
-			// 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:`.', 'hello-world' ),
-				// widget description
-				'output'      => array( $this, 'output' )
-			),
-			'no_wrap'        => true,
-			// This will prevent the widget being wrapped in the containing widget class div.
-			//'block-editor-style'    => 'https://example.com/style.css',
-			// Lets you add a URL for styles that should be added to the block editor.
-			'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:', 'hello-world' ),
-					// input title
-					'desc'        => __( 'This is the text that will appear after `Hello:`.', 'hello-world' ),
-					// 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', 'hello-world' ),
+                    'class'   => '[%className%]',
+                    'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
+                )
+            ),
+            'output_types'   => array( 'block', 'shortcode' ),
+            // Sample showing how to disable widgets for a given SD instance.
+            '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', 'hello-world' ),
+            // 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:`.', 'hello-world' ),
+                // widget description
+                'output'      => array( $this, 'output' )
+            ),
+            'no_wrap'        => true,
+            // This will prevent the widget being wrapped in the containing widget class div.
+            //'block-editor-style'    => 'https://example.com/style.css',
+            // Lets you add a URL for styles that should be added to the block editor.
+            '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:', 'hello-world' ),
+                    // input title
+                    'desc'        => __( 'This is the text that will appear after `Hello:`.', 'hello-world' ),
+                    // 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;
+    }
 
 }
 
@@ -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:', 'hello-world' ), // input title
-		'desc'        => __( 'This is an input added via filter.', 'hello-world' ), // 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:', 'hello-world' ), // input title
+        'desc'        => __( 'This is an input added via filter.', 'hello-world' ), // 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' );

Spacing +15 added lines, -15 removed lines

@@ -22,12 +22,12 @@ 
 			'block-output'   => array( // the block visual output elements as an array
 				array(
 					'element' => 'p',
-					'title'   => __( 'Placeholder', 'hello-world' ),
+					'title'   => __('Placeholder', 'hello-world'),
 					'class'   => '[%className%]',
 					'content' => 'Hello: [%after_text%]' // block properties can be added by wrapping them in [%name%]
 				)
 			),
-			'output_types'   => array( 'block', 'shortcode' ),
+			'output_types'   => array('block', 'shortcode'),
 			// Sample showing how to disable widgets for a given SD instance.
 			'block-wrap'     => '',
 			// You can specify the type of element to wrap the block `div` or `span` etc.. Or blank for no wrap at all.
@@ -35,14 +35,14 @@ 
 			// The calling class name
 			'base_id'        => 'hello_world',
 			// this is used as the widget id and the shortcode id.
-			'name'           => __( 'Hello World', 'hello-world' ),
+			'name'           => __('Hello World', 'hello-world'),
 			// 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:`.', 'hello-world' ),
+				'description' => esc_html__('This is an example that will take a text parameter and output it after `Hello:`.', 'hello-world'),
 				// widget description
-				'output'      => array( $this, 'output' )
+				'output'      => array($this, 'output')
 			),
 			'no_wrap'        => true,
 			// This will prevent the widget being wrapped in the containing widget class div.
@@ -50,9 +50,9 @@ 
 			// Lets you add a URL for styles that should be added to the block editor.
 			'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:', 'hello-world' ),
+					'title'       => __('Text after hello:', 'hello-world'),
 					// input title
-					'desc'        => __( 'This is the text that will appear after `Hello:`.', 'hello-world' ),
+					'desc'        => __('This is the text that will appear after `Hello:`.', 'hello-world'),
 					// input description
 					'type'        => 'text',
 					// the type of input, test, select, checkbox etc.
@@ -68,7 +68,7 @@ 
 			)
 		);
 
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 
@@ -81,17 +81,17 @@ 
 	 *
 	 * @return string
 	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
+	public function output($args = array(), $widget_args = array(), $content = '') {
 		/**
 		 * @var string $after_text
 		 * @var string $another_input This is added by filter below.
 		 */
-		extract( $args, EXTR_SKIP );
+		extract($args, EXTR_SKIP);
 
 		/*
 		 * This value is added by filter so might not exist if filter is removed so we check.
 		 */
-		if ( ! isset( $another_input ) ) {
+		if (!isset($another_input)) {
 			$another_input = '';
 		}
 
@@ -109,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:', 'hello-world' ), // input title
-		'desc'        => __( 'This is an input added via filter.', 'hello-world' ), // input description
+		'title'       => __('Another input:', 'hello-world'), // input title
+		'desc'        => __('This is an input added via filter.', 'hello-world'), // 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/composer/installed.php

Indentation +60 added lines, -60 removed lines

@@ -1,6 +1,6 @@ 
 <?php return array (
-  'root' => 
-  array (
+    'root' => 
+    array (
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
@@ -8,94 +8,94 @@ 
     ),
     'reference' => '877d435f0d6e766e8c5a957200a2dcebe6a6cdeb',
     'name' => 'ayecode/invoicing',
-  ),
-  'versions' => 
-  array (
+    ),
+    'versions' => 
+    array (
     'ayecode/ayecode-connect-helper' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
+        'pretty_version' => '1.0.3',
+        'version' => '1.0.3.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '877d435f0d6e766e8c5a957200a2dcebe6a6cdeb',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '877d435f0d6e766e8c5a957200a2dcebe6a6cdeb',
     ),
     'ayecode/wp-ayecode-ui' => 
     array (
-      'pretty_version' => '0.1.61',
-      'version' => '0.1.61.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'e97d1e520d6722df2cb323c04a6e818b1e901ab5',
+        'pretty_version' => '0.1.61',
+        'version' => '0.1.61.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'e97d1e520d6722df2cb323c04a6e818b1e901ab5',
     ),
     'ayecode/wp-deactivation-survey' => 
     array (
-      'pretty_version' => '1.0.3',
-      'version' => '1.0.3.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'c4b0ba914835f17dca0cf69fe621c2db491d4667',
+        'pretty_version' => '1.0.3',
+        'version' => '1.0.3.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'c4b0ba914835f17dca0cf69fe621c2db491d4667',
     ),
     'ayecode/wp-font-awesome-settings' => 
     array (
-      'pretty_version' => '1.0.13',
-      'version' => '1.0.13.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
+        'pretty_version' => '1.0.13',
+        'version' => '1.0.13.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
     ),
     'ayecode/wp-super-duper' => 
     array (
-      'pretty_version' => '2.0.0',
-      'version' => '2.0.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '0b76c70dff7339ddcfc67c148e932b8915cbcbf5',
+        'pretty_version' => '2.0.0',
+        'version' => '2.0.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => '0b76c70dff7339ddcfc67c148e932b8915cbcbf5',
     ),
     'composer/installers' => 
     array (
-      'pretty_version' => 'v1.12.0',
-      'version' => '1.12.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
+        'pretty_version' => 'v1.12.0',
+        'version' => '1.12.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
     ),
     'maxmind-db/reader' => 
     array (
-      'pretty_version' => 'v1.6.0',
-      'version' => '1.6.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
+        'pretty_version' => 'v1.6.0',
+        'version' => '1.6.0.0',
+        'aliases' => 
+        array (
+        ),
+        'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
     ),
     'shama/baton' => 
     array (
-      'replaced' => 
-      array (
+        'replaced' => 
+        array (
         0 => '*',
-      ),
+        ),
+    ),
     ),
-  ),
 );

Spacing +24 added lines, -24 removed lines

@@ -1,99 +1,99 @@
-<?php return array (
+<?php return array(
   'root' => 
-  array (
+  array(
     'pretty_version' => 'dev-master',
     'version' => 'dev-master',
     'aliases' => 
-    array (
+    array(
     ),
     'reference' => '877d435f0d6e766e8c5a957200a2dcebe6a6cdeb',
     'name' => 'ayecode/invoicing',
   ),
   'versions' => 
-  array (
+  array(
     'ayecode/ayecode-connect-helper' => 
-    array (
+    array(
       'pretty_version' => '1.0.3',
       'version' => '1.0.3.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '1af7cdefdbd20d4443a3ab4834e4c1cd8fe57fb4',
     ),
     'ayecode/invoicing' => 
-    array (
+    array(
       'pretty_version' => 'dev-master',
       'version' => 'dev-master',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '877d435f0d6e766e8c5a957200a2dcebe6a6cdeb',
     ),
     'ayecode/wp-ayecode-ui' => 
-    array (
+    array(
       'pretty_version' => '0.1.61',
       'version' => '0.1.61.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'e97d1e520d6722df2cb323c04a6e818b1e901ab5',
     ),
     'ayecode/wp-deactivation-survey' => 
-    array (
+    array(
       'pretty_version' => '1.0.3',
       'version' => '1.0.3.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'c4b0ba914835f17dca0cf69fe621c2db491d4667',
     ),
     'ayecode/wp-font-awesome-settings' => 
-    array (
+    array(
       'pretty_version' => '1.0.13',
       'version' => '1.0.13.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'a7a11ee4290674ec214d1fe694139af275350402',
     ),
     'ayecode/wp-super-duper' => 
-    array (
+    array(
       'pretty_version' => '2.0.0',
       'version' => '2.0.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => '0b76c70dff7339ddcfc67c148e932b8915cbcbf5',
     ),
     'composer/installers' => 
-    array (
+    array(
       'pretty_version' => 'v1.12.0',
       'version' => '1.12.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'd20a64ed3c94748397ff5973488761b22f6d3f19',
     ),
     'maxmind-db/reader' => 
-    array (
+    array(
       'pretty_version' => 'v1.6.0',
       'version' => '1.6.0.0',
       'aliases' => 
-      array (
+      array(
       ),
       'reference' => 'febd4920bf17c1da84cef58e56a8227dfb37fbe4',
     ),
     'roundcube/plugin-installer' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),
     'shama/baton' => 
-    array (
+    array(
       'replaced' => 
-      array (
+      array(
         0 => '*',
       ),
     ),