View GitHub Repository invoicing

Schedule Inspection
Subscribe
Passed
Push — master ( fecf8d...919089 )
by Stiofan
01:09 queued 10s
created
Status
Category
Toggle Patches
vendor/composer/installers/src/bootstrap.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -6,8 +6,8 @@
 
 block discarded – undo
6 6 
     }
7 7 
 }
8 8 
 if ((!$loader = includeIfExists(__DIR__ . '/../vendor/autoload.php')) && (!$loader = includeIfExists(__DIR__ . '/../../../autoload.php'))) {
9 
-    die('You must set up the project dependencies, run the following commands:'.PHP_EOL.
10 
-        'curl -s http://getcomposer.org/installer | php'.PHP_EOL.
11 
-        'php composer.phar install'.PHP_EOL);
9 
+    die('You must set up the project dependencies, run the following commands:' . PHP_EOL .
10 
+        'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
11 
+        'php composer.phar install' . PHP_EOL);
12 12 
 }
13 13 
 return $loader;
Please login to merge, or discard this patch.
includes/class-wpinv.php 1 patch
Spacing   +176 added lines, -176 removed lines patch added patch discarded remove patch 
@@ -7,15 +7,15 @@  discard block
 
 block discarded – undo
7 7 
  */
8 8
9 9 
 // MUST have WordPress.
10 
-if ( !defined( 'WPINC' ) ) {
11 
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
10 
+if (!defined('WPINC')) {
11 
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
12 12 
 }
13 13
14 14 
 class WPInv_Plugin {
15 15 
     private static $instance;
16 16
17 17 
     public static function run() {
18 
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
18 
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
19 19 
             self::$instance = new WPInv_Plugin;
20 20 
             self::$instance->includes();
21 21 
             self::$instance->actions();
 
@@ -31,31 +31,31 @@  discard block
 
 block discarded – undo
31 31 
     }
32 32
33 33 
     public function define_constants() {
34 
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
35 
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
34 
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
35 
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
36 36 
     }
37 37
38 38 
     private function actions() {
39 39 
         /* Internationalize the text strings used. */
40 
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
40 
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
41 41
42 42 
         /* Perform actions on admin initialization. */
43 
-        add_action( 'admin_init', array( &$this, 'admin_init') );
44 
-        add_action( 'init', array( &$this, 'init' ), 3 );
45 
-        add_action( 'init', array( 'WPInv_Shortcodes', 'init' ) );
46 
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
43 
+        add_action('admin_init', array(&$this, 'admin_init'));
44 
+        add_action('init', array(&$this, 'init'), 3);
45 
+        add_action('init', array('WPInv_Shortcodes', 'init'));
46 
+        add_action('init', array(&$this, 'wpinv_actions'));
47 47
48 
-        if ( class_exists( 'BuddyPress' ) ) {
49 
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
48 
+        if (class_exists('BuddyPress')) {
49 
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
50 50 
         }
51 51
52 
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
52 
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
53 53
54 
-        if ( is_admin() ) {
55 
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
56 
-            add_action( 'admin_body_class', array( &$this, 'admin_body_class' ) );
54 
+        if (is_admin()) {
55 
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
56 
+            add_action('admin_body_class', array(&$this, 'admin_body_class'));
57 57 
         } else {
58 
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
58 
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
59 59 
         }
60 60
61 61 
         /**
 
@@ -65,16 +65,16 @@  discard block
 
 block discarded – undo
65 65 
          *
66 66 
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
67 67 
          */
68 
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
68 
+        do_action_ref_array('wpinv_actions', array(&$this));
69 69
70 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
70 
+        add_action('admin_init', array(&$this, 'activation_redirect'));
71 71 
     }
72 72
73 73 
     public function plugins_loaded() {
74 74 
         /* Internationalize the text strings used. */
75 75 
         $this->load_textdomain();
76 76
77 
-        do_action( 'wpinv_loaded' );
77 
+        do_action('wpinv_loaded');
78 78 
     }
79 79
80 80 
     /**
 
@@ -82,210 +82,210 @@  discard block
 
 block discarded – undo
82 82 
      *
83 83 
      * @since 1.0
84 84 
      */
85 
-    public function load_textdomain( $locale = NULL ) {
86 
-        if ( empty( $locale ) ) {
87 
-            $locale = is_admin() && function_exists( 'get_user_locale' ) ? get_user_locale() : get_locale();
85 
+    public function load_textdomain($locale = NULL) {
86 
+        if (empty($locale)) {
87 
+            $locale = is_admin() && function_exists('get_user_locale') ? get_user_locale() : get_locale();
88 88 
         }
89 89
90 
-        $locale = apply_filters( 'plugin_locale', $locale, 'invoicing' );
90 
+        $locale = apply_filters('plugin_locale', $locale, 'invoicing');
91 91
92 
-        unload_textdomain( 'invoicing' );
93 
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
94 
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
92 
+        unload_textdomain('invoicing');
93 
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
94 
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
95 95
96 96 
         /**
97 97 
          * Define language constants.
98 98 
          */
99 
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
99 
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
100 100 
     }
101 101
102 102 
     public function includes() {
103 103 
         global $wpinv_options;
104 104
105 
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
105 
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
106 106 
         $wpinv_options = wpinv_get_settings();
107 107
108 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
109 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
110 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
111 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
112 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
113 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
114 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
115 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );
116 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
117 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
118 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
119 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
120 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
121 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
122 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
123 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
124 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
125 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session.php' );
126 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
127 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
128 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
129 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php' );
130 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php' );
131 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php' );
132 
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
133 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php' );
134 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php' );
135 
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php' );
136 
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php' );
137 
-        require_once( WPINV_PLUGIN_DIR . 'includes/abstract-wpinv-privacy.php' );
138 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php' );
139 
-        require_once( WPINV_PLUGIN_DIR . 'vendor/autoload.php' );
108 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
109 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
110 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
111 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
112 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
113 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
114 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
115 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');
116 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
117 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
118 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
119 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
120 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
121 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
122 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
123 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
124 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
125 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session.php');
126 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
127 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
128 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
129 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php');
130 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-cache-helper.php');
131 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-db.php');
132 
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php');
133 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions-db.php');
134 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-subscriptions.php');
135 
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-subscription.php');
136 
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-subscriptions-list-table.php');
137 
+        require_once(WPINV_PLUGIN_DIR . 'includes/abstract-wpinv-privacy.php');
138 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-privacy.php');
139 
+        require_once(WPINV_PLUGIN_DIR . 'vendor/autoload.php');
140 140
141 
-        if ( !class_exists( 'WPInv_EUVat' ) ) {
142 
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
141 
+        if (!class_exists('WPInv_EUVat')) {
142 
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
143 143 
         }
144 144
145 
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
146 
-        if ( !empty( $gateways ) ) {
147 
-            foreach ( $gateways as $gateway ) {
148 
-                if ( $gateway == 'manual' ) {
145 
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
146 
+        if (!empty($gateways)) {
147 
+            foreach ($gateways as $gateway) {
148 
+                if ($gateway == 'manual') {
149 149 
                     continue;
150 150 
                 }
151 151
152 152 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
153 153
154 
-                if ( file_exists( $gateway_file ) ) {
155 
-                    require_once( $gateway_file );
154 
+                if (file_exists($gateway_file)) {
155 
+                    require_once($gateway_file);
156 156 
                 }
157 157 
             }
158 158 
         }
159 
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
159 
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
160 160
161 
-        if ( is_admin() || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
162 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php' );
163 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
164 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
161 
+        if (is_admin() || (defined('WP_CLI') && WP_CLI)) {
162 
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-upgrade-functions.php');
163 
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
164 
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
165 165 
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-recurring-admin.php' );
166 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
167 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );
168 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
169 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );
170 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
171 
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php' );
166 
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');
167 
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');
168 
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
169 
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');
170 
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
171 
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/class-wpinv-users.php');
172 172 
             //require_once( WPINV_PLUGIN_DIR . 'includes/admin/subscriptions.php' );
173 173 
             // load the user class only on the users.php page
174 174 
             global $pagenow;
175 
-            if($pagenow=='users.php'){
175 
+            if ($pagenow == 'users.php') {
176 176 
                 new WPInv_Admin_Users();
177 177 
             }
178 178 
         }
179 179
180 180 
         // include css inliner
181 
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
182 
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
181 
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
182 
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
183 183 
         }
184 184
185 
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
185 
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
186 186 
     }
187 187
188 188 
     public function init() {
189 189 
     }
190 190
191 191 
     public function admin_init() {
192 
-        if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
192 
+        if (!(defined('DOING_AJAX') && DOING_AJAX)) {
193 193 
         }
194 194
195 
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
195 
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
196 196 
     }
197 197
198 198 
     public function activation_redirect() {
199 199 
         // Bail if no activation redirect
200 
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
200 
+        if (!get_transient('_wpinv_activation_redirect')) {
201 201 
             return;
202 202 
         }
203 203
204 204 
         // Delete the redirect transient
205 
-        delete_transient( '_wpinv_activation_redirect' );
205 
+        delete_transient('_wpinv_activation_redirect');
206 206
207 207 
         // Bail if activating from network, or bulk
208 
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
208 
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
209 209 
             return;
210 210 
         }
211 211
212 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
212 
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
213 213 
         exit;
214 214 
     }
215 215
216 216 
     public function enqueue_scripts() {
217 
-        $suffix       = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
217 
+        $suffix = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
218 218
219 
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
220 
-        wp_enqueue_style( 'wpinv_front_style' );
219 
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION);
220 
+        wp_enqueue_style('wpinv_front_style');
221 221
222 222 
         // Register scripts
223 
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
224 
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front' . $suffix . '.js', array( 'jquery', 'wpinv-vat-script' ),  WPINV_VERSION );
223 
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
224 
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front' . $suffix . '.js', array('jquery', 'wpinv-vat-script'), WPINV_VERSION);
225 225
226 226 
         $localize                         = array();
227 
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
228 
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
227 
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
228 
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
229 229 
         $localize['currency_symbol']      = wpinv_currency_symbol();
230 230 
         $localize['currency_pos']         = wpinv_currency_position();
231 231 
         $localize['thousand_sep']         = wpinv_thousands_separator();
232 232 
         $localize['decimal_sep']          = wpinv_decimal_separator();
233 233 
         $localize['decimals']             = wpinv_decimals();
234 
-        $localize['txtComplete']          = __( 'Complete', 'invoicing' );
234 
+        $localize['txtComplete']          = __('Complete', 'invoicing');
235 235
236 
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
236 
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
237 237
238 
-        wp_enqueue_script( 'jquery-blockui' );
238 
+        wp_enqueue_script('jquery-blockui');
239 239 
         $autofill_api = wpinv_get_option('address_autofill_api');
240 240 
         $autofill_active = wpinv_get_option('address_autofill_active');
241 
-        if ( isset( $autofill_active ) && 1 == $autofill_active && !empty( $autofill_api ) && wpinv_is_checkout() ) {
242 
-            if ( wp_script_is( 'google-maps-api', 'enqueued' ) ) {
243 
-                wp_dequeue_script( 'google-maps-api' );
241 
+        if (isset($autofill_active) && 1 == $autofill_active && !empty($autofill_api) && wpinv_is_checkout()) {
242 
+            if (wp_script_is('google-maps-api', 'enqueued')) {
243 
+                wp_dequeue_script('google-maps-api');
244 244 
             }
245 
-            wp_enqueue_script( 'google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array( 'jquery' ), '', false );
246 
-            wp_enqueue_script( 'google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array( 'jquery', 'google-maps-api' ), '', true );
245 
+            wp_enqueue_script('google-maps-api', 'https://maps.googleapis.com/maps/api/js?key=' . $autofill_api . '&libraries=places', array('jquery'), '', false);
246 
+            wp_enqueue_script('google-maps-init', WPINV_PLUGIN_URL . 'assets/js/gaaf.js', array('jquery', 'google-maps-api'), '', true);
247 247 
         }
248 
-        wp_enqueue_script( 'wpinv-front-script' );
249 
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
248 
+        wp_enqueue_script('wpinv-front-script');
249 
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
250 250 
     }
251 251
252 252 
     public function admin_enqueue_scripts() {
253 253 
         global $post, $pagenow;
254 254
255 255 
         $post_type  = wpinv_admin_post_type();
256 
-        $suffix     = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
257 
-        $page       = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : '';
256 
+        $suffix     = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
257 
+        $page       = isset($_GET['page']) ? strtolower($_GET['page']) : '';
258 258
259 259 
         $jquery_ui_css = false;
260 
-        if ( ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount' ) && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
260 
+        if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $post_type == 'wpi_discount') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
261 261 
             $jquery_ui_css = true;
262 
-        } else if ( $page == 'wpinv-settings' || $page == 'wpinv-reports' ) {
262 
+        } else if ($page == 'wpinv-settings' || $page == 'wpinv-reports') {
263 263 
             $jquery_ui_css = true;
264 264 
         }
265 
-        if ( $jquery_ui_css ) {
266 
-            wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
267 
-            wp_enqueue_style( 'jquery-ui-css' );
265 
+        if ($jquery_ui_css) {
266 
+            wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
267 
+            wp_enqueue_style('jquery-ui-css');
268 268 
         }
269 269
270 
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
271 
-        wp_enqueue_style( 'wpinv_meta_box_style' );
270 
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
271 
+        wp_enqueue_style('wpinv_meta_box_style');
272 272
273 
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION );
274 
-        wp_enqueue_style( 'wpinv_admin_style' );
273 
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION);
274 
+        wp_enqueue_style('wpinv_admin_style');
275 275
276 
-        $enqueue = ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) );
277 
-        if ( $page == 'wpinv-subscriptions' ) {
278 
-            wp_enqueue_script( 'jquery-ui-datepicker' );
276 
+        $enqueue = ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php'));
277 
+        if ($page == 'wpinv-subscriptions') {
278 
+            wp_enqueue_script('jquery-ui-datepicker');
279 279 
         }
280 280
281 
-        if ( $enqueue_datepicker = apply_filters( 'wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue ) ) {
282 
-            wp_enqueue_script( 'jquery-ui-datepicker' );
281 
+        if ($enqueue_datepicker = apply_filters('wpinv_admin_enqueue_jquery_ui_datepicker', $enqueue)) {
282 
+            wp_enqueue_script('jquery-ui-datepicker');
283 283 
         }
284 284
285 
-        wp_enqueue_style( 'wp-color-picker' );
286 
-        wp_enqueue_script( 'wp-color-picker' );
285 
+        wp_enqueue_style('wp-color-picker');
286 
+        wp_enqueue_script('wp-color-picker');
287 287
288 
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
288 
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
289 289
290 290 
         if (($post_type == 'wpi_invoice' || $post_type == 'wpi_quote') && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
291 291 
             $autofill_api = wpinv_get_option('address_autofill_api');
 
@@ -296,17 +296,17 @@  discard block
 
 block discarded – undo
296 296 
             }
297 297 
         }
298 298
299 
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array( 'jquery', 'jquery-blockui','jquery-ui-tooltip' ),  WPINV_VERSION );
300 
-        wp_enqueue_script( 'wpinv-admin-script' );
299 
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array('jquery', 'jquery-blockui', 'jquery-ui-tooltip'), WPINV_VERSION);
300 
+        wp_enqueue_script('wpinv-admin-script');
301 301
302 302 
         $localize                               = array();
303 
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
304 
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
305 
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
306 
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
307 
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
308 
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
309 
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
303 
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
304 
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
305 
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
306 
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
307 
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
308 
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
309 
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
310 310 
         $localize['tax']                        = wpinv_tax_amount();
311 311 
         $localize['discount']                   = wpinv_discount_amount();
312 312 
         $localize['currency_symbol']            = wpinv_currency_symbol();
 
@@ -314,69 +314,69 @@  discard block
 
 block discarded – undo
314 314 
         $localize['thousand_sep']               = wpinv_thousands_separator();
315 315 
         $localize['decimal_sep']                = wpinv_decimal_separator();
316 316 
         $localize['decimals']                   = wpinv_decimals();
317 
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
318 
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
319 
-        $localize['status_pending']             = wpinv_status_nicename( 'wpi-pending' );
320 
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
321 
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
322 
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
323 
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
324 
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
325 
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
326 
-        $localize['emptyInvoice']               = __( 'Add at least one item to save invoice!', 'invoicing' );
327 
-        $localize['errDeleteItem']              = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
328 
-        $localize['delete_subscription']        = __( 'Are you sure you want to delete this subscription?', 'invoicing' );
329 
-        $localize['action_edit']                = __( 'Edit', 'invoicing' );
330 
-        $localize['action_cancel']              = __( 'Cancel', 'invoicing' );
317 
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
318 
+        $localize['status_publish']             = wpinv_status_nicename('publish');
319 
+        $localize['status_pending']             = wpinv_status_nicename('wpi-pending');
320 
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
321 
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
322 
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
323 
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
324 
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
325 
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
326 
+        $localize['emptyInvoice']               = __('Add at least one item to save invoice!', 'invoicing');
327 
+        $localize['errDeleteItem']              = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
328 
+        $localize['delete_subscription']        = __('Are you sure you want to delete this subscription?', 'invoicing');
329 
+        $localize['action_edit']                = __('Edit', 'invoicing');
330 
+        $localize['action_cancel']              = __('Cancel', 'invoicing');
331 331
332 
-        $localize = apply_filters( 'wpinv_admin_js_localize', $localize );
332 
+        $localize = apply_filters('wpinv_admin_js_localize', $localize);
333 333
334 
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
334 
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
335 335
336 
-        if ( $page == 'wpinv-subscriptions' ) {
337 
-            wp_register_script( 'wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions' . $suffix . '.js', array( 'wpinv-admin-script' ),  WPINV_VERSION );
338 
-            wp_enqueue_script( 'wpinv-sub-admin-script' );
336 
+        if ($page == 'wpinv-subscriptions') {
337 
+            wp_register_script('wpinv-sub-admin-script', WPINV_PLUGIN_URL . 'assets/js/subscriptions' . $suffix . '.js', array('wpinv-admin-script'), WPINV_VERSION);
338 
+            wp_enqueue_script('wpinv-sub-admin-script');
339 339 
         }
340 340 
     }
341 341
342 
-    public function admin_body_class( $classes ) {
342 
+    public function admin_body_class($classes) {
343 343 
         global $pagenow, $post, $current_screen;
344 344
345 
-        if ( !empty( $current_screen->post_type ) && ( $current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote' ) ) {
345 
+        if (!empty($current_screen->post_type) && ($current_screen->post_type == 'wpi_invoice' || $current_screen->post_type == 'wpi_quote')) {
346 346 
             $classes .= ' wpinv-cpt';
347 347 
         }
348 348
349 
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
349 
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
350 350
351 
-        $add_class = $page && $pagenow == 'admin.php' && strpos( $page, 'wpinv-' ) === 0 ? true : false;
352 
-        if ( $add_class ) {
353 
-            $classes .= ' wpi-' . wpinv_sanitize_key( $page );
351 
+        $add_class = $page && $pagenow == 'admin.php' && strpos($page, 'wpinv-') === 0 ? true : false;
352 
+        if ($add_class) {
353 
+            $classes .= ' wpi-' . wpinv_sanitize_key($page);
354 354 
         }
355 355
356 356 
         $settings_class = array();
357 
-        if ( $page == 'wpinv-settings' ) {
358 
-            if ( !empty( $_REQUEST['tab'] ) ) {
359 
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
357 
+        if ($page == 'wpinv-settings') {
358 
+            if (!empty($_REQUEST['tab'])) {
359 
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
360 360 
             }
361 361
362 
-            if ( !empty( $_REQUEST['section'] ) ) {
363 
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
362 
+            if (!empty($_REQUEST['section'])) {
363 
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
364 364 
             }
365 365
366 
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
366 
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
367 367 
         }
368 368
369 
-        if ( !empty( $settings_class ) ) {
370 
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
369 
+        if (!empty($settings_class)) {
370 
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
371 371 
         }
372 372
373 373 
         $post_type = wpinv_admin_post_type();
374 374
375 
-        if ( $post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false ) {
375 
+        if ($post_type == 'wpi_invoice' || $post_type == 'wpi_quote' || $add_class !== false) {
376 376 
             return $classes .= ' wpinv';
377 377 
         }
378 378
379 
-        if ( $pagenow == 'post.php' && $post_type == 'wpi_item' && !empty( $post ) && !wpinv_item_is_editable( $post ) ) {
379 
+        if ($pagenow == 'post.php' && $post_type == 'wpi_item' && !empty($post) && !wpinv_item_is_editable($post)) {
380 380 
             $classes .= ' wpi-editable-n';
381 381 
         }
382 382 
 
@@ -388,20 +388,20 @@  discard block
 
 block discarded – undo
388 388 
     }
389 389
390 390 
     public function wpinv_actions() {
391 
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
392 
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
391 
+        if (isset($_REQUEST['wpi_action'])) {
392 
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
393 393 
         }
394 394 
     }
395 395
396 
-    public function pre_get_posts( $wp_query ) {
397 
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
398 
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
396 
+    public function pre_get_posts($wp_query) {
397 
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
398 
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
399 399 
         }
400 400
401 401 
         return $wp_query;
402 402 
     }
403 403
404 404 
     public function bp_invoicing_init() {
405 
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
405 
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
406 406 
     }
407 407 
 }
408 408 
\ No newline at end of file
Please login to merge, or discard this patch.
vendor/ayecode/wp-super-duper/wp-super-duper.php 4 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -196,7 +196,7 @@  discard block
 
 block discarded – undo
196 196 
 				<?php
197 197 
 				if(! empty( $insert_shortcode_function )){
198 198 
 					echo $insert_shortcode_function;
199 
-				}else{
199 
+				} else{
200 200
201 201 
 				/**
202 202 
 				 * Function for super duper insert shortcode.
 
@@ -1068,7 +1068,7 @@  discard block
 
 block discarded – undo
1068 1068 
 								// If the user sets block-output array then build it
1069 1069 
 								if ( ! empty( $this->options['block-output'] ) ) {
1070 1070 
 								$this->block_element( $this->options['block-output'] );
1071 
-							}else{
1071 
+							} else{
1072 1072 
 								// if no block-output is set then we try and get the shortcode html output via ajax.
1073 1073 
 								?>
1074 1074 
 								el('div', {
Please login to merge, or discard this patch.
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -186,7 +186,7 @@  discard block
 
 block discarded – undo
186 186 
 		 * Makes SD work with the siteOrigin page builder.
187 187 
 		 *
188 188 
 		 * @since 1.0.6
189 
-		 * @return mixed
189 
+		 * @return string
190 190 
 		 */
191 191 
 		public static function siteorigin_js() {
192 192 
 			ob_start();
 
@@ -1075,7 +1075,7 @@  discard block
 
 block discarded – undo
1075 1075 
 		 * Output the JS for building the dynamic Guntenberg block.
1076 1076 
 		 *
1077 1077 
 		 * @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.
1078 
-		 * @return mixed
1078 
+		 * @return string
1079 1079 
 		 */
1080 1080 
 		public function block() {
1081 1081 
 			ob_start();
Please login to merge, or discard this patch.
Indentation   +1214 added lines, -1214 removed lines patch added patch discarded remove patch 
@@ -1,155 +1,155 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 if ( ! defined( 'ABSPATH' ) ) {
3 
-	exit;
3 
+    exit;
4 4 
 }
5 5
6 6 
 if ( ! class_exists( 'WP_Super_Duper' ) ) {
7 7
8 8
9 
-	/**
10 
-	 * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
11 
-	 *
12 
-	 * Should not be called direct but extended instead.
13 
-	 *
14 
-	 * Class WP_Super_Duper
15 
-	 * @since 1.0.3 is_block_content_call() method added.
16 
-	 * @since 1.0.3 Placeholder text will be shown for widget that return no block content.
17 
-	 * @since 1.0.4 is_elementor_widget_output() method added.
18 
-	 * @since 1.0.4 is_elementor_preview() method added.
19 
-	 * @since 1.0.5 Block checkbox options are set as true by default even when set as false - FIXED
20 
-	 * @since 1.0.6 Some refactoring for page builders - CHANGED
21 
-	 * @ver 1.0.6
22 
-	 */
23 
-	class WP_Super_Duper extends WP_Widget {
24 
-
25 
-		public $version = "1.0.6";
26 
-		public $block_code;
27 
-		public $options;
28 
-		public $base_id;
29 
-		public $arguments = array();
30 
-		public $instance = array();
31 
-		private $class_name;
32 
-
33 
-		/**
34 
-		 * Take the array options and use them to build.
35 
-		 */
36 
-		public function __construct( $options ) {
37 
-			global $sd_widgets;
38 
-
39 
-			$sd_widgets[ $options['base_id'] ] = array(
40 
-				'name'       => $options['name'],
41 
-				'class_name' => $options['class_name']
42 
-			);
43 
-			$this->base_id                     = $options['base_id'];
44 
-			// lets filter the options before we do anything
45 
-			$options       = apply_filters( "wp_super_duper_options", $options );
46 
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
47 
-			$options       = $this->add_name_from_key( $options );
48 
-			$this->options = $options;
49 
-
50 
-			$this->base_id   = $options['base_id'];
51 
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
52 
-
53 
-			// init parent
54 
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
55 
-
56 
-			if ( isset( $options['class_name'] ) ) {
57 
-				// register widget
58 
-				$this->class_name = $options['class_name'];
59 
-
60 
-				// register shortcode
61 
-				$this->register_shortcode();
62 
-
63 
-				// register block
64 
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
65 
-			}
66 
-
67 
-			// add the CSS and JS we need ONCE
68 
-			global $sd_widget_scripts;
69 
-
70 
-			if ( ! $sd_widget_scripts ) {
71 
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
72 
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
73 
-				wp_add_inline_style( 'widgets', $this->widget_css() );
74 
-
75 
-				$sd_widget_scripts = true;
76 
-
77 
-				// add shortcode insert button once
78 
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
79 
-				if ( $this->is_preview() ) {
80 
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
81 
-				}
82 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
83 
-			}
84 
-
85 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
86 
-		}
87 
-
88 
-		/**
89 
-		 * Get widget settings.
90 
-		 *
91 
-		 * @since 1.0.0
92 
-		 */
93 
-		public static function get_widget_settings() {
94 
-			global $sd_widgets;
95 
-
96 
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
97 
-			if ( ! $shortcode ) {
98 
-				wp_die();
99 
-			}
100 
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
101 
-			if ( ! $widget_args ) {
102 
-				wp_die();
103 
-			}
104 
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
105 
-			if ( ! $class_name ) {
106 
-				wp_die();
107 
-			}
108 
-
109 
-			// invoke an instance method
110 
-			$widget = new $class_name;
111 
-
112 
-			ob_start();
113 
-			$widget->form( array() );
114 
-			$form = ob_get_clean();
115 
-			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
116 
-			echo "<style>" . $widget->widget_css() . "</style>";
117 
-			echo "<script>" . $widget->widget_js() . "</script>";
118 
-			?>
9 
+    /**
10 
+     * A Class to be able to create a Widget, Shortcode or Block to be able to output content for WordPress.
11 
+     *
12 
+     * Should not be called direct but extended instead.
13 
+     *
14 
+     * Class WP_Super_Duper
15 
+     * @since 1.0.3 is_block_content_call() method added.
16 
+     * @since 1.0.3 Placeholder text will be shown for widget that return no block content.
17 
+     * @since 1.0.4 is_elementor_widget_output() method added.
18 
+     * @since 1.0.4 is_elementor_preview() method added.
19 
+     * @since 1.0.5 Block checkbox options are set as true by default even when set as false - FIXED
20 
+     * @since 1.0.6 Some refactoring for page builders - CHANGED
21 
+     * @ver 1.0.6
22 
+     */
23 
+    class WP_Super_Duper extends WP_Widget {
24 
+
25 
+        public $version = "1.0.6";
26 
+        public $block_code;
27 
+        public $options;
28 
+        public $base_id;
29 
+        public $arguments = array();
30 
+        public $instance = array();
31 
+        private $class_name;
32 
+
33 
+        /**
34 
+         * Take the array options and use them to build.
35 
+         */
36 
+        public function __construct( $options ) {
37 
+            global $sd_widgets;
38 
+
39 
+            $sd_widgets[ $options['base_id'] ] = array(
40 
+                'name'       => $options['name'],
41 
+                'class_name' => $options['class_name']
42 
+            );
43 
+            $this->base_id                     = $options['base_id'];
44 
+            // lets filter the options before we do anything
45 
+            $options       = apply_filters( "wp_super_duper_options", $options );
46 
+            $options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
47 
+            $options       = $this->add_name_from_key( $options );
48 
+            $this->options = $options;
49 
+
50 
+            $this->base_id   = $options['base_id'];
51 
+            $this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
52 
+
53 
+            // init parent
54 
+            parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
55 
+
56 
+            if ( isset( $options['class_name'] ) ) {
57 
+                // register widget
58 
+                $this->class_name = $options['class_name'];
59 
+
60 
+                // register shortcode
61 
+                $this->register_shortcode();
62 
+
63 
+                // register block
64 
+                add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
65 
+            }
66 
+
67 
+            // add the CSS and JS we need ONCE
68 
+            global $sd_widget_scripts;
69 
+
70 
+            if ( ! $sd_widget_scripts ) {
71 
+                wp_add_inline_script( 'admin-widgets', $this->widget_js() );
72 
+                wp_add_inline_script( 'customize-controls', $this->widget_js() );
73 
+                wp_add_inline_style( 'widgets', $this->widget_css() );
74 
+
75 
+                $sd_widget_scripts = true;
76 
+
77 
+                // add shortcode insert button once
78 
+                add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
79 
+                if ( $this->is_preview() ) {
80 
+                    add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
81 
+                }
82 
+                add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
83 
+            }
84 
+
85 
+            do_action( 'wp_super_duper_widget_init', $options, $this );
86 
+        }
87 
+
88 
+        /**
89 
+         * Get widget settings.
90 
+         *
91 
+         * @since 1.0.0
92 
+         */
93 
+        public static function get_widget_settings() {
94 
+            global $sd_widgets;
95 
+
96 
+            $shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
97 
+            if ( ! $shortcode ) {
98 
+                wp_die();
99 
+            }
100 
+            $widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
101 
+            if ( ! $widget_args ) {
102 
+                wp_die();
103 
+            }
104 
+            $class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
105 
+            if ( ! $class_name ) {
106 
+                wp_die();
107 
+            }
108 
+
109 
+            // invoke an instance method
110 
+            $widget = new $class_name;
111 
+
112 
+            ob_start();
113 
+            $widget->form( array() );
114 
+            $form = ob_get_clean();
115 
+            echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
116 
+            echo "<style>" . $widget->widget_css() . "</style>";
117 
+            echo "<script>" . $widget->widget_js() . "</script>";
118 
+            ?>
119 119 
 			<?php
120 
-			wp_die();
121 
-		}
122 
-
123 
-		/**
124 
-		 * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
125 
-		 *
126 
-		 * @since 1.0.0
127 
-		 *
128 
-		 * @param string $editor_id Optional. Shortcode editor id. Default null.
129 
-		 * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
130 
-		 */
131 
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
132 
-			global $sd_widgets, $shortcode_insert_button_once;
133 
-			if ( $shortcode_insert_button_once ) {
134 
-				return;
135 
-			}
136 
-			add_thickbox();
137 
-			?>
120 
+            wp_die();
121 
+        }
122 
+
123 
+        /**
124 
+         * Insert shortcode builder button to classic editor (not inside Gutenberg, not needed).
125 
+         *
126 
+         * @since 1.0.0
127 
+         *
128 
+         * @param string $editor_id Optional. Shortcode editor id. Default null.
129 
+         * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
130 
+         */
131 
+        public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
132 
+            global $sd_widgets, $shortcode_insert_button_once;
133 
+            if ( $shortcode_insert_button_once ) {
134 
+                return;
135 
+            }
136 
+            add_thickbox();
137 
+            ?>
138 138 
 			<div id="super-duper-content" style="display:none;">
139 139
140 140 
 				<div class="sd-shortcode-left-wrap">
141 141 
 					<?php
142 
-					asort( $sd_widgets );
143 
-					if ( ! empty( $sd_widgets ) ) {
144 
-						echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
145 
-						echo "<option>" . __( 'Select shortcode' ) . "</option>";
146 
-						foreach ( $sd_widgets as $shortcode => $class ) {
147 
-							echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
148 
-						}
149 
-						echo "</select>";
150 
-
151 
-					}
152 
-					?>
142 
+                    asort( $sd_widgets );
143 
+                    if ( ! empty( $sd_widgets ) ) {
144 
+                        echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
145 
+                        echo "<option>" . __( 'Select shortcode' ) . "</option>";
146 
+                        foreach ( $sd_widgets as $shortcode => $class ) {
147 
+                            echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
148 
+                        }
149 
+                        echo "</select>";
150 
+
151 
+                    }
152 
+                    ?>
153 153 
 					<div class="sd-shortcode-settings"></div>
154 154
155 155 
 				</div>
 
@@ -159,8 +159,8 @@  discard block
 
 block discarded – undo
159 159 
 					<div id='sd-shortcode-output-actions'>
160 160 
 						<button class="button"
161 161 
 						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
162 
-							        echo "'" . $editor_id . "'";
163 
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
162 
+                                    echo "'" . $editor_id . "'";
163 
+                                } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
164 164 
 						<button class="button"
165 165 
 						        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
166 166 
 					</div>
 
@@ -169,28 +169,28 @@  discard block
 
 block discarded – undo
169 169 
 			</div>
170 170
171 171 
 			<?php
172 
-			// if Font Awesome is available then show a icon if not show a WP icon.
173 
-			$button_string = wp_style_is( 'font-awesome', 'enqueued' ) && 1 == 2 ? '<i class="fas fa-cubes" aria-hidden="true"></i>' : '<span style="vertical-align: middle;line-height: 18px;font-size: 20px;" class="dashicons dashicons-screenoptions"></span>';
174 
-			?>
172 
+            // if Font Awesome is available then show a icon if not show a WP icon.
173 
+            $button_string = wp_style_is( 'font-awesome', 'enqueued' ) && 1 == 2 ? '<i class="fas fa-cubes" aria-hidden="true"></i>' : '<span style="vertical-align: middle;line-height: 18px;font-size: 20px;" class="dashicons dashicons-screenoptions"></span>';
174 
+            ?>
175 175
176 176 
 			<a href="#TB_inline?width=100%&height=550&inlineId=super-duper-content"
177 177 
 			   class="thickbox button super-duper-content-open"
178 178 
 			   title="<?php _e( 'Add Shortcode' ); ?>"><?php echo $button_string; ?></a>
179 179
180 180 
 			<?php
181 
-			self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
182 
-			$shortcode_insert_button_once = true;
183 
-		}
184 
-
185 
-		/**
186 
-		 * Makes SD work with the siteOrigin page builder.
187 
-		 *
188 
-		 * @since 1.0.6
189 
-		 * @return mixed
190 
-		 */
191 
-		public static function siteorigin_js() {
192 
-			ob_start();
193 
-			?>
181 
+            self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
182 
+            $shortcode_insert_button_once = true;
183 
+        }
184 
+
185 
+        /**
186 
+         * Makes SD work with the siteOrigin page builder.
187 
+         *
188 
+         * @since 1.0.6
189 
+         * @return mixed
190 
+         */
191 
+        public static function siteorigin_js() {
192 
+            ob_start();
193 
+            ?>
194 194 
 			<script>
195 195 
 				/**
196 196 
 				 * Check a form to see what items shoudl be shown or hidden.
 
@@ -268,28 +268,28 @@  discard block
 
 block discarded – undo
268 268 
 				});
269 269 
 			</script>
270 270 
 			<?php
271 
-			$output = ob_get_clean();
271 
+            $output = ob_get_clean();
272 272
273 
-			/*
273 
+            /*
274 274 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
275 275 
 			 */
276 276
277 
-			return str_replace( array(
278 
-				'<script>',
279 
-				'</script>'
280 
-			), '', $output );
281 
-		}
282 
-
283 
-		/**
284 
-		 * Output the JS and CSS for the shortcode insert button.
285 
-		 *
286 
-		 * @since 1.0.6
287 
-		 *
288 
-		 * @param string $editor_id
289 
-		 * @param string $insert_shortcode_function
290 
-		 */
291 
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
292 
-			?>
277 
+            return str_replace( array(
278 
+                '<script>',
279 
+                '</script>'
280 
+            ), '', $output );
281 
+        }
282 
+
283 
+        /**
284 
+         * Output the JS and CSS for the shortcode insert button.
285 
+         *
286 
+         * @since 1.0.6
287 
+         *
288 
+         * @param string $editor_id
289 
+         * @param string $insert_shortcode_function
290 
+         */
291 
+        public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
292 
+            ?>
293 293 
 			<style>
294 294 
 				.sd-shortcode-left-wrap {
295 295 
 					float: left;
 
@@ -408,32 +408,32 @@  discard block
 
 block discarded – undo
408 408 
 				}
409 409 
 			</style>
410 410 
 			<?php
411 
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
412 
-				echo "<script>" . self::siteorigin_js() . "</script>";
413 
-			}
414 
-			?>
411 
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
412 
+                echo "<script>" . self::siteorigin_js() . "</script>";
413 
+            }
414 
+            ?>
415 415 
 			<script>
416 416 
 				<?php
417 
-				if(! empty( $insert_shortcode_function )){
418 
-					echo $insert_shortcode_function;
419 
-				}else{
420 
-
421 
-				/**
422 
-				 * Function for super duper insert shortcode.
423 
-				 *
424 
-				 * @since 1.0.0
425 
-				 */
426 
-				?>
417 
+                if(! empty( $insert_shortcode_function )){
418 
+                    echo $insert_shortcode_function;
419 
+                }else{
420 
+
421 
+                /**
422 
+                 * Function for super duper insert shortcode.
423 
+                 *
424 
+                 * @since 1.0.0
425 
+                 */
426 
+                ?>
427 427 
 				function sd_insert_shortcode($editor_id) {
428 428 
 					$shortcode = jQuery('#sd-shortcode-output').val();
429 429 
 					if ($shortcode) {
430 430
431 431 
 						if (!$editor_id) {
432 432 
 							$editor_id = "<?php if ( isset( $_REQUEST['et_fb'] ) ) {
433 
-								echo "#main_content_content_vb_tiny_mce";
434 
-							} else {
435 
-								echo "#wp-content-editor-container textarea";
436 
-							} ?>";
433 
+                                echo "#main_content_content_vb_tiny_mce";
434 
+                            } else {
435 
+                                echo "#wp-content-editor-container textarea";
436 
+                            } ?>";
437 437 
 						}
438 438
439 439 
 						if (tinyMCE && tinyMCE.activeEditor && jQuery($editor_id).attr("aria-hidden") == "true") {
 
@@ -591,11 +591,11 @@  discard block
 
 block discarded – undo
591 591 
 			</script>
592 592
593 593 
 			<?php
594 
-		}
594 
+        }
595 595
596 
-		public function widget_css() {
597 
-			ob_start();
598 
-			?>
596 
+        public function widget_css() {
597 
+            ob_start();
598 
+            ?>
599 599 
 			<style>
600 600 
 				.sd-advanced-setting {
601 601 
 					display: none;
 
@@ -616,21 +616,21 @@  discard block
 
 block discarded – undo
616 616 
 				}
617 617 
 			</style>
618 618 
 			<?php
619 
-			$output = ob_get_clean();
619 
+            $output = ob_get_clean();
620 620
621 
-			/*
621 
+            /*
622 622 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
623 623 
 			 */
624 624
625 
-			return str_replace( array(
626 
-				'<style>',
627 
-				'</style>'
628 
-			), '', $output );
629 
-		}
625 
+            return str_replace( array(
626 
+                '<style>',
627 
+                '</style>'
628 
+            ), '', $output );
629 
+        }
630 630
631 
-		public function widget_js() {
632 
-			ob_start();
633 
-			?>
631 
+        public function widget_js() {
632 
+            ob_start();
633 
+            ?>
634 634 
 			<script>
635 635
636 636 
 				/**
 
@@ -785,301 +785,301 @@  discard block
 
 block discarded – undo
785 785 
 				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
786 786 
 			</script>
787 787 
 			<?php
788 
-			$output = ob_get_clean();
788 
+            $output = ob_get_clean();
789 789
790 
-			/*
790 
+            /*
791 791 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
792 792 
 			 */
793 793
794 
-			return str_replace( array(
795 
-				'<script>',
796 
-				'</script>'
797 
-			), '', $output );
798 
-		}
799 
-
800 
-
801 
-		/**
802 
-		 * Set the name from the argument key.
803 
-		 *
804 
-		 * @param $options
805 
-		 *
806 
-		 * @return mixed
807 
-		 */
808 
-		private function add_name_from_key( $options, $arguments = false ) {
809 
-			if ( ! empty( $options['arguments'] ) ) {
810 
-				foreach ( $options['arguments'] as $key => $val ) {
811 
-					$options['arguments'][ $key ]['name'] = $key;
812 
-				}
813 
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
814 
-				foreach ( $options as $key => $val ) {
815 
-					$options[ $key ]['name'] = $key;
816 
-				}
817 
-			}
818 
-
819 
-			return $options;
820 
-		}
821 
-
822 
-		/**
823 
-		 * Register the parent shortcode.
824 
-		 *
825 
-		 * @since 1.0.0
826 
-		 */
827 
-		public function register_shortcode() {
828 
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
829 
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
830 
-		}
831 
-
832 
-		/**
833 
-		 * Render the shortcode via ajax so we can return it to Gutenberg.
834 
-		 *
835 
-		 * @since 1.0.0
836 
-		 */
837 
-		public static function render_shortcode() {
838 
-
839 
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
840 
-			if ( ! current_user_can( 'manage_options' ) ) {
841 
-				wp_die();
842 
-			}
843 
-
844 
-			// we might need the $post value here so lets set it.
845 
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
846 
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
847 
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
848 
-					global $post;
849 
-					$post = $post_obj;
850 
-				}
851 
-			}
852 
-
853 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
854 
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
855 
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
856 
-				$attributes       = '';
857 
-				if ( ! empty( $attributes_array ) ) {
858 
-					foreach ( $attributes_array as $key => $value ) {
859 
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
860 
-					}
861 
-				}
862 
-
863 
-				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
864 
-
865 
-				echo do_shortcode( $shortcode );
866 
-
867 
-			}
868 
-			wp_die();
869 
-		}
870 
-
871 
-		/**
872 
-		 * Output the shortcode.
873 
-		 *
874 
-		 * @param array $args
875 
-		 * @param string $content
876 
-		 *
877 
-		 * @return string
878 
-		 */
879 
-		public function shortcode_output( $args = array(), $content = '' ) {
880 
-			$args = self::argument_values( $args );
881 
-
882 
-			// add extra argument so we know its a output to gutenberg
883 
-			//$args
884 
-			$args = $this->string_to_bool( $args );
885 
-
886 
-
887 
-			$calss = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
888 
-
889 
-			$calss = apply_filters( 'wp_super_duper_div_classname', $calss, $args, $this );
890 
-			$calss = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $calss, $args, $this );
891 
-
892 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
893 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
894 
-
895 
-			$shortcode_args = array();
896 
-			$output         = '';
897 
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
898 
-			$main_content   = $this->output( $args, $shortcode_args, $content );
899 
-			if ( $main_content && ! $no_wrap ) {
900 
-				// wrap the shortcode in a dive with the same class as the widget
901 
-				$output .= '<div class="' . $calss . '" ' . $attrs . '>';
902 
-				if ( ! empty( $args['title'] ) ) {
903 
-					// if its a shortcode and there is a title try to grab the title wrappers
904 
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
905 
-					if ( empty( $instance ) ) {
906 
-						global $wp_registered_sidebars;
907 
-						if ( ! empty( $wp_registered_sidebars ) ) {
908 
-							foreach ( $wp_registered_sidebars as $sidebar ) {
909 
-								if ( ! empty( $sidebar['before_title'] ) ) {
910 
-									$shortcode_args['before_title'] = $sidebar['before_title'];
911 
-									$shortcode_args['after_title']  = $sidebar['after_title'];
912 
-									break;
913 
-								}
914 
-							}
915 
-						}
916 
-					}
917 
-					$output .= $this->output_title( $shortcode_args, $args );
918 
-				}
919 
-				$output .= $main_content;
920 
-				$output .= '</div>';
921 
-			} elseif ( $main_content && $no_wrap ) {
922 
-				$output .= $main_content;
923 
-			}
924 
-
925 
-			// if preview show a placeholder if empty
926 
-			if ( $this->is_preview() && $output == '' ) {
927 
-				$output = $this->preview_placeholder_text( "[{" . $this->base_id . "}]" );
928 
-			}
929 
-
930 
-			return $output;
931 
-		}
932 
-
933 
-		/**
934 
-		 * Placeholder text to show if output is empty and we are on a preview/builder page.
935 
-		 *
936 
-		 * @param string $name
937 
-		 *
938 
-		 * @return string
939 
-		 */
940 
-		public function preview_placeholder_text( $name = '' ) {
941 
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
942 
-		}
943 
-
944 
-		/**
945 
-		 * Sometimes booleans values can be turned to strings, so we fix that.
946 
-		 *
947 
-		 * @param $options
948 
-		 *
949 
-		 * @return mixed
950 
-		 */
951 
-		public function string_to_bool( $options ) {
952 
-			// convert bool strings to booleans
953 
-			foreach ( $options as $key => $val ) {
954 
-				if ( $val == 'false' ) {
955 
-					$options[ $key ] = false;
956 
-				} elseif ( $val == 'true' ) {
957 
-					$options[ $key ] = true;
958 
-				}
959 
-			}
960 
-
961 
-			return $options;
962 
-		}
963 
-
964 
-		/**
965 
-		 * Get the argument values that are also filterable.
966 
-		 *
967 
-		 * @param $instance
968 
-		 *
969 
-		 * @return array
970 
-		 */
971 
-		public function argument_values( $instance ) {
972 
-			$argument_values = array();
973 
-
974 
-			// set widget instance
975 
-			$this->instance = $instance;
976 
-
977 
-			if ( empty( $this->arguments ) ) {
978 
-				$this->arguments = $this->get_arguments();
979 
-			}
980 
-
981 
-			if ( ! empty( $this->arguments ) ) {
982 
-				foreach ( $this->arguments as $key => $args ) {
983 
-					// set the input name from the key
984 
-					$args['name'] = $key;
985 
-					//
986 
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
987 
-					if ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
988 
-						$argument_values[ $key ] = $args['default'];
989 
-					}
990 
-				}
991 
-			}
992 
-
993 
-			return $argument_values;
994 
-		}
995 
-
996 
-		/**
997 
-		 * Set arguments in super duper.
998 
-		 *
999 
-		 * @since 1.0.0
1000 
-		 *
1001 
-		 * @return array Set arguments.
1002 
-		 */
1003 
-		public function set_arguments() {
1004 
-			return $this->arguments;
1005 
-		}
1006 
-
1007 
-		/**
1008 
-		 * Get arguments in super duper.
1009 
-		 *
1010 
-		 * @since 1.0.0
1011 
-		 *
1012 
-		 * @return array Get arguments.
1013 
-		 */
1014 
-		public function get_arguments() {
1015 
-			if ( empty( $this->arguments ) ) {
1016 
-				$this->arguments = $this->set_arguments();
1017 
-			}
1018 
-
1019 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
1020 
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
1021 
-
1022 
-			return $this->arguments;
1023 
-		}
1024 
-
1025 
-		/**
1026 
-		 * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
1027 
-		 *
1028 
-		 * @param array $args
1029 
-		 * @param array $widget_args
1030 
-		 * @param string $content
1031 
-		 */
1032 
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
1033 
-
1034 
-		}
1035 
-
1036 
-		/**
1037 
-		 * Add the dynamic block code inline when the wp-block in enqueued.
1038 
-		 */
1039 
-		public function register_block() {
1040 
-			wp_add_inline_script( 'wp-blocks', $this->block() );
1041 
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
1042 
-
1043 
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
1044 
-
1045 
-			}
1046 
-		}
1047 
-
1048 
-		/**
1049 
-		 * Check if we need to show advanced options.
1050 
-		 *
1051 
-		 * @return bool
1052 
-		 */
1053 
-		public function block_show_advanced() {
1054 
-
1055 
-			$show      = false;
1056 
-			$arguments = $this->arguments;
1057 
-
1058 
-			if ( empty( $arguments ) ) {
1059 
-				$arguments = $this->get_arguments();
1060 
-			}
1061 
-
1062 
-			if ( ! empty( $arguments ) ) {
1063 
-				foreach ( $arguments as $argument ) {
1064 
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
1065 
-						$show = true;
1066 
-					}
1067 
-				}
1068 
-			}
1069 
-
1070 
-			return $show;
1071 
-		}
1072 
-
1073 
-
1074 
-		/**
1075 
-		 * Output the JS for building the dynamic Guntenberg block.
1076 
-		 *
1077 
-		 * @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.
1078 
-		 * @return mixed
1079 
-		 */
1080 
-		public function block() {
1081 
-			ob_start();
1082 
-			?>
794 
+            return str_replace( array(
795 
+                '<script>',
796 
+                '</script>'
797 
+            ), '', $output );
798 
+        }
799 
+
800 
+
801 
+        /**
802 
+         * Set the name from the argument key.
803 
+         *
804 
+         * @param $options
805 
+         *
806 
+         * @return mixed
807 
+         */
808 
+        private function add_name_from_key( $options, $arguments = false ) {
809 
+            if ( ! empty( $options['arguments'] ) ) {
810 
+                foreach ( $options['arguments'] as $key => $val ) {
811 
+                    $options['arguments'][ $key ]['name'] = $key;
812 
+                }
813 
+            } elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
814 
+                foreach ( $options as $key => $val ) {
815 
+                    $options[ $key ]['name'] = $key;
816 
+                }
817 
+            }
818 
+
819 
+            return $options;
820 
+        }
821 
+
822 
+        /**
823 
+         * Register the parent shortcode.
824 
+         *
825 
+         * @since 1.0.0
826 
+         */
827 
+        public function register_shortcode() {
828 
+            add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
829 
+            add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
830 
+        }
831 
+
832 
+        /**
833 
+         * Render the shortcode via ajax so we can return it to Gutenberg.
834 
+         *
835 
+         * @since 1.0.0
836 
+         */
837 
+        public static function render_shortcode() {
838 
+
839 
+            check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
840 
+            if ( ! current_user_can( 'manage_options' ) ) {
841 
+                wp_die();
842 
+            }
843 
+
844 
+            // we might need the $post value here so lets set it.
845 
+            if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
846 
+                $post_obj = get_post( absint( $_POST['post_id'] ) );
847 
+                if ( ! empty( $post_obj ) && empty( $post ) ) {
848 
+                    global $post;
849 
+                    $post = $post_obj;
850 
+                }
851 
+            }
852 
+
853 
+            if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
854 
+                $shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
855 
+                $attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
856 
+                $attributes       = '';
857 
+                if ( ! empty( $attributes_array ) ) {
858 
+                    foreach ( $attributes_array as $key => $value ) {
859 
+                        $attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
860 
+                    }
861 
+                }
862 
+
863 
+                $shortcode = "[" . $shortcode_name . " " . $attributes . "]";
864 
+
865 
+                echo do_shortcode( $shortcode );
866 
+
867 
+            }
868 
+            wp_die();
869 
+        }
870 
+
871 
+        /**
872 
+         * Output the shortcode.
873 
+         *
874 
+         * @param array $args
875 
+         * @param string $content
876 
+         *
877 
+         * @return string
878 
+         */
879 
+        public function shortcode_output( $args = array(), $content = '' ) {
880 
+            $args = self::argument_values( $args );
881 
+
882 
+            // add extra argument so we know its a output to gutenberg
883 
+            //$args
884 
+            $args = $this->string_to_bool( $args );
885 
+
886 
+
887 
+            $calss = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
888 
+
889 
+            $calss = apply_filters( 'wp_super_duper_div_classname', $calss, $args, $this );
890 
+            $calss = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $calss, $args, $this );
891 
+
892 
+            $attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
893 
+            $attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
894 
+
895 
+            $shortcode_args = array();
896 
+            $output         = '';
897 
+            $no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
898 
+            $main_content   = $this->output( $args, $shortcode_args, $content );
899 
+            if ( $main_content && ! $no_wrap ) {
900 
+                // wrap the shortcode in a dive with the same class as the widget
901 
+                $output .= '<div class="' . $calss . '" ' . $attrs . '>';
902 
+                if ( ! empty( $args['title'] ) ) {
903 
+                    // if its a shortcode and there is a title try to grab the title wrappers
904 
+                    $shortcode_args = array( 'before_title' => '', 'after_title' => '' );
905 
+                    if ( empty( $instance ) ) {
906 
+                        global $wp_registered_sidebars;
907 
+                        if ( ! empty( $wp_registered_sidebars ) ) {
908 
+                            foreach ( $wp_registered_sidebars as $sidebar ) {
909 
+                                if ( ! empty( $sidebar['before_title'] ) ) {
910 
+                                    $shortcode_args['before_title'] = $sidebar['before_title'];
911 
+                                    $shortcode_args['after_title']  = $sidebar['after_title'];
912 
+                                    break;
913 
+                                }
914 
+                            }
915 
+                        }
916 
+                    }
917 
+                    $output .= $this->output_title( $shortcode_args, $args );
918 
+                }
919 
+                $output .= $main_content;
920 
+                $output .= '</div>';
921 
+            } elseif ( $main_content && $no_wrap ) {
922 
+                $output .= $main_content;
923 
+            }
924 
+
925 
+            // if preview show a placeholder if empty
926 
+            if ( $this->is_preview() && $output == '' ) {
927 
+                $output = $this->preview_placeholder_text( "[{" . $this->base_id . "}]" );
928 
+            }
929 
+
930 
+            return $output;
931 
+        }
932 
+
933 
+        /**
934 
+         * Placeholder text to show if output is empty and we are on a preview/builder page.
935 
+         *
936 
+         * @param string $name
937 
+         *
938 
+         * @return string
939 
+         */
940 
+        public function preview_placeholder_text( $name = '' ) {
941 
+            return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
942 
+        }
943 
+
944 
+        /**
945 
+         * Sometimes booleans values can be turned to strings, so we fix that.
946 
+         *
947 
+         * @param $options
948 
+         *
949 
+         * @return mixed
950 
+         */
951 
+        public function string_to_bool( $options ) {
952 
+            // convert bool strings to booleans
953 
+            foreach ( $options as $key => $val ) {
954 
+                if ( $val == 'false' ) {
955 
+                    $options[ $key ] = false;
956 
+                } elseif ( $val == 'true' ) {
957 
+                    $options[ $key ] = true;
958 
+                }
959 
+            }
960 
+
961 
+            return $options;
962 
+        }
963 
+
964 
+        /**
965 
+         * Get the argument values that are also filterable.
966 
+         *
967 
+         * @param $instance
968 
+         *
969 
+         * @return array
970 
+         */
971 
+        public function argument_values( $instance ) {
972 
+            $argument_values = array();
973 
+
974 
+            // set widget instance
975 
+            $this->instance = $instance;
976 
+
977 
+            if ( empty( $this->arguments ) ) {
978 
+                $this->arguments = $this->get_arguments();
979 
+            }
980 
+
981 
+            if ( ! empty( $this->arguments ) ) {
982 
+                foreach ( $this->arguments as $key => $args ) {
983 
+                    // set the input name from the key
984 
+                    $args['name'] = $key;
985 
+                    //
986 
+                    $argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
987 
+                    if ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
988 
+                        $argument_values[ $key ] = $args['default'];
989 
+                    }
990 
+                }
991 
+            }
992 
+
993 
+            return $argument_values;
994 
+        }
995 
+
996 
+        /**
997 
+         * Set arguments in super duper.
998 
+         *
999 
+         * @since 1.0.0
1000 
+         *
1001 
+         * @return array Set arguments.
1002 
+         */
1003 
+        public function set_arguments() {
1004 
+            return $this->arguments;
1005 
+        }
1006 
+
1007 
+        /**
1008 
+         * Get arguments in super duper.
1009 
+         *
1010 
+         * @since 1.0.0
1011 
+         *
1012 
+         * @return array Get arguments.
1013 
+         */
1014 
+        public function get_arguments() {
1015 
+            if ( empty( $this->arguments ) ) {
1016 
+                $this->arguments = $this->set_arguments();
1017 
+            }
1018 
+
1019 
+            $this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
1020 
+            $this->arguments = $this->add_name_from_key( $this->arguments, true );
1021 
+
1022 
+            return $this->arguments;
1023 
+        }
1024 
+
1025 
+        /**
1026 
+         * This is the main output class for all 3 items, widget, shortcode and block, it is extended in the calling class.
1027 
+         *
1028 
+         * @param array $args
1029 
+         * @param array $widget_args
1030 
+         * @param string $content
1031 
+         */
1032 
+        public function output( $args = array(), $widget_args = array(), $content = '' ) {
1033 
+
1034 
+        }
1035 
+
1036 
+        /**
1037 
+         * Add the dynamic block code inline when the wp-block in enqueued.
1038 
+         */
1039 
+        public function register_block() {
1040 
+            wp_add_inline_script( 'wp-blocks', $this->block() );
1041 
+            if ( class_exists( 'SiteOrigin_Panels' ) ) {
1042 
+
1043 
+                wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
1044 
+
1045 
+            }
1046 
+        }
1047 
+
1048 
+        /**
1049 
+         * Check if we need to show advanced options.
1050 
+         *
1051 
+         * @return bool
1052 
+         */
1053 
+        public function block_show_advanced() {
1054 
+
1055 
+            $show      = false;
1056 
+            $arguments = $this->arguments;
1057 
+
1058 
+            if ( empty( $arguments ) ) {
1059 
+                $arguments = $this->get_arguments();
1060 
+            }
1061 
+
1062 
+            if ( ! empty( $arguments ) ) {
1063 
+                foreach ( $arguments as $argument ) {
1064 
+                    if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
1065 
+                        $show = true;
1066 
+                    }
1067 
+                }
1068 
+            }
1069 
+
1070 
+            return $show;
1071 
+        }
1072 
+
1073 
+
1074 
+        /**
1075 
+         * Output the JS for building the dynamic Guntenberg block.
1076 
+         *
1077 
+         * @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.
1078 
+         * @return mixed
1079 
+         */
1080 
+        public function block() {
1081 
+            ob_start();
1082 
+            ?>
1083 1083 
 			<script>
1084 1084 
 				/**
1085 1085 
 				 * BLOCK: Basic
 
@@ -1118,76 +1118,76 @@  discard block
 
 block discarded – undo
1118 1118 
 						icon: '<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
1119 1119 
 						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
1120 1120 
 						<?php if ( isset( $this->options['block-keywords'] ) ) {
1121 
-						echo "keywords : " . $this->options['block-keywords'] . ",";
1122 
-					}?>
1121 
+                        echo "keywords : " . $this->options['block-keywords'] . ",";
1122 
+                    }?>
1123 1123
1124 1124 
 						<?php
1125 1125
1126 
-						$show_advanced = $this->block_show_advanced();
1127 
-
1128 
-						$show_alignment = false;
1129 
-
1130 
-						if ( ! empty( $this->arguments ) ) {
1131 
-							echo "attributes : {";
1132 
-
1133 
-							if ( $show_advanced ) {
1134 
-								echo "show_advanced: {";
1135 
-								echo "	type: 'boolean',";
1136 
-								echo "  default: false,";
1137 
-								echo "},";
1138 
-							}
1139 
-
1140 
-							// block wrap element
1141 
-							if ( isset( $this->options['block-wrap'] ) ) { //@todo we should validate this?
1142 
-								echo "block_wrap: {";
1143 
-								echo "	type: 'string',";
1144 
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
1145 
-								echo "},";
1146 
-							}
1147 
-
1148 
-
1149 
-							foreach ( $this->arguments as $key => $args ) {
1150 
-
1151 
-								// set if we should show alignment
1152 
-								if ( $key == 'alignment' ) {
1153 
-									$show_alignment = true;
1154 
-								}
1155 
-
1156 
-								$extra = '';
1157 
-
1158 
-								if ( $args['type'] == 'checkbox' ) {
1159 
-									$type    = 'boolean';
1160 
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
1161 
-								} elseif ( $args['type'] == 'number' ) {
1162 
-									$type    = 'number';
1163 
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1164 
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
1165 
-									$type = 'array';
1166 
-									if ( is_array( $args['default'] ) ) {
1167 
-										$default = isset( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
1168 
-									} else {
1169 
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1170 
-									}
1171 
-								} elseif ( $args['type'] == 'multiselect' ) {
1172 
-									$type    = 'array';
1173 
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1174 
-								} else {
1175 
-									$type    = 'string';
1176 
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1177 
-								}
1178 
-								echo $key . " : {";
1179 
-								echo "type : '$type',";
1180 
-								echo "default : $default,";
1181 
-								echo "},";
1182 
-							}
1183 
-
1184 
-							echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
1185 
-
1186 
-							echo "},";
1187 
-
1188 
-						}
1189 
-
1190 
-						?>
1126 
+                        $show_advanced = $this->block_show_advanced();
1127 
+
1128 
+                        $show_alignment = false;
1129 
+
1130 
+                        if ( ! empty( $this->arguments ) ) {
1131 
+                            echo "attributes : {";
1132 
+
1133 
+                            if ( $show_advanced ) {
1134 
+                                echo "show_advanced: {";
1135 
+                                echo "	type: 'boolean',";
1136 
+                                echo "  default: false,";
1137 
+                                echo "},";
1138 
+                            }
1139 
+
1140 
+                            // block wrap element
1141 
+                            if ( isset( $this->options['block-wrap'] ) ) { //@todo we should validate this?
1142 
+                                echo "block_wrap: {";
1143 
+                                echo "	type: 'string',";
1144 
+                                echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
1145 
+                                echo "},";
1146 
+                            }
1147 
+
1148 
+
1149 
+                            foreach ( $this->arguments as $key => $args ) {
1150 
+
1151 
+                                // set if we should show alignment
1152 
+                                if ( $key == 'alignment' ) {
1153 
+                                    $show_alignment = true;
1154 
+                                }
1155 
+
1156 
+                                $extra = '';
1157 
+
1158 
+                                if ( $args['type'] == 'checkbox' ) {
1159 
+                                    $type    = 'boolean';
1160 
+                                    $default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
1161 
+                                } elseif ( $args['type'] == 'number' ) {
1162 
+                                    $type    = 'number';
1163 
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1164 
+                                } elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
1165 
+                                    $type = 'array';
1166 
+                                    if ( is_array( $args['default'] ) ) {
1167 
+                                        $default = isset( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
1168 
+                                    } else {
1169 
+                                        $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1170 
+                                    }
1171 
+                                } elseif ( $args['type'] == 'multiselect' ) {
1172 
+                                    $type    = 'array';
1173 
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1174 
+                                } else {
1175 
+                                    $type    = 'string';
1176 
+                                    $default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1177 
+                                }
1178 
+                                echo $key . " : {";
1179 
+                                echo "type : '$type',";
1180 
+                                echo "default : $default,";
1181 
+                                echo "},";
1182 
+                            }
1183 
+
1184 
+                            echo "content : {type : 'string',default: 'Please select the attributes in the block settings'},";
1185 
+
1186 
+                            echo "},";
1187 
+
1188 
+                        }
1189 
+
1190 
+                        ?>
1191 1191
1192 1192 
 						// The "edit" property must be a valid function.
1193 1193 
 						edit: function (props) {
 
@@ -1206,8 +1206,8 @@  discard block
 
 block discarded – undo
1206 1206 
 										'shortcode': '<?php echo $this->options['base_id'];?>',
1207 1207 
 										'attributes': props.attributes,
1208 1208 
 										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
1209 
-										echo $post->ID;
1210 
-									}?>,
1209 
+                                        echo $post->ID;
1210 
+                                    }?>,
1211 1211 
 										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
1212 1212 
 									};
1213 1213 
 
@@ -1254,10 +1254,10 @@  discard block
 
 block discarded – undo
1254 1254
1255 1255 
 									<?php
1256 1256
1257 
-									if(! empty( $this->arguments )){
1257 
+                                    if(! empty( $this->arguments )){
1258 1258
1259 
-									if ( $show_advanced ) {
1260 
-									?>
1259 
+                                    if ( $show_advanced ) {
1260 
+                                    ?>
1261 1261 
 									el(
1262 1262 
 										wp.components.ToggleControl,
1263 1263 
 										{
 
@@ -1270,65 +1270,65 @@  discard block
 
 block discarded – undo
1270 1270 
 									),
1271 1271 
 									<?php
1272 1272
1273 
-									}
1274 
-
1275 
-									foreach($this->arguments as $key => $args){
1276 
-									$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
1277 
-									$options = '';
1278 
-									$extra = '';
1279 
-									$require = '';
1280 
-									$onchange = "props.setAttributes({ $key: $key } )";
1281 
-									$value = "props.attributes.$key";
1282 
-									$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'color' );
1283 
-									if ( in_array( $args['type'], $text_type ) ) {
1284 
-										$type = 'TextControl';
1285 
-									} elseif ( $args['type'] == 'checkbox' ) {
1286 
-										$type = 'CheckboxControl';
1287 
-										$extra .= "checked: props.attributes.$key,";
1288 
-										$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
1289 
-									} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
1290 
-										$type = 'SelectControl';
1291 
-										if ( ! empty( $args['options'] ) ) {
1292 
-											$options .= "options  : [";
1293 
-											foreach ( $args['options'] as $option_val => $option_label ) {
1294 
-												$options .= "{ value : '" . esc_attr( $option_val ) . "',     label : '" . esc_attr( $option_label ) . "'     },";
1295 
-											}
1296 
-											$options .= "],";
1297 
-										}
1298 
-										if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
1299 
-											$extra .= ' multiple: true, ';
1300 
-											//$onchange = "props.setAttributes({ $key: ['edit'] } )";
1301 
-											//$value = "['edit', 'delete']";
1302 
-										}
1303 
-									} elseif ( $args['type'] == 'alignment' ) {
1304 
-										$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
1305 
-									} else {
1306 
-										continue;// if we have not implemented the control then don't break the JS.
1307 
-									}
1308 
-
1309 
-									// add show only if advanced
1310 
-									if ( ! empty( $args['advanced'] ) ) {
1311 
-										echo "props.attributes.show_advanced && ";
1312 
-									}
1313 
-									// add setting require if defined
1314 
-									if ( ! empty( $args['element_require'] ) ) {
1315 
-										echo $this->block_props_replace( $args['element_require'], true ) . " && ";
1316 
-									}
1317 
-									?>
1273 
+                                    }
1274 
+
1275 
+                                    foreach($this->arguments as $key => $args){
1276 
+                                    $custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
1277 
+                                    $options = '';
1278 
+                                    $extra = '';
1279 
+                                    $require = '';
1280 
+                                    $onchange = "props.setAttributes({ $key: $key } )";
1281 
+                                    $value = "props.attributes.$key";
1282 
+                                    $text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'color' );
1283 
+                                    if ( in_array( $args['type'], $text_type ) ) {
1284 
+                                        $type = 'TextControl';
1285 
+                                    } elseif ( $args['type'] == 'checkbox' ) {
1286 
+                                        $type = 'CheckboxControl';
1287 
+                                        $extra .= "checked: props.attributes.$key,";
1288 
+                                        $onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
1289 
+                                    } elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
1290 
+                                        $type = 'SelectControl';
1291 
+                                        if ( ! empty( $args['options'] ) ) {
1292 
+                                            $options .= "options  : [";
1293 
+                                            foreach ( $args['options'] as $option_val => $option_label ) {
1294 
+                                                $options .= "{ value : '" . esc_attr( $option_val ) . "',     label : '" . esc_attr( $option_label ) . "'     },";
1295 
+                                            }
1296 
+                                            $options .= "],";
1297 
+                                        }
1298 
+                                        if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
1299 
+                                            $extra .= ' multiple: true, ';
1300 
+                                            //$onchange = "props.setAttributes({ $key: ['edit'] } )";
1301 
+                                            //$value = "['edit', 'delete']";
1302 
+                                        }
1303 
+                                    } elseif ( $args['type'] == 'alignment' ) {
1304 
+                                        $type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
1305 
+                                    } else {
1306 
+                                        continue;// if we have not implemented the control then don't break the JS.
1307 
+                                    }
1308 
+
1309 
+                                    // add show only if advanced
1310 
+                                    if ( ! empty( $args['advanced'] ) ) {
1311 
+                                        echo "props.attributes.show_advanced && ";
1312 
+                                    }
1313 
+                                    // add setting require if defined
1314 
+                                    if ( ! empty( $args['element_require'] ) ) {
1315 
+                                        echo $this->block_props_replace( $args['element_require'], true ) . " && ";
1316 
+                                    }
1317 
+                                    ?>
1318 1318 
 									el(
1319 1319 
 										wp.components.<?php echo esc_attr( $type );?>,
1320 1320 
 										{
1321 1321 
 											label: '<?php echo esc_attr( $args['title'] );?>',
1322 1322 
 											help: '<?php if ( isset( $args['desc'] ) ) {
1323 
-												echo esc_attr( $args['desc'] );
1324 
-											}?>',
1323 
+                                                echo esc_attr( $args['desc'] );
1324 
+                                            }?>',
1325 1325 
 											value: <?php echo $value;?>,
1326 1326 
 											<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
1327 
-											echo "type: '" . esc_attr( $args['type'] ) . "',";
1328 
-										}?>
1327 
+                                            echo "type: '" . esc_attr( $args['type'] ) . "',";
1328 
+                                        }?>
1329 1329 
 											<?php if ( ! empty( $args['placeholder'] ) ) {
1330 
-											echo "placeholder: '" . esc_attr( $args['placeholder'] ) . "',";
1331 
-										}?>
1330 
+                                            echo "placeholder: '" . esc_attr( $args['placeholder'] ) . "',";
1331 
+                                        }?>
1332 1332 
 											<?php echo $options;?>
1333 1333 
 											<?php echo $extra;?>
1334 1334 
 											<?php echo $custom_attributes;?>
 
@@ -1338,27 +1338,27 @@  discard block
 
 block discarded – undo
1338 1338 
 										}
1339 1339 
 									),
1340 1340 
 									<?php
1341 
-									}
1342 
-									}
1343 
-									?>
1341 
+                                    }
1342 
+                                    }
1343 
+                                    ?>
1344 1344
1345 1345 
 								),
1346 1346
1347 1347 
 								<?php
1348 
-								// If the user sets block-output array then build it
1349 
-								if ( ! empty( $this->options['block-output'] ) ) {
1350 
-								$this->block_element( $this->options['block-output'] );
1351 
-							}else{
1352 
-								// if no block-output is set then we try and get the shortcode html output via ajax.
1353 
-								?>
1348 
+                                // If the user sets block-output array then build it
1349 
+                                if ( ! empty( $this->options['block-output'] ) ) {
1350 
+                                $this->block_element( $this->options['block-output'] );
1351 
+                            }else{
1352 
+                                // if no block-output is set then we try and get the shortcode html output via ajax.
1353 
+                                ?>
1354 1354 
 								el('div', {
1355 1355 
 									dangerouslySetInnerHTML: {__html: onChangeContent()},
1356 1356 
 									className: props.className,
1357 1357 
 									style: {'min-height': '30px'}
1358 1358 
 								})
1359 1359 
 								<?php
1360 
-								}
1361 
-								?>
1360 
+                                }
1361 
+                                ?>
1362 1362 
 							]; // end return
1363 1363 
 						},
1364 1364 
 
@@ -1375,17 +1375,17 @@  discard block
 
 block discarded – undo
1375 1375 
 							var content = "[<?php echo $this->options['base_id'];?>";
1376 1376 
 							<?php
1377 1377
1378 
-							if(! empty( $this->arguments )){
1379 
-							foreach($this->arguments as $key => $args){
1380 
-							?>
1378 
+                            if(! empty( $this->arguments )){
1379 
+                            foreach($this->arguments as $key => $args){
1380 
+                            ?>
1381 1381 
 							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
1382 1382 
 								content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>+ "' ";
1383 1383 
 							}
1384 1384 
 							<?php
1385 
-							}
1386 
-							}
1385 
+                            }
1386 
+                            }
1387 1387
1388 
-							?>
1388 
+                            ?>
1389 1389 
 							content += "]";
1390 1390
1391 1391 
 
@@ -1414,439 +1414,439 @@  discard block
 
 block discarded – undo
1414 1414 
 				})();
1415 1415 
 			</script>
1416 1416 
 			<?php
1417 
-			$output = ob_get_clean();
1417 
+            $output = ob_get_clean();
1418 1418
1419 
-			/*
1419 
+            /*
1420 1420 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
1421 1421 
 			 */
1422 1422
1423 
-			return str_replace( array(
1424 
-				'<script>',
1425 
-				'</script>'
1426 
-			), '', $output );
1427 
-		}
1428 
-
1429 
-		/**
1430 
-		 * Convert an array of attributes to block string.
1431 
-		 *
1432 
-		 * @todo there is prob a faster way to do this, also we could add some validation here.
1433 
-		 *
1434 
-		 * @param $custom_attributes
1435 
-		 *
1436 
-		 * @return string
1437 
-		 */
1438 
-		public function array_to_attributes( $custom_attributes, $html = false ) {
1439 
-			$attributes = '';
1440 
-			if ( ! empty( $custom_attributes ) ) {
1441 
-
1442 
-				if ( $html ) {
1443 
-					foreach ( $custom_attributes as $key => $val ) {
1444 
-						$attributes .= " $key='$val' ";
1445 
-					}
1446 
-				} else {
1447 
-					foreach ( $custom_attributes as $key => $val ) {
1448 
-						$attributes .= "'$key': '$val',";
1449 
-					}
1450 
-				}
1451 
-			}
1452 
-
1453 
-			return $attributes;
1454 
-		}
1455 
-
1456 
-		/**
1457 
-		 * A self looping function to create the output for JS block elements.
1458 
-		 *
1459 
-		 * This is what is output in the WP Editor visual view.
1460 
-		 *
1461 
-		 * @param $args
1462 
-		 */
1463 
-		public function block_element( $args ) {
1464 
-
1465 
-
1466 
-			if ( ! empty( $args ) ) {
1467 
-				foreach ( $args as $element => $new_args ) {
1468 
-
1469 
-					if ( is_array( $new_args ) ) { // its an element
1470 
-
1471 
-
1472 
-						if ( isset( $new_args['element'] ) ) {
1473 
-
1474 
-							if ( isset( $new_args['element_require'] ) ) {
1475 
-								echo str_replace( array(
1476 
-										"'+",
1477 
-										"+'"
1478 
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
1479 
-								unset( $new_args['element_require'] );
1480 
-							}
1481 
-
1482 
-							echo "\n el( '" . $new_args['element'] . "', {";
1483 
-
1484 
-							// get the attributes
1485 
-							foreach ( $new_args as $new_key => $new_value ) {
1486 
-
1487 
-
1488 
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
1489 
-									// do nothing
1490 
-								} else {
1491 
-									echo $this->block_element( array( $new_key => $new_value ) );
1492 
-								}
1493 
-							}
1494 
-
1495 
-							echo "},";// end attributes
1496 
-
1497 
-							// get the content
1498 
-							$first_item = 0;
1499 
-							foreach ( $new_args as $new_key => $new_value ) {
1500 
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
1501 
-
1502 
-									if ( $new_key === 'content' ) {
1503 
-										echo "'" . $this->block_props_replace( $new_value ) . "'";
1504 
-									}
1505 
-
1506 
-									if ( is_array( $new_value ) ) {
1507 
-
1508 
-										if ( isset( $new_value['element_require'] ) ) {
1509 
-											echo str_replace( array(
1510 
-													"'+",
1511 
-													"+'"
1512 
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
1513 
-											unset( $new_value['element_require'] );
1514 
-										}
1515 
-
1516 
-										if ( isset( $new_value['element_repeat'] ) ) {
1517 
-											$x = 1;
1518 
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
1519 
-												$this->block_element( array( '' => $new_value ) );
1520 
-												$x ++;
1521 
-											}
1522 
-										} else {
1523 
-											$this->block_element( array( '' => $new_value ) );
1524 
-										}
1525 
-									}
1526 
-									$first_item ++;
1527 
-								}
1528 
-							}
1529 
-
1530 
-							echo ")";// end content
1531 
-
1532 
-							echo ", \n";
1533 
-
1534 
-						}
1535 
-					} else {
1536 
-
1537 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
1538 
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
1539 
-						} elseif ( $element == 'style' ) {
1540 
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
1541 
-						} else {
1542 
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
1543 
-						}
1544 
-
1545 
-					}
1546 
-				}
1547 
-			}
1548 
-		}
1549 
-
1550 
-		/**
1551 
-		 * Replace block attributes placeholders with the proper naming.
1552 
-		 *
1553 
-		 * @param $string
1554 
-		 *
1555 
-		 * @return mixed
1556 
-		 */
1557 
-		public function block_props_replace( $string, $no_wrap = false ) {
1558 
-
1559 
-			if ( $no_wrap ) {
1560 
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
1561 
-			} else {
1562 
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
1563 
-			}
1564 
-
1565 
-			return $string;
1566 
-		}
1567 
-
1568 
-		/**
1569 
-		 * Outputs the content of the widget
1570 
-		 *
1571 
-		 * @param array $args
1572 
-		 * @param array $instance
1573 
-		 */
1574 
-		public function widget( $args, $instance ) {
1575 
-
1576 
-			// get the filtered values
1577 
-			$argument_values = $this->argument_values( $instance );
1578 
-			$argument_values = $this->string_to_bool( $argument_values );
1579 
-			$output          = $this->output( $argument_values, $args );
1580 
-
1581 
-			if ( $output ) {
1582 
-				// Before widget
1583 
-				$before_widget = $args['before_widget'];
1584 
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
1585 
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
1586 
-
1587 
-				// After widget
1588 
-				$after_widget = $args['after_widget'];
1589 
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
1590 
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
1591 
-
1592 
-				echo $before_widget;
1593 
-				// elementor strips the widget wrapping div so we check for and add it back if needed
1594 
-				if ( $this->is_elementor_widget_output() ) {
1595 
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $this->options['widget_ops']['classname'] ) . "'>" : '';
1596 
-				}
1597 
-				echo $this->output_title( $args, $instance );
1598 
-				echo $output;
1599 
-				if ( $this->is_elementor_widget_output() ) {
1600 
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
1601 
-				}
1602 
-				echo $after_widget;
1603 
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
1604 
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
1605 
-				echo $output;
1606 
-			}
1607 
-		}
1608 
-
1609 
-		/**
1610 
-		 * Tests if the current output is inside a elementor container.
1611 
-		 *
1612 
-		 * @since 1.0.4
1613 
-		 * @return bool
1614 
-		 */
1615 
-		public function is_elementor_widget_output() {
1616 
-			$result = false;
1617 
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
1618 
-				$result = true;
1619 
-			}
1620 
-
1621 
-			return $result;
1622 
-		}
1623 
-
1624 
-		/**
1625 
-		 * Tests if the current output is inside a elementor preview.
1626 
-		 *
1627 
-		 * @since 1.0.4
1628 
-		 * @return bool
1629 
-		 */
1630 
-		public function is_elementor_preview() {
1631 
-			$result = false;
1632 
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
1633 
-				$result = true;
1634 
-			}
1635 
-
1636 
-			return $result;
1637 
-		}
1638 
-
1639 
-		/**
1640 
-		 * Tests if the current output is inside a Divi preview.
1641 
-		 *
1642 
-		 * @since 1.0.6
1643 
-		 * @return bool
1644 
-		 */
1645 
-		public function is_divi_preview() {
1646 
-			$result = false;
1647 
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
1648 
-				$result = true;
1649 
-			}
1650 
-
1651 
-			return $result;
1652 
-		}
1653 
-
1654 
-		/**
1655 
-		 * Tests if the current output is inside a Beaver builder preview.
1656 
-		 *
1657 
-		 * @since 1.0.6
1658 
-		 * @return bool
1659 
-		 */
1660 
-		public function is_beaver_preview() {
1661 
-			$result = false;
1662 
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
1663 
-				$result = true;
1664 
-			}
1665 
-
1666 
-			return $result;
1667 
-		}
1668 
-
1669 
-		/**
1670 
-		 * Tests if the current output is inside a siteorigin builder preview.
1671 
-		 *
1672 
-		 * @since 1.0.6
1673 
-		 * @return bool
1674 
-		 */
1675 
-		public function is_siteorigin_preview() {
1676 
-			$result = false;
1677 
-			if ( !empty( $_REQUEST['siteorigin_panels_live_editor'] )) {
1678 
-				$result = true;
1679 
-			}
1680 
-
1681 
-			return $result;
1682 
-		}
1683 
-
1684 
-		/**
1685 
-		 * General function to check if we are in a preview situation.
1686 
-		 *
1687 
-		 * @since 1.0.6
1688 
-		 * @return bool
1689 
-		 */
1690 
-		public function is_preview() {
1691 
-			$preview = false;
1692 
-			if ( $this->is_divi_preview() ) {
1693 
-				$preview = true;
1694 
-			} elseif ( $this->is_elementor_preview() ) {
1695 
-				$preview = true;
1696 
-			} elseif ( $this->is_beaver_preview() ) {
1697 
-				$preview = true;
1698 
-			} elseif ( $this->is_siteorigin_preview() ) {
1699 
-				$preview = true;
1700 
-			}
1701 
-
1702 
-			return $preview;
1703 
-		}
1704 
-
1705 
-		/**
1706 
-		 * Output the super title.
1707 
-		 *
1708 
-		 * @param $args
1709 
-		 * @param array $instance
1710 
-		 *
1711 
-		 * @return string
1712 
-		 */
1713 
-		public function output_title( $args, $instance = array() ) {
1714 
-			$output = '';
1715 
-			if ( ! empty( $instance['title'] ) ) {
1716 
-				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
1717 
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
1718 
-				$output = $args['before_title'] . $title . $args['after_title'];
1719 
-			}
1720 
-
1721 
-			return $output;
1722 
-		}
1723 
-
1724 
-		/**
1725 
-		 * Outputs the options form inputs for the widget.
1726 
-		 *
1727 
-		 * @param array $instance The widget options.
1728 
-		 */
1729 
-		public function form( $instance ) {
1730 
-
1731 
-			// set widget instance
1732 
-			$this->instance = $instance;
1733 
-
1734 
-			// set it as a SD widget
1735 
-			echo $this->widget_advanced_toggle();
1736 
-
1737 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
1738 
-			$arguments = $this->get_arguments();
1739 
-
1740 
-			if ( is_array( $arguments ) ) {
1741 
-				foreach ( $arguments as $key => $args ) {
1742 
-					$this->widget_inputs( $args, $instance );
1743 
-				}
1744 
-			}
1745 
-		}
1746 
-
1747 
-		/**
1748 
-		 * Get the hidden input that when added makes the advanced button show on widget settings.
1749 
-		 *
1750 
-		 * @return string
1751 
-		 */
1752 
-		public function widget_advanced_toggle() {
1753 
-
1754 
-			$output = '';
1755 
-			if ( $this->block_show_advanced() ) {
1756 
-				$val = 1;
1757 
-			} else {
1758 
-				$val = 0;
1759 
-			}
1760 
-
1761 
-			$output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
1762 
-
1763 
-			return $output;
1764 
-		}
1765 
-
1766 
-		/**
1767 
-		 * Convert require element.
1768 
-		 *
1769 
-		 * @since 1.0.0
1770 
-		 *
1771 
-		 * @param string $input Input element.
1772 
-		 *
1773 
-		 * @return string $output
1774 
-		 */
1775 
-		public function convert_element_require( $input ) {
1776 
-
1777 
-			$input = str_replace( "'", '"', $input );// we only want double quotes
1778 
-
1779 
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
1780 
-				"jQuery(form).find('[data-argument=\"",
1781 
-				"\"]').find('input,select').val()"
1782 
-			), $input ) );
1783 
-
1784 
-			return $output;
1785 
-		}
1786 
-
1787 
-		/**
1788 
-		 * Builds the inputs for the widget options.
1789 
-		 *
1790 
-		 * @param $args
1791 
-		 * @param $instance
1792 
-		 */
1793 
-		public function widget_inputs( $args, $instance ) {
1794 
-
1795 
-			$class             = "";
1796 
-			$element_require   = "";
1797 
-			$custom_attributes = "";
1798 
-
1799 
-			// get value
1800 
-			if ( isset( $instance[ $args['name'] ] ) ) {
1801 
-				$value = $instance[ $args['name'] ];
1802 
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
1803 
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
1804 
-			} else {
1805 
-				$value = '';
1806 
-			}
1807 
-
1808 
-			// get placeholder
1809 
-			if ( ! empty( $args['placeholder'] ) ) {
1810 
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
1811 
-			} else {
1812 
-				$placeholder = '';
1813 
-			}
1814 
-
1815 
-			// get if advanced
1816 
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
1817 
-				$class .= " sd-advanced-setting ";
1818 
-			}
1819 
-
1820 
-			// element_require
1821 
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
1822 
-				$element_require = $args['element_require'];
1823 
-			}
1824 
-
1825 
-			// custom_attributes
1826 
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
1827 
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
1828 
-			}
1829 
-
1830 
-			// before wrapper
1831 
-			?>
1423 
+            return str_replace( array(
1424 
+                '<script>',
1425 
+                '</script>'
1426 
+            ), '', $output );
1427 
+        }
1428 
+
1429 
+        /**
1430 
+         * Convert an array of attributes to block string.
1431 
+         *
1432 
+         * @todo there is prob a faster way to do this, also we could add some validation here.
1433 
+         *
1434 
+         * @param $custom_attributes
1435 
+         *
1436 
+         * @return string
1437 
+         */
1438 
+        public function array_to_attributes( $custom_attributes, $html = false ) {
1439 
+            $attributes = '';
1440 
+            if ( ! empty( $custom_attributes ) ) {
1441 
+
1442 
+                if ( $html ) {
1443 
+                    foreach ( $custom_attributes as $key => $val ) {
1444 
+                        $attributes .= " $key='$val' ";
1445 
+                    }
1446 
+                } else {
1447 
+                    foreach ( $custom_attributes as $key => $val ) {
1448 
+                        $attributes .= "'$key': '$val',";
1449 
+                    }
1450 
+                }
1451 
+            }
1452 
+
1453 
+            return $attributes;
1454 
+        }
1455 
+
1456 
+        /**
1457 
+         * A self looping function to create the output for JS block elements.
1458 
+         *
1459 
+         * This is what is output in the WP Editor visual view.
1460 
+         *
1461 
+         * @param $args
1462 
+         */
1463 
+        public function block_element( $args ) {
1464 
+
1465 
+
1466 
+            if ( ! empty( $args ) ) {
1467 
+                foreach ( $args as $element => $new_args ) {
1468 
+
1469 
+                    if ( is_array( $new_args ) ) { // its an element
1470 
+
1471 
+
1472 
+                        if ( isset( $new_args['element'] ) ) {
1473 
+
1474 
+                            if ( isset( $new_args['element_require'] ) ) {
1475 
+                                echo str_replace( array(
1476 
+                                        "'+",
1477 
+                                        "+'"
1478 
+                                    ), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
1479 
+                                unset( $new_args['element_require'] );
1480 
+                            }
1481 
+
1482 
+                            echo "\n el( '" . $new_args['element'] . "', {";
1483 
+
1484 
+                            // get the attributes
1485 
+                            foreach ( $new_args as $new_key => $new_value ) {
1486 
+
1487 
+
1488 
+                                if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
1489 
+                                    // do nothing
1490 
+                                } else {
1491 
+                                    echo $this->block_element( array( $new_key => $new_value ) );
1492 
+                                }
1493 
+                            }
1494 
+
1495 
+                            echo "},";// end attributes
1496 
+
1497 
+                            // get the content
1498 
+                            $first_item = 0;
1499 
+                            foreach ( $new_args as $new_key => $new_value ) {
1500 
+                                if ( $new_key === 'content' || is_array( $new_value ) ) {
1501 
+
1502 
+                                    if ( $new_key === 'content' ) {
1503 
+                                        echo "'" . $this->block_props_replace( $new_value ) . "'";
1504 
+                                    }
1505 
+
1506 
+                                    if ( is_array( $new_value ) ) {
1507 
+
1508 
+                                        if ( isset( $new_value['element_require'] ) ) {
1509 
+                                            echo str_replace( array(
1510 
+                                                    "'+",
1511 
+                                                    "+'"
1512 
+                                                ), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
1513 
+                                            unset( $new_value['element_require'] );
1514 
+                                        }
1515 
+
1516 
+                                        if ( isset( $new_value['element_repeat'] ) ) {
1517 
+                                            $x = 1;
1518 
+                                            while ( $x <= absint( $new_value['element_repeat'] ) ) {
1519 
+                                                $this->block_element( array( '' => $new_value ) );
1520 
+                                                $x ++;
1521 
+                                            }
1522 
+                                        } else {
1523 
+                                            $this->block_element( array( '' => $new_value ) );
1524 
+                                        }
1525 
+                                    }
1526 
+                                    $first_item ++;
1527 
+                                }
1528 
+                            }
1529 
+
1530 
+                            echo ")";// end content
1531 
+
1532 
+                            echo ", \n";
1533 
+
1534 
+                        }
1535 
+                    } else {
1536 
+
1537 
+                        if ( substr( $element, 0, 3 ) === "if_" ) {
1538 
+                            echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
1539 
+                        } elseif ( $element == 'style' ) {
1540 
+                            echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
1541 
+                        } else {
1542 
+                            echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
1543 
+                        }
1544 
+
1545 
+                    }
1546 
+                }
1547 
+            }
1548 
+        }
1549 
+
1550 
+        /**
1551 
+         * Replace block attributes placeholders with the proper naming.
1552 
+         *
1553 
+         * @param $string
1554 
+         *
1555 
+         * @return mixed
1556 
+         */
1557 
+        public function block_props_replace( $string, $no_wrap = false ) {
1558 
+
1559 
+            if ( $no_wrap ) {
1560 
+                $string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
1561 
+            } else {
1562 
+                $string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
1563 
+            }
1564 
+
1565 
+            return $string;
1566 
+        }
1567 
+
1568 
+        /**
1569 
+         * Outputs the content of the widget
1570 
+         *
1571 
+         * @param array $args
1572 
+         * @param array $instance
1573 
+         */
1574 
+        public function widget( $args, $instance ) {
1575 
+
1576 
+            // get the filtered values
1577 
+            $argument_values = $this->argument_values( $instance );
1578 
+            $argument_values = $this->string_to_bool( $argument_values );
1579 
+            $output          = $this->output( $argument_values, $args );
1580 
+
1581 
+            if ( $output ) {
1582 
+                // Before widget
1583 
+                $before_widget = $args['before_widget'];
1584 
+                $before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
1585 
+                $before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
1586 
+
1587 
+                // After widget
1588 
+                $after_widget = $args['after_widget'];
1589 
+                $after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
1590 
+                $after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
1591 
+
1592 
+                echo $before_widget;
1593 
+                // elementor strips the widget wrapping div so we check for and add it back if needed
1594 
+                if ( $this->is_elementor_widget_output() ) {
1595 
+                    echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $this->options['widget_ops']['classname'] ) . "'>" : '';
1596 
+                }
1597 
+                echo $this->output_title( $args, $instance );
1598 
+                echo $output;
1599 
+                if ( $this->is_elementor_widget_output() ) {
1600 
+                    echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
1601 
+                }
1602 
+                echo $after_widget;
1603 
+            } elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
1604 
+                $output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
1605 
+                echo $output;
1606 
+            }
1607 
+        }
1608 
+
1609 
+        /**
1610 
+         * Tests if the current output is inside a elementor container.
1611 
+         *
1612 
+         * @since 1.0.4
1613 
+         * @return bool
1614 
+         */
1615 
+        public function is_elementor_widget_output() {
1616 
+            $result = false;
1617 
+            if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
1618 
+                $result = true;
1619 
+            }
1620 
+
1621 
+            return $result;
1622 
+        }
1623 
+
1624 
+        /**
1625 
+         * Tests if the current output is inside a elementor preview.
1626 
+         *
1627 
+         * @since 1.0.4
1628 
+         * @return bool
1629 
+         */
1630 
+        public function is_elementor_preview() {
1631 
+            $result = false;
1632 
+            if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
1633 
+                $result = true;
1634 
+            }
1635 
+
1636 
+            return $result;
1637 
+        }
1638 
+
1639 
+        /**
1640 
+         * Tests if the current output is inside a Divi preview.
1641 
+         *
1642 
+         * @since 1.0.6
1643 
+         * @return bool
1644 
+         */
1645 
+        public function is_divi_preview() {
1646 
+            $result = false;
1647 
+            if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
1648 
+                $result = true;
1649 
+            }
1650 
+
1651 
+            return $result;
1652 
+        }
1653 
+
1654 
+        /**
1655 
+         * Tests if the current output is inside a Beaver builder preview.
1656 
+         *
1657 
+         * @since 1.0.6
1658 
+         * @return bool
1659 
+         */
1660 
+        public function is_beaver_preview() {
1661 
+            $result = false;
1662 
+            if ( isset( $_REQUEST['fl_builder'] ) ) {
1663 
+                $result = true;
1664 
+            }
1665 
+
1666 
+            return $result;
1667 
+        }
1668 
+
1669 
+        /**
1670 
+         * Tests if the current output is inside a siteorigin builder preview.
1671 
+         *
1672 
+         * @since 1.0.6
1673 
+         * @return bool
1674 
+         */
1675 
+        public function is_siteorigin_preview() {
1676 
+            $result = false;
1677 
+            if ( !empty( $_REQUEST['siteorigin_panels_live_editor'] )) {
1678 
+                $result = true;
1679 
+            }
1680 
+
1681 
+            return $result;
1682 
+        }
1683 
+
1684 
+        /**
1685 
+         * General function to check if we are in a preview situation.
1686 
+         *
1687 
+         * @since 1.0.6
1688 
+         * @return bool
1689 
+         */
1690 
+        public function is_preview() {
1691 
+            $preview = false;
1692 
+            if ( $this->is_divi_preview() ) {
1693 
+                $preview = true;
1694 
+            } elseif ( $this->is_elementor_preview() ) {
1695 
+                $preview = true;
1696 
+            } elseif ( $this->is_beaver_preview() ) {
1697 
+                $preview = true;
1698 
+            } elseif ( $this->is_siteorigin_preview() ) {
1699 
+                $preview = true;
1700 
+            }
1701 
+
1702 
+            return $preview;
1703 
+        }
1704 
+
1705 
+        /**
1706 
+         * Output the super title.
1707 
+         *
1708 
+         * @param $args
1709 
+         * @param array $instance
1710 
+         *
1711 
+         * @return string
1712 
+         */
1713 
+        public function output_title( $args, $instance = array() ) {
1714 
+            $output = '';
1715 
+            if ( ! empty( $instance['title'] ) ) {
1716 
+                /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
1717 
+                $title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
1718 
+                $output = $args['before_title'] . $title . $args['after_title'];
1719 
+            }
1720 
+
1721 
+            return $output;
1722 
+        }
1723 
+
1724 
+        /**
1725 
+         * Outputs the options form inputs for the widget.
1726 
+         *
1727 
+         * @param array $instance The widget options.
1728 
+         */
1729 
+        public function form( $instance ) {
1730 
+
1731 
+            // set widget instance
1732 
+            $this->instance = $instance;
1733 
+
1734 
+            // set it as a SD widget
1735 
+            echo $this->widget_advanced_toggle();
1736 
+
1737 
+            echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
1738 
+            $arguments = $this->get_arguments();
1739 
+
1740 
+            if ( is_array( $arguments ) ) {
1741 
+                foreach ( $arguments as $key => $args ) {
1742 
+                    $this->widget_inputs( $args, $instance );
1743 
+                }
1744 
+            }
1745 
+        }
1746 
+
1747 
+        /**
1748 
+         * Get the hidden input that when added makes the advanced button show on widget settings.
1749 
+         *
1750 
+         * @return string
1751 
+         */
1752 
+        public function widget_advanced_toggle() {
1753 
+
1754 
+            $output = '';
1755 
+            if ( $this->block_show_advanced() ) {
1756 
+                $val = 1;
1757 
+            } else {
1758 
+                $val = 0;
1759 
+            }
1760 
+
1761 
+            $output .= "<input type='hidden'  class='sd-show-advanced' value='$val' />";
1762 
+
1763 
+            return $output;
1764 
+        }
1765 
+
1766 
+        /**
1767 
+         * Convert require element.
1768 
+         *
1769 
+         * @since 1.0.0
1770 
+         *
1771 
+         * @param string $input Input element.
1772 
+         *
1773 
+         * @return string $output
1774 
+         */
1775 
+        public function convert_element_require( $input ) {
1776 
+
1777 
+            $input = str_replace( "'", '"', $input );// we only want double quotes
1778 
+
1779 
+            $output = esc_attr( str_replace( array( "[%", "%]" ), array(
1780 
+                "jQuery(form).find('[data-argument=\"",
1781 
+                "\"]').find('input,select').val()"
1782 
+            ), $input ) );
1783 
+
1784 
+            return $output;
1785 
+        }
1786 
+
1787 
+        /**
1788 
+         * Builds the inputs for the widget options.
1789 
+         *
1790 
+         * @param $args
1791 
+         * @param $instance
1792 
+         */
1793 
+        public function widget_inputs( $args, $instance ) {
1794 
+
1795 
+            $class             = "";
1796 
+            $element_require   = "";
1797 
+            $custom_attributes = "";
1798 
+
1799 
+            // get value
1800 
+            if ( isset( $instance[ $args['name'] ] ) ) {
1801 
+                $value = $instance[ $args['name'] ];
1802 
+            } elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
1803 
+                $value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
1804 
+            } else {
1805 
+                $value = '';
1806 
+            }
1807 
+
1808 
+            // get placeholder
1809 
+            if ( ! empty( $args['placeholder'] ) ) {
1810 
+                $placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
1811 
+            } else {
1812 
+                $placeholder = '';
1813 
+            }
1814 
+
1815 
+            // get if advanced
1816 
+            if ( isset( $args['advanced'] ) && $args['advanced'] ) {
1817 
+                $class .= " sd-advanced-setting ";
1818 
+            }
1819 
+
1820 
+            // element_require
1821 
+            if ( isset( $args['element_require'] ) && $args['element_require'] ) {
1822 
+                $element_require = $args['element_require'];
1823 
+            }
1824 
+
1825 
+            // custom_attributes
1826 
+            if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
1827 
+                $custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
1828 
+            }
1829 
+
1830 
+            // before wrapper
1831 
+            ?>
1832 1832 
 			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
1833 1833 
 			   data-argument='<?php echo esc_attr( $args['name'] ); ?>'
1834 1834 
 			   data-element_require='<?php if ( $element_require ) {
1835 
-				   echo $this->convert_element_require( $element_require );
1836 
-			   } ?>'
1835 
+                    echo $this->convert_element_require( $element_require );
1836 
+                } ?>'
1837 1837 
 			>
1838 1838 
 				<?php
1839 1839
1840 
-				switch ( $args['type'] ) {
1841 
-					//array('text','password','number','email','tel','url','color')
1842 
-					case "text":
1843 
-					case "password":
1844 
-					case "number":
1845 
-					case "email":
1846 
-					case "tel":
1847 
-					case "url":
1848 
-					case "color":
1849 
-						?>
1840 
+                switch ( $args['type'] ) {
1841 
+                    //array('text','password','number','email','tel','url','color')
1842 
+                    case "text":
1843 
+                    case "password":
1844 
+                    case "number":
1845 
+                    case "email":
1846 
+                    case "tel":
1847 
+                    case "url":
1848 
+                    case "color":
1849 
+                        ?>
1850 1850 
 						<label
1851 1851 
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
1852 1852 
 						<input <?php echo $placeholder; ?> class="widefat"
 
@@ -1857,47 +1857,47 @@  discard block
 
 block discarded – undo
1857 1857 
 							                               value="<?php echo esc_attr( $value ); ?>">
1858 1858 
 						<?php
1859 1859
1860 
-						break;
1861 
-					case "select":
1862 
-						$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
1863 
-						if ( $multiple ) {
1864 
-							if ( empty( $value ) ) {
1865 
-								$value = array();
1866 
-							}
1867 
-						}
1868 
-						?>
1860 
+                        break;
1861 
+                    case "select":
1862 
+                        $multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
1863 
+                        if ( $multiple ) {
1864 
+                            if ( empty( $value ) ) {
1865 
+                                $value = array();
1866 
+                            }
1867 
+                        }
1868 
+                        ?>
1869 1869 
 						<label
1870 1870 
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
1871 1871 
 						<select <?php echo $placeholder; ?> class="widefat"
1872 1872 
 							<?php echo $custom_attributes; ?>
1873 1873 
 							                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
1874 1874 
 							                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
1875 
-							                                if ( $multiple ) {
1876 
-								                                echo "[]";
1877 
-							                                } ?>"
1875 
+                                                            if ( $multiple ) {
1876 
+                                                                echo "[]";
1877 
+                                                            } ?>"
1878 1878 
 							<?php if ( $multiple ) {
1879 
-								echo "multiple";
1880 
-							} //@todo not implemented yet due to gutenberg not supporting it
1881 
-							?>
1879 
+                                echo "multiple";
1880 
+                            } //@todo not implemented yet due to gutenberg not supporting it
1881 
+                            ?>
1882 1882 
 						>
1883 1883 
 							<?php
1884 1884
1885 
-							if ( ! empty( $args['options'] ) ) {
1886 
-								foreach ( $args['options'] as $val => $label ) {
1887 
-									if ( $multiple ) {
1888 
-										$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
1889 
-									} else {
1890 
-										$selected = selected( $value, $val, false );
1891 
-									}
1892 
-									echo "<option value='$val' " . $selected . ">$label</option>";
1893 
-								}
1894 
-							}
1895 
-							?>
1885 
+                            if ( ! empty( $args['options'] ) ) {
1886 
+                                foreach ( $args['options'] as $val => $label ) {
1887 
+                                    if ( $multiple ) {
1888 
+                                        $selected = in_array( $val, $value ) ? 'selected="selected"' : '';
1889 
+                                    } else {
1890 
+                                        $selected = selected( $value, $val, false );
1891 
+                                    }
1892 
+                                    echo "<option value='$val' " . $selected . ">$label</option>";
1893 
+                                }
1894 
+                            }
1895 
+                            ?>
1896 1896 
 						</select>
1897 1897 
 						<?php
1898 
-						break;
1899 
-					case "checkbox":
1900 
-						?>
1898 
+                        break;
1899 
+                    case "checkbox":
1900 
+                        ?>
1901 1901 
 						<input <?php echo $placeholder; ?>
1902 1902 
 							<?php checked( 1, $value, true ) ?>
1903 1903 
 							<?php echo $custom_attributes; ?>
 
@@ -1907,136 +1907,136 @@  discard block
 
 block discarded – undo
1907 1907 
 						<label
1908 1908 
 							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
1909 1909 
 						<?php
1910 
-						break;
1911 
-					case "hidden":
1912 
-						?>
1910 
+                        break;
1911 
+                    case "hidden":
1912 
+                        ?>
1913 1913 
 						<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
1914 1914 
 						       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
1915 1915 
 						       value="<?php echo esc_attr( $value ); ?>">
1916 1916 
 						<?php
1917 
-						break;
1918 
-					default:
1919 
-						echo "No input type found!"; // @todo we need to add more input types.
1920 
-				}
1917 
+                        break;
1918 
+                    default:
1919 
+                        echo "No input type found!"; // @todo we need to add more input types.
1920 
+                }
1921 1921
1922 
-				// after wrapper
1923 
-				?>
1922 
+                // after wrapper
1923 
+                ?>
1924 1924 
 			</p>
1925 1925 
 			<?php
1926 1926
1927 
-		}
1928 
-
1929 
-		/**
1930 
-		 * Get the widget input description html.
1931 
-		 *
1932 
-		 * @param $args
1933 
-		 *
1934 
-		 * @return string
1935 
-		 * @todo, need to make its own tooltip script
1936 
-		 */
1937 
-		public function widget_field_desc( $args ) {
1938 
-
1939 
-			$description = '';
1940 
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
1941 
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
1942 
-					$description = $this->desc_tip( $args['desc'] );
1943 
-				} else {
1944 
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
1945 
-				}
1946 
-			}
1947 
-
1948 
-			return $description;
1949 
-		}
1950 
-
1951 
-		/**
1952 
-		 * Get the tool tip html.
1953 
-		 *
1954 
-		 * @param $tip
1955 
-		 * @param bool $allow_html
1956 
-		 *
1957 
-		 * @return string
1958 
-		 */
1959 
-		function desc_tip( $tip, $allow_html = false ) {
1960 
-			if ( $allow_html ) {
1961 
-				$tip = $this->sanitize_tooltip( $tip );
1962 
-			} else {
1963 
-				$tip = esc_attr( $tip );
1964 
-			}
1965 
-
1966 
-			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
1967 
-		}
1968 
-
1969 
-		/**
1970 
-		 * Sanitize a string destined to be a tooltip.
1971 
-		 *
1972 
-		 * @param string $var
1973 
-		 *
1974 
-		 * @return string
1975 
-		 */
1976 
-		public function sanitize_tooltip( $var ) {
1977 
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
1978 
-				'br'     => array(),
1979 
-				'em'     => array(),
1980 
-				'strong' => array(),
1981 
-				'small'  => array(),
1982 
-				'span'   => array(),
1983 
-				'ul'     => array(),
1984 
-				'li'     => array(),
1985 
-				'ol'     => array(),
1986 
-				'p'      => array(),
1987 
-			) ) );
1988 
-		}
1989 
-
1990 
-		/**
1991 
-		 * Processing widget options on save
1992 
-		 *
1993 
-		 * @param array $new_instance The new options
1994 
-		 * @param array $old_instance The previous options
1995 
-		 *
1996 
-		 * @return array
1997 
-		 * @todo we should add some sanitation here.
1998 
-		 */
1999 
-		public function update( $new_instance, $old_instance ) {
2000 
-
2001 
-			//save the widget
2002 
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
2003 
-
2004 
-			// set widget instance
2005 
-			$this->instance = $instance;
2006 
-
2007 
-			if ( empty( $this->arguments ) ) {
2008 
-				$this->get_arguments();
2009 
-			}
2010 
-
2011 
-			// check for checkboxes
2012 
-			if ( ! empty( $this->arguments ) ) {
2013 
-				foreach ( $this->arguments as $argument ) {
2014 
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
2015 
-						$instance[ $argument['name'] ] = '0';
2016 
-					}
2017 
-				}
2018 
-			}
2019 
-
2020 
-			return $instance;
2021 
-		}
2022 
-
2023 
-		/**
2024 
-		 * Checks if the current call is a ajax call to get the block content.
2025 
-		 *
2026 
-		 * This can be used in your widget to return different content as the block content.
2027 
-		 *
2028 
-		 * @since 1.0.3
2029 
-		 * @return bool
2030 
-		 */
2031 
-		public function is_block_content_call() {
2032 
-			$result = false;
2033 
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
2034 
-				$result = true;
2035 
-			}
2036 
-
2037 
-			return $result;
2038 
-		}
2039 
-
2040 
-	}
1927 
+        }
1928 
+
1929 
+        /**
1930 
+         * Get the widget input description html.
1931 
+         *
1932 
+         * @param $args
1933 
+         *
1934 
+         * @return string
1935 
+         * @todo, need to make its own tooltip script
1936 
+         */
1937 
+        public function widget_field_desc( $args ) {
1938 
+
1939 
+            $description = '';
1940 
+            if ( isset( $args['desc'] ) && $args['desc'] ) {
1941 
+                if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
1942 
+                    $description = $this->desc_tip( $args['desc'] );
1943 
+                } else {
1944 
+                    $description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
1945 
+                }
1946 
+            }
1947 
+
1948 
+            return $description;
1949 
+        }
1950 
+
1951 
+        /**
1952 
+         * Get the tool tip html.
1953 
+         *
1954 
+         * @param $tip
1955 
+         * @param bool $allow_html
1956 
+         *
1957 
+         * @return string
1958 
+         */
1959 
+        function desc_tip( $tip, $allow_html = false ) {
1960 
+            if ( $allow_html ) {
1961 
+                $tip = $this->sanitize_tooltip( $tip );
1962 
+            } else {
1963 
+                $tip = esc_attr( $tip );
1964 
+            }
1965 
+
1966 
+            return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
1967 
+        }
1968 
+
1969 
+        /**
1970 
+         * Sanitize a string destined to be a tooltip.
1971 
+         *
1972 
+         * @param string $var
1973 
+         *
1974 
+         * @return string
1975 
+         */
1976 
+        public function sanitize_tooltip( $var ) {
1977 
+            return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
1978 
+                'br'     => array(),
1979 
+                'em'     => array(),
1980 
+                'strong' => array(),
1981 
+                'small'  => array(),
1982 
+                'span'   => array(),
1983 
+                'ul'     => array(),
1984 
+                'li'     => array(),
1985 
+                'ol'     => array(),
1986 
+                'p'      => array(),
1987 
+            ) ) );
1988 
+        }
1989 
+
1990 
+        /**
1991 
+         * Processing widget options on save
1992 
+         *
1993 
+         * @param array $new_instance The new options
1994 
+         * @param array $old_instance The previous options
1995 
+         *
1996 
+         * @return array
1997 
+         * @todo we should add some sanitation here.
1998 
+         */
1999 
+        public function update( $new_instance, $old_instance ) {
2000 
+
2001 
+            //save the widget
2002 
+            $instance = array_merge( (array) $old_instance, (array) $new_instance );
2003 
+
2004 
+            // set widget instance
2005 
+            $this->instance = $instance;
2006 
+
2007 
+            if ( empty( $this->arguments ) ) {
2008 
+                $this->get_arguments();
2009 
+            }
2010 
+
2011 
+            // check for checkboxes
2012 
+            if ( ! empty( $this->arguments ) ) {
2013 
+                foreach ( $this->arguments as $argument ) {
2014 
+                    if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
2015 
+                        $instance[ $argument['name'] ] = '0';
2016 
+                    }
2017 
+                }
2018 
+            }
2019 
+
2020 
+            return $instance;
2021 
+        }
2022 
+
2023 
+        /**
2024 
+         * Checks if the current call is a ajax call to get the block content.
2025 
+         *
2026 
+         * This can be used in your widget to return different content as the block content.
2027 
+         *
2028 
+         * @since 1.0.3
2029 
+         * @return bool
2030 
+         */
2031 
+        public function is_block_content_call() {
2032 
+            $result = false;
2033 
+            if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
2034 
+                $result = true;
2035 
+            }
2036 
+
2037 
+            return $result;
2038 
+        }
2039 
+
2040 
+    }
2041 2041
2042 2042 
 }
2043 2043 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +336 added lines, -336 removed lines patch added patch discarded remove patch 
@@ -1,9 +1,9 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 
-if ( ! defined( 'ABSPATH' ) ) {
2 
+if (!defined('ABSPATH')) {
3 3 
 	exit;
4 4 
 }
5 5
6 
-if ( ! class_exists( 'WP_Super_Duper' ) ) {
6 
+if (!class_exists('WP_Super_Duper')) {
7 7
8 8
9 9 
 	/**
 
@@ -33,27 +33,27 @@  discard block
 
 block discarded – undo
33 33 
 		/**
34 34 
 		 * Take the array options and use them to build.
35 35 
 		 */
36 
-		public function __construct( $options ) {
36 
+		public function __construct($options) {
37 37 
 			global $sd_widgets;
38 38
39 
-			$sd_widgets[ $options['base_id'] ] = array(
39 
+			$sd_widgets[$options['base_id']] = array(
40 40 
 				'name'       => $options['name'],
41 41 
 				'class_name' => $options['class_name']
42 42 
 			);
43 
-			$this->base_id                     = $options['base_id'];
43 
+			$this->base_id = $options['base_id'];
44 44 
 			// lets filter the options before we do anything
45 
-			$options       = apply_filters( "wp_super_duper_options", $options );
46 
-			$options       = apply_filters( "wp_super_duper_options_{$this->base_id}", $options );
47 
-			$options       = $this->add_name_from_key( $options );
45 
+			$options       = apply_filters("wp_super_duper_options", $options);
46 
+			$options       = apply_filters("wp_super_duper_options_{$this->base_id}", $options);
47 
+			$options       = $this->add_name_from_key($options);
48 48 
 			$this->options = $options;
49 49
50 50 
 			$this->base_id   = $options['base_id'];
51 
-			$this->arguments = isset( $options['arguments'] ) ? $options['arguments'] : array();
51 
+			$this->arguments = isset($options['arguments']) ? $options['arguments'] : array();
52 52
53 53 
 			// init parent
54 
-			parent::__construct( $options['base_id'], $options['name'], $options['widget_ops'] );
54 
+			parent::__construct($options['base_id'], $options['name'], $options['widget_ops']);
55 55
56 
-			if ( isset( $options['class_name'] ) ) {
56 
+			if (isset($options['class_name'])) {
57 57 
 				// register widget
58 58 
 				$this->class_name = $options['class_name'];
59 59 
 
@@ -61,28 +61,28 @@  discard block
 
 block discarded – undo
61 61 
 				$this->register_shortcode();
62 62
63 63 
 				// register block
64 
-				add_action( 'admin_enqueue_scripts', array( $this, 'register_block' ) );
64 
+				add_action('admin_enqueue_scripts', array($this, 'register_block'));
65 65 
 			}
66 66
67 67 
 			// add the CSS and JS we need ONCE
68 68 
 			global $sd_widget_scripts;
69 69
70 
-			if ( ! $sd_widget_scripts ) {
71 
-				wp_add_inline_script( 'admin-widgets', $this->widget_js() );
72 
-				wp_add_inline_script( 'customize-controls', $this->widget_js() );
73 
-				wp_add_inline_style( 'widgets', $this->widget_css() );
70 
+			if (!$sd_widget_scripts) {
71 
+				wp_add_inline_script('admin-widgets', $this->widget_js());
72 
+				wp_add_inline_script('customize-controls', $this->widget_js());
73 
+				wp_add_inline_style('widgets', $this->widget_css());
74 74
75 75 
 				$sd_widget_scripts = true;
76 76
77 77 
 				// add shortcode insert button once
78 
-				add_action( 'media_buttons', array( $this, 'shortcode_insert_button' ) );
79 
-				if ( $this->is_preview() ) {
80 
-					add_action( 'wp_footer', array( $this, 'shortcode_insert_button_script' ) );
78 
+				add_action('media_buttons', array($this, 'shortcode_insert_button'));
79 
+				if ($this->is_preview()) {
80 
+					add_action('wp_footer', array($this, 'shortcode_insert_button_script'));
81 81 
 				}
82 
-				add_action( 'wp_ajax_super_duper_get_widget_settings', array( __CLASS__, 'get_widget_settings' ) );
82 
+				add_action('wp_ajax_super_duper_get_widget_settings', array(__CLASS__, 'get_widget_settings'));
83 83 
 			}
84 84
85 
-			do_action( 'wp_super_duper_widget_init', $options, $this );
85 
+			do_action('wp_super_duper_widget_init', $options, $this);
86 86 
 		}
87 87
88 88 
 		/**
 
@@ -93,16 +93,16 @@  discard block
 
 block discarded – undo
93 93 
 		public static function get_widget_settings() {
94 94 
 			global $sd_widgets;
95 95
96 
-			$shortcode = isset( $_REQUEST['shortcode'] ) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes( $_REQUEST['shortcode'] ) : '';
97 
-			if ( ! $shortcode ) {
96 
+			$shortcode = isset($_REQUEST['shortcode']) && $_REQUEST['shortcode'] ? sanitize_title_with_dashes($_REQUEST['shortcode']) : '';
97 
+			if (!$shortcode) {
98 98 
 				wp_die();
99 99 
 			}
100 
-			$widget_args = isset( $sd_widgets[ $shortcode ] ) ? $sd_widgets[ $shortcode ] : '';
101 
-			if ( ! $widget_args ) {
100 
+			$widget_args = isset($sd_widgets[$shortcode]) ? $sd_widgets[$shortcode] : '';
101 
+			if (!$widget_args) {
102 102 
 				wp_die();
103 103 
 			}
104 
-			$class_name = isset( $widget_args['class_name'] ) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
105 
-			if ( ! $class_name ) {
104 
+			$class_name = isset($widget_args['class_name']) && $widget_args['class_name'] ? $widget_args['class_name'] : '';
105 
+			if (!$class_name) {
106 106 
 				wp_die();
107 107 
 			}
108 108 
 
@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
 			$widget = new $class_name;
111 111
112 112 
 			ob_start();
113 
-			$widget->form( array() );
113 
+			$widget->form(array());
114 114 
 			$form = ob_get_clean();
115 115 
 			echo "<form id='$shortcode'>" . $form . "<div class=\"widget-control-save\"></div></form>";
116 116 
 			echo "<style>" . $widget->widget_css() . "</style>";
 
@@ -128,9 +128,9 @@  discard block
 
 block discarded – undo
128 128 
 		 * @param string $editor_id Optional. Shortcode editor id. Default null.
129 129 
 		 * @param string $insert_shortcode_function Optional. Insert shotcode function. Default null.
130 130 
 		 */
131 
-		public static function shortcode_insert_button( $editor_id = '', $insert_shortcode_function = '' ) {
131 
+		public static function shortcode_insert_button($editor_id = '', $insert_shortcode_function = '') {
132 132 
 			global $sd_widgets, $shortcode_insert_button_once;
133 
-			if ( $shortcode_insert_button_once ) {
133 
+			if ($shortcode_insert_button_once) {
134 134 
 				return;
135 135 
 			}
136 136 
 			add_thickbox();
 
@@ -139,12 +139,12 @@  discard block
 
 block discarded – undo
139 139
140 140 
 				<div class="sd-shortcode-left-wrap">
141 141 
 					<?php
142 
-					asort( $sd_widgets );
143 
-					if ( ! empty( $sd_widgets ) ) {
142 
+					asort($sd_widgets);
143 
+					if (!empty($sd_widgets)) {
144 144 
 						echo '<select class="widefat" onchange="sd_get_shortcode_options(this);">';
145 
-						echo "<option>" . __( 'Select shortcode' ) . "</option>";
146 
-						foreach ( $sd_widgets as $shortcode => $class ) {
147 
-							echo "<option value='" . esc_attr( $shortcode ) . "'>" . esc_attr( $shortcode ) . " (" . esc_attr( $class['name'] ) . ")</option>";
145 
+						echo "<option>" . __('Select shortcode') . "</option>";
146 
+						foreach ($sd_widgets as $shortcode => $class) {
147 
+							echo "<option value='" . esc_attr($shortcode) . "'>" . esc_attr($shortcode) . " (" . esc_attr($class['name']) . ")</option>";
148 148 
 						}
149 149 
 						echo "</select>";
150 150 
 
@@ -158,11 +158,11 @@  discard block
 
 block discarded – undo
158 158 
 					<textarea id='sd-shortcode-output' disabled></textarea>
159 159 
 					<div id='sd-shortcode-output-actions'>
160 160 
 						<button class="button"
161 
-						        onclick="sd_insert_shortcode(<?php if ( ! empty( $editor_id ) ) {
161 
+						        onclick="sd_insert_shortcode(<?php if (!empty($editor_id)) {
162 162 
 							        echo "'" . $editor_id . "'";
163 
-						        } ?>)"><?php _e( 'Insert shortcode' ); ?></button>
163 
+						        } ?>)"><?php _e('Insert shortcode'); ?></button>
164 164 
 						<button class="button"
165 
-						        onclick="sd_copy_to_clipboard()"><?php _e( 'Copy shortcode' ); ?></button>
165 
+						        onclick="sd_copy_to_clipboard()"><?php _e('Copy shortcode'); ?></button>
166 166 
 					</div>
167 167 
 				</div>
168 168 
 
@@ -170,15 +170,15 @@  discard block
 
 block discarded – undo
170 170
171 171 
 			<?php
172 172 
 			// if Font Awesome is available then show a icon if not show a WP icon.
173 
-			$button_string = wp_style_is( 'font-awesome', 'enqueued' ) && 1 == 2 ? '<i class="fas fa-cubes" aria-hidden="true"></i>' : '<span style="vertical-align: middle;line-height: 18px;font-size: 20px;" class="dashicons dashicons-screenoptions"></span>';
173 
+			$button_string = wp_style_is('font-awesome', 'enqueued') && 1 == 2 ? '<i class="fas fa-cubes" aria-hidden="true"></i>' : '<span style="vertical-align: middle;line-height: 18px;font-size: 20px;" class="dashicons dashicons-screenoptions"></span>';
174 174 
 			?>
175 175
176 176 
 			<a href="#TB_inline?width=100%&height=550&inlineId=super-duper-content"
177 177 
 			   class="thickbox button super-duper-content-open"
178 
-			   title="<?php _e( 'Add Shortcode' ); ?>"><?php echo $button_string; ?></a>
178 
+			   title="<?php _e('Add Shortcode'); ?>"><?php echo $button_string; ?></a>
179 179
180 180 
 			<?php
181 
-			self::shortcode_insert_button_script( $editor_id, $insert_shortcode_function );
181 
+			self::shortcode_insert_button_script($editor_id, $insert_shortcode_function);
182 182 
 			$shortcode_insert_button_once = true;
183 183 
 		}
184 184 
 
@@ -237,7 +237,7 @@  discard block
 
 block discarded – undo
237 237 
 						jQuery($this).data('sd-widget-enabled', true);
238 238 
 					}
239 239
240 
-					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>';
240 
+					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>';
241 241 
 					var form = jQuery($this).parents('' + $selector + '');
242 242
243 243 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
 
@@ -274,10 +274,10 @@  discard block
 
 block discarded – undo
274 274 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
275 275 
 			 */
276 276
277 
-			return str_replace( array(
277 
+			return str_replace(array(
278 278 
 				'<script>',
279 279 
 				'</script>'
280 
-			), '', $output );
280 
+			), '', $output);
281 281 
 		}
282 282
283 283 
 		/**
 
@@ -288,7 +288,7 @@  discard block
 
 block discarded – undo
288 288 
 		 * @param string $editor_id
289 289 
 		 * @param string $insert_shortcode_function
290 290 
 		 */
291 
-		public static function shortcode_insert_button_script( $editor_id = '', $insert_shortcode_function = '' ) {
291 
+		public static function shortcode_insert_button_script($editor_id = '', $insert_shortcode_function = '') {
292 292 
 			?>
293 293 
 			<style>
294 294 
 				.sd-shortcode-left-wrap {
 
@@ -408,15 +408,15 @@  discard block
 
 block discarded – undo
408 408 
 				}
409 409 
 			</style>
410 410 
 			<?php
411 
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
411 
+			if (class_exists('SiteOrigin_Panels')) {
412 412 
 				echo "<script>" . self::siteorigin_js() . "</script>";
413 413 
 			}
414 414 
 			?>
415 415 
 			<script>
416 416 
 				<?php
417 
-				if(! empty( $insert_shortcode_function )){
417 
+				if (!empty($insert_shortcode_function)) {
418 418 
 					echo $insert_shortcode_function;
419 
-				}else{
419 
+				} else {
420 420
421 421 
 				/**
422 422 
 				 * Function for super duper insert shortcode.
 
@@ -429,7 +429,7 @@  discard block
 
 block discarded – undo
429 429 
 					if ($shortcode) {
430 430
431 431 
 						if (!$editor_id) {
432 
-							$editor_id = "<?php if ( isset( $_REQUEST['et_fb'] ) ) {
432 
+							$editor_id = "<?php if (isset($_REQUEST['et_fb'])) {
433 433 
 								echo "#main_content_content_vb_tiny_mce";
434 434 
 							} else {
435 435 
 								echo "#wp-content-editor-container textarea";
 
@@ -496,11 +496,11 @@  discard block
 
 block discarded – undo
496 496 
 							'shortcode': $short_code,
497 497 
 							'attributes': 123,
498 498 
 							'post_id': 321,
499 
-							'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
499 
+							'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
500 500 
 						};
501 501
502 502 
 						if (typeof ajaxurl === 'undefined') {
503 
-							var ajaxurl = "<?php echo admin_url( 'admin-ajax.php' );?>";
503 
+							var ajaxurl = "<?php echo admin_url('admin-ajax.php'); ?>";
504 504 
 						}
505 505
506 506 
 						jQuery.post(ajaxurl, data, function (response) {
 
@@ -622,10 +622,10 @@  discard block
 
 block discarded – undo
622 622 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
623 623 
 			 */
624 624
625 
-			return str_replace( array(
625 
+			return str_replace(array(
626 626 
 				'<style>',
627 627 
 				'</style>'
628 
-			), '', $output );
628 
+			), '', $output);
629 629 
 		}
630 630
631 631 
 		public function widget_js() {
 
@@ -690,7 +690,7 @@  discard block
 
 block discarded – undo
690 690 
 						jQuery($this).data('sd-widget-enabled', true);
691 691 
 					}
692 692
693 
-					var $button = '<button title="<?php _e( 'Advanced Settings' );?>" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
693 
+					var $button = '<button title="<?php _e('Advanced Settings'); ?>" class="button button-primary right sd-advanced-button" onclick="sd_toggle_advanced(this);return false;"><i class="fas fa-sliders-h" aria-hidden="true"></i></button>';
694 694 
 					var form = jQuery($this).parents('' + $selector + '');
695 695
696 696 
 					if (jQuery($this).val() == '1' && jQuery(form).find('.sd-advanced-button').length == 0) {
 
@@ -782,7 +782,7 @@  discard block
 
 block discarded – undo
782 782 
 					});
783 783
784 784 
 				}
785 
-				<?php do_action( 'wp_super_duper_widget_js', $this ); ?>
785 
+				<?php do_action('wp_super_duper_widget_js', $this); ?>
786 786 
 			</script>
787 787 
 			<?php
788 788 
 			$output = ob_get_clean();
 
@@ -791,10 +791,10 @@  discard block
 
 block discarded – undo
791 791 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
792 792 
 			 */
793 793
794 
-			return str_replace( array(
794 
+			return str_replace(array(
795 795 
 				'<script>',
796 796 
 				'</script>'
797 
-			), '', $output );
797 
+			), '', $output);
798 798 
 		}
799 799
800 800 
 
@@ -805,14 +805,14 @@  discard block
 
 block discarded – undo
805 805 
 		 *
806 806 
 		 * @return mixed
807 807 
 		 */
808 
-		private function add_name_from_key( $options, $arguments = false ) {
809 
-			if ( ! empty( $options['arguments'] ) ) {
810 
-				foreach ( $options['arguments'] as $key => $val ) {
811 
-					$options['arguments'][ $key ]['name'] = $key;
808 
+		private function add_name_from_key($options, $arguments = false) {
809 
+			if (!empty($options['arguments'])) {
810 
+				foreach ($options['arguments'] as $key => $val) {
811 
+					$options['arguments'][$key]['name'] = $key;
812 812 
 				}
813 
-			} elseif ( $arguments && is_array( $options ) && ! empty( $options ) ) {
814 
-				foreach ( $options as $key => $val ) {
815 
-					$options[ $key ]['name'] = $key;
813 
+			} elseif ($arguments && is_array($options) && !empty($options)) {
814 
+				foreach ($options as $key => $val) {
815 
+					$options[$key]['name'] = $key;
816 816 
 				}
817 817 
 			}
818 818 
 
@@ -825,8 +825,8 @@  discard block
 
 block discarded – undo
825 825 
 		 * @since 1.0.0
826 826 
 		 */
827 827 
 		public function register_shortcode() {
828 
-			add_shortcode( $this->base_id, array( $this, 'shortcode_output' ) );
829 
-			add_action( 'wp_ajax_super_duper_output_shortcode', array( __CLASS__, 'render_shortcode' ) );
828 
+			add_shortcode($this->base_id, array($this, 'shortcode_output'));
829 
+			add_action('wp_ajax_super_duper_output_shortcode', array(__CLASS__, 'render_shortcode'));
830 830 
 		}
831 831
832 832 
 		/**
 
@@ -836,33 +836,33 @@  discard block
 
 block discarded – undo
836 836 
 		 */
837 837 
 		public static function render_shortcode() {
838 838
839 
-			check_ajax_referer( 'super_duper_output_shortcode', '_ajax_nonce', true );
840 
-			if ( ! current_user_can( 'manage_options' ) ) {
839 
+			check_ajax_referer('super_duper_output_shortcode', '_ajax_nonce', true);
840 
+			if (!current_user_can('manage_options')) {
841 841 
 				wp_die();
842 842 
 			}
843 843
844 844 
 			// we might need the $post value here so lets set it.
845 
-			if ( isset( $_POST['post_id'] ) && $_POST['post_id'] ) {
846 
-				$post_obj = get_post( absint( $_POST['post_id'] ) );
847 
-				if ( ! empty( $post_obj ) && empty( $post ) ) {
845 
+			if (isset($_POST['post_id']) && $_POST['post_id']) {
846 
+				$post_obj = get_post(absint($_POST['post_id']));
847 
+				if (!empty($post_obj) && empty($post)) {
848 848 
 					global $post;
849 849 
 					$post = $post_obj;
850 850 
 				}
851 851 
 			}
852 852
853 
-			if ( isset( $_POST['shortcode'] ) && $_POST['shortcode'] ) {
854 
-				$shortcode_name   = sanitize_title_with_dashes( $_POST['shortcode'] );
855 
-				$attributes_array = isset( $_POST['attributes'] ) && $_POST['attributes'] ? $_POST['attributes'] : array();
853 
+			if (isset($_POST['shortcode']) && $_POST['shortcode']) {
854 
+				$shortcode_name   = sanitize_title_with_dashes($_POST['shortcode']);
855 
+				$attributes_array = isset($_POST['attributes']) && $_POST['attributes'] ? $_POST['attributes'] : array();
856 856 
 				$attributes       = '';
857 
-				if ( ! empty( $attributes_array ) ) {
858 
-					foreach ( $attributes_array as $key => $value ) {
859 
-						$attributes .= " " . sanitize_title_with_dashes( $key ) . "='" . wp_slash( $value ) . "' ";
857 
+				if (!empty($attributes_array)) {
858 
+					foreach ($attributes_array as $key => $value) {
859 
+						$attributes .= " " . sanitize_title_with_dashes($key) . "='" . wp_slash($value) . "' ";
860 860 
 					}
861 861 
 				}
862 862
863 863 
 				$shortcode = "[" . $shortcode_name . " " . $attributes . "]";
864 864
865 
-				echo do_shortcode( $shortcode );
865 
+				echo do_shortcode($shortcode);
866 866
867 867 
 			}
868 868 
 			wp_die();
 
@@ -876,37 +876,37 @@  discard block
 
 block discarded – undo
876 876 
 		 *
877 877 
 		 * @return string
878 878 
 		 */
879 
-		public function shortcode_output( $args = array(), $content = '' ) {
880 
-			$args = self::argument_values( $args );
879 
+		public function shortcode_output($args = array(), $content = '') {
880 
+			$args = self::argument_values($args);
881 881
882 882 
 			// add extra argument so we know its a output to gutenberg
883 883 
 			//$args
884 
-			$args = $this->string_to_bool( $args );
884 
+			$args = $this->string_to_bool($args);
885 885
886 886
887 
-			$calss = isset( $this->options['widget_ops']['classname'] ) ? esc_attr( $this->options['widget_ops']['classname'] ) : '';
887 
+			$calss = isset($this->options['widget_ops']['classname']) ? esc_attr($this->options['widget_ops']['classname']) : '';
888 888
889 
-			$calss = apply_filters( 'wp_super_duper_div_classname', $calss, $args, $this );
890 
-			$calss = apply_filters( 'wp_super_duper_div_classname_' . $this->base_id, $calss, $args, $this );
889 
+			$calss = apply_filters('wp_super_duper_div_classname', $calss, $args, $this);
890 
+			$calss = apply_filters('wp_super_duper_div_classname_' . $this->base_id, $calss, $args, $this);
891 891
892 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs', '', $args, $this );
893 
-			$attrs = apply_filters( 'wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this );
892 
+			$attrs = apply_filters('wp_super_duper_div_attrs', '', $args, $this);
893 
+			$attrs = apply_filters('wp_super_duper_div_attrs_' . $this->base_id, '', $args, $this);
894 894
895 895 
 			$shortcode_args = array();
896 896 
 			$output         = '';
897 
-			$no_wrap        = isset( $this->options['no_wrap'] ) && $this->options['no_wrap'] ? true : false;
898 
-			$main_content   = $this->output( $args, $shortcode_args, $content );
899 
-			if ( $main_content && ! $no_wrap ) {
897 
+			$no_wrap        = isset($this->options['no_wrap']) && $this->options['no_wrap'] ? true : false;
898 
+			$main_content   = $this->output($args, $shortcode_args, $content);
899 
+			if ($main_content && !$no_wrap) {
900 900 
 				// wrap the shortcode in a dive with the same class as the widget
901 901 
 				$output .= '<div class="' . $calss . '" ' . $attrs . '>';
902 
-				if ( ! empty( $args['title'] ) ) {
902 
+				if (!empty($args['title'])) {
903 903 
 					// if its a shortcode and there is a title try to grab the title wrappers
904 
-					$shortcode_args = array( 'before_title' => '', 'after_title' => '' );
905 
-					if ( empty( $instance ) ) {
904 
+					$shortcode_args = array('before_title' => '', 'after_title' => '');
905 
+					if (empty($instance)) {
906 906 
 						global $wp_registered_sidebars;
907 
-						if ( ! empty( $wp_registered_sidebars ) ) {
908 
-							foreach ( $wp_registered_sidebars as $sidebar ) {
909 
-								if ( ! empty( $sidebar['before_title'] ) ) {
907 
+						if (!empty($wp_registered_sidebars)) {
908 
+							foreach ($wp_registered_sidebars as $sidebar) {
909 
+								if (!empty($sidebar['before_title'])) {
910 910 
 									$shortcode_args['before_title'] = $sidebar['before_title'];
911 911 
 									$shortcode_args['after_title']  = $sidebar['after_title'];
912 912 
 									break;
 
@@ -914,17 +914,17 @@  discard block
 
 block discarded – undo
914 914 
 							}
915 915 
 						}
916 916 
 					}
917 
-					$output .= $this->output_title( $shortcode_args, $args );
917 
+					$output .= $this->output_title($shortcode_args, $args);
918 918 
 				}
919 919 
 				$output .= $main_content;
920 920 
 				$output .= '</div>';
921 
-			} elseif ( $main_content && $no_wrap ) {
921 
+			} elseif ($main_content && $no_wrap) {
922 922 
 				$output .= $main_content;
923 923 
 			}
924 924
925 925 
 			// if preview show a placeholder if empty
926 
-			if ( $this->is_preview() && $output == '' ) {
927 
-				$output = $this->preview_placeholder_text( "[{" . $this->base_id . "}]" );
926 
+			if ($this->is_preview() && $output == '') {
927 
+				$output = $this->preview_placeholder_text("[{" . $this->base_id . "}]");
928 928 
 			}
929 929
930 930 
 			return $output;
 
@@ -937,8 +937,8 @@  discard block
 
 block discarded – undo
937 937 
 		 *
938 938 
 		 * @return string
939 939 
 		 */
940 
-		public function preview_placeholder_text( $name = '' ) {
941 
-			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf( __( 'Placeholder for: %s' ), $name ) . "</div>";
940 
+		public function preview_placeholder_text($name = '') {
941 
+			return "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" . sprintf(__('Placeholder for: %s'), $name) . "</div>";
942 942 
 		}
943 943
944 944 
 		/**
 
@@ -948,13 +948,13 @@  discard block
 
 block discarded – undo
948 948 
 		 *
949 949 
 		 * @return mixed
950 950 
 		 */
951 
-		public function string_to_bool( $options ) {
951 
+		public function string_to_bool($options) {
952 952 
 			// convert bool strings to booleans
953 
-			foreach ( $options as $key => $val ) {
954 
-				if ( $val == 'false' ) {
955 
-					$options[ $key ] = false;
956 
-				} elseif ( $val == 'true' ) {
957 
-					$options[ $key ] = true;
953 
+			foreach ($options as $key => $val) {
954 
+				if ($val == 'false') {
955 
+					$options[$key] = false;
956 
+				} elseif ($val == 'true') {
957 
+					$options[$key] = true;
958 958 
 				}
959 959 
 			}
960 960 
 
@@ -968,24 +968,24 @@  discard block
 
 block discarded – undo
968 968 
 		 *
969 969 
 		 * @return array
970 970 
 		 */
971 
-		public function argument_values( $instance ) {
971 
+		public function argument_values($instance) {
972 972 
 			$argument_values = array();
973 973
974 974 
 			// set widget instance
975 975 
 			$this->instance = $instance;
976 976
977 
-			if ( empty( $this->arguments ) ) {
977 
+			if (empty($this->arguments)) {
978 978 
 				$this->arguments = $this->get_arguments();
979 979 
 			}
980 980
981 
-			if ( ! empty( $this->arguments ) ) {
982 
-				foreach ( $this->arguments as $key => $args ) {
981 
+			if (!empty($this->arguments)) {
982 
+				foreach ($this->arguments as $key => $args) {
983 983 
 					// set the input name from the key
984 984 
 					$args['name'] = $key;
985 985 
 					//
986 
-					$argument_values[ $key ] = isset( $instance[ $key ] ) ? $instance[ $key ] : '';
987 
-					if ( $argument_values[ $key ] == '' && isset( $args['default'] ) ) {
988 
-						$argument_values[ $key ] = $args['default'];
986 
+					$argument_values[$key] = isset($instance[$key]) ? $instance[$key] : '';
987 
+					if ($argument_values[$key] == '' && isset($args['default'])) {
988 
+						$argument_values[$key] = $args['default'];
989 989 
 					}
990 990 
 				}
991 991 
 			}
 
@@ -1012,12 +1012,12 @@  discard block
 
 block discarded – undo
1012 1012 
 		 * @return array Get arguments.
1013 1013 
 		 */
1014 1014 
 		public function get_arguments() {
1015 
-			if ( empty( $this->arguments ) ) {
1015 
+			if (empty($this->arguments)) {
1016 1016 
 				$this->arguments = $this->set_arguments();
1017 1017 
 			}
1018 1018
1019 
-			$this->arguments = apply_filters( 'wp_super_duper_arguments', $this->arguments, $this->options, $this->instance );
1020 
-			$this->arguments = $this->add_name_from_key( $this->arguments, true );
1019 
+			$this->arguments = apply_filters('wp_super_duper_arguments', $this->arguments, $this->options, $this->instance);
1020 
+			$this->arguments = $this->add_name_from_key($this->arguments, true);
1021 1021
1022 1022 
 			return $this->arguments;
1023 1023 
 		}
 
@@ -1029,7 +1029,7 @@  discard block
 
 block discarded – undo
1029 1029 
 		 * @param array $widget_args
1030 1030 
 		 * @param string $content
1031 1031 
 		 */
1032 
-		public function output( $args = array(), $widget_args = array(), $content = '' ) {
1032 
+		public function output($args = array(), $widget_args = array(), $content = '') {
1033 1033
1034 1034 
 		}
1035 1035 
 
@@ -1037,10 +1037,10 @@  discard block
 
 block discarded – undo
1037 1037 
 		 * Add the dynamic block code inline when the wp-block in enqueued.
1038 1038 
 		 */
1039 1039 
 		public function register_block() {
1040 
-			wp_add_inline_script( 'wp-blocks', $this->block() );
1041 
-			if ( class_exists( 'SiteOrigin_Panels' ) ) {
1040 
+			wp_add_inline_script('wp-blocks', $this->block());
1041 
+			if (class_exists('SiteOrigin_Panels')) {
1042 1042
1043 
-				wp_add_inline_script( 'wp-blocks', $this->siteorigin_js() );
1043 
+				wp_add_inline_script('wp-blocks', $this->siteorigin_js());
1044 1044
1045 1045 
 			}
1046 1046 
 		}
 
@@ -1055,13 +1055,13 @@  discard block
 
 block discarded – undo
1055 1055 
 			$show      = false;
1056 1056 
 			$arguments = $this->arguments;
1057 1057
1058 
-			if ( empty( $arguments ) ) {
1058 
+			if (empty($arguments)) {
1059 1059 
 				$arguments = $this->get_arguments();
1060 1060 
 			}
1061 1061
1062 
-			if ( ! empty( $arguments ) ) {
1063 
-				foreach ( $arguments as $argument ) {
1064 
-					if ( isset( $argument['advanced'] ) && $argument['advanced'] ) {
1062 
+			if (!empty($arguments)) {
1063 
+				foreach ($arguments as $argument) {
1064 
+					if (isset($argument['advanced']) && $argument['advanced']) {
1065 1065 
 						$show = true;
1066 1066 
 					}
1067 1067 
 				}
 
@@ -1112,12 +1112,12 @@  discard block
 
 block discarded – undo
1112 1112 
 					 * @return {?WPBlock}          The block, if it has been successfully
1113 1113 
 					 *                             registered; otherwise `undefined`.
1114 1114 
 					 */
1115 
-					registerBlockType('<?php echo str_replace( "_", "-", sanitize_title_with_dashes( $this->options['textdomain'] ) . '/' . sanitize_title_with_dashes( $this->options['class_name'] ) );  ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
1116 
-						title: '<?php echo $this->options['name'];?>', // Block title.
1117 
-						description: '<?php echo esc_attr( $this->options['widget_ops']['description'] )?>', // Block title.
1118 
-						icon: '<?php echo isset( $this->options['block-icon'] ) ? esc_attr( $this->options['block-icon'] ) : 'shield-alt';?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
1119 
-						category: '<?php echo isset( $this->options['block-category'] ) ? esc_attr( $this->options['block-category'] ) : 'common';?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
1120 
-						<?php if ( isset( $this->options['block-keywords'] ) ) {
1115 
+					registerBlockType('<?php echo str_replace("_", "-", sanitize_title_with_dashes($this->options['textdomain']) . '/' . sanitize_title_with_dashes($this->options['class_name'])); ?>', { // Block name. Block names must be string that contains a namespace prefix. Example: my-plugin/my-custom-block.
1116 
+						title: '<?php echo $this->options['name']; ?>', // Block title.
1117 
+						description: '<?php echo esc_attr($this->options['widget_ops']['description'])?>', // Block title.
1118 
+						icon: '<?php echo isset($this->options['block-icon']) ? esc_attr($this->options['block-icon']) : 'shield-alt'; ?>', // Block icon from Dashicons → https://developer.wordpress.org/resource/dashicons/.
1119 
+						category: '<?php echo isset($this->options['block-category']) ? esc_attr($this->options['block-category']) : 'common'; ?>', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
1120 
+						<?php if (isset($this->options['block-keywords'])) {
1121 1121 
 						echo "keywords : " . $this->options['block-keywords'] . ",";
1122 1122 
 					}?>
1123 1123 
 
@@ -1127,10 +1127,10 @@  discard block
 
 block discarded – undo
1127 1127
1128 1128 
 						$show_alignment = false;
1129 1129
1130 
-						if ( ! empty( $this->arguments ) ) {
1130 
+						if (!empty($this->arguments)) {
1131 1131 
 							echo "attributes : {";
1132 1132
1133 
-							if ( $show_advanced ) {
1133 
+							if ($show_advanced) {
1134 1134 
 								echo "show_advanced: {";
1135 1135 
 								echo "	type: 'boolean',";
1136 1136 
 								echo "  default: false,";
 
@@ -1138,42 +1138,42 @@  discard block
 
 block discarded – undo
1138 1138 
 							}
1139 1139
1140 1140 
 							// block wrap element
1141 
-							if ( isset( $this->options['block-wrap'] ) ) { //@todo we should validate this?
1141 
+							if (isset($this->options['block-wrap'])) { //@todo we should validate this?
1142 1142 
 								echo "block_wrap: {";
1143 1143 
 								echo "	type: 'string',";
1144 
-								echo "  default: '" . esc_attr( $this->options['block-wrap'] ) . "',";
1144 
+								echo "  default: '" . esc_attr($this->options['block-wrap']) . "',";
1145 1145 
 								echo "},";
1146 1146 
 							}
1147 1147
1148 1148
1149 
-							foreach ( $this->arguments as $key => $args ) {
1149 
+							foreach ($this->arguments as $key => $args) {
1150 1150
1151 1151 
 								// set if we should show alignment
1152 
-								if ( $key == 'alignment' ) {
1152 
+								if ($key == 'alignment') {
1153 1153 
 									$show_alignment = true;
1154 1154 
 								}
1155 1155
1156 1156 
 								$extra = '';
1157 1157
1158 
-								if ( $args['type'] == 'checkbox' ) {
1158 
+								if ($args['type'] == 'checkbox') {
1159 1159 
 									$type    = 'boolean';
1160 
-									$default = isset( $args['default'] ) && $args['default'] ? 'true' : 'false';
1161 
-								} elseif ( $args['type'] == 'number' ) {
1160 
+									$default = isset($args['default']) && $args['default'] ? 'true' : 'false';
1161 
+								} elseif ($args['type'] == 'number') {
1162 1162 
 									$type    = 'number';
1163 
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1164 
-								} elseif ( $args['type'] == 'select' && ! empty( $args['multiple'] ) ) {
1163 
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
1164 
+								} elseif ($args['type'] == 'select' && !empty($args['multiple'])) {
1165 1165 
 									$type = 'array';
1166 
-									if ( is_array( $args['default'] ) ) {
1167 
-										$default = isset( $args['default'] ) ? "['" . implode( "','", $args['default'] ) . "']" : "[]";
1166 
+									if (is_array($args['default'])) {
1167 
+										$default = isset($args['default']) ? "['" . implode("','", $args['default']) . "']" : "[]";
1168 1168 
 									} else {
1169 
-										$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1169 
+										$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
1170 1170 
 									}
1171 
-								} elseif ( $args['type'] == 'multiselect' ) {
1171 
+								} elseif ($args['type'] == 'multiselect') {
1172 1172 
 									$type    = 'array';
1173 
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1173 
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
1174 1174 
 								} else {
1175 1175 
 									$type    = 'string';
1176 
-									$default = isset( $args['default'] ) ? "'" . $args['default'] . "'" : "''";
1176 
+									$default = isset($args['default']) ? "'" . $args['default'] . "'" : "''";
1177 1177 
 								}
1178 1178 
 								echo $key . " : {";
1179 1179 
 								echo "type : '$type',";
 
@@ -1203,12 +1203,12 @@  discard block
 
 block discarded – undo
1203 1203 
 									is_fetching = true;
1204 1204 
 									var data = {
1205 1205 
 										'action': 'super_duper_output_shortcode',
1206 
-										'shortcode': '<?php echo $this->options['base_id'];?>',
1206 
+										'shortcode': '<?php echo $this->options['base_id']; ?>',
1207 1207 
 										'attributes': props.attributes,
1208 
-										'post_id': <?php global $post; if ( isset( $post->ID ) ) {
1208 
+										'post_id': <?php global $post; if (isset($post->ID)) {
1209 1209 
 										echo $post->ID;
1210 1210 
 									}?>,
1211 
-										'_ajax_nonce': '<?php echo wp_create_nonce( 'super_duper_output_shortcode' );?>'
1211 
+										'_ajax_nonce': '<?php echo wp_create_nonce('super_duper_output_shortcode'); ?>'
1212 1212 
 									};
1213 1213
1214 1214 
 									jQuery.post(ajaxurl, data, function (response) {
 
@@ -1217,7 +1217,7 @@  discard block
 
 block discarded – undo
1217 1217
1218 1218 
 										// if the content is empty then we place some placeholder text
1219 1219 
 										if (env == '') {
1220 
-											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e( 'Placeholder for: ' );?>" + props.name + "</div>";
1220 
+											env = "<div style='background:#0185ba33;padding: 10px;border: 4px #ccc dashed;'>" + "<?php _e('Placeholder for: '); ?>" + props.name + "</div>";
1221 1221 
 										}
1222 1222
1223 1223 
 										props.setAttributes({content: env});
 
@@ -1236,7 +1236,7 @@  discard block
 
 block discarded – undo
1236 1236
1237 1237 
 								el(wp.editor.BlockControls, {key: 'controls'},
1238 1238
1239 
-									<?php if($show_alignment){?>
1239 
+									<?php if ($show_alignment) {?>
1240 1240 
 									el(
1241 1241 
 										wp.editor.AlignmentToolbar,
1242 1242 
 										{
 
@@ -1254,9 +1254,9 @@  discard block
 
 block discarded – undo
1254 1254
1255 1255 
 									<?php
1256 1256
1257 
-									if(! empty( $this->arguments )){
1257 
+									if (!empty($this->arguments)) {
1258 1258
1259 
-									if ( $show_advanced ) {
1259 
+									if ($show_advanced) {
1260 1260 
 									?>
1261 1261 
 									el(
1262 1262 
 										wp.components.ToggleControl,
 
@@ -1272,68 +1272,68 @@  discard block
 
 block discarded – undo
1272 1272
1273 1273 
 									}
1274 1274
1275 
-									foreach($this->arguments as $key => $args){
1276 
-									$custom_attributes = ! empty( $args['custom_attributes'] ) ? $this->array_to_attributes( $args['custom_attributes'] ) : '';
1275 
+									foreach ($this->arguments as $key => $args) {
1276 
+									$custom_attributes = !empty($args['custom_attributes']) ? $this->array_to_attributes($args['custom_attributes']) : '';
1277 1277 
 									$options = '';
1278 1278 
 									$extra = '';
1279 1279 
 									$require = '';
1280 1280 
 									$onchange = "props.setAttributes({ $key: $key } )";
1281 1281 
 									$value = "props.attributes.$key";
1282 
-									$text_type = array( 'text', 'password', 'number', 'email', 'tel', 'url', 'color' );
1283 
-									if ( in_array( $args['type'], $text_type ) ) {
1282 
+									$text_type = array('text', 'password', 'number', 'email', 'tel', 'url', 'color');
1283 
+									if (in_array($args['type'], $text_type)) {
1284 1284 
 										$type = 'TextControl';
1285 
-									} elseif ( $args['type'] == 'checkbox' ) {
1285 
+									} elseif ($args['type'] == 'checkbox') {
1286 1286 
 										$type = 'CheckboxControl';
1287 1287 
 										$extra .= "checked: props.attributes.$key,";
1288 1288 
 										$onchange = "props.setAttributes({ $key: ! props.attributes.$key } )";
1289 
-									} elseif ( $args['type'] == 'select' || $args['type'] == 'multiselect' ) {
1289 
+									} elseif ($args['type'] == 'select' || $args['type'] == 'multiselect') {
1290 1290 
 										$type = 'SelectControl';
1291 
-										if ( ! empty( $args['options'] ) ) {
1291 
+										if (!empty($args['options'])) {
1292 1292 
 											$options .= "options  : [";
1293 
-											foreach ( $args['options'] as $option_val => $option_label ) {
1294 
-												$options .= "{ value : '" . esc_attr( $option_val ) . "',     label : '" . esc_attr( $option_label ) . "'     },";
1293 
+											foreach ($args['options'] as $option_val => $option_label) {
1294 
+												$options .= "{ value : '" . esc_attr($option_val) . "',     label : '" . esc_attr($option_label) . "'     },";
1295 1295 
 											}
1296 1296 
 											$options .= "],";
1297 1297 
 										}
1298 
-										if ( isset( $args['multiple'] ) && $args['multiple'] ) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
1298 
+										if (isset($args['multiple']) && $args['multiple']) { //@todo multiselect does not work at the moment: https://github.com/WordPress/gutenberg/issues/5550
1299 1299 
 											$extra .= ' multiple: true, ';
1300 1300 
 											//$onchange = "props.setAttributes({ $key: ['edit'] } )";
1301 1301 
 											//$value = "['edit', 'delete']";
1302 1302 
 										}
1303 
-									} elseif ( $args['type'] == 'alignment' ) {
1303 
+									} elseif ($args['type'] == 'alignment') {
1304 1304 
 										$type = 'AlignmentToolbar'; // @todo this does not seem to work but cant find a example
1305 1305 
 									} else {
1306 
-										continue;// if we have not implemented the control then don't break the JS.
1306 
+										continue; // if we have not implemented the control then don't break the JS.
1307 1307 
 									}
1308 1308
1309 1309 
 									// add show only if advanced
1310 
-									if ( ! empty( $args['advanced'] ) ) {
1310 
+									if (!empty($args['advanced'])) {
1311 1311 
 										echo "props.attributes.show_advanced && ";
1312 1312 
 									}
1313 1313 
 									// add setting require if defined
1314 
-									if ( ! empty( $args['element_require'] ) ) {
1315 
-										echo $this->block_props_replace( $args['element_require'], true ) . " && ";
1314 
+									if (!empty($args['element_require'])) {
1315 
+										echo $this->block_props_replace($args['element_require'], true) . " && ";
1316 1316 
 									}
1317 1317 
 									?>
1318 1318 
 									el(
1319 
-										wp.components.<?php echo esc_attr( $type );?>,
1319 
+										wp.components.<?php echo esc_attr($type); ?>,
1320 1320 
 										{
1321 
-											label: '<?php echo esc_attr( $args['title'] );?>',
1322 
-											help: '<?php if ( isset( $args['desc'] ) ) {
1323 
-												echo esc_attr( $args['desc'] );
1321 
+											label: '<?php echo esc_attr($args['title']); ?>',
1322 
+											help: '<?php if (isset($args['desc'])) {
1323 
+												echo esc_attr($args['desc']);
1324 1324 
 											}?>',
1325 
-											value: <?php echo $value;?>,
1326 
-											<?php if ( $type == 'TextControl' && $args['type'] != 'text' ) {
1327 
-											echo "type: '" . esc_attr( $args['type'] ) . "',";
1325 
+											value: <?php echo $value; ?>,
1326 
+											<?php if ($type == 'TextControl' && $args['type'] != 'text') {
1327 
+											echo "type: '" . esc_attr($args['type']) . "',";
1328 1328 
 										}?>
1329 
-											<?php if ( ! empty( $args['placeholder'] ) ) {
1330 
-											echo "placeholder: '" . esc_attr( $args['placeholder'] ) . "',";
1329 
+											<?php if (!empty($args['placeholder'])) {
1330 
+											echo "placeholder: '" . esc_attr($args['placeholder']) . "',";
1331 1331 
 										}?>
1332 
-											<?php echo $options;?>
1333 
-											<?php echo $extra;?>
1334 
-											<?php echo $custom_attributes;?>
1335 
-											onChange: function ( <?php echo $key;?> ) {
1336 
-												<?php echo $onchange;?>
1332 
+											<?php echo $options; ?>
1333 
+											<?php echo $extra; ?>
1334 
+											<?php echo $custom_attributes; ?>
1335 
+											onChange: function ( <?php echo $key; ?> ) {
1336 
+												<?php echo $onchange; ?>
1337 1337 
 											}
1338 1338 
 										}
1339 1339 
 									),
 
@@ -1346,9 +1346,9 @@  discard block
 
 block discarded – undo
1346 1346
1347 1347 
 								<?php
1348 1348 
 								// If the user sets block-output array then build it
1349 
-								if ( ! empty( $this->options['block-output'] ) ) {
1350 
-								$this->block_element( $this->options['block-output'] );
1351 
-							}else{
1349 
+								if (!empty($this->options['block-output'])) {
1350 
+								$this->block_element($this->options['block-output']);
1351 
+							} else {
1352 1352 
 								// if no block-output is set then we try and get the shortcode html output via ajax.
1353 1353 
 								?>
1354 1354 
 								el('div', {
 
@@ -1372,14 +1372,14 @@  discard block
 
 block discarded – undo
1372 1372 
 							var align = '';
1373 1373
1374 1374 
 							// build the shortcode.
1375 
-							var content = "[<?php echo $this->options['base_id'];?>";
1375 
+							var content = "[<?php echo $this->options['base_id']; ?>";
1376 1376 
 							<?php
1377 1377
1378 
-							if(! empty( $this->arguments )){
1379 
-							foreach($this->arguments as $key => $args){
1378 
+							if (!empty($this->arguments)) {
1379 
+							foreach ($this->arguments as $key => $args) {
1380 1380 
 							?>
1381 
-							if (attr.hasOwnProperty("<?php echo esc_attr( $key );?>")) {
1382 
-								content += " <?php echo esc_attr( $key );?>='" + attr.<?php echo esc_attr( $key );?>+ "' ";
1381 
+							if (attr.hasOwnProperty("<?php echo esc_attr($key); ?>")) {
1382 
+								content += " <?php echo esc_attr($key); ?>='" + attr.<?php echo esc_attr($key); ?>+ "' ";
1383 1383 
 							}
1384 1384 
 							<?php
1385 1385 
 							}
 
@@ -1420,10 +1420,10 @@  discard block
 
 block discarded – undo
1420 1420 
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
1421 1421 
 			 */
1422 1422
1423 
-			return str_replace( array(
1423 
+			return str_replace(array(
1424 1424 
 				'<script>',
1425 1425 
 				'</script>'
1426 
-			), '', $output );
1426 
+			), '', $output);
1427 1427 
 		}
1428 1428
1429 1429 
 		/**
 
@@ -1435,16 +1435,16 @@  discard block
 
 block discarded – undo
1435 1435 
 		 *
1436 1436 
 		 * @return string
1437 1437 
 		 */
1438 
-		public function array_to_attributes( $custom_attributes, $html = false ) {
1438 
+		public function array_to_attributes($custom_attributes, $html = false) {
1439 1439 
 			$attributes = '';
1440 
-			if ( ! empty( $custom_attributes ) ) {
1440 
+			if (!empty($custom_attributes)) {
1441 1441
1442 
-				if ( $html ) {
1443 
-					foreach ( $custom_attributes as $key => $val ) {
1442 
+				if ($html) {
1443 
+					foreach ($custom_attributes as $key => $val) {
1444 1444 
 						$attributes .= " $key='$val' ";
1445 1445 
 					}
1446 1446 
 				} else {
1447 
-					foreach ( $custom_attributes as $key => $val ) {
1447 
+					foreach ($custom_attributes as $key => $val) {
1448 1448 
 						$attributes .= "'$key': '$val',";
1449 1449 
 					}
1450 1450 
 				}
 
@@ -1460,86 +1460,86 @@  discard block
 
 block discarded – undo
1460 1460 
 		 *
1461 1461 
 		 * @param $args
1462 1462 
 		 */
1463 
-		public function block_element( $args ) {
1463 
+		public function block_element($args) {
1464 1464
1465 1465
1466 
-			if ( ! empty( $args ) ) {
1467 
-				foreach ( $args as $element => $new_args ) {
1466 
+			if (!empty($args)) {
1467 
+				foreach ($args as $element => $new_args) {
1468 1468
1469 
-					if ( is_array( $new_args ) ) { // its an element
1469 
+					if (is_array($new_args)) { // its an element
1470 1470
1471 1471
1472 
-						if ( isset( $new_args['element'] ) ) {
1472 
+						if (isset($new_args['element'])) {
1473 1473
1474 
-							if ( isset( $new_args['element_require'] ) ) {
1475 
-								echo str_replace( array(
1474 
+							if (isset($new_args['element_require'])) {
1475 
+								echo str_replace(array(
1476 1476 
 										"'+",
1477 1477 
 										"+'"
1478 
-									), '', $this->block_props_replace( $new_args['element_require'] ) ) . " &&  ";
1479 
-								unset( $new_args['element_require'] );
1478 
+									), '', $this->block_props_replace($new_args['element_require'])) . " &&  ";
1479 
+								unset($new_args['element_require']);
1480 1480 
 							}
1481 1481
1482 1482 
 							echo "\n el( '" . $new_args['element'] . "', {";
1483 1483
1484 1484 
 							// get the attributes
1485 
-							foreach ( $new_args as $new_key => $new_value ) {
1485 
+							foreach ($new_args as $new_key => $new_value) {
1486 1486
1487 1487
1488 
-								if ( $new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array( $new_value ) ) {
1488 
+								if ($new_key == 'element' || $new_key == 'content' || $new_key == 'element_require' || $new_key == 'element_repeat' || is_array($new_value)) {
1489 1489 
 									// do nothing
1490 1490 
 								} else {
1491 
-									echo $this->block_element( array( $new_key => $new_value ) );
1491 
+									echo $this->block_element(array($new_key => $new_value));
1492 1492 
 								}
1493 1493 
 							}
1494 1494
1495 
-							echo "},";// end attributes
1495 
+							echo "},"; // end attributes
1496 1496
1497 1497 
 							// get the content
1498 1498 
 							$first_item = 0;
1499 
-							foreach ( $new_args as $new_key => $new_value ) {
1500 
-								if ( $new_key === 'content' || is_array( $new_value ) ) {
1499 
+							foreach ($new_args as $new_key => $new_value) {
1500 
+								if ($new_key === 'content' || is_array($new_value)) {
1501 1501
1502 
-									if ( $new_key === 'content' ) {
1503 
-										echo "'" . $this->block_props_replace( $new_value ) . "'";
1502 
+									if ($new_key === 'content') {
1503 
+										echo "'" . $this->block_props_replace($new_value) . "'";
1504 1504 
 									}
1505 1505
1506 
-									if ( is_array( $new_value ) ) {
1506 
+									if (is_array($new_value)) {
1507 1507
1508 
-										if ( isset( $new_value['element_require'] ) ) {
1509 
-											echo str_replace( array(
1508 
+										if (isset($new_value['element_require'])) {
1509 
+											echo str_replace(array(
1510 1510 
 													"'+",
1511 1511 
 													"+'"
1512 
-												), '', $this->block_props_replace( $new_value['element_require'] ) ) . " &&  ";
1513 
-											unset( $new_value['element_require'] );
1512 
+												), '', $this->block_props_replace($new_value['element_require'])) . " &&  ";
1513 
+											unset($new_value['element_require']);
1514 1514 
 										}
1515 1515
1516 
-										if ( isset( $new_value['element_repeat'] ) ) {
1516 
+										if (isset($new_value['element_repeat'])) {
1517 1517 
 											$x = 1;
1518 
-											while ( $x <= absint( $new_value['element_repeat'] ) ) {
1519 
-												$this->block_element( array( '' => $new_value ) );
1520 
-												$x ++;
1518 
+											while ($x <= absint($new_value['element_repeat'])) {
1519 
+												$this->block_element(array('' => $new_value));
1520 
+												$x++;
1521 1521 
 											}
1522 1522 
 										} else {
1523 
-											$this->block_element( array( '' => $new_value ) );
1523 
+											$this->block_element(array('' => $new_value));
1524 1524 
 										}
1525 1525 
 									}
1526 
-									$first_item ++;
1526 
+									$first_item++;
1527 1527 
 								}
1528 1528 
 							}
1529 1529
1530 
-							echo ")";// end content
1530 
+							echo ")"; // end content
1531 1531
1532 1532 
 							echo ", \n";
1533 1533
1534 1534 
 						}
1535 1535 
 					} else {
1536 1536
1537 
-						if ( substr( $element, 0, 3 ) === "if_" ) {
1538 
-							echo str_replace( "if_", "", $element ) . ": " . $this->block_props_replace( $new_args, true ) . ",";
1539 
-						} elseif ( $element == 'style' ) {
1540 
-							echo $element . ": " . $this->block_props_replace( $new_args ) . ",";
1537 
+						if (substr($element, 0, 3) === "if_") {
1538 
+							echo str_replace("if_", "", $element) . ": " . $this->block_props_replace($new_args, true) . ",";
1539 
+						} elseif ($element == 'style') {
1540 
+							echo $element . ": " . $this->block_props_replace($new_args) . ",";
1541 1541 
 						} else {
1542 
-							echo $element . ": '" . $this->block_props_replace( $new_args ) . "',";
1542 
+							echo $element . ": '" . $this->block_props_replace($new_args) . "',";
1543 1543 
 						}
1544 1544
1545 1545 
 					}
 
@@ -1554,12 +1554,12 @@  discard block
 
 block discarded – undo
1554 1554 
 		 *
1555 1555 
 		 * @return mixed
1556 1556 
 		 */
1557 
-		public function block_props_replace( $string, $no_wrap = false ) {
1557 
+		public function block_props_replace($string, $no_wrap = false) {
1558 1558
1559 
-			if ( $no_wrap ) {
1560 
-				$string = str_replace( array( "[%", "%]" ), array( "props.attributes.", "" ), $string );
1559 
+			if ($no_wrap) {
1560 
+				$string = str_replace(array("[%", "%]"), array("props.attributes.", ""), $string);
1561 1561 
 			} else {
1562 
-				$string = str_replace( array( "[%", "%]" ), array( "'+props.attributes.", "+'" ), $string );
1562 
+				$string = str_replace(array("[%", "%]"), array("'+props.attributes.", "+'"), $string);
1563 1563 
 			}
1564 1564
1565 1565 
 			return $string;
 
@@ -1571,37 +1571,37 @@  discard block
 
 block discarded – undo
1571 1571 
 		 * @param array $args
1572 1572 
 		 * @param array $instance
1573 1573 
 		 */
1574 
-		public function widget( $args, $instance ) {
1574 
+		public function widget($args, $instance) {
1575 1575
1576 1576 
 			// get the filtered values
1577 
-			$argument_values = $this->argument_values( $instance );
1578 
-			$argument_values = $this->string_to_bool( $argument_values );
1579 
-			$output          = $this->output( $argument_values, $args );
1577 
+			$argument_values = $this->argument_values($instance);
1578 
+			$argument_values = $this->string_to_bool($argument_values);
1579 
+			$output          = $this->output($argument_values, $args);
1580 1580
1581 
-			if ( $output ) {
1581 
+			if ($output) {
1582 1582 
 				// Before widget
1583 1583 
 				$before_widget = $args['before_widget'];
1584 
-				$before_widget = apply_filters( 'wp_super_duper_before_widget', $before_widget, $args, $instance, $this );
1585 
-				$before_widget = apply_filters( 'wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this );
1584 
+				$before_widget = apply_filters('wp_super_duper_before_widget', $before_widget, $args, $instance, $this);
1585 
+				$before_widget = apply_filters('wp_super_duper_before_widget_' . $this->base_id, $before_widget, $args, $instance, $this);
1586 1586
1587 1587 
 				// After widget
1588 1588 
 				$after_widget = $args['after_widget'];
1589 
-				$after_widget = apply_filters( 'wp_super_duper_after_widget', $after_widget, $args, $instance, $this );
1590 
-				$after_widget = apply_filters( 'wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this );
1589 
+				$after_widget = apply_filters('wp_super_duper_after_widget', $after_widget, $args, $instance, $this);
1590 
+				$after_widget = apply_filters('wp_super_duper_after_widget_' . $this->base_id, $after_widget, $args, $instance, $this);
1591 1591
1592 1592 
 				echo $before_widget;
1593 1593 
 				// elementor strips the widget wrapping div so we check for and add it back if needed
1594 
-				if ( $this->is_elementor_widget_output() ) {
1595 
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "<span class='" . esc_attr( $this->options['widget_ops']['classname'] ) . "'>" : '';
1594 
+				if ($this->is_elementor_widget_output()) {
1595 
+					echo !empty($this->options['widget_ops']['classname']) ? "<span class='" . esc_attr($this->options['widget_ops']['classname']) . "'>" : '';
1596 1596 
 				}
1597 
-				echo $this->output_title( $args, $instance );
1597 
+				echo $this->output_title($args, $instance);
1598 1598 
 				echo $output;
1599 
-				if ( $this->is_elementor_widget_output() ) {
1600 
-					echo ! empty( $this->options['widget_ops']['classname'] ) ? "</span>" : '';
1599 
+				if ($this->is_elementor_widget_output()) {
1600 
+					echo !empty($this->options['widget_ops']['classname']) ? "</span>" : '';
1601 1601 
 				}
1602 1602 
 				echo $after_widget;
1603 
-			} elseif ( $this->is_preview() && $output == '' ) {// if preview show a placeholder if empty
1604 
-				$output = $this->preview_placeholder_text( "{{" . $this->base_id . "}}" );
1603 
+			} elseif ($this->is_preview() && $output == '') {// if preview show a placeholder if empty
1604 
+				$output = $this->preview_placeholder_text("{{" . $this->base_id . "}}");
1605 1605 
 				echo $output;
1606 1606 
 			}
1607 1607 
 		}
 
@@ -1614,7 +1614,7 @@  discard block
 
 block discarded – undo
1614 1614 
 		 */
1615 1615 
 		public function is_elementor_widget_output() {
1616 1616 
 			$result = false;
1617 
-			if ( defined( 'ELEMENTOR_VERSION' ) && isset( $this->number ) && $this->number == 'REPLACE_TO_ID' ) {
1617 
+			if (defined('ELEMENTOR_VERSION') && isset($this->number) && $this->number == 'REPLACE_TO_ID') {
1618 1618 
 				$result = true;
1619 1619 
 			}
1620 1620 
 
@@ -1629,7 +1629,7 @@  discard block
 
 block discarded – undo
1629 1629 
 		 */
1630 1630 
 		public function is_elementor_preview() {
1631 1631 
 			$result = false;
1632 
-			if ( isset( $_REQUEST['elementor-preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
1632 
+			if (isset($_REQUEST['elementor-preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor')) {
1633 1633 
 				$result = true;
1634 1634 
 			}
1635 1635 
 
@@ -1644,7 +1644,7 @@  discard block
 
 block discarded – undo
1644 1644 
 		 */
1645 1645 
 		public function is_divi_preview() {
1646 1646 
 			$result = false;
1647 
-			if ( isset( $_REQUEST['et_fb'] ) || isset( $_REQUEST['et_pb_preview'] ) || ( is_admin() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'elementor' ) ) {
1647 
+			if (isset($_REQUEST['et_fb']) || isset($_REQUEST['et_pb_preview']) || (is_admin() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'elementor')) {
1648 1648 
 				$result = true;
1649 1649 
 			}
1650 1650 
 
@@ -1659,7 +1659,7 @@  discard block
 
 block discarded – undo
1659 1659 
 		 */
1660 1660 
 		public function is_beaver_preview() {
1661 1661 
 			$result = false;
1662 
-			if ( isset( $_REQUEST['fl_builder'] ) ) {
1662 
+			if (isset($_REQUEST['fl_builder'])) {
1663 1663 
 				$result = true;
1664 1664 
 			}
1665 1665 
 
@@ -1674,7 +1674,7 @@  discard block
 
 block discarded – undo
1674 1674 
 		 */
1675 1675 
 		public function is_siteorigin_preview() {
1676 1676 
 			$result = false;
1677 
-			if ( !empty( $_REQUEST['siteorigin_panels_live_editor'] )) {
1677 
+			if (!empty($_REQUEST['siteorigin_panels_live_editor'])) {
1678 1678 
 				$result = true;
1679 1679 
 			}
1680 1680 
 
@@ -1689,13 +1689,13 @@  discard block
 
 block discarded – undo
1689 1689 
 		 */
1690 1690 
 		public function is_preview() {
1691 1691 
 			$preview = false;
1692 
-			if ( $this->is_divi_preview() ) {
1692 
+			if ($this->is_divi_preview()) {
1693 1693 
 				$preview = true;
1694 
-			} elseif ( $this->is_elementor_preview() ) {
1694 
+			} elseif ($this->is_elementor_preview()) {
1695 1695 
 				$preview = true;
1696 
-			} elseif ( $this->is_beaver_preview() ) {
1696 
+			} elseif ($this->is_beaver_preview()) {
1697 1697 
 				$preview = true;
1698 
-			} elseif ( $this->is_siteorigin_preview() ) {
1698 
+			} elseif ($this->is_siteorigin_preview()) {
1699 1699 
 				$preview = true;
1700 1700 
 			}
1701 1701 
 
@@ -1710,11 +1710,11 @@  discard block
 
 block discarded – undo
1710 1710 
 		 *
1711 1711 
 		 * @return string
1712 1712 
 		 */
1713 
-		public function output_title( $args, $instance = array() ) {
1713 
+		public function output_title($args, $instance = array()) {
1714 1714 
 			$output = '';
1715 
-			if ( ! empty( $instance['title'] ) ) {
1715 
+			if (!empty($instance['title'])) {
1716 1716 
 				/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
1717 
-				$title  = apply_filters( 'widget_title', $instance['title'], $instance, $this->id_base );
1717 
+				$title  = apply_filters('widget_title', $instance['title'], $instance, $this->id_base);
1718 1718 
 				$output = $args['before_title'] . $title . $args['after_title'];
1719 1719 
 			}
1720 1720 
 
@@ -1726,7 +1726,7 @@  discard block
 
 block discarded – undo
1726 1726 
 		 *
1727 1727 
 		 * @param array $instance The widget options.
1728 1728 
 		 */
1729 
-		public function form( $instance ) {
1729 
+		public function form($instance) {
1730 1730
1731 1731 
 			// set widget instance
1732 1732 
 			$this->instance = $instance;
 
@@ -1734,12 +1734,12 @@  discard block
 
 block discarded – undo
1734 1734 
 			// set it as a SD widget
1735 1735 
 			echo $this->widget_advanced_toggle();
1736 1736
1737 
-			echo "<p>" . esc_attr( $this->options['widget_ops']['description'] ) . "</p>";
1737 
+			echo "<p>" . esc_attr($this->options['widget_ops']['description']) . "</p>";
1738 1738 
 			$arguments = $this->get_arguments();
1739 1739
1740 
-			if ( is_array( $arguments ) ) {
1741 
-				foreach ( $arguments as $key => $args ) {
1742 
-					$this->widget_inputs( $args, $instance );
1740 
+			if (is_array($arguments)) {
1741 
+				foreach ($arguments as $key => $args) {
1742 
+					$this->widget_inputs($args, $instance);
1743 1743 
 				}
1744 1744 
 			}
1745 1745 
 		}
 
@@ -1752,7 +1752,7 @@  discard block
 
 block discarded – undo
1752 1752 
 		public function widget_advanced_toggle() {
1753 1753
1754 1754 
 			$output = '';
1755 
-			if ( $this->block_show_advanced() ) {
1755 
+			if ($this->block_show_advanced()) {
1756 1756 
 				$val = 1;
1757 1757 
 			} else {
1758 1758 
 				$val = 0;
 
@@ -1772,14 +1772,14 @@  discard block
 
 block discarded – undo
1772 1772 
 		 *
1773 1773 
 		 * @return string $output
1774 1774 
 		 */
1775 
-		public function convert_element_require( $input ) {
1775 
+		public function convert_element_require($input) {
1776 1776
1777 
-			$input = str_replace( "'", '"', $input );// we only want double quotes
1777 
+			$input = str_replace("'", '"', $input); // we only want double quotes
1778 1778
1779 
-			$output = esc_attr( str_replace( array( "[%", "%]" ), array(
1779 
+			$output = esc_attr(str_replace(array("[%", "%]"), array(
1780 1780 
 				"jQuery(form).find('[data-argument=\"",
1781 1781 
 				"\"]').find('input,select').val()"
1782 
-			), $input ) );
1782 
+			), $input));
1783 1783
1784 1784 
 			return $output;
1785 1785 
 		}
 
@@ -1790,54 +1790,54 @@  discard block
 
 block discarded – undo
1790 1790 
 		 * @param $args
1791 1791 
 		 * @param $instance
1792 1792 
 		 */
1793 
-		public function widget_inputs( $args, $instance ) {
1793 
+		public function widget_inputs($args, $instance) {
1794 1794
1795 1795 
 			$class             = "";
1796 1796 
 			$element_require   = "";
1797 1797 
 			$custom_attributes = "";
1798 1798
1799 1799 
 			// get value
1800 
-			if ( isset( $instance[ $args['name'] ] ) ) {
1801 
-				$value = $instance[ $args['name'] ];
1802 
-			} elseif ( ! isset( $instance[ $args['name'] ] ) && ! empty( $args['default'] ) ) {
1803 
-				$value = is_array( $args['default'] ) ? array_map( "esc_html", $args['default'] ) : esc_html( $args['default'] );
1800 
+			if (isset($instance[$args['name']])) {
1801 
+				$value = $instance[$args['name']];
1802 
+			} elseif (!isset($instance[$args['name']]) && !empty($args['default'])) {
1803 
+				$value = is_array($args['default']) ? array_map("esc_html", $args['default']) : esc_html($args['default']);
1804 1804 
 			} else {
1805 1805 
 				$value = '';
1806 1806 
 			}
1807 1807
1808 1808 
 			// get placeholder
1809 
-			if ( ! empty( $args['placeholder'] ) ) {
1810 
-				$placeholder = "placeholder='" . esc_html( $args['placeholder'] ) . "'";
1809 
+			if (!empty($args['placeholder'])) {
1810 
+				$placeholder = "placeholder='" . esc_html($args['placeholder']) . "'";
1811 1811 
 			} else {
1812 1812 
 				$placeholder = '';
1813 1813 
 			}
1814 1814
1815 1815 
 			// get if advanced
1816 
-			if ( isset( $args['advanced'] ) && $args['advanced'] ) {
1816 
+			if (isset($args['advanced']) && $args['advanced']) {
1817 1817 
 				$class .= " sd-advanced-setting ";
1818 1818 
 			}
1819 1819
1820 1820 
 			// element_require
1821 
-			if ( isset( $args['element_require'] ) && $args['element_require'] ) {
1821 
+			if (isset($args['element_require']) && $args['element_require']) {
1822 1822 
 				$element_require = $args['element_require'];
1823 1823 
 			}
1824 1824
1825 1825 
 			// custom_attributes
1826 
-			if ( isset( $args['custom_attributes'] ) && $args['custom_attributes'] ) {
1827 
-				$custom_attributes = $this->array_to_attributes( $args['custom_attributes'], true );
1826 
+			if (isset($args['custom_attributes']) && $args['custom_attributes']) {
1827 
+				$custom_attributes = $this->array_to_attributes($args['custom_attributes'], true);
1828 1828 
 			}
1829 1829
1830 1830 
 			// before wrapper
1831 1831 
 			?>
1832 
-			<p class="sd-argument <?php echo esc_attr( $class ); ?>"
1833 
-			   data-argument='<?php echo esc_attr( $args['name'] ); ?>'
1834 
-			   data-element_require='<?php if ( $element_require ) {
1835 
-				   echo $this->convert_element_require( $element_require );
1832 
+			<p class="sd-argument <?php echo esc_attr($class); ?>"
1833 
+			   data-argument='<?php echo esc_attr($args['name']); ?>'
1834 
+			   data-element_require='<?php if ($element_require) {
1835 
+				   echo $this->convert_element_require($element_require);
1836 1836 
 			   } ?>'
1837 1837 
 			>
1838 1838 
 				<?php
1839 1839
1840 
-				switch ( $args['type'] ) {
1840 
+				switch ($args['type']) {
1841 1841 
 					//array('text','password','number','email','tel','url','color')
1842 1842 
 					case "text":
1843 1843 
 					case "password":
 
@@ -1848,46 +1848,46 @@  discard block
 
 block discarded – undo
1848 1848 
 					case "color":
1849 1849 
 						?>
1850 1850 
 						<label
1851 
-							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
1851 
+							for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo esc_attr($args['title']); ?><?php echo $this->widget_field_desc($args); ?></label>
1852 1852 
 						<input <?php echo $placeholder; ?> class="widefat"
1853 1853 
 							<?php echo $custom_attributes; ?>
1854 
-							                               id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
1855 
-							                               name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>"
1856 
-							                               type="<?php echo esc_attr( $args['type'] ); ?>"
1857 
-							                               value="<?php echo esc_attr( $value ); ?>">
1854 
+							                               id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
1855 
+							                               name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>"
1856 
+							                               type="<?php echo esc_attr($args['type']); ?>"
1857 
+							                               value="<?php echo esc_attr($value); ?>">
1858 1858 
 						<?php
1859 1859
1860 1860 
 						break;
1861 1861 
 					case "select":
1862 
-						$multiple = isset( $args['multiple'] ) && $args['multiple'] ? true : false;
1863 
-						if ( $multiple ) {
1864 
-							if ( empty( $value ) ) {
1862 
+						$multiple = isset($args['multiple']) && $args['multiple'] ? true : false;
1863 
+						if ($multiple) {
1864 
+							if (empty($value)) {
1865 1865 
 								$value = array();
1866 1866 
 							}
1867 1867 
 						}
1868 1868 
 						?>
1869 1869 
 						<label
1870 
-							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
1870 
+							for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo esc_attr($args['title']); ?><?php echo $this->widget_field_desc($args); ?></label>
1871 1871 
 						<select <?php echo $placeholder; ?> class="widefat"
1872 1872 
 							<?php echo $custom_attributes; ?>
1873 
-							                                id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
1874 
-							                                name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) );
1875 
-							                                if ( $multiple ) {
1873 
+							                                id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
1874 
+							                                name="<?php echo esc_attr($this->get_field_name($args['name']));
1875 
+							                                if ($multiple) {
1876 1876 
 								                                echo "[]";
1877 1877 
 							                                } ?>"
1878 
-							<?php if ( $multiple ) {
1878 
+							<?php if ($multiple) {
1879 1879 
 								echo "multiple";
1880 1880 
 							} //@todo not implemented yet due to gutenberg not supporting it
1881 1881 
 							?>
1882 1882 
 						>
1883 1883 
 							<?php
1884 1884
1885 
-							if ( ! empty( $args['options'] ) ) {
1886 
-								foreach ( $args['options'] as $val => $label ) {
1887 
-									if ( $multiple ) {
1888 
-										$selected = in_array( $val, $value ) ? 'selected="selected"' : '';
1885 
+							if (!empty($args['options'])) {
1886 
+								foreach ($args['options'] as $val => $label) {
1887 
+									if ($multiple) {
1888 
+										$selected = in_array($val, $value) ? 'selected="selected"' : '';
1889 1889 
 									} else {
1890 
-										$selected = selected( $value, $val, false );
1890 
+										$selected = selected($value, $val, false);
1891 1891 
 									}
1892 1892 
 									echo "<option value='$val' " . $selected . ">$label</option>";
1893 1893 
 								}
 
@@ -1899,20 +1899,20 @@  discard block
 
 block discarded – undo
1899 1899 
 					case "checkbox":
1900 1900 
 						?>
1901 1901 
 						<input <?php echo $placeholder; ?>
1902 
-							<?php checked( 1, $value, true ) ?>
1902 
+							<?php checked(1, $value, true) ?>
1903 1903 
 							<?php echo $custom_attributes; ?>
1904 
-							class="widefat" id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
1905 
-							name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="checkbox"
1904 
+							class="widefat" id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
1905 
+							name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="checkbox"
1906 1906 
 							value="1">
1907 1907 
 						<label
1908 
-							for="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"><?php echo esc_attr( $args['title'] ); ?><?php echo $this->widget_field_desc( $args ); ?></label>
1908 
+							for="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"><?php echo esc_attr($args['title']); ?><?php echo $this->widget_field_desc($args); ?></label>
1909 1909 
 						<?php
1910 1910 
 						break;
1911 1911 
 					case "hidden":
1912 1912 
 						?>
1913 
-						<input id="<?php echo esc_attr( $this->get_field_id( $args['name'] ) ); ?>"
1914 
-						       name="<?php echo esc_attr( $this->get_field_name( $args['name'] ) ); ?>" type="hidden"
1915 
-						       value="<?php echo esc_attr( $value ); ?>">
1913 
+						<input id="<?php echo esc_attr($this->get_field_id($args['name'])); ?>"
1914 
+						       name="<?php echo esc_attr($this->get_field_name($args['name'])); ?>" type="hidden"
1915 
+						       value="<?php echo esc_attr($value); ?>">
1916 1916 
 						<?php
1917 1917 
 						break;
1918 1918 
 					default:
 
@@ -1934,14 +1934,14 @@  discard block
 
 block discarded – undo
1934 1934 
 		 * @return string
1935 1935 
 		 * @todo, need to make its own tooltip script
1936 1936 
 		 */
1937 
-		public function widget_field_desc( $args ) {
1937 
+		public function widget_field_desc($args) {
1938 1938
1939 1939 
 			$description = '';
1940 
-			if ( isset( $args['desc'] ) && $args['desc'] ) {
1941 
-				if ( isset( $args['desc_tip'] ) && $args['desc_tip'] ) {
1942 
-					$description = $this->desc_tip( $args['desc'] );
1940 
+			if (isset($args['desc']) && $args['desc']) {
1941 
+				if (isset($args['desc_tip']) && $args['desc_tip']) {
1942 
+					$description = $this->desc_tip($args['desc']);
1943 1943 
 				} else {
1944 
-					$description = '<span class="description">' . wp_kses_post( $args['desc'] ) . '</span>';
1944 
+					$description = '<span class="description">' . wp_kses_post($args['desc']) . '</span>';
1945 1945 
 				}
1946 1946 
 			}
1947 1947 
 
@@ -1956,11 +1956,11 @@  discard block
 
 block discarded – undo
1956 1956 
 		 *
1957 1957 
 		 * @return string
1958 1958 
 		 */
1959 
-		function desc_tip( $tip, $allow_html = false ) {
1960 
-			if ( $allow_html ) {
1961 
-				$tip = $this->sanitize_tooltip( $tip );
1959 
+		function desc_tip($tip, $allow_html = false) {
1960 
+			if ($allow_html) {
1961 
+				$tip = $this->sanitize_tooltip($tip);
1962 1962 
 			} else {
1963 
-				$tip = esc_attr( $tip );
1963 
+				$tip = esc_attr($tip);
1964 1964 
 			}
1965 1965
1966 1966 
 			return '<span class="gd-help-tip dashicons dashicons-editor-help" title="' . $tip . '"></span>';
 
@@ -1973,8 +1973,8 @@  discard block
 
 block discarded – undo
1973 1973 
 		 *
1974 1974 
 		 * @return string
1975 1975 
 		 */
1976 
-		public function sanitize_tooltip( $var ) {
1977 
-			return htmlspecialchars( wp_kses( html_entity_decode( $var ), array(
1976 
+		public function sanitize_tooltip($var) {
1977 
+			return htmlspecialchars(wp_kses(html_entity_decode($var), array(
1978 1978 
 				'br'     => array(),
1979 1979 
 				'em'     => array(),
1980 1980 
 				'strong' => array(),
 
@@ -1984,7 +1984,7 @@  discard block
 
 block discarded – undo
1984 1984 
 				'li'     => array(),
1985 1985 
 				'ol'     => array(),
1986 1986 
 				'p'      => array(),
1987 
-			) ) );
1987 
+			)));
1988 1988 
 		}
1989 1989
1990 1990 
 		/**
 
@@ -1996,23 +1996,23 @@  discard block
 
 block discarded – undo
1996 1996 
 		 * @return array
1997 1997 
 		 * @todo we should add some sanitation here.
1998 1998 
 		 */
1999 
-		public function update( $new_instance, $old_instance ) {
1999 
+		public function update($new_instance, $old_instance) {
2000 2000
2001 2001 
 			//save the widget
2002 
-			$instance = array_merge( (array) $old_instance, (array) $new_instance );
2002 
+			$instance = array_merge((array)$old_instance, (array)$new_instance);
2003 2003
2004 2004 
 			// set widget instance
2005 2005 
 			$this->instance = $instance;
2006 2006
2007 
-			if ( empty( $this->arguments ) ) {
2007 
+			if (empty($this->arguments)) {
2008 2008 
 				$this->get_arguments();
2009 2009 
 			}
2010 2010
2011 2011 
 			// check for checkboxes
2012 
-			if ( ! empty( $this->arguments ) ) {
2013 
-				foreach ( $this->arguments as $argument ) {
2014 
-					if ( isset( $argument['type'] ) && $argument['type'] == 'checkbox' && ! isset( $new_instance[ $argument['name'] ] ) ) {
2015 
-						$instance[ $argument['name'] ] = '0';
2012 
+			if (!empty($this->arguments)) {
2013 
+				foreach ($this->arguments as $argument) {
2014 
+					if (isset($argument['type']) && $argument['type'] == 'checkbox' && !isset($new_instance[$argument['name']])) {
2015 
+						$instance[$argument['name']] = '0';
2016 2016 
 					}
2017 2017 
 				}
2018 2018 
 			}
 
@@ -2030,7 +2030,7 @@  discard block
 
 block discarded – undo
2030 2030 
 		 */
2031 2031 
 		public function is_block_content_call() {
2032 2032 
 			$result = false;
2033 
-			if ( wp_doing_ajax() && isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'super_duper_output_shortcode' ) {
2033 
+			if (wp_doing_ajax() && isset($_REQUEST['action']) && $_REQUEST['action'] == 'super_duper_output_shortcode') {
2034 2034 
 				$result = true;
2035 2035 
 			}
2036 2036
Please login to merge, or discard this patch.
vendor/ayecode/wp-font-awesome-settings/wp-font-awesome-settings.php 2 patches
Indentation   +353 added lines, -353 removed lines patch added patch discarded remove patch 
@@ -13,7 +13,7 @@  discard block
 
 block discarded – undo
13 13 
  * Bail if we are not in WP.
14 14 
  */
15 15 
 if ( ! defined( 'ABSPATH' ) ) {
16 
-	exit;
16 
+    exit;
17 17 
 }
18 18
19 19 
 /**
 
@@ -21,285 +21,285 @@  discard block
 
 block discarded – undo
21 21 
  */
22 22 
 if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
23 23
24 
-	/**
25 
-	 * A Class to be able to change settings for Font Awesome.
26 
-	 *
27 
-	 * Class WP_Font_Awesome_Settings
28 
-	 * @since 1.0.10 Now able to pass wp.org theme check.
29 
-	 * @ver 1.0.10
30 
-	 * @todo decide how to implement textdomain
31 
-	 */
32 
-	class WP_Font_Awesome_Settings {
33 
-
34 
-		/**
35 
-		 * Class version version.
36 
-		 *
37 
-		 * @var string
38 
-		 */
39 
-		public $version = '1.0.10';
40 
-
41 
-		/**
42 
-		 * Class textdomain.
43 
-		 *
44 
-		 * @var string
45 
-		 */
46 
-		public $textdomain = 'font-awesome-settings';
47 
-
48 
-		/**
49 
-		 * Latest version of Font Awesome at time of publish published.
50 
-		 *
51 
-		 * @var string
52 
-		 */
53 
-		public $latest = "5.6.1";
54 
-
55 
-		/**
56 
-		 * The title.
57 
-		 *
58 
-		 * @var string
59 
-		 */
60 
-		public $name = 'Font Awesome';
61 
-
62 
-		/**
63 
-		 * Holds the settings values.
64 
-		 *
65 
-		 * @var array
66 
-		 */
67 
-		private $settings;
68 
-
69 
-		/**
70 
-		 * WP_Font_Awesome_Settings instance.
71 
-		 *
72 
-		 * @access private
73 
-		 * @since  1.0.0
74 
-		 * @var    WP_Font_Awesome_Settings There can be only one!
75 
-		 */
76 
-		private static $instance = null;
77 
-
78 
-		/**
79 
-		 * Main WP_Font_Awesome_Settings Instance.
80 
-		 *
81 
-		 * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
82 
-		 *
83 
-		 * @since 1.0.0
84 
-		 * @static
85 
-		 * @return WP_Font_Awesome_Settings - Main instance.
86 
-		 */
87 
-		public static function instance() {
88 
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
89 
-				self::$instance = new WP_Font_Awesome_Settings;
90 
-
91 
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
92 
-
93 
-				if ( is_admin() ) {
94 
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
95 
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
96 
-				}
97 
-
98 
-				do_action( 'wp_font_awesome_settings_loaded' );
99 
-			}
100 
-
101 
-			return self::$instance;
102 
-		}
103 
-
104 
-		/**
105 
-		 * Initiate the settings and add the required action hooks.
106 
-		 *
107 
-		 * @since 1.0.8 Settings name wrong - FIXED
108 
-		 */
109 
-		public function init() {
110 
-			$this->settings = $this->get_settings();
111 
-
112 
-			if ( $this->settings['type'] == 'CSS' ) {
113 
-
114 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
115 
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );//echo '###';exit;
116 
-				}
117 
-
118 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
119 
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
120 
-				}
121 
-
122 
-			} else {
123 
-
124 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
125 
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );//echo '###';exit;
126 
-				}
127 
-
128 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
129 
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
130 
-				}
131 
-			}
132 
-
133 
-			// remove font awesome if set to do so
134 
-			if ( $this->settings['dequeue'] == '1' ) {
135 
-				add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
136 
-			}
137 
-
138 
-		}
139 
-
140 
-		/**
141 
-		 * Adds the Font Awesome styles.
142 
-		 */
143 
-		public function enqueue_style() {
144 
-			// build url
145 
-			$url = $this->get_url();
146 
-
147 
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
148 
-			wp_register_style( 'font-awesome', $url, array(), null );
149 
-			wp_enqueue_style( 'font-awesome' );
150 
-
151 
-			if ( $this->settings['shims'] ) {
152 
-				$url = $this->get_url( true );
153 
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
154 
-				wp_register_style( 'font-awesome-shims', $url, array(), null );
155 
-				wp_enqueue_style( 'font-awesome-shims' );
156 
-			}
157 
-		}
158 
-
159 
-		/**
160 
-		 * Adds the Font Awesome JS.
161 
-		 */
162 
-		public function enqueue_scripts() {
163 
-			// build url
164 
-			$url = $this->get_url();
165 
-
166 
-			$deregister_function = 'wp'.'_'.'deregister'.'_'.'script';
167 
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
168 
-			wp_register_script( 'font-awesome', $url, array(), null );
169 
-			wp_enqueue_script( 'font-awesome' );
170 
-
171 
-			if ( $this->settings['shims'] ) {
172 
-				$url = $this->get_url( true );
173 
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
174 
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
175 
-				wp_enqueue_script( 'font-awesome-shims' );
176 
-			}
177 
-		}
178 
-
179 
-		/**
180 
-		 * Get the url of the Font Awesome files.
181 
-		 *
182 
-		 * @param bool $shims If this is a shim file or not.
183 
-		 *
184 
-		 * @return string The url to the file.
185 
-		 */
186 
-		public function get_url( $shims = false ) {
187 
-			$script  = $shims ? 'v4-shims' : 'all';
188 
-			$type    = $this->settings['type'];
189 
-			$version = $this->settings['version'];
190 
-
191 
-			$url = "https://use.fontawesome.com/releases/"; // CDN
192 
-			$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
193 
-			$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
194 
-			$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
195 
-			$url .= "?wpfas=true"; // set our var so our version is not removed
196 
-
197 
-			return $url;
198 
-		}
199 
-
200 
-		/**
201 
-		 * Try and remove any other versions of Font Awesome added by other plugins/themes.
202 
-		 *
203 
-		 * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
204 
-		 *
205 
-		 * @param $url
206 
-		 * @param $original_url
207 
-		 * @param $_context
208 
-		 *
209 
-		 * @return string The filtered url.
210 
-		 */
211 
-		public function remove_font_awesome( $url, $original_url, $_context ) {
212 
-
213 
-			if ( $_context == 'display'
214 
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
215 
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
216 
-			) {// it's a font-awesome-url (probably)
217 
-
218 
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
219 
-					if ( $this->settings['type'] == 'JS' ) {
220 
-						if ( $this->settings['js-pseudo'] ) {
221 
-							$url .= "' data-search-pseudo-elements defer='defer";
222 
-						} else {
223 
-							$url .= "' defer='defer";
224 
-						}
225 
-					}
226 
-				} else {
227 
-					$url = ''; // removing the url removes the file
228 
-				}
229 
-
230 
-			}
231 
-
232 
-			return $url;
233 
-		}
234 
-
235 
-		/**
236 
-		 * Register the database settings with WordPress.
237 
-		 */
238 
-		public function register_settings() {
239 
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
240 
-		}
241 
-
242 
-		/**
243 
-		 * Add the WordPress settings menu item.
244 
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
245 
-		 */
246 
-		public function menu_item() {
247 
-			$menu_function = 'add'.'_'.'options'.'_'.'page'; // won't pass theme check if function name present in theme
248 
-			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
249 
-				$this,
250 
-				'settings_page'
251 
-			) );
252 
-		}
253 
-
254 
-		/**
255 
-		 * Get the current Font Awesome output settings.
256 
-		 *
257 
-		 * @return array The array of settings.
258 
-		 */
259 
-		public function get_settings() {
260 
-
261 
-			$db_settings = get_option( 'wp-font-awesome-settings' );
262 
-
263 
-			$defaults = array(
264 
-				'type'      => 'CSS', // type to use, CSS or JS
265 
-				'version'   => '', // latest
266 
-				'enqueue'   => '', // front and backend
267 
-				'shims'     => '1', // default on for now, @todo maybe change to off in 2020
268 
-				'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
269 
-				'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
270 
-			);
271 
-
272 
-			$settings = wp_parse_args( $db_settings, $defaults );
273 
-
274 
-			/**
275 
-			 * Filter the Font Awesome settings.
276 
-			 *
277 
-			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
278 
-			 */
279 
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
280 
-		}
281 
-
282 
-
283 
-		/**
284 
-		 * The settings page html output.
285 
-		 */
286 
-		public function settings_page() {
287 
-			if ( ! current_user_can( 'manage_options' ) ) {
288 
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'font-awesome-settings' ) );
289 
-			}
290 
-
291 
-			// a hidden way to force the update of the verison number vai api instead of waiting the 48 hours
292 
-			if(isset($_REQUEST['force-version-check'])){
293 
-				$this->get_latest_version($force_api = true);
294 
-			}
295 
-			?>
24 
+    /**
25 
+     * A Class to be able to change settings for Font Awesome.
26 
+     *
27 
+     * Class WP_Font_Awesome_Settings
28 
+     * @since 1.0.10 Now able to pass wp.org theme check.
29 
+     * @ver 1.0.10
30 
+     * @todo decide how to implement textdomain
31 
+     */
32 
+    class WP_Font_Awesome_Settings {
33 
+
34 
+        /**
35 
+         * Class version version.
36 
+         *
37 
+         * @var string
38 
+         */
39 
+        public $version = '1.0.10';
40 
+
41 
+        /**
42 
+         * Class textdomain.
43 
+         *
44 
+         * @var string
45 
+         */
46 
+        public $textdomain = 'font-awesome-settings';
47 
+
48 
+        /**
49 
+         * Latest version of Font Awesome at time of publish published.
50 
+         *
51 
+         * @var string
52 
+         */
53 
+        public $latest = "5.6.1";
54 
+
55 
+        /**
56 
+         * The title.
57 
+         *
58 
+         * @var string
59 
+         */
60 
+        public $name = 'Font Awesome';
61 
+
62 
+        /**
63 
+         * Holds the settings values.
64 
+         *
65 
+         * @var array
66 
+         */
67 
+        private $settings;
68 
+
69 
+        /**
70 
+         * WP_Font_Awesome_Settings instance.
71 
+         *
72 
+         * @access private
73 
+         * @since  1.0.0
74 
+         * @var    WP_Font_Awesome_Settings There can be only one!
75 
+         */
76 
+        private static $instance = null;
77 
+
78 
+        /**
79 
+         * Main WP_Font_Awesome_Settings Instance.
80 
+         *
81 
+         * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
82 
+         *
83 
+         * @since 1.0.0
84 
+         * @static
85 
+         * @return WP_Font_Awesome_Settings - Main instance.
86 
+         */
87 
+        public static function instance() {
88 
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
89 
+                self::$instance = new WP_Font_Awesome_Settings;
90 
+
91 
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
92 
+
93 
+                if ( is_admin() ) {
94 
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
95 
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
96 
+                }
97 
+
98 
+                do_action( 'wp_font_awesome_settings_loaded' );
99 
+            }
100 
+
101 
+            return self::$instance;
102 
+        }
103 
+
104 
+        /**
105 
+         * Initiate the settings and add the required action hooks.
106 
+         *
107 
+         * @since 1.0.8 Settings name wrong - FIXED
108 
+         */
109 
+        public function init() {
110 
+            $this->settings = $this->get_settings();
111 
+
112 
+            if ( $this->settings['type'] == 'CSS' ) {
113 
+
114 
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
115 
+                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );//echo '###';exit;
116 
+                }
117 
+
118 
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
119 
+                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
120 
+                }
121 
+
122 
+            } else {
123 
+
124 
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
125 
+                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );//echo '###';exit;
126 
+                }
127 
+
128 
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
129 
+                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
130 
+                }
131 
+            }
132 
+
133 
+            // remove font awesome if set to do so
134 
+            if ( $this->settings['dequeue'] == '1' ) {
135 
+                add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
136 
+            }
137 
+
138 
+        }
139 
+
140 
+        /**
141 
+         * Adds the Font Awesome styles.
142 
+         */
143 
+        public function enqueue_style() {
144 
+            // build url
145 
+            $url = $this->get_url();
146 
+
147 
+            wp_deregister_style( 'font-awesome' ); // deregister in case its already there
148 
+            wp_register_style( 'font-awesome', $url, array(), null );
149 
+            wp_enqueue_style( 'font-awesome' );
150 
+
151 
+            if ( $this->settings['shims'] ) {
152 
+                $url = $this->get_url( true );
153 
+                wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
154 
+                wp_register_style( 'font-awesome-shims', $url, array(), null );
155 
+                wp_enqueue_style( 'font-awesome-shims' );
156 
+            }
157 
+        }
158 
+
159 
+        /**
160 
+         * Adds the Font Awesome JS.
161 
+         */
162 
+        public function enqueue_scripts() {
163 
+            // build url
164 
+            $url = $this->get_url();
165 
+
166 
+            $deregister_function = 'wp'.'_'.'deregister'.'_'.'script';
167 
+            call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
168 
+            wp_register_script( 'font-awesome', $url, array(), null );
169 
+            wp_enqueue_script( 'font-awesome' );
170 
+
171 
+            if ( $this->settings['shims'] ) {
172 
+                $url = $this->get_url( true );
173 
+                call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
174 
+                wp_register_script( 'font-awesome-shims', $url, array(), null );
175 
+                wp_enqueue_script( 'font-awesome-shims' );
176 
+            }
177 
+        }
178 
+
179 
+        /**
180 
+         * Get the url of the Font Awesome files.
181 
+         *
182 
+         * @param bool $shims If this is a shim file or not.
183 
+         *
184 
+         * @return string The url to the file.
185 
+         */
186 
+        public function get_url( $shims = false ) {
187 
+            $script  = $shims ? 'v4-shims' : 'all';
188 
+            $type    = $this->settings['type'];
189 
+            $version = $this->settings['version'];
190 
+
191 
+            $url = "https://use.fontawesome.com/releases/"; // CDN
192 
+            $url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
193 
+            $url .= $type == 'CSS' ? 'css/' : 'js/'; // type
194 
+            $url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
195 
+            $url .= "?wpfas=true"; // set our var so our version is not removed
196 
+
197 
+            return $url;
198 
+        }
199 
+
200 
+        /**
201 
+         * Try and remove any other versions of Font Awesome added by other plugins/themes.
202 
+         *
203 
+         * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
204 
+         *
205 
+         * @param $url
206 
+         * @param $original_url
207 
+         * @param $_context
208 
+         *
209 
+         * @return string The filtered url.
210 
+         */
211 
+        public function remove_font_awesome( $url, $original_url, $_context ) {
212 
+
213 
+            if ( $_context == 'display'
214 
+                 && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
215 
+                 && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
216 
+            ) {// it's a font-awesome-url (probably)
217 
+
218 
+                if ( strstr( $url, "wpfas=true" ) !== false ) {
219 
+                    if ( $this->settings['type'] == 'JS' ) {
220 
+                        if ( $this->settings['js-pseudo'] ) {
221 
+                            $url .= "' data-search-pseudo-elements defer='defer";
222 
+                        } else {
223 
+                            $url .= "' defer='defer";
224 
+                        }
225 
+                    }
226 
+                } else {
227 
+                    $url = ''; // removing the url removes the file
228 
+                }
229 
+
230 
+            }
231 
+
232 
+            return $url;
233 
+        }
234 
+
235 
+        /**
236 
+         * Register the database settings with WordPress.
237 
+         */
238 
+        public function register_settings() {
239 
+            register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
240 
+        }
241 
+
242 
+        /**
243 
+         * Add the WordPress settings menu item.
244 
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
245 
+         */
246 
+        public function menu_item() {
247 
+            $menu_function = 'add'.'_'.'options'.'_'.'page'; // won't pass theme check if function name present in theme
248 
+            call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
249 
+                $this,
250 
+                'settings_page'
251 
+            ) );
252 
+        }
253 
+
254 
+        /**
255 
+         * Get the current Font Awesome output settings.
256 
+         *
257 
+         * @return array The array of settings.
258 
+         */
259 
+        public function get_settings() {
260 
+
261 
+            $db_settings = get_option( 'wp-font-awesome-settings' );
262 
+
263 
+            $defaults = array(
264 
+                'type'      => 'CSS', // type to use, CSS or JS
265 
+                'version'   => '', // latest
266 
+                'enqueue'   => '', // front and backend
267 
+                'shims'     => '1', // default on for now, @todo maybe change to off in 2020
268 
+                'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
269 
+                'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
270 
+            );
271 
+
272 
+            $settings = wp_parse_args( $db_settings, $defaults );
273 
+
274 
+            /**
275 
+             * Filter the Font Awesome settings.
276 
+             *
277 
+             * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
278 
+             */
279 
+            return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
280 
+        }
281 
+
282 
+
283 
+        /**
284 
+         * The settings page html output.
285 
+         */
286 
+        public function settings_page() {
287 
+            if ( ! current_user_can( 'manage_options' ) ) {
288 
+                wp_die( __( 'You do not have sufficient permissions to access this page.', 'font-awesome-settings' ) );
289 
+            }
290 
+
291 
+            // a hidden way to force the update of the verison number vai api instead of waiting the 48 hours
292 
+            if(isset($_REQUEST['force-version-check'])){
293 
+                $this->get_latest_version($force_api = true);
294 
+            }
295 
+            ?>
296 296 
 			<div class="wrap">
297 297 
 				<h1><?php echo $this->name; ?></h1>
298 298 
 				<form method="post" action="options.php">
299 299 
 					<?php
300 
-					settings_fields( 'wp-font-awesome-settings' );
301 
-					do_settings_sections( 'wp-font-awesome-settings' );
302 
-					?>
300 
+                    settings_fields( 'wp-font-awesome-settings' );
301 
+                    do_settings_sections( 'wp-font-awesome-settings' );
302 
+                    ?>
303 303 
 					<table class="form-table">
304 304 
 						<tr valign="top">
305 305 
 							<th scope="row"><label for="wpfas-type"><?php _e( 'Type', 'font-awesome-settings' ); ?></label></th>
 
@@ -396,87 +396,87 @@  discard block
 
 block discarded – undo
396 396
397 397 
 					</table>
398 398 
 					<?php
399 
-					submit_button();
400 
-					?>
399 
+                    submit_button();
400 
+                    ?>
401 401 
 				</form>
402 402
403 403 
 				<div id="wpfas-version"><?php echo $this->version; ?></div>
404 404 
 			</div>
405 405
406 406 
 			<?php
407 
-		}
408 
-
409 
-		/**
410 
-		 * Check a version number is valid and if so return it or else return an empty string.
411 
-		 *
412 
-		 * @param $version string The version number to check.
413 
-		 * @since 1.0.6
414 
-		 *
415 
-		 * @return string Either a valid version number or an empty string.
416 
-		 */
417 
-		public function validate_version_number( $version ) {
418 
-
419 
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
420 
-				// valid
421 
-			} else {
422 
-				$version = '';// not validated
423 
-			}
424 
-
425 
-			return $version;
426 
-		}
427 
-
428 
-
429 
-		/**
430 
-		 * Get the latest version of Font Awesome.
431 
-		 *
432 
-		 * We check for a cached bersion and if none we will check for a live version via API and then cache it for 48 hours.
433 
-		 *
434 
-		 * @since 1.0.7
435 
-		 * @return mixed|string The latest version number found.
436 
-		 */
437 
-		public function get_latest_version($force_api = false) {
438 
-			$latest_version = $this->latest;
439 
-
440 
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
441 
-
442 
-			if ( $cache === false || $force_api) { // its not set
443 
-				$api_ver = $this->get_latest_version_from_api();
444 
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
445 
-					$latest_version = $api_ver;
446 
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
447 
-				}
448 
-			} elseif ( $this->validate_version_number( $cache ) ) {
449 
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
450 
-					$latest_version = $cache;
451 
-				}
452 
-			}
453 
-
454 
-			return $latest_version;
455 
-		}
456 
-
457 
-		/**
458 
-		 * Get the latest Font Awesome version from the github API.
459 
-		 *
460 
-		 * @since 1.0.7
461 
-		 * @return string The latest version number or `0` on API fail.
462 
-		 */
463 
-		public function get_latest_version_from_api() {
464 
-			$version  = "0";
465 
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
466 
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
467 
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
468 
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
469 
-					$version = $api_response['tag_name'];
470 
-				}
471 
-			}
472 
-
473 
-			return $version;
474 
-		}
475 
-
476 
-	}
477 
-
478 
-	/**
479 
-	 * Run the class if found.
480 
-	 */
481 
-	WP_Font_Awesome_Settings::instance();
407 
+        }
408 
+
409 
+        /**
410 
+         * Check a version number is valid and if so return it or else return an empty string.
411 
+         *
412 
+         * @param $version string The version number to check.
413 
+         * @since 1.0.6
414 
+         *
415 
+         * @return string Either a valid version number or an empty string.
416 
+         */
417 
+        public function validate_version_number( $version ) {
418 
+
419 
+            if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
420 
+                // valid
421 
+            } else {
422 
+                $version = '';// not validated
423 
+            }
424 
+
425 
+            return $version;
426 
+        }
427 
+
428 
+
429 
+        /**
430 
+         * Get the latest version of Font Awesome.
431 
+         *
432 
+         * We check for a cached bersion and if none we will check for a live version via API and then cache it for 48 hours.
433 
+         *
434 
+         * @since 1.0.7
435 
+         * @return mixed|string The latest version number found.
436 
+         */
437 
+        public function get_latest_version($force_api = false) {
438 
+            $latest_version = $this->latest;
439 
+
440 
+            $cache = get_transient( 'wp-font-awesome-settings-version' );
441 
+
442 
+            if ( $cache === false || $force_api) { // its not set
443 
+                $api_ver = $this->get_latest_version_from_api();
444 
+                if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
445 
+                    $latest_version = $api_ver;
446 
+                    set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
447 
+                }
448 
+            } elseif ( $this->validate_version_number( $cache ) ) {
449 
+                if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
450 
+                    $latest_version = $cache;
451 
+                }
452 
+            }
453 
+
454 
+            return $latest_version;
455 
+        }
456 
+
457 
+        /**
458 
+         * Get the latest Font Awesome version from the github API.
459 
+         *
460 
+         * @since 1.0.7
461 
+         * @return string The latest version number or `0` on API fail.
462 
+         */
463 
+        public function get_latest_version_from_api() {
464 
+            $version  = "0";
465 
+            $response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
466 
+            if ( ! is_wp_error( $response ) && is_array( $response ) ) {
467 
+                $api_response = json_decode( wp_remote_retrieve_body( $response ), true );
468 
+                if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
469 
+                    $version = $api_response['tag_name'];
470 
+                }
471 
+            }
472 
+
473 
+            return $version;
474 
+        }
475 
+
476 
+    }
477 
+
478 
+    /**
479 
+     * Run the class if found.
480 
+     */
481 
+    WP_Font_Awesome_Settings::instance();
482 482 
 }
483 483 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +94 added lines, -94 removed lines patch added patch discarded remove patch 
@@ -12,14 +12,14 @@  discard block
 
 block discarded – undo
12 12 
 /**
13 13 
  * Bail if we are not in WP.
14 14 
  */
15 
-if ( ! defined( 'ABSPATH' ) ) {
15 
+if (!defined('ABSPATH')) {
16 16 
 	exit;
17 17 
 }
18 18
19 19 
 /**
20 20 
  * Only add if the class does not already exist.
21 21 
  */
22 
-if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
22 
+if (!class_exists('WP_Font_Awesome_Settings')) {
23 23
24 24 
 	/**
25 25 
 	 * A Class to be able to change settings for Font Awesome.
 
@@ -85,17 +85,17 @@  discard block
 
 block discarded – undo
85 85 
 		 * @return WP_Font_Awesome_Settings - Main instance.
86 86 
 		 */
87 87 
 		public static function instance() {
88 
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
88 
+			if (!isset(self::$instance) && !(self::$instance instanceof WP_Font_Awesome_Settings)) {
89 89 
 				self::$instance = new WP_Font_Awesome_Settings;
90 90
91 
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
91 
+				add_action('init', array(self::$instance, 'init')); // set settings
92 92
93 
-				if ( is_admin() ) {
94 
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
95 
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
93 
+				if (is_admin()) {
94 
+					add_action('admin_menu', array(self::$instance, 'menu_item'));
95 
+					add_action('admin_init', array(self::$instance, 'register_settings'));
96 96 
 				}
97 97
98 
-				do_action( 'wp_font_awesome_settings_loaded' );
98 
+				do_action('wp_font_awesome_settings_loaded');
99 99 
 			}
100 100
101 101 
 			return self::$instance;
 
@@ -109,30 +109,30 @@  discard block
 
 block discarded – undo
109 109 
 		public function init() {
110 110 
 			$this->settings = $this->get_settings();
111 111
112 
-			if ( $this->settings['type'] == 'CSS' ) {
112 
+			if ($this->settings['type'] == 'CSS') {
113 113
114 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
115 
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );//echo '###';exit;
114 
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
115 
+					add_action('wp_enqueue_scripts', array($this, 'enqueue_style'), 5000); //echo '###';exit;
116 116 
 				}
117 117
118 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
119 
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
118 
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
119 
+					add_action('admin_enqueue_scripts', array($this, 'enqueue_style'), 5000);
120 120 
 				}
121 121
122 122 
 			} else {
123 123
124 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
125 
-					add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );//echo '###';exit;
124 
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
125 
+					add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 5000); //echo '###';exit;
126 126 
 				}
127 127
128 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
129 
-					add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
128 
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
129 
+					add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'), 5000);
130 130 
 				}
131 131 
 			}
132 132
133 133 
 			// remove font awesome if set to do so
134 
-			if ( $this->settings['dequeue'] == '1' ) {
135 
-				add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
134 
+			if ($this->settings['dequeue'] == '1') {
135 
+				add_action('clean_url', array($this, 'remove_font_awesome'), 5000, 3);
136 136 
 			}
137 137
138 138 
 		}
 
@@ -144,15 +144,15 @@  discard block
 
 block discarded – undo
144 144 
 			// build url
145 145 
 			$url = $this->get_url();
146 146
147 
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
148 
-			wp_register_style( 'font-awesome', $url, array(), null );
149 
-			wp_enqueue_style( 'font-awesome' );
147 
+			wp_deregister_style('font-awesome'); // deregister in case its already there
148 
+			wp_register_style('font-awesome', $url, array(), null);
149 
+			wp_enqueue_style('font-awesome');
150 150
151 
-			if ( $this->settings['shims'] ) {
152 
-				$url = $this->get_url( true );
153 
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
154 
-				wp_register_style( 'font-awesome-shims', $url, array(), null );
155 
-				wp_enqueue_style( 'font-awesome-shims' );
151 
+			if ($this->settings['shims']) {
152 
+				$url = $this->get_url(true);
153 
+				wp_deregister_style('font-awesome-shims'); // deregister in case its already there
154 
+				wp_register_style('font-awesome-shims', $url, array(), null);
155 
+				wp_enqueue_style('font-awesome-shims');
156 156 
 			}
157 157 
 		}
158 158 
 
@@ -163,16 +163,16 @@  discard block
 
 block discarded – undo
163 163 
 			// build url
164 164 
 			$url = $this->get_url();
165 165
166 
-			$deregister_function = 'wp'.'_'.'deregister'.'_'.'script';
167 
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
168 
-			wp_register_script( 'font-awesome', $url, array(), null );
169 
-			wp_enqueue_script( 'font-awesome' );
166 
+			$deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
167 
+			call_user_func($deregister_function, 'font-awesome'); // deregister in case its already there
168 
+			wp_register_script('font-awesome', $url, array(), null);
169 
+			wp_enqueue_script('font-awesome');
170 170
171 
-			if ( $this->settings['shims'] ) {
172 
-				$url = $this->get_url( true );
173 
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
174 
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
175 
-				wp_enqueue_script( 'font-awesome-shims' );
171 
+			if ($this->settings['shims']) {
172 
+				$url = $this->get_url(true);
173 
+				call_user_func($deregister_function, 'font-awesome-shims'); // deregister in case its already there
174 
+				wp_register_script('font-awesome-shims', $url, array(), null);
175 
+				wp_enqueue_script('font-awesome-shims');
176 176 
 			}
177 177 
 		}
178 178 
 
@@ -183,13 +183,13 @@  discard block
 
 block discarded – undo
183 183 
 		 *
184 184 
 		 * @return string The url to the file.
185 185 
 		 */
186 
-		public function get_url( $shims = false ) {
186 
+		public function get_url($shims = false) {
187 187 
 			$script  = $shims ? 'v4-shims' : 'all';
188 188 
 			$type    = $this->settings['type'];
189 189 
 			$version = $this->settings['version'];
190 190
191 191 
 			$url = "https://use.fontawesome.com/releases/"; // CDN
192 
-			$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
192 
+			$url .= !empty($version) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
193 193 
 			$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
194 194 
 			$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
195 195 
 			$url .= "?wpfas=true"; // set our var so our version is not removed
 
@@ -208,16 +208,16 @@  discard block
 
 block discarded – undo
208 208 
 		 *
209 209 
 		 * @return string The filtered url.
210 210 
 		 */
211 
-		public function remove_font_awesome( $url, $original_url, $_context ) {
211 
+		public function remove_font_awesome($url, $original_url, $_context) {
212 212
213 
-			if ( $_context == 'display'
214 
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
215 
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
213 
+			if ($_context == 'display'
214 
+			     && (strstr($url, "fontawesome") !== false || strstr($url, "font-awesome") !== false)
215 
+			     && (strstr($url, ".js") !== false || strstr($url, ".css") !== false)
216 216 
 			) {// it's a font-awesome-url (probably)
217 217
218 
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
219 
-					if ( $this->settings['type'] == 'JS' ) {
220 
-						if ( $this->settings['js-pseudo'] ) {
218 
+				if (strstr($url, "wpfas=true") !== false) {
219 
+					if ($this->settings['type'] == 'JS') {
220 
+						if ($this->settings['js-pseudo']) {
221 221 
 							$url .= "' data-search-pseudo-elements defer='defer";
222 222 
 						} else {
223 223 
 							$url .= "' defer='defer";
 
@@ -236,7 +236,7 @@  discard block
 
 block discarded – undo
236 236 
 		 * Register the database settings with WordPress.
237 237 
 		 */
238 238 
 		public function register_settings() {
239 
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
239 
+			register_setting('wp-font-awesome-settings', 'wp-font-awesome-settings');
240 240 
 		}
241 241
242 242 
 		/**
 
@@ -244,11 +244,11 @@  discard block
 
 block discarded – undo
244 244 
 		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
245 245 
 		 */
246 246 
 		public function menu_item() {
247 
-			$menu_function = 'add'.'_'.'options'.'_'.'page'; // won't pass theme check if function name present in theme
247 
+			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
248 248 
 			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
249 249 
 				$this,
250 250 
 				'settings_page'
251 
-			) );
251 
+			));
252 252 
 		}
253 253
254 254 
 		/**
 
@@ -258,7 +258,7 @@  discard block
 
 block discarded – undo
258 258 
 		 */
259 259 
 		public function get_settings() {
260 260
261 
-			$db_settings = get_option( 'wp-font-awesome-settings' );
261 
+			$db_settings = get_option('wp-font-awesome-settings');
262 262
263 263 
 			$defaults = array(
264 264 
 				'type'      => 'CSS', // type to use, CSS or JS
 
@@ -269,14 +269,14 @@  discard block
 
 block discarded – undo
269 269 
 				'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
270 270 
 			);
271 271
272 
-			$settings = wp_parse_args( $db_settings, $defaults );
272 
+			$settings = wp_parse_args($db_settings, $defaults);
273 273
274 274 
 			/**
275 275 
 			 * Filter the Font Awesome settings.
276 276 
 			 *
277 277 
 			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
278 278 
 			 */
279 
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
279 
+			return $this->settings = apply_filters('wp-font-awesome-settings', $settings, $db_settings, $defaults);
280 280 
 		}
281 281
282 282 
 
@@ -284,12 +284,12 @@  discard block
 
 block discarded – undo
284 284 
 		 * The settings page html output.
285 285 
 		 */
286 286 
 		public function settings_page() {
287 
-			if ( ! current_user_can( 'manage_options' ) ) {
288 
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'font-awesome-settings' ) );
287 
+			if (!current_user_can('manage_options')) {
288 
+				wp_die(__('You do not have sufficient permissions to access this page.', 'font-awesome-settings'));
289 289 
 			}
290 290
291 291 
 			// a hidden way to force the update of the verison number vai api instead of waiting the 48 hours
292 
-			if(isset($_REQUEST['force-version-check'])){
292 
+			if (isset($_REQUEST['force-version-check'])) {
293 293 
 				$this->get_latest_version($force_api = true);
294 294 
 			}
295 295 
 			?>
 
@@ -297,47 +297,47 @@  discard block
 
 block discarded – undo
297 297 
 				<h1><?php echo $this->name; ?></h1>
298 298 
 				<form method="post" action="options.php">
299 299 
 					<?php
300 
-					settings_fields( 'wp-font-awesome-settings' );
301 
-					do_settings_sections( 'wp-font-awesome-settings' );
300 
+					settings_fields('wp-font-awesome-settings');
301 
+					do_settings_sections('wp-font-awesome-settings');
302 302 
 					?>
303 303 
 					<table class="form-table">
304 304 
 						<tr valign="top">
305 
-							<th scope="row"><label for="wpfas-type"><?php _e( 'Type', 'font-awesome-settings' ); ?></label></th>
305 
+							<th scope="row"><label for="wpfas-type"><?php _e('Type', 'font-awesome-settings'); ?></label></th>
306 306 
 							<td>
307 307 
 								<select name="wp-font-awesome-settings[type]" id="wpfas-type">
308 308 
 									<option
309 
-										value="CSS" <?php selected( $this->settings['type'], 'CSS' ); ?>><?php _e( 'CSS (default)', 'font-awesome-settings' ); ?></option>
310 
-									<option value="JS" <?php selected( $this->settings['type'], 'JS' ); ?>>JS</option>
309 
+										value="CSS" <?php selected($this->settings['type'], 'CSS'); ?>><?php _e('CSS (default)', 'font-awesome-settings'); ?></option>
310 
+									<option value="JS" <?php selected($this->settings['type'], 'JS'); ?>>JS</option>
311 311 
 								</select>
312 312 
 							</td>
313 313 
 						</tr>
314 314
315 315 
 						<tr valign="top">
316 
-							<th scope="row"><label for="wpfas-version"><?php _e( 'Version', 'font-awesome-settings' ); ?></label></th>
316 
+							<th scope="row"><label for="wpfas-version"><?php _e('Version', 'font-awesome-settings'); ?></label></th>
317 317 
 							<td>
318 318 
 								<select name="wp-font-awesome-settings[version]" id="wpfas-version">
319 319 
 									<option
320 
-										value="" <?php selected( $this->settings['version'], '' ); ?>><?php echo sprintf( __( 'Latest - %s (default)', 'font-awesome-settings' ), $this->get_latest_version() ); ?>
320 
+										value="" <?php selected($this->settings['version'], ''); ?>><?php echo sprintf(__('Latest - %s (default)', 'font-awesome-settings'), $this->get_latest_version()); ?>
321 321 
 									</option>
322 
-									<option value="5.6.0" <?php selected( $this->settings['version'], '5.6.0' ); ?>>
322 
+									<option value="5.6.0" <?php selected($this->settings['version'], '5.6.0'); ?>>
323 323 
 										5.6.0
324 324 
 									</option>
325 
-									<option value="5.5.0" <?php selected( $this->settings['version'], '5.5.0' ); ?>>
325 
+									<option value="5.5.0" <?php selected($this->settings['version'], '5.5.0'); ?>>
326 326 
 										5.5.0
327 327 
 									</option>
328 
-									<option value="5.4.0" <?php selected( $this->settings['version'], '5.4.0' ); ?>>
328 
+									<option value="5.4.0" <?php selected($this->settings['version'], '5.4.0'); ?>>
329 329 
 										5.4.0
330 330 
 									</option>
331 
-									<option value="5.3.0" <?php selected( $this->settings['version'], '5.3.0' ); ?>>
331 
+									<option value="5.3.0" <?php selected($this->settings['version'], '5.3.0'); ?>>
332 332 
 										5.3.0
333 333 
 									</option>
334 
-									<option value="5.2.0" <?php selected( $this->settings['version'], '5.2.0' ); ?>>
334 
+									<option value="5.2.0" <?php selected($this->settings['version'], '5.2.0'); ?>>
335 335 
 										5.2.0
336 336 
 									</option>
337 
-									<option value="5.1.0" <?php selected( $this->settings['version'], '5.1.0' ); ?>>
337 
+									<option value="5.1.0" <?php selected($this->settings['version'], '5.1.0'); ?>>
338 338 
 										5.1.0
339 339 
 									</option>
340 
-									<option value="4.7.0" <?php selected( $this->settings['version'], '4.7.0' ); ?>>
340 
+									<option value="4.7.0" <?php selected($this->settings['version'], '4.7.0'); ?>>
341 341 
 										4.7.1 (CSS only)
342 342 
 									</option>
343 343 
 								</select>
 
@@ -345,51 +345,51 @@  discard block
 
 block discarded – undo
345 345 
 						</tr>
346 346
347 347 
 						<tr valign="top">
348 
-							<th scope="row"><label for="wpfas-enqueue"><?php _e( 'Enqueue', 'font-awesome-settings' ); ?></label></th>
348 
+							<th scope="row"><label for="wpfas-enqueue"><?php _e('Enqueue', 'font-awesome-settings'); ?></label></th>
349 349 
 							<td>
350 350 
 								<select name="wp-font-awesome-settings[enqueue]" id="wpfas-enqueue">
351 351 
 									<option
352 
-										value="" <?php selected( $this->settings['enqueue'], '' ); ?>><?php _e( 'Frontend + Backend (default)', 'font-awesome-settings' ); ?></option>
352 
+										value="" <?php selected($this->settings['enqueue'], ''); ?>><?php _e('Frontend + Backend (default)', 'font-awesome-settings'); ?></option>
353 353 
 									<option
354 
-										value="frontend" <?php selected( $this->settings['enqueue'], 'frontend' ); ?>><?php _e( 'Frontend', 'font-awesome-settings' ); ?></option>
354 
+										value="frontend" <?php selected($this->settings['enqueue'], 'frontend'); ?>><?php _e('Frontend', 'font-awesome-settings'); ?></option>
355 355 
 									<option
356 
-										value="backend" <?php selected( $this->settings['enqueue'], 'backend' ); ?>><?php _e( 'Backend', 'font-awesome-settings' ); ?></option>
356 
+										value="backend" <?php selected($this->settings['enqueue'], 'backend'); ?>><?php _e('Backend', 'font-awesome-settings'); ?></option>
357 357 
 								</select>
358 358 
 							</td>
359 359 
 						</tr>
360 360
361 361 
 						<tr valign="top">
362 362 
 							<th scope="row"><label
363 
-									for="wpfas-shims"><?php _e( 'Enable v4 shims compatibility', 'font-awesome-settings' ); ?></label></th>
363 
+									for="wpfas-shims"><?php _e('Enable v4 shims compatibility', 'font-awesome-settings'); ?></label></th>
364 364 
 							<td>
365 365 
 								<input type="hidden" name="wp-font-awesome-settings[shims]" value="0"/>
366 366 
 								<input type="checkbox" name="wp-font-awesome-settings[shims]"
367 
-								       value="1" <?php checked( $this->settings['shims'], '1' ); ?> id="wpfas-shims"/>
368 
-								<span><?php _e( 'This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'font-awesome-settings' ); ?></span>
367 
+								       value="1" <?php checked($this->settings['shims'], '1'); ?> id="wpfas-shims"/>
368 
+								<span><?php _e('This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'font-awesome-settings'); ?></span>
369 369 
 							</td>
370 370 
 						</tr>
371 371
372 372 
 						<tr valign="top">
373 373 
 							<th scope="row"><label
374 
-									for="wpfas-js-pseudo"><?php _e( 'Enable JS pseudo elements (not recommended)', 'font-awesome-settings' ); ?></label>
374 
+									for="wpfas-js-pseudo"><?php _e('Enable JS pseudo elements (not recommended)', 'font-awesome-settings'); ?></label>
375 375 
 							</th>
376 376 
 							<td>
377 377 
 								<input type="hidden" name="wp-font-awesome-settings[js-pseudo]" value="0"/>
378 378 
 								<input type="checkbox" name="wp-font-awesome-settings[js-pseudo]"
379 
-								       value="1" <?php checked( $this->settings['js-pseudo'], '1' ); ?>
379 
+								       value="1" <?php checked($this->settings['js-pseudo'], '1'); ?>
380 380 
 								       id="wpfas-js-pseudo"/>
381 
-								<span><?php _e( 'Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'font-awesome-settings' ); ?></span>
381 
+								<span><?php _e('Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'font-awesome-settings'); ?></span>
382 382 
 							</td>
383 383 
 						</tr>
384 384
385 385 
 						<tr valign="top">
386 
-							<th scope="row"><label for="wpfas-dequeue"><?php _e( 'Dequeue', 'font-awesome-settings' ); ?></label></th>
386 
+							<th scope="row"><label for="wpfas-dequeue"><?php _e('Dequeue', 'font-awesome-settings'); ?></label></th>
387 387 
 							<td>
388 388 
 								<input type="hidden" name="wp-font-awesome-settings[dequeue]" value="0"/>
389 389 
 								<input type="checkbox" name="wp-font-awesome-settings[dequeue]"
390 
-								       value="1" <?php checked( $this->settings['dequeue'], '1' ); ?>
390 
+								       value="1" <?php checked($this->settings['dequeue'], '1'); ?>
391 391 
 								       id="wpfas-dequeue"/>
392 
-								<span><?php _e( 'This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'font-awesome-settings' ); ?></span>
392 
+								<span><?php _e('This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'font-awesome-settings'); ?></span>
393 393 
 							</td>
394 394 
 						</tr>
395 395 
 
@@ -414,12 +414,12 @@  discard block
 
 block discarded – undo
414 414 
 		 *
415 415 
 		 * @return string Either a valid version number or an empty string.
416 416 
 		 */
417 
-		public function validate_version_number( $version ) {
417 
+		public function validate_version_number($version) {
418 418
419 
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
419 
+			if (version_compare($version, '0.0.1', '>=') >= 0) {
420 420 
 				// valid
421 421 
 			} else {
422 
-				$version = '';// not validated
422 
+				$version = ''; // not validated
423 423 
 			}
424 424
425 425 
 			return $version;
 
@@ -437,16 +437,16 @@  discard block
 
 block discarded – undo
437 437 
 		public function get_latest_version($force_api = false) {
438 438 
 			$latest_version = $this->latest;
439 439
440 
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
440 
+			$cache = get_transient('wp-font-awesome-settings-version');
441 441
442 
-			if ( $cache === false || $force_api) { // its not set
442 
+			if ($cache === false || $force_api) { // its not set
443 443 
 				$api_ver = $this->get_latest_version_from_api();
444 
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
444 
+				if (version_compare($api_ver, $this->latest, '>=') >= 0) {
445 445 
 					$latest_version = $api_ver;
446 
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
446 
+					set_transient('wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS);
447 447 
 				}
448 
-			} elseif ( $this->validate_version_number( $cache ) ) {
449 
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
448 
+			} elseif ($this->validate_version_number($cache)) {
449 
+				if (version_compare($cache, $this->latest, '>=') >= 0) {
450 450 
 					$latest_version = $cache;
451 451 
 				}
452 452 
 			}
 
@@ -462,10 +462,10 @@  discard block
 
 block discarded – undo
462 462 
 		 */
463 463 
 		public function get_latest_version_from_api() {
464 464 
 			$version  = "0";
465 
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
466 
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
467 
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
468 
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
465 
+			$response = wp_remote_get("https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest");
466 
+			if (!is_wp_error($response) && is_array($response)) {
467 
+				$api_response = json_decode(wp_remote_retrieve_body($response), true);
468 
+				if (isset($api_response['tag_name']) && version_compare($api_response['tag_name'], $this->latest, '>=') >= 0 && empty($api_response['prerelease'])) {
469 469 
 					$version = $api_response['tag_name'];
470 470 
 				}
471 471 
 			}
Please login to merge, or discard this patch.
invoicing.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -12,19 +12,19 @@
 
 block discarded – undo
12 12 
 */
13 13
14 14 
 // MUST have WordPress.
15 
-if ( !defined( 'WPINC' ) ) {
16 
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
15 
+if (!defined('WPINC')) {
16 
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
17 17 
 }
18 18
19 
-if ( !defined( 'WPINV_VERSION' ) ) {
20 
-    define( 'WPINV_VERSION', '1.0.7' );
19 
+if (!defined('WPINV_VERSION')) {
20 
+    define('WPINV_VERSION', '1.0.7');
21 21 
 }
22 22
23 
-if ( !defined( 'WPINV_PLUGIN_FILE' ) ) {
24 
-    define( 'WPINV_PLUGIN_FILE', __FILE__ );
23 
+if (!defined('WPINV_PLUGIN_FILE')) {
24 
+    define('WPINV_PLUGIN_FILE', __FILE__);
25 25 
 }
26 26
27 
-require plugin_dir_path( __FILE__ ) . 'includes/class-wpinv.php';
27 
+require plugin_dir_path(__FILE__) . 'includes/class-wpinv.php';
28 28
29 29 
 function wpinv_run() {
30 30 
     global $invoicing;
Please login to merge, or discard this patch.