AyeCode / invoicing

templates/payment-forms-admin/edit/email.php

Spacing +10 added lines, -10 removed lines

@@ -7,49 +7,49 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Field Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Field Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Placeholder text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Placeholder text', 'invoicing'); ?></span>
         <input v-model='active_form_element.placeholder' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php esc_html_e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php esc_html_e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group mb-3 form-check'>
     <input :id="active_form_element.id + '_edit'" v-model='active_form_element.required' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e( 'Is this field required?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e('Is this field required?', 'invoicing'); ?></label>
 </div>
 
 <div class='form-group mb-3 form-check'>
     <input :id="active_form_element.id + '_add_meta'" v-model='active_form_element.add_meta' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e( 'Show this field in receipts and emails?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e('Show this field in receipts and emails?', 'invoicing'); ?></label>
 </div>
 
 <hr class='featurette-divider mt-4'>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Email Merge Tag', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Email Merge Tag', 'invoicing'); ?></span>
         <input :value='active_form_element.label | formatMergeTag' class='form-control bg-white' type="text" readonly onclick="this.select()" />
-        <span class="form-text text-muted"><?php esc_html_e( 'You can use this merge tag in notification emails', 'invoicing' ); ?></span>
+        <span class="form-text text-muted"><?php esc_html_e('You can use this merge tag in notification emails', 'invoicing'); ?></span>
     </label>
 </div>
 

templates/payment-forms-admin/edit/textarea.php

Spacing +10 added lines, -10 removed lines

@@ -7,49 +7,49 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Field Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Field Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Placeholder text', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Placeholder text', 'invoicing'); ?></span>
         <input v-model='active_form_element.placeholder' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php esc_html_e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php esc_html_e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>
 
 <div class='form-group mb-3 form-check'>
     <input :id="active_form_element.id + '_edit'" v-model='active_form_element.required' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e( 'Is this field required?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_edit'"><?php esc_html_e('Is this field required?', 'invoicing'); ?></label>
 </div>
 
 <div class='form-group mb-3 form-check'>
     <input :id="active_form_element.id + '_add_meta'" v-model='active_form_element.add_meta' type='checkbox' class='form-check-input' />
-    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e( 'Show this field in receipts and emails?', 'invoicing' ); ?></label>
+    <label class='form-check-label' :for="active_form_element.id + '_add_meta'"><?php esc_html_e('Show this field in receipts and emails?', 'invoicing'); ?></label>
 </div>
 
 <hr class='featurette-divider mt-4'>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Email Merge Tag', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Email Merge Tag', 'invoicing'); ?></span>
         <input :value='active_form_element.label | formatMergeTag' class='form-control bg-white' type="text" readonly onclick="this.select()" />
-        <span class="form-text text-muted"><?php esc_html_e( 'You can use this merge tag in notification emails', 'invoicing' ); ?></span>
+        <span class="form-text text-muted"><?php esc_html_e('You can use this merge tag in notification emails', 'invoicing'); ?></span>
     </label>
 </div>
 

templates/payment-forms-admin/previews/alert.php

Spacing +2 added lines, -2 removed lines

@@ -7,14 +7,14 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='alert mb-0' :class='form_element.class' role='alert'>
     <span v-html='form_element.text'></span>
     <button v-if='form_element.dismissible' type='button' class='close btn-close' @click.prevent='' style="margin-top: -4px;">
-        <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+        <?php if (empty($GLOBALS['aui_bs5'])) : ?>
             <span aria-hidden="true">×</span>
         <?php endif; ?>
     </button>

includes/admin/views/html-tax-rate-edit.php

Spacing +15 added lines, -15 removed lines

@@ -6,7 +6,7 @@ 
  * @var array $tax_rate
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
@@ -18,13 +18,13 @@ 
             aui()->select(
                 array(
                     'options' => array_merge(
-                        array( '' => __( 'All Countries', 'invoicing' ) ),
+                        array('' => __('All Countries', 'invoicing')),
                         wpinv_get_country_list()
                     ),
                     'name'    => "tax_rates[$key][country]",
-                    'id'      => uniqid( 'tax_rate_country' ),
-                    'value'   => esc_html( $tax_rate['country'] ),
-                    'label'   => __( 'Country', 'invoicing' ),
+                    'id'      => uniqid('tax_rate_country'),
+                    'value'   => esc_html($tax_rate['country']),
+                    'label'   => __('Country', 'invoicing'),
                     'class'   => 'wpinv_country',
                     'no_wrap' => true,
                 ),
@@ -37,36 +37,36 @@ 
     <td class="wpinv_tax_state">
 
         <label class="w-100">
-            <span class="screen-reader-text"><?php esc_html_e( 'States', 'invoicing' ); ?></span>
-            <input type="text" placeholder="<?php esc_attr_e( 'Apply to whole country', 'invoicing' ); ?>" name="tax_rates[<?php echo esc_attr( $key ); ?>][state]" value="<?php echo empty( $tax_rate['global'] ) ? esc_attr( $tax_rate['state'] ) : ''; ?>"/>
+            <span class="screen-reader-text"><?php esc_html_e('States', 'invoicing'); ?></span>
+            <input type="text" placeholder="<?php esc_attr_e('Apply to whole country', 'invoicing'); ?>" name="tax_rates[<?php echo esc_attr($key); ?>][state]" value="<?php echo empty($tax_rate['global']) ? esc_attr($tax_rate['state']) : ''; ?>"/>
         </label>
 
     </td>
 
     <td class="wpinv_standard_rate">
         <label class="w-100">
-            <span class="screen-reader-text"><?php esc_html_e( 'Standard Rate', 'invoicing' ); ?></span>
-            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo esc_attr( $key ); ?>][rate]" value="<?php echo esc_attr( $tax_rate['rate'] ); ?>"/>
+            <span class="screen-reader-text"><?php esc_html_e('Standard Rate', 'invoicing'); ?></span>
+            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo esc_attr($key); ?>][rate]" value="<?php echo esc_attr($tax_rate['rate']); ?>"/>
         </label>
     </td>
 
     <td class="wpinv_reduced_rate">
         <label class="w-100">
-            <span class="screen-reader-text"><?php esc_html_e( 'Reduced Rate', 'invoicing' ); ?></span>
-            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo esc_attr( $key ); ?>][reduced_rate]" value="<?php echo esc_attr( $tax_rate['reduced_rate'] ); ?>"/>
+            <span class="screen-reader-text"><?php esc_html_e('Reduced Rate', 'invoicing'); ?></span>
+            <input type="number" step="any" min="0" max="99" name="tax_rates[<?php echo esc_attr($key); ?>][reduced_rate]" value="<?php echo esc_attr($tax_rate['reduced_rate']); ?>"/>
         </label>
     </td>
 
     <td class="wpinv_tax_name">
         <label class="w-100">
-            <span class="screen-reader-text"><?php esc_html_e( 'Tax Name', 'invoicing' ); ?></span>
-            <input type="text" name="tax_rates[<?php echo esc_attr( $key ); ?>][name]" value="<?php echo esc_attr( $tax_rate['name'] ); ?>"/>
+            <span class="screen-reader-text"><?php esc_html_e('Tax Name', 'invoicing'); ?></span>
+            <input type="text" name="tax_rates[<?php echo esc_attr($key); ?>][name]" value="<?php echo esc_attr($tax_rate['name']); ?>"/>
         </label>
     </td>
 
     <td class="wpinv_tax_remove">
-        <button type="button" class="close btn-close wpinv_remove_tax_rate" aria-label="<?php esc_attr_e( 'Delete', 'invoicing' ); ?>" title="<?php esc_attr_e( 'Delete', 'invoicing' ); ?>">
-            <?php if ( empty( $GLOBALS['aui_bs5'] ) ) : ?>
+        <button type="button" class="close btn-close wpinv_remove_tax_rate" aria-label="<?php esc_attr_e('Delete', 'invoicing'); ?>" title="<?php esc_attr_e('Delete', 'invoicing'); ?>">
+            <?php if (empty($GLOBALS['aui_bs5'])) : ?>
                 <span aria-hidden="true">×</span>
             <?php endif; ?>
         </button>

includes/class-wpinv-ajax.php

Indentation +64 added lines, -64 removed lines

@@ -14,70 +14,70 @@ 
 class WPInv_Ajax {
 
     /**
-	 * Hook in ajax handlers.
-	 */
-	public static function init() {
-		add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
-		add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
-		self::add_ajax_events();
+     * Hook in ajax handlers.
+     */
+    public static function init() {
+        add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
+        add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
+        self::add_ajax_events();
     }
 
     /**
-	 * Set GetPaid AJAX constant and headers.
-	 */
-	public static function define_ajax() {
-
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			getpaid_maybe_define_constant( 'DOING_AJAX', true );
-			getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
-			if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-				/** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
-			}
-			$GLOBALS['wpdb']->hide_errors();
-		}
+     * Set GetPaid AJAX constant and headers.
+     */
+    public static function define_ajax() {
+
+        if ( ! empty( $_GET['wpinv-ajax'] ) ) {
+            getpaid_maybe_define_constant( 'DOING_AJAX', true );
+            getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
+            if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
+                /** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
+            }
+            $GLOBALS['wpdb']->hide_errors();
+        }
 
     }
 
     /**
-	 * Send headers for GetPaid Ajax Requests.
-	 *
-	 * @since 1.0.18
-	 */
-	private static function wpinv_ajax_headers() {
-		if ( ! headers_sent() ) {
-			send_origin_headers();
-			send_nosniff_header();
-			nocache_headers();
-			header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-			header( 'X-Robots-Tag: noindex' );
-			status_header( 200 );
-		}
+     * Send headers for GetPaid Ajax Requests.
+     *
+     * @since 1.0.18
+     */
+    private static function wpinv_ajax_headers() {
+        if ( ! headers_sent() ) {
+            send_origin_headers();
+            send_nosniff_header();
+            nocache_headers();
+            header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+            header( 'X-Robots-Tag: noindex' );
+            status_header( 200 );
+        }
     }
 
     /**
-	 * Check for GetPaid Ajax request and fire action.
-	 */
-	public static function do_wpinv_ajax() {
-		global $wp_query;
+     * Check for GetPaid Ajax request and fire action.
+     */
+    public static function do_wpinv_ajax() {
+        global $wp_query;
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			$wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
-		}
+        if ( ! empty( $_GET['wpinv-ajax'] ) ) {
+            $wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
+        }
 
-		$action = $wp_query->get( 'wpinv-ajax' );
+        $action = $wp_query->get( 'wpinv-ajax' );
 
-		if ( $action ) {
-			self::wpinv_ajax_headers();
-			$action = sanitize_text_field( $action );
-			do_action( 'wpinv_ajax_' . $action );
-			wp_die();
-		}
+        if ( $action ) {
+            self::wpinv_ajax_headers();
+            $action = sanitize_text_field( $action );
+            do_action( 'wpinv_ajax_' . $action );
+            wp_die();
+        }
 
     }
 
     /**
-	 * Hook in ajax methods.
-	 */
+     * Hook in ajax methods.
+     */
     public static function add_ajax_events() {
 
         // array( 'event' => is_frontend )
@@ -258,11 +258,11 @@ 
         global $getpaid_force_checkbox;
 
         // Is the request set up correctly?
-		if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) && empty( $_GET['invoice'] ) ) {
-			aui()->alert(
-				array(
-					'type'    => 'warning',
-					'content' => __( 'No payment form or item provided', 'invoicing' ),
+        if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) && empty( $_GET['invoice'] ) ) {
+            aui()->alert(
+                array(
+                    'type'    => 'warning',
+                    'content' => __( 'No payment form or item provided', 'invoicing' ),
                 ),
                 true
             );
@@ -270,7 +270,7 @@ 
         }
 
         // Payment form or button?
-		if ( ! empty( $_GET['form'] ) ) {
+        if ( ! empty( $_GET['form'] ) ) {
             $form = sanitize_text_field( urldecode( $_GET['form'] ) );
 
             if ( false !== strpos( $form, '|' ) ) {
@@ -323,10 +323,10 @@ 
                 getpaid_display_payment_form( $form );
             }
 } elseif ( ! empty( $_GET['invoice'] ) ) {
-		    getpaid_display_invoice_payment_form( (int) urldecode( $_GET['invoice'] ) );
+            getpaid_display_invoice_payment_form( (int) urldecode( $_GET['invoice'] ) );
         } else {
-			$items = getpaid_convert_items_to_array( sanitize_text_field( urldecode( $_GET['item'] ) ) );
-		    getpaid_display_item_payment_form( $items );
+            $items = getpaid_convert_items_to_array( sanitize_text_field( urldecode( $_GET['item'] ) ) );
+            getpaid_display_item_payment_form( $items );
         }
 
         exit;
@@ -643,7 +643,7 @@ 
         if ( is_wp_error( $error ) ) {
             $alert = $error->get_error_message();
             wp_send_json_success( compact( 'alert' ) );
-         }
+            }
 
         // Update totals.
         $invoice->recalculate_total();
@@ -1072,12 +1072,12 @@ 
     }
 
     /**
-	 * Handles file uploads.
-	 *
-	 * @since       1.0.0
-	 * @return      void
-	 */
-	public static function file_upload() {
+     * Handles file uploads.
+     *
+     * @since       1.0.0
+     * @return      void
+     */
+    public static function file_upload() {
 
         // Check nonce.
         check_ajax_referer( 'getpaid_form_nonce' );
@@ -1138,7 +1138,7 @@ 
 
         wp_send_json_success( $response );
 
-	}
+    }
 
 }
 

Spacing +339 added lines, -339 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * WPInv_Ajax class.
@@ -17,8 +17,8 @@ 
 	 * Hook in ajax handlers.
 	 */
 	public static function init() {
-		add_action( 'init', array( __CLASS__, 'define_ajax' ), 0 );
-		add_action( 'template_redirect', array( __CLASS__, 'do_wpinv_ajax' ), 0 );
+		add_action('init', array(__CLASS__, 'define_ajax'), 0);
+		add_action('template_redirect', array(__CLASS__, 'do_wpinv_ajax'), 0);
 		self::add_ajax_events();
     }
 
@@ -27,11 +27,11 @@ 
 	 */
 	public static function define_ajax() {
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			getpaid_maybe_define_constant( 'DOING_AJAX', true );
-			getpaid_maybe_define_constant( 'WPInv_DOING_AJAX', true );
-			if ( ! WP_DEBUG || ( WP_DEBUG && ! WP_DEBUG_DISPLAY ) ) {
-				/** @scrutinizer ignore-unhandled */ @ini_set( 'display_errors', 0 );
+		if (!empty($_GET['wpinv-ajax'])) {
+			getpaid_maybe_define_constant('DOING_AJAX', true);
+			getpaid_maybe_define_constant('WPInv_DOING_AJAX', true);
+			if (!WP_DEBUG || (WP_DEBUG && !WP_DEBUG_DISPLAY)) {
+				/** @scrutinizer ignore-unhandled */ @ini_set('display_errors', 0);
 			}
 			$GLOBALS['wpdb']->hide_errors();
 		}
@@ -44,13 +44,13 @@ 
 	 * @since 1.0.18
 	 */
 	private static function wpinv_ajax_headers() {
-		if ( ! headers_sent() ) {
+		if (!headers_sent()) {
 			send_origin_headers();
 			send_nosniff_header();
 			nocache_headers();
-			header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-			header( 'X-Robots-Tag: noindex' );
-			status_header( 200 );
+			header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+			header('X-Robots-Tag: noindex');
+			status_header(200);
 		}
     }
 
@@ -60,16 +60,16 @@ 
 	public static function do_wpinv_ajax() {
 		global $wp_query;
 
-		if ( ! empty( $_GET['wpinv-ajax'] ) ) {
-			$wp_query->set( 'wpinv-ajax', sanitize_text_field( wp_unslash( $_GET['wpinv-ajax'] ) ) );
+		if (!empty($_GET['wpinv-ajax'])) {
+			$wp_query->set('wpinv-ajax', sanitize_text_field(wp_unslash($_GET['wpinv-ajax'])));
 		}
 
-		$action = $wp_query->get( 'wpinv-ajax' );
+		$action = $wp_query->get('wpinv-ajax');
 
-		if ( $action ) {
+		if ($action) {
 			self::wpinv_ajax_headers();
-			$action = sanitize_text_field( $action );
-			do_action( 'wpinv_ajax_' . $action );
+			$action = sanitize_text_field($action);
+			do_action('wpinv_ajax_' . $action);
 			wp_die();
 		}
 
@@ -106,36 +106,36 @@ 
             'file_upload'                   => true,
         );
 
-        foreach ( $ajax_events as $ajax_event => $nopriv ) {
-            add_action( 'wp_ajax_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-            add_action( 'wp_ajax_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+        foreach ($ajax_events as $ajax_event => $nopriv) {
+            add_action('wp_ajax_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+            add_action('wp_ajax_getpaid_' . $ajax_event, array(__CLASS__, $ajax_event));
 
-            if ( $nopriv ) {
-                add_action( 'wp_ajax_nopriv_wpinv_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-                add_action( 'wp_ajax_nopriv_getpaid_' . $ajax_event, array( __CLASS__, $ajax_event ) );
-                add_action( 'wpinv_ajax_' . $ajax_event, array( __CLASS__, $ajax_event ) );
+            if ($nopriv) {
+                add_action('wp_ajax_nopriv_wpinv_' . $ajax_event, array(__CLASS__, $ajax_event));
+                add_action('wp_ajax_nopriv_getpaid_' . $ajax_event, array(__CLASS__, $ajax_event));
+                add_action('wpinv_ajax_' . $ajax_event, array(__CLASS__, $ajax_event));
             }
         }
     }
 
     public static function add_note() {
-        check_ajax_referer( 'add-invoice-note', '_nonce' );
+        check_ajax_referer('add-invoice-note', '_nonce');
 
-        $post_id   = absint( $_POST['post_id'] );
-        $note      = wp_kses_post( trim( stripslashes( $_POST['note'] ) ) );
-        $note_type = sanitize_text_field( $_POST['note_type'] );
+        $post_id   = absint($_POST['post_id']);
+        $note      = wp_kses_post(trim(stripslashes($_POST['note'])));
+        $note_type = sanitize_text_field($_POST['note_type']);
 
-        if ( ! wpinv_current_user_can( 'invoice_add_note', array( 'invoice_id' => $post_id, 'note_type' => $note_type ) ) ) {
+        if (!wpinv_current_user_can('invoice_add_note', array('invoice_id' => $post_id, 'note_type' => $note_type))) {
             die( -1 );
         }
 
         $is_customer_note = $note_type == 'customer' ? 1 : 0;
 
-        if ( $post_id > 0 ) {
-            $note_id = wpinv_insert_payment_note( $post_id, $note, $is_customer_note );
+        if ($post_id > 0) {
+            $note_id = wpinv_insert_payment_note($post_id, $note, $is_customer_note);
 
-            if ( $note_id > 0 && ! is_wp_error( $note_id ) ) {
-                wpinv_get_invoice_note_line_item( $note_id );
+            if ($note_id > 0 && !is_wp_error($note_id)) {
+                wpinv_get_invoice_note_line_item($note_id);
             }
         }
 
@@ -143,16 +143,16 @@ 
     }
 
     public static function delete_note() {
-        check_ajax_referer( 'delete-invoice-note', '_nonce' );
+        check_ajax_referer('delete-invoice-note', '_nonce');
 
-        $note_id = (int)$_POST['note_id'];
+        $note_id = (int) $_POST['note_id'];
 
-        if ( ! wpinv_current_user_can( 'invoice_delete_note', array( 'note_id' => $note_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_delete_note', array('note_id' => $note_id))) {
             die( -1 );
         }
 
-        if ( $note_id > 0 ) {
-            wp_delete_comment( $note_id, true );
+        if ($note_id > 0) {
+            wp_delete_comment($note_id, true);
         }
 
         die();
@@ -169,35 +169,35 @@ 
      */
     public static function get_billing_details() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // Do we have a user id?
         $user_id = (int) $_GET['user_id'];
-        $invoice_id = ! empty( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
+        $invoice_id = !empty($_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : 0;
 
-        if ( empty( $user_id ) || ! is_numeric( $user_id ) ) {
+        if (empty($user_id) || !is_numeric($user_id)) {
             die( -1 );
         }
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'invoice_get_billing_details', array( 'user_id' => $user_id, 'invoice_id' => $invoice_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_get_billing_details', array('user_id' => $user_id, 'invoice_id' => $invoice_id))) {
             die( -1 );
         }
 
         // Fetch the billing details.
-        $billing_details    = wpinv_get_user_address( $user_id );
-        $billing_details    = apply_filters( 'wpinv_ajax_billing_details', $billing_details, $user_id );
+        $billing_details    = wpinv_get_user_address($user_id);
+        $billing_details    = apply_filters('wpinv_ajax_billing_details', $billing_details, $user_id);
 
         // unset the user id and email.
-        $to_ignore = array( 'user_id', 'email' );
+        $to_ignore = array('user_id', 'email');
 
-        foreach ( $to_ignore as $key ) {
-            if ( isset( $billing_details[ $key ] ) ) {
-                unset( $billing_details[ $key ] );
+        foreach ($to_ignore as $key) {
+            if (isset($billing_details[$key])) {
+                unset($billing_details[$key]);
             }
         }
 
-        wp_send_json_success( $billing_details );
+        wp_send_json_success($billing_details);
 
     }
 
@@ -206,54 +206,54 @@ 
      */
     public static function check_new_user_email() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        $invoice_id = ! empty( $_REQUEST['post_id'] ) ? absint( $_REQUEST['post_id'] ) : 0;
+        $invoice_id = !empty($_REQUEST['post_id']) ? absint($_REQUEST['post_id']) : 0;
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             die( -1 );
         }
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'invoice_check_new_user_email', array( 'invoice_id' => $invoice_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_check_new_user_email', array('invoice_id' => $invoice_id))) {
             die( -1 );
         }
 
         // We need an email address.
-        if ( empty( $_GET['email'] ) ) {
-            esc_html_e( "Provide the new user's email address", 'invoicing' );
+        if (empty($_GET['email'])) {
+            esc_html_e("Provide the new user's email address", 'invoicing');
             exit;
         }
 
         // Ensure the email is valid.
-        $email = sanitize_email( $_GET['email'] );
-        if ( ! is_email( $email ) ) {
-            esc_html_e( 'Invalid email address', 'invoicing' );
+        $email = sanitize_email($_GET['email']);
+        if (!is_email($email)) {
+            esc_html_e('Invalid email address', 'invoicing');
             exit;
         }
 
         // And it does not exist.
-        $id = email_exists( $email );
-        if ( $id ) {
-            wp_send_json_success( compact( 'id' ) );
+        $id = email_exists($email);
+        if ($id) {
+            wp_send_json_success(compact('id'));
         }
 
-        wp_send_json_success( true );
+        wp_send_json_success(true);
     }
 
     public static function run_tool() {
-        check_ajax_referer( 'wpinv-nonce', '_nonce' );
+        check_ajax_referer('wpinv-nonce', '_nonce');
 
-        if ( ! wpinv_current_user_can_manage_invoicing() ) {
+        if (!wpinv_current_user_can_manage_invoicing()) {
             die( -1 );
         }
 
-        $tool = sanitize_text_field( $_POST['tool'] );
+        $tool = sanitize_text_field($_POST['tool']);
 
-        do_action( 'wpinv_run_tool' );
+        do_action('wpinv_run_tool');
 
-        if ( ! empty( $tool ) ) {
-            do_action( 'wpinv_tool_' . $tool );
+        if (!empty($tool)) {
+            do_action('wpinv_tool_' . $tool);
         }
     }
 
@@ -264,11 +264,11 @@ 
         global $getpaid_force_checkbox;
 
         // Is the request set up correctly?
-		if ( empty( $_GET['form'] ) && empty( $_GET['item'] ) && empty( $_GET['invoice'] ) ) {
+		if (empty($_GET['form']) && empty($_GET['item']) && empty($_GET['invoice'])) {
 			aui()->alert(
 				array(
 					'type'    => 'warning',
-					'content' => __( 'No payment form or item provided', 'invoicing' ),
+					'content' => __('No payment form or item provided', 'invoicing'),
                 ),
                 true
             );
@@ -276,29 +276,29 @@ 
         }
 
         // Payment form or button?
-		if ( ! empty( $_GET['form'] ) ) {
-            $form = sanitize_text_field( urldecode( $_GET['form'] ) );
+		if (!empty($_GET['form'])) {
+            $form = sanitize_text_field(urldecode($_GET['form']));
 
-            if ( false !== strpos( $form, '|' ) ) {
-                $form_pos = strpos( $form, '|' );
-                $_items   = getpaid_convert_items_to_array( substr( $form, $form_pos + 1 ) );
-                $form     = substr( $form, 0, $form_pos );
+            if (false !== strpos($form, '|')) {
+                $form_pos = strpos($form, '|');
+                $_items   = getpaid_convert_items_to_array(substr($form, $form_pos + 1));
+                $form     = substr($form, 0, $form_pos);
 
                 // Retrieve appropriate payment form.
-                $payment_form = new GetPaid_Payment_Form( $form );
-                $payment_form = $payment_form->exists() ? $payment_form : new GetPaid_Payment_Form( wpinv_get_default_payment_form() );
+                $payment_form = new GetPaid_Payment_Form($form);
+                $payment_form = $payment_form->exists() ? $payment_form : new GetPaid_Payment_Form(wpinv_get_default_payment_form());
 
                 $items    = array();
                 $item_ids = array();
 
-                foreach ( $_items as $item_id => $qty ) {
-                    if ( ! in_array( $item_id, $item_ids ) ) {
-                        $item = new GetPaid_Form_Item( $item_id );
-                        $item->set_quantity( $qty );
+                foreach ($_items as $item_id => $qty) {
+                    if (!in_array($item_id, $item_ids)) {
+                        $item = new GetPaid_Form_Item($item_id);
+                        $item->set_quantity($qty);
 
-                        if ( 0 == $qty ) {
-                            $item->set_allow_quantities( true );
-                            $item->set_is_required( false );
+                        if (0 == $qty) {
+                            $item->set_allow_quantities(true);
+                            $item->set_is_required(false);
                             $getpaid_force_checkbox = true;
                         }
 
@@ -307,32 +307,32 @@ 
                     }
                 }
 
-                if ( ! $payment_form->is_default() ) {
+                if (!$payment_form->is_default()) {
 
-                    foreach ( $payment_form->get_items() as $item ) {
-                        if ( ! in_array( $item->get_id(), $item_ids ) ) {
+                    foreach ($payment_form->get_items() as $item) {
+                        if (!in_array($item->get_id(), $item_ids)) {
                             $item_ids[] = $item->get_id();
                             $items[]    = $item;
                         }
                     }
                 }
 
-                $payment_form->set_items( $items );
-                $extra_items     = esc_attr( getpaid_convert_items_to_string( $_items ) );
-                $extra_items_key = md5( NONCE_KEY . AUTH_KEY . $extra_items );
+                $payment_form->set_items($items);
+                $extra_items     = esc_attr(getpaid_convert_items_to_string($_items));
+                $extra_items_key = md5(NONCE_KEY . AUTH_KEY . $extra_items);
                 $extra_items     = "<input type='hidden' name='getpaid-form-items' value='$extra_items' />";
                 $extra_items    .= "<input type='hidden' name='getpaid-form-items-key' value='$extra_items_key' />";
-                $payment_form->display( $extra_items );
+                $payment_form->display($extra_items);
                 $getpaid_force_checkbox = false;
 
             } else {
-                getpaid_display_payment_form( $form );
+                getpaid_display_payment_form($form);
             }
-} elseif ( ! empty( $_GET['invoice'] ) ) {
-		    getpaid_display_invoice_payment_form( (int) urldecode( $_GET['invoice'] ) );
+} elseif (!empty($_GET['invoice'])) {
+		    getpaid_display_invoice_payment_form((int) urldecode($_GET['invoice']));
         } else {
-			$items = getpaid_convert_items_to_array( sanitize_text_field( urldecode( $_GET['item'] ) ) );
-		    getpaid_display_item_payment_form( $items );
+			$items = getpaid_convert_items_to_array(sanitize_text_field(urldecode($_GET['item'])));
+		    getpaid_display_item_payment_form($items);
         }
 
         exit;
@@ -347,14 +347,14 @@ 
     public static function payment_form() {
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            esc_html_e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            esc_html_e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
         // Process the payment form.
-        $checkout_class = apply_filters( 'getpaid_checkout_class', 'GetPaid_Checkout' );
-        $checkout       = new $checkout_class( new GetPaid_Payment_Form_Submission() );
+        $checkout_class = apply_filters('getpaid_checkout_class', 'GetPaid_Checkout');
+        $checkout       = new $checkout_class(new GetPaid_Payment_Form_Submission());
         $checkout->process_checkout();
 
         exit;
@@ -367,55 +367,55 @@ 
      */
     public static function get_payment_form_states_field() {
 
-        if ( empty( $_GET['country'] ) || empty( $_GET['form'] ) ) {
+        if (empty($_GET['country']) || empty($_GET['form'])) {
             exit;
         }
 
-        $elements = getpaid_get_payment_form_elements( (int) $_GET['form'] );
+        $elements = getpaid_get_payment_form_elements((int) $_GET['form']);
 
-        if ( empty( $elements ) ) {
+        if (empty($elements)) {
             exit;
         }
 
         $address_fields = array();
-        foreach ( $elements as $element ) {
-            if ( 'address' === $element['type'] ) {
+        foreach ($elements as $element) {
+            if ('address' === $element['type']) {
                 $address_fields = $element;
                 break;
             }
         }
 
-        if ( empty( $address_fields ) ) {
+        if (empty($address_fields)) {
             exit;
         }
 
-        foreach ( $address_fields['fields'] as $address_field ) {
+        foreach ($address_fields['fields'] as $address_field) {
 
-            if ( 'wpinv_state' == $address_field['name'] ) {
+            if ('wpinv_state' == $address_field['name']) {
 
-                $wrap_class  = getpaid_get_form_element_grid_class( $address_field );
-                $wrap_class  = esc_attr( "$wrap_class getpaid-address-field-wrapper" );
-                $placeholder = empty( $address_field['placeholder'] ) ? '' : esc_attr( $address_field['placeholder'] );
-                $description = empty( $address_field['description'] ) ? '' : wp_kses_post( $address_field['description'] );
-                $value       = is_user_logged_in() ? get_user_meta( get_current_user_id(), '_wpinv_state', true ) : '';
-                $label       = empty( $address_field['label'] ) ? '' : wp_kses_post( $address_field['label'] );
+                $wrap_class  = getpaid_get_form_element_grid_class($address_field);
+                $wrap_class  = esc_attr("$wrap_class getpaid-address-field-wrapper");
+                $placeholder = empty($address_field['placeholder']) ? '' : esc_attr($address_field['placeholder']);
+                $description = empty($address_field['description']) ? '' : wp_kses_post($address_field['description']);
+                $value       = is_user_logged_in() ? get_user_meta(get_current_user_id(), '_wpinv_state', true) : '';
+                $label       = empty($address_field['label']) ? '' : wp_kses_post($address_field['label']);
 
-                if ( ! empty( $address_field['required'] ) ) {
+                if (!empty($address_field['required'])) {
                     $label .= "<span class='text-danger'> *</span>";
                 }
 
                 $html = getpaid_get_states_select_markup(
-                    sanitize_text_field( $_GET['country'] ),
+                    sanitize_text_field($_GET['country']),
                     $value,
                     $placeholder,
                     $label,
                     $description,
-                    ! empty( $address_field['required'] ),
+                    !empty($address_field['required']),
                     $wrap_class,
-                    sanitize_text_field( $_GET['name'] )
+                    sanitize_text_field($_GET['name'])
                 );
 
-                wp_send_json_success( $html );
+                wp_send_json_success($html);
                 exit;
 
             }
@@ -429,68 +429,68 @@ 
      */
     public static function recalculate_invoice_totals() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        $invoice_id = ! empty( $_POST['post_id'] ) ? absint( $_POST['post_id'] ) : 0;
+        $invoice_id = !empty($_POST['post_id']) ? absint($_POST['post_id']) : 0;
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             die( -1 );
         }
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'invoice_recalculate_totals', array( 'invoice_id' => $invoice_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_recalculate_totals', array('invoice_id' => $invoice_id))) {
             die( -1 );
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $invoice_id );
+        $invoice = new WPInv_Invoice($invoice_id);
 
         // Ensure it exists.
-        if ( ! $invoice->get_id() ) {
+        if (!$invoice->get_id()) {
             exit;
         }
 
         // Maybe set the country, state, currency.
-        foreach ( array( 'country', 'state', 'currency', 'vat_number', 'discount_code' ) as $key ) {
-            if ( isset( $_POST[ $key ] ) ) {
+        foreach (array('country', 'state', 'currency', 'vat_number', 'discount_code') as $key) {
+            if (isset($_POST[$key])) {
                 $method = "set_$key";
-                $invoice->$method( sanitize_text_field( $_POST[ $key ] ) );
+                $invoice->$method(sanitize_text_field($_POST[$key]));
             }
         }
 
         // Maybe disable taxes.
-        $invoice->set_disable_taxes( ! empty( $_POST['taxes'] ) );
+        $invoice->set_disable_taxes(!empty($_POST['taxes']));
 
         // Discount code.
-        if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-            $discount = new WPInv_Discount( $invoice->get_discount_code() );
-            if ( $discount->exists() ) {
-                $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+        if (!$invoice->is_paid() && !$invoice->is_refunded()) {
+            $discount = new WPInv_Discount($invoice->get_discount_code());
+            if ($discount->exists()) {
+                $invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
             } else {
-                $invoice->remove_discount( 'discount_code' );
+                $invoice->remove_discount('discount_code');
             }
         }
 
         // Recalculate totals.
         $invoice->recalculate_total();
 
-        $total        = wpinv_price( $invoice->get_total(), $invoice->get_currency() );
-        $suscriptions = getpaid_get_invoice_subscriptions( $invoice );
-        if ( is_a( $suscriptions, 'WPInv_Subscription' ) && $invoice->is_recurring() && $invoice->is_parent() && $invoice->get_total() != $invoice->get_recurring_total() ) {
-            $recurring_total = wpinv_price( $invoice->get_recurring_total(), $invoice->get_currency() );
-            $total          .= '<small class="form-text text-muted">' . sprintf( __( 'Recurring Price: %s', 'invoicing' ), $recurring_total ) . '</small>';
+        $total        = wpinv_price($invoice->get_total(), $invoice->get_currency());
+        $suscriptions = getpaid_get_invoice_subscriptions($invoice);
+        if (is_a($suscriptions, 'WPInv_Subscription') && $invoice->is_recurring() && $invoice->is_parent() && $invoice->get_total() != $invoice->get_recurring_total()) {
+            $recurring_total = wpinv_price($invoice->get_recurring_total(), $invoice->get_currency());
+            $total          .= '<small class="form-text text-muted">' . sprintf(__('Recurring Price: %s', 'invoicing'), $recurring_total) . '</small>';
         }
 
         $totals = array(
-            'subtotal' => wpinv_price( $invoice->get_subtotal(), $invoice->get_currency() ),
-            'discount' => wpinv_price( $invoice->get_total_discount(), $invoice->get_currency() ),
-            'tax'      => wpinv_price( $invoice->get_total_tax(), $invoice->get_currency() ),
+            'subtotal' => wpinv_price($invoice->get_subtotal(), $invoice->get_currency()),
+            'discount' => wpinv_price($invoice->get_total_discount(), $invoice->get_currency()),
+            'tax'      => wpinv_price($invoice->get_total_tax(), $invoice->get_currency()),
             'total'    => $total,
         );
 
-        $totals = apply_filters( 'getpaid_invoice_totals', $totals, $invoice );
+        $totals = apply_filters('getpaid_invoice_totals', $totals, $invoice);
 
-        wp_send_json_success( compact( 'totals' ) );
+        wp_send_json_success(compact('totals'));
     }
 
     /**
@@ -498,35 +498,35 @@ 
      */
     public static function get_invoice_items() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        $invoice_id = ! empty( $_POST['post_id'] ) ? absint( $_POST['post_id'] ) : 0;
+        $invoice_id = !empty($_POST['post_id']) ? absint($_POST['post_id']) : 0;
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             exit;
         }
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'invoice_get_items', array( 'invoice_id' => $invoice_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_get_items', array('invoice_id' => $invoice_id))) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $invoice_id );
+        $invoice = new WPInv_Invoice($invoice_id);
 
         // Ensure it exists.
-        if ( ! $invoice->get_id() ) {
+        if (!$invoice->get_id()) {
             exit;
         }
 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
-            $items[] = $item->prepare_data_for_invoice_edit_ajax( $invoice->get_currency(), $invoice->is_renewal() );
+        foreach ($invoice->get_items() as $item) {
+            $items[] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency(), $invoice->is_renewal());
         }
 
-        wp_send_json_success( compact( 'items' ) );
+        wp_send_json_success(compact('items'));
     }
 
     /**
@@ -534,57 +534,57 @@ 
      */
     public static function edit_invoice_item() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // We need an invoice and item details.
-        if ( empty( $_POST['post_id'] ) || empty( $_POST['data'] ) ) {
+        if (empty($_POST['post_id']) || empty($_POST['data'])) {
             exit;
         }
 
-        $invoice_id = absint( $_POST['post_id'] );
+        $invoice_id = absint($_POST['post_id']);
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             exit;
         }
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'invoice_edit_item', array( 'invoice_id' => $invoice_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_edit_item', array('invoice_id' => $invoice_id))) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $invoice_id );
+        $invoice = new WPInv_Invoice($invoice_id);
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Format the data.
-        $data = wp_kses_post_deep( wp_unslash( wp_list_pluck( $_POST['data'], 'value', 'field' ) ) );
+        $data = wp_kses_post_deep(wp_unslash(wp_list_pluck($_POST['data'], 'value', 'field')));
 
         // Ensure that we have an item id.
-        if ( empty( $data['id'] ) ) {
+        if (empty($data['id'])) {
             exit;
         }
 
         // Abort if the invoice does not have the specified item.
-        $item = $invoice->get_item( (int) $data['id'] );
+        $item = $invoice->get_item((int) $data['id']);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             exit;
         }
 
         // Update the item.
-        $item->set_price( getpaid_standardize_amount( $data['price'] ) );
-        $item->set_name( sanitize_text_field( $data['name'] ) );
-        $item->set_description( wp_kses_post( $data['description'] ) );
-        $item->set_quantity( floatval( $data['quantity'] ) );
+        $item->set_price(getpaid_standardize_amount($data['price']));
+        $item->set_name(sanitize_text_field($data['name']));
+        $item->set_description(wp_kses_post($data['description']));
+        $item->set_quantity(floatval($data['quantity']));
 
         // Add it to the invoice.
-        $error = $invoice->add_item( $item );
+        $error = $invoice->add_item($item);
         $alert = false;
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             $alert = $error->get_error_message();
         }
 
@@ -597,11 +597,11 @@ 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
-            $items[] = $item->prepare_data_for_invoice_edit_ajax( $invoice->get_currency() );
+        foreach ($invoice->get_items() as $item) {
+            $items[] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items', 'alert' ) );
+        wp_send_json_success(compact('items', 'alert'));
     }
 
     /**
@@ -609,63 +609,63 @@ 
      */
     public static function create_invoice_item() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // We need an invoice and item details.
-        if ( empty( $_POST['invoice_id'] ) || empty( $_POST['_wpinv_quick'] ) ) {
+        if (empty($_POST['invoice_id']) || empty($_POST['_wpinv_quick'])) {
             exit;
         }
 
-        $invoice_id = absint( $_POST['invoice_id'] );
+        $invoice_id = absint($_POST['invoice_id']);
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             exit;
         }
 
-        if ( ! wpinv_current_user_can( 'invoice_create_item', array( 'invoice_id' => $invoice_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_create_item', array('invoice_id' => $invoice_id))) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $invoice_id );
+        $invoice = new WPInv_Invoice($invoice_id);
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Format the data.
-        $data = wp_kses_post_deep( wp_unslash( $_POST['_wpinv_quick'] ) );
+        $data = wp_kses_post_deep(wp_unslash($_POST['_wpinv_quick']));
 
         $item = new WPInv_Item();
-        $item->set_price( getpaid_standardize_amount( $data['price'] ) );
-        $item->set_name( sanitize_text_field( $data['name'] ) );
-        $item->set_description( wp_kses_post( $data['description'] ) );
-        $item->set_type( sanitize_text_field( $data['type'] ) );
-        $item->set_vat_rule( sanitize_text_field( $data['vat_rule'] ) );
-        $item->set_vat_class( sanitize_text_field( $data['vat_class'] ) );
-        $item->set_status( 'publish' );
+        $item->set_price(getpaid_standardize_amount($data['price']));
+        $item->set_name(sanitize_text_field($data['name']));
+        $item->set_description(wp_kses_post($data['description']));
+        $item->set_type(sanitize_text_field($data['type']));
+        $item->set_vat_rule(sanitize_text_field($data['vat_rule']));
+        $item->set_vat_class(sanitize_text_field($data['vat_class']));
+        $item->set_status('publish');
         $item->save();
 
-        if ( ! $item->exists() ) {
-            $alert = __( 'Could not create invoice item. Please try again.', 'invoicing' );
-            wp_send_json_success( compact( 'alert' ) );
+        if (!$item->exists()) {
+            $alert = __('Could not create invoice item. Please try again.', 'invoicing');
+            wp_send_json_success(compact('alert'));
         }
 
-        if ( ! empty( $data['one-time'] ) ) {
-            update_post_meta( $item->get_id(), '_wpinv_one_time', 'yes' );
+        if (!empty($data['one-time'])) {
+            update_post_meta($item->get_id(), '_wpinv_one_time', 'yes');
         }
 
-        $item = new GetPaid_Form_Item( $item->get_id() );
-        $item->set_quantity( floatval( $data['qty'] ) );
+        $item = new GetPaid_Form_Item($item->get_id());
+        $item->set_quantity(floatval($data['qty']));
 
         // Add it to the invoice.
-        $error = $invoice->add_item( $item );
+        $error = $invoice->add_item($item);
         $alert = false;
 
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             $alert = $error->get_error_message();
-            wp_send_json_success( compact( 'alert' ) );
+            wp_send_json_success(compact('alert'));
          }
 
         // Update totals.
@@ -678,9 +678,9 @@ 
         $invoice->recalculate_total();
         $invoice->save();
         ob_start();
-        GetPaid_Meta_Box_Invoice_Items::output_row( GetPaid_Meta_Box_Invoice_Items::get_columns( $invoice ), $item, $invoice );
+        GetPaid_Meta_Box_Invoice_Items::output_row(GetPaid_Meta_Box_Invoice_Items::get_columns($invoice), $item, $invoice);
         $row = ob_get_clean();
-        wp_send_json_success( compact( 'row' ) );
+        wp_send_json_success(compact('row'));
     }
 
     /**
@@ -688,37 +688,37 @@ 
      */
     public static function remove_invoice_item() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // We need an invoice and item.
-        $invoice_id = ! empty( $_POST['post_id'] ) ? absint( $_POST['post_id'] ) : 0;
-        $item_id = ! empty( $_POST['item_id'] ) ? absint( $_POST['item_id'] ) : 0;
+        $invoice_id = !empty($_POST['post_id']) ? absint($_POST['post_id']) : 0;
+        $item_id = !empty($_POST['item_id']) ? absint($_POST['item_id']) : 0;
 
-        if ( empty( $invoice_id ) || empty( $item_id ) ) {
+        if (empty($invoice_id) || empty($item_id)) {
             exit;
         }
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'invoice_remove_item', array( 'invoice_id' => $invoice_id, 'item_id' => $item_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_remove_item', array('invoice_id' => $invoice_id, 'item_id' => $item_id))) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $invoice_id );
+        $invoice = new WPInv_Invoice($invoice_id);
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Abort if the invoice does not have the specified item.
-        $item = $invoice->get_item( $item_id );
+        $item = $invoice->get_item($item_id);
 
-        if ( empty( $item ) ) {
+        if (empty($item)) {
             exit;
         }
 
-        $invoice->remove_item( $item_id );
+        $invoice->remove_item($item_id);
 
         // Update totals.
         $invoice->recalculate_total();
@@ -729,11 +729,11 @@ 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
-            $items[] = $item->prepare_data_for_invoice_edit_ajax( $invoice->get_currency() );
+        foreach ($invoice->get_items() as $item) {
+            $items[] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items' ) );
+        wp_send_json_success(compact('items'));
     }
 
     /**
@@ -741,69 +741,69 @@ 
      */
     public static function recalculate_full_prices() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        $invoice_id = ! empty( $_POST['post_id'] ) ? absint( $_POST['post_id'] ) : 0;
+        $invoice_id = !empty($_POST['post_id']) ? absint($_POST['post_id']) : 0;
 
-        if ( empty( $invoice_id ) ) {
+        if (empty($invoice_id)) {
             exit;
         }
 
-        if ( ! wpinv_current_user_can( 'invoice_recalculate_full_prices', array( 'invoice_id' => $invoice_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_recalculate_full_prices', array('invoice_id' => $invoice_id))) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $invoice_id );
+        $invoice = new WPInv_Invoice($invoice_id);
         $alert   = false;
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
-        $invoice->set_items( array() );
+        $invoice->set_items(array());
 
-        if ( ! empty( $_POST['getpaid_items'] ) ) {
+        if (!empty($_POST['getpaid_items'])) {
 
-            foreach ( wp_kses_post_deep( wp_unslash( $_POST['getpaid_items'] ) ) as $item_id => $args ) {
-                $item = new GetPaid_Form_Item( $item_id );
+            foreach (wp_kses_post_deep(wp_unslash($_POST['getpaid_items'])) as $item_id => $args) {
+                $item = new GetPaid_Form_Item($item_id);
 
-                if ( $item->exists() ) {
-                    $item->set_price( getpaid_standardize_amount( $args['price'] ) );
-                    $item->set_quantity( floatval( $args['quantity'] ) );
-                    $item->set_name( sanitize_text_field( $args['name'] ) );
-                    $item->set_description( wp_kses_post( $args['description'] ) );
-                    $invoice->add_item( $item );
+                if ($item->exists()) {
+                    $item->set_price(getpaid_standardize_amount($args['price']));
+                    $item->set_quantity(floatval($args['quantity']));
+                    $item->set_name(sanitize_text_field($args['name']));
+                    $item->set_description(wp_kses_post($args['description']));
+                    $invoice->add_item($item);
                 }
             }
         }
 
-        $invoice->set_disable_taxes( ! empty( $_POST['disable_taxes'] ) );
+        $invoice->set_disable_taxes(!empty($_POST['disable_taxes']));
 
         // Maybe set the country, state, currency.
-        foreach ( array( 'wpinv_country', 'wpinv_state', 'wpinv_currency', 'wpinv_vat_number', 'wpinv_discount_code' ) as $key ) {
-            if ( isset( $_POST[ $key ] ) ) {
-                $_key   = str_replace( 'wpinv_', '', $key );
+        foreach (array('wpinv_country', 'wpinv_state', 'wpinv_currency', 'wpinv_vat_number', 'wpinv_discount_code') as $key) {
+            if (isset($_POST[$key])) {
+                $_key   = str_replace('wpinv_', '', $key);
                 $method = "set_$_key";
-                $invoice->$method( sanitize_text_field( $_POST[ $key ] ) );
+                $invoice->$method(sanitize_text_field($_POST[$key]));
             }
         }
 
-        $discount = new WPInv_Discount( $invoice->get_discount_code() );
-        if ( $discount->exists() ) {
-            $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+        $discount = new WPInv_Discount($invoice->get_discount_code());
+        if ($discount->exists()) {
+            $invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
         } else {
-            $invoice->remove_discount( 'discount_code' );
+            $invoice->remove_discount('discount_code');
         }
 
         // Save the invoice.
         $invoice->recalculate_total();
         $invoice->save();
         ob_start();
-        GetPaid_Meta_Box_Invoice_Items::output( get_post( $invoice->get_id() ), $invoice );
+        GetPaid_Meta_Box_Invoice_Items::output(get_post($invoice->get_id()), $invoice);
         $table = ob_get_clean();
-        wp_send_json_success( compact( 'table' ) );
+        wp_send_json_success(compact('table'));
     }
 
     /**
@@ -811,47 +811,47 @@ 
      */
     public static function admin_add_invoice_item() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // We need an invoice and item.
-        $invoice_id = ! empty( $_POST['post_id'] ) ? absint( $_POST['post_id'] ) : 0;
-        $item_id = ! empty( $_POST['item_id'] ) ? absint( $_POST['item_id'] ) : 0;
+        $invoice_id = !empty($_POST['post_id']) ? absint($_POST['post_id']) : 0;
+        $item_id = !empty($_POST['item_id']) ? absint($_POST['item_id']) : 0;
 
-        if ( empty( $invoice_id ) || empty( $item_id ) ) {
+        if (empty($invoice_id) || empty($item_id)) {
             exit;
         }
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'invoice_add_item', array( 'invoice_id' => $invoice_id, 'item_id' => $item_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_add_item', array('invoice_id' => $invoice_id, 'item_id' => $item_id))) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $invoice_id );
+        $invoice = new WPInv_Invoice($invoice_id);
         $alert   = false;
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Add the item.
-        $item  = new GetPaid_Form_Item( $item_id );
+        $item  = new GetPaid_Form_Item($item_id);
 
-        $error = $invoice->add_item( $item );
+        $error = $invoice->add_item($item);
 
-        if ( is_wp_error( $error ) ) {
+        if (is_wp_error($error)) {
             $alert = $error->get_error_message();
-            wp_send_json_success( compact( 'alert' ) );
+            wp_send_json_success(compact('alert'));
         }
 
         // Save the invoice.
         $invoice->recalculate_total();
         $invoice->save();
         ob_start();
-        GetPaid_Meta_Box_Invoice_Items::output_row( GetPaid_Meta_Box_Invoice_Items::get_columns( $invoice ), $item, $invoice );
+        GetPaid_Meta_Box_Invoice_Items::output_row(GetPaid_Meta_Box_Invoice_Items::get_columns($invoice), $item, $invoice);
         $row = ob_get_clean();
-        wp_send_json_success( compact( 'row' ) );
+        wp_send_json_success(compact('row'));
     }
 
     /**
@@ -859,42 +859,42 @@ 
      */
     public static function add_invoice_items() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        $invoice_id = ! empty( $_POST['post_id'] ) ? absint( $_POST['post_id'] ) : 0;
+        $invoice_id = !empty($_POST['post_id']) ? absint($_POST['post_id']) : 0;
 
         // We need an invoice and items.
-        if ( empty( $invoice_id ) || empty( $_POST['items'] ) ) {
+        if (empty($invoice_id) || empty($_POST['items'])) {
             exit;
         }
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'invoice_add_items', array( 'invoice_id' => $invoice_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_add_items', array('invoice_id' => $invoice_id))) {
             exit;
         }
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $invoice_id );
+        $invoice = new WPInv_Invoice($invoice_id);
         $alert   = false;
 
         // Ensure it exists and its not been paid for.
-        if ( ! $invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded() ) {
+        if (!$invoice->get_id() || $invoice->is_paid() || $invoice->is_refunded()) {
             exit;
         }
 
         // Add the items.
-        foreach ( wp_kses_post_deep( wp_unslash( $_POST['items'] ) ) as $data ) {
+        foreach (wp_kses_post_deep(wp_unslash($_POST['items'])) as $data) {
 
-            $item = new GetPaid_Form_Item( (int) $data['id'] );
+            $item = new GetPaid_Form_Item((int) $data['id']);
 
-            if ( is_numeric( $data['qty'] ) && (float) $data['qty'] > 0 ) {
-                $item->set_quantity( floatval( $data['qty'] ) );
+            if (is_numeric($data['qty']) && (float) $data['qty'] > 0) {
+                $item->set_quantity(floatval($data['qty']));
             }
 
-            if ( $item->get_id() > 0 ) {
-                $error = $invoice->add_item( $item );
+            if ($item->get_id() > 0) {
+                $error = $invoice->add_item($item);
 
-                if ( is_wp_error( $error ) ) {
+                if (is_wp_error($error)) {
                     $alert = $error->get_error_message();
                 }
 }
@@ -907,11 +907,11 @@ 
         // Return an array of invoice items.
         $items = array();
 
-        foreach ( $invoice->get_items() as $item ) {
-            $items[] = $item->prepare_data_for_invoice_edit_ajax( $invoice->get_currency() );
+        foreach ($invoice->get_items() as $item) {
+            $items[] = $item->prepare_data_for_invoice_edit_ajax($invoice->get_currency());
         }
 
-        wp_send_json_success( compact( 'items', 'alert' ) );
+        wp_send_json_success(compact('items', 'alert'));
     }
 
     /**
@@ -919,16 +919,16 @@ 
      */
     public static function get_invoicing_items() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'get_invoicing_items' ) ) {
+        if (!wpinv_current_user_can('get_invoicing_items')) {
             exit;
         }
 
         // We need a search term.
-        if ( empty( $_GET['search'] ) ) {
-            wp_send_json_success( array() );
+        if (empty($_GET['search'])) {
+            wp_send_json_success(array());
         }
 
         // Retrieve items.
@@ -937,8 +937,8 @@ 
             'orderby'        => 'title',
             'order'          => 'ASC',
             'posts_per_page' => -1,
-            'post_status'    => array( 'publish' ),
-            's'              => sanitize_text_field( urldecode( $_GET['search'] ) ),
+            'post_status'    => array('publish'),
+            's'              => sanitize_text_field(urldecode($_GET['search'])),
             'meta_query'     => array(
                 array(
                     'key'     => '_wpinv_type',
@@ -952,25 +952,25 @@ 
             ),
         );
 
-        if ( ! empty( $_GET['ignore'] ) ) {
-            $item_args['exclude'] = wp_parse_id_list( sanitize_text_field( $_GET['ignore'] ) );
+        if (!empty($_GET['ignore'])) {
+            $item_args['exclude'] = wp_parse_id_list(sanitize_text_field($_GET['ignore']));
         }
 
-        $items = get_posts( apply_filters( 'getpaid_ajax_invoice_items_query_args', $item_args ) );
+        $items = get_posts(apply_filters('getpaid_ajax_invoice_items_query_args', $item_args));
         $data  = array();
 
-        $is_payment_form = ( ! empty( $_GET['post_id'] ) && 'wpi_payment_form' == get_post_type( (int) $_GET['post_id'] ) );
+        $is_payment_form = (!empty($_GET['post_id']) && 'wpi_payment_form' == get_post_type((int) $_GET['post_id']));
 
-        foreach ( $items as $item ) {
-            $item      = new GetPaid_Form_Item( $item );
+        foreach ($items as $item) {
+            $item = new GetPaid_Form_Item($item);
             $data[] = array(
                 'id'        => (int) $item->get_id(),
-                'text'      => strip_tags( $item->get_name() ),
-                'form_data' => $is_payment_form ? $item->prepare_data_for_use( false ) : '',
+                'text'      => strip_tags($item->get_name()),
+                'form_data' => $is_payment_form ? $item->prepare_data_for_use(false) : '',
             );
         }
 
-        wp_send_json_success( $data );
+        wp_send_json_success($data);
 
     }
 
@@ -979,40 +979,40 @@ 
      */
     public static function get_customers() {
         // Verify nonce.
-        check_ajax_referer( 'wpinv-nonce' );
+        check_ajax_referer('wpinv-nonce');
 
-        $invoice_id = ! empty( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
+        $invoice_id = !empty($_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : 0;
 
         // Can the user manage the plugin?
-        if ( ! wpinv_current_user_can( 'invoice_get_customers', array( 'invoice_id' => $invoice_id ) ) ) {
+        if (!wpinv_current_user_can('invoice_get_customers', array('invoice_id' => $invoice_id))) {
             die( -1 );
         }
 
         // We need a search term.
-        if ( empty( $_GET['search'] ) ) {
-            wp_send_json_success( array() );
+        if (empty($_GET['search'])) {
+            wp_send_json_success(array());
         }
 
         // Retrieve customers.
 
         $customer_args = array(
-            'fields'         => array( 'ID', 'user_email', 'display_name' ),
+            'fields'         => array('ID', 'user_email', 'display_name'),
             'orderby'        => 'display_name',
-            'search'         => '*' . sanitize_text_field( $_GET['search'] ) . '*',
-            'search_columns' => array( 'user_login', 'user_email', 'display_name' ),
+            'search'         => '*' . sanitize_text_field($_GET['search']) . '*',
+            'search_columns' => array('user_login', 'user_email', 'display_name'),
         );
 
-        $customers = get_users( apply_filters( 'getpaid_ajax_invoice_customers_query_args', $customer_args ) );
+        $customers = get_users(apply_filters('getpaid_ajax_invoice_customers_query_args', $customer_args));
         $data      = array();
 
-        foreach ( $customers as $customer ) {
+        foreach ($customers as $customer) {
             $data[] = array(
                 'id'   => (int) $customer->ID,
-                'text' => strip_tags( sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email ) ),
+                'text' => strip_tags(sprintf(_x('%1$s (%2$s)', 'user dropdown', 'invoicing'), $customer->display_name, $customer->user_email)),
             );
         }
 
-        wp_send_json_success( $data );
+        wp_send_json_success($data);
 
     }
 
@@ -1022,25 +1022,25 @@ 
     public static function get_aui_states_field() {
 
         // We need a country.
-        if ( empty( $_GET['country'] ) ) {
+        if (empty($_GET['country'])) {
             exit;
         }
 
-        $states = wpinv_get_country_states( sanitize_text_field( $_GET['country'] ) );
-        $state  = isset( $_GET['state'] ) ? sanitize_text_field( $_GET['state'] ) : wpinv_get_default_state();
-        $name   = isset( $_GET['name'] ) ? sanitize_text_field( $_GET['name'] ) : 'wpinv_state';
-        $class  = isset( $_GET['class'] ) ? sanitize_text_field( $_GET['class'] ) : 'form-control-sm';
+        $states = wpinv_get_country_states(sanitize_text_field($_GET['country']));
+        $state  = isset($_GET['state']) ? sanitize_text_field($_GET['state']) : wpinv_get_default_state();
+        $name   = isset($_GET['name']) ? sanitize_text_field($_GET['name']) : 'wpinv_state';
+        $class  = isset($_GET['class']) ? sanitize_text_field($_GET['class']) : 'form-control-sm';
 
-        if ( empty( $states ) ) {
+        if (empty($states)) {
 
             $html = aui()->input(
                 array(
                     'type'        => 'text',
                     'id'          => 'wpinv_state',
                     'name'        => $name,
-                    'label'       => __( 'State', 'invoicing' ),
+                    'label'       => __('State', 'invoicing'),
                     'label_type'  => 'vertical',
-                    'placeholder' => __( 'State', 'invoicing' ),
+                    'placeholder' => __('State', 'invoicing'),
                     'class'       => $class,
                     'value'       => $state,
                 )
@@ -1052,9 +1052,9 @@ 
                 array(
                     'id'               => 'wpinv_state',
                     'name'             => $name,
-                    'label'            => __( 'State', 'invoicing' ),
+                    'label'            => __('State', 'invoicing'),
                     'label_type'       => 'vertical',
-                    'placeholder'      => __( 'Select a state', 'invoicing' ),
+                    'placeholder'      => __('Select a state', 'invoicing'),
                     'class'            => $class,
                     'value'            => $state,
                     'options'          => $states,
@@ -1068,7 +1068,7 @@ 
         wp_send_json_success(
             array(
                 'html'   => $html,
-                'select' => ! empty( $states ),
+                'select' => !empty($states),
             )
         );
 
@@ -1082,8 +1082,8 @@ 
     public static function payment_form_refresh_prices() {
 
         // ... form fields...
-        if ( empty( $_POST['getpaid_payment_form_submission'] ) ) {
-            esc_html_e( 'Error: Reload the page and try again.', 'invoicing' );
+        if (empty($_POST['getpaid_payment_form_submission'])) {
+            esc_html_e('Error: Reload the page and try again.', 'invoicing');
             exit;
         }
 
@@ -1091,7 +1091,7 @@ 
         $submission = new GetPaid_Payment_Form_Submission();
 
         // Do we have an error?
-        if ( ! empty( $submission->last_error ) ) {
+        if (!empty($submission->last_error)) {
             wp_send_json_error(
                 array(
                     'code'  => $submission->last_error_code,
@@ -1101,12 +1101,12 @@ 
         }
 
         // Prepare the response.
-        $response = new GetPaid_Payment_Form_Submission_Refresh_Prices( $submission );
+        $response = new GetPaid_Payment_Form_Submission_Refresh_Prices($submission);
 
         // Filter the response.
-        $response = apply_filters( 'getpaid_payment_form_ajax_refresh_prices', $response->response, $submission );
+        $response = apply_filters('getpaid_payment_form_ajax_refresh_prices', $response->response, $submission);
 
-        wp_send_json_success( $response );
+        wp_send_json_success($response);
     }
 
     /**
@@ -1118,63 +1118,63 @@ 
 	public static function file_upload() {
 
         // Check nonce.
-        check_ajax_referer( 'getpaid_form_nonce' );
+        check_ajax_referer('getpaid_form_nonce');
 
-        if ( empty( $_POST['form_id'] ) || empty( $_POST['field_name'] ) || empty( $_FILES['file'] ) ) {
-            wp_die( esc_html_e( 'Bad Request', 'invoicing' ), 400 );
+        if (empty($_POST['form_id']) || empty($_POST['field_name']) || empty($_FILES['file'])) {
+            wp_die(esc_html_e('Bad Request', 'invoicing'), 400);
         }
 
         // Fetch form.
-        $form = new GetPaid_Payment_Form( intval( $_POST['form_id'] ) );
+        $form = new GetPaid_Payment_Form(intval($_POST['form_id']));
 
-        if ( ! $form->is_active() ) {
-            wp_send_json_error( __( 'Payment form not active', 'invoicing' ) );
+        if (!$form->is_active()) {
+            wp_send_json_error(__('Payment form not active', 'invoicing'));
         }
 
         // Fetch appropriate field.
-        $upload_field = current( wp_list_filter( $form->get_elements(), array( 'id' => sanitize_text_field( $_POST['field_name'] ) ) ) );
-        if ( empty( $upload_field ) ) {
-            wp_send_json_error( __( 'Invalid upload field.', 'invoicing' ) );
+        $upload_field = current(wp_list_filter($form->get_elements(), array('id' => sanitize_text_field($_POST['field_name']))));
+        if (empty($upload_field)) {
+            wp_send_json_error(__('Invalid upload field.', 'invoicing'));
         }
 
         // Prepare allowed file types.
-        $file_types = isset( $upload_field['file_types'] ) ? $upload_field['file_types'] : array( 'jpg|jpeg|jpe', 'gif', 'png' );
+        $file_types = isset($upload_field['file_types']) ? $upload_field['file_types'] : array('jpg|jpeg|jpe', 'gif', 'png');
         $all_types  = getpaid_get_allowed_mime_types();
         $mime_types = array();
 
-        foreach ( $file_types as $file_type ) {
-            if ( isset( $all_types[ $file_type ] ) ) {
-                $mime_types[] = $all_types[ $file_type ];
+        foreach ($file_types as $file_type) {
+            if (isset($all_types[$file_type])) {
+                $mime_types[] = $all_types[$file_type];
             }
         }
 
-        if ( ! in_array( $_FILES['file']['type'], $mime_types ) ) {
-            wp_send_json_error( __( 'Unsupported file type.', 'invoicing' ) );
+        if (!in_array($_FILES['file']['type'], $mime_types)) {
+            wp_send_json_error(__('Unsupported file type.', 'invoicing'));
         }
 
         // Upload file.
-        $file_name = explode( '.', strtolower( $_FILES['file']['name'] ) );
-        $file_name = uniqid( 'getpaid-' ) . '.' . array_pop( $file_name );
+        $file_name = explode('.', strtolower($_FILES['file']['name']));
+        $file_name = uniqid('getpaid-') . '.' . array_pop($file_name);
 
         $uploaded = wp_upload_bits(
             $file_name,
             null,
-            file_get_contents( $_FILES['file']['tmp_name'] )
+            file_get_contents($_FILES['file']['tmp_name'])
         );
 
-        if ( ! empty( $uploaded['error'] ) ) {
-            wp_send_json_error( $uploaded['error'] );
+        if (!empty($uploaded['error'])) {
+            wp_send_json_error($uploaded['error']);
         }
 
         // Retrieve response.
         $response = sprintf(
             '<input type="hidden" name="%s[%s]" value="%s" />',
-            esc_attr( sanitize_text_field( $_POST['field_name'] ) ),
-            esc_url( $uploaded['url'] ),
-            esc_attr( sanitize_text_field( strtolower( $_FILES['file']['name'] ) ) )
+            esc_attr(sanitize_text_field($_POST['field_name'])),
+            esc_url($uploaded['url']),
+            esc_attr(sanitize_text_field(strtolower($_FILES['file']['name'])))
         );
 
-        wp_send_json_success( $response );
+        wp_send_json_success($response);
 
 	}
 

includes/class-wpinv-session-handler.php

Indentation +274 added lines, -274 removed lines

@@ -14,125 +14,125 @@ 
  */
 class WPInv_Session_Handler extends WPInv_Session {
 
-	/**
-	 * Cookie name used for the session.
-	 *
-	 * @var string cookie name
-	 */
-	protected $_cookie;
-
-	/**
-	 * Stores session expiry.
-	 *
-	 * @var int session due to expire timestamp
-	 */
-	protected $_session_expiring;
-
-	/**
-	 * Stores session due to expire timestamp.
-	 *
-	 * @var string session expiration timestamp
-	 */
-	protected $_session_expiration;
-
-	/**
-	 * True when the cookie exists.
-	 *
-	 * @var bool Based on whether a cookie exists.
-	 */
-	protected $_has_cookie = false;
-
-	/**
-	 * Table name for session data.
-	 *
-	 * @var string Custom session table name
-	 */
-	protected $_table;
-
-	/**
-	 * Constructor for the session class.
-	 */
-	public function old__construct() {
-
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
+    /**
+     * Cookie name used for the session.
+     *
+     * @var string cookie name
+     */
+    protected $_cookie;
+
+    /**
+     * Stores session expiry.
+     *
+     * @var int session due to expire timestamp
+     */
+    protected $_session_expiring;
+
+    /**
+     * Stores session due to expire timestamp.
+     *
+     * @var string session expiration timestamp
+     */
+    protected $_session_expiration;
+
+    /**
+     * True when the cookie exists.
+     *
+     * @var bool Based on whether a cookie exists.
+     */
+    protected $_has_cookie = false;
+
+    /**
+     * Table name for session data.
+     *
+     * @var string Custom session table name
+     */
+    protected $_table;
+
+    /**
+     * Constructor for the session class.
+     */
+    public function old__construct() {
+
+        $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
         add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
-
-	}
-
-	/**
-	 * Init hooks and session data.
-	 *
-	 * @since 3.3.0
-	 */
-	public function init() {
-		$this->init_session_cookie();
-
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
-		}
-	}
-
-	/**
-	 * Setup cookie and customer ID.
-	 *
-	 * @since 3.6.0
-	 */
-	public function init_session_cookie() {
-		$cookie = $this->get_session_cookie();
-
-		if ( $cookie ) {
-			$this->_customer_id        = $cookie[0];
-			$this->_session_expiration = $cookie[1];
-			$this->_session_expiring   = $cookie[2];
-			$this->_has_cookie         = true;
-			$this->_data               = $this->get_session_data();
-
-			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
-				$this->_customer_id = get_current_user_id();
-				$this->_dirty       = true;
-				$this->save_data();
-				$this->set_customer_session_cookie( true );
-			}
-
-			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
-				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
-			}
-		} else {
-			$this->set_session_expiration();
-			$this->_customer_id = $this->generate_customer_id();
-			$this->_data        = $this->get_session_data();
-		}
-	}
-
-	/**
-	 * Sets the session cookie on-demand (usually after adding an item to the cart).
-	 *
-	 * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
-	 *
-	 * Warning: Cookies will only be set if this is called before the headers are sent.
-	 *
-	 * @param bool $set Should the session cookie be set.
-	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
-			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
-			$this->_has_cookie = true;
-
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
-			}
-		}
-	}
-
-	public function setcookie( $name, $value, $expire = 0, $secure = false, $httponly = false ) {
+        add_action( 'wp_logout', array( $this, 'destroy_session' ) );
+        add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
+        add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+
+    }
+
+    /**
+     * Init hooks and session data.
+     *
+     * @since 3.3.0
+     */
+    public function init() {
+        $this->init_session_cookie();
+
+        if ( ! is_user_logged_in() ) {
+            add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
+        }
+    }
+
+    /**
+     * Setup cookie and customer ID.
+     *
+     * @since 3.6.0
+     */
+    public function init_session_cookie() {
+        $cookie = $this->get_session_cookie();
+
+        if ( $cookie ) {
+            $this->_customer_id        = $cookie[0];
+            $this->_session_expiration = $cookie[1];
+            $this->_session_expiring   = $cookie[2];
+            $this->_has_cookie         = true;
+            $this->_data               = $this->get_session_data();
+
+            // If the user logs in, update session.
+            if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+                $this->_customer_id = get_current_user_id();
+                $this->_dirty       = true;
+                $this->save_data();
+                $this->set_customer_session_cookie( true );
+            }
+
+            // Update session if its close to expiring.
+            if ( time() > $this->_session_expiring ) {
+                $this->set_session_expiration();
+                $this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+            }
+        } else {
+            $this->set_session_expiration();
+            $this->_customer_id = $this->generate_customer_id();
+            $this->_data        = $this->get_session_data();
+        }
+    }
+
+    /**
+     * Sets the session cookie on-demand (usually after adding an item to the cart).
+     *
+     * Since the cookie name (as of 2.1) is prepended with wp, cache systems like batcache will not cache pages when set.
+     *
+     * Warning: Cookies will only be set if this is called before the headers are sent.
+     *
+     * @param bool $set Should the session cookie be set.
+     */
+    public function set_customer_session_cookie( $set ) {
+        if ( $set ) {
+            $to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
+            $cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+            $cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
+            $this->_has_cookie = true;
+
+            if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
+                $this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+            }
+        }
+    }
+
+    public function setcookie( $name, $value, $expire = 0, $secure = false, $httponly = false ) {
         if ( ! headers_sent() ) {
             setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
         } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
@@ -141,86 +141,86 @@ 
         }
     }
 
-	/**
-	 * Should the session cookie be secure?
-	 *
-	 * @since 3.6.0
-	 * @return bool
-	 */
-	protected function use_secure_cookie() {
+    /**
+     * Should the session cookie be secure?
+     *
+     * @since 3.6.0
+     * @return bool
+     */
+    protected function use_secure_cookie() {
         $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
-	}
-
-	/**
-	 * Return true if the current user has an active session, i.e. a cookie to retrieve values.
-	 *
-	 * @return bool
-	 */
-	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
-	}
-
-	/**
-	 * Set session expiration.
-	 */
-	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
-	}
-
-	/**
-	 * Generates session ids.
-	 *
-	 * @return string
-	 */
-	public function generate_customer_id() {
-		require_once ABSPATH . 'wp-includes/class-phpass.php';
-		$hasher      = new PasswordHash( 8, false );
-		return md5( $hasher->get_random_bytes( 32 ) );
-	}
-
-	/**
-	 * Get the session cookie, if set. Otherwise return false.
-	 *
-	 * Session cookies without a customer ID are invalid.
-	 *
-	 * @return bool|array
-	 */
-	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
-
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
-			return false;
-		}
-
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
-
-		if ( empty( $customer_id ) ) {
-			return false;
-		}
-
-		// Validate hash.
-		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
-
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
-			return false;
-		}
-
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
-	}
-
-	/**
-	 * Get session data.
-	 *
-	 * @return array
-	 */
-	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
-	}
-
-	public function generate_key( $customer_id ) {
+        return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+    }
+
+    /**
+     * Return true if the current user has an active session, i.e. a cookie to retrieve values.
+     *
+     * @return bool
+     */
+    public function has_session() {
+        return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+    }
+
+    /**
+     * Set session expiration.
+     */
+    public function set_session_expiration() {
+        $this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
+        $this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+    }
+
+    /**
+     * Generates session ids.
+     *
+     * @return string
+     */
+    public function generate_customer_id() {
+        require_once ABSPATH . 'wp-includes/class-phpass.php';
+        $hasher      = new PasswordHash( 8, false );
+        return md5( $hasher->get_random_bytes( 32 ) );
+    }
+
+    /**
+     * Get the session cookie, if set. Otherwise return false.
+     *
+     * Session cookies without a customer ID are invalid.
+     *
+     * @return bool|array
+     */
+    public function get_session_cookie() {
+        $cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+
+        if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+            return false;
+        }
+
+        list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+
+        if ( empty( $customer_id ) ) {
+            return false;
+        }
+
+        // Validate hash.
+        $to_hash = $customer_id . '|' . $session_expiration;
+        $hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+
+        if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+            return false;
+        }
+
+        return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+    }
+
+    /**
+     * Get session data.
+     *
+     * @return array
+     */
+    public function get_session_data() {
+        return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+    }
+
+    public function generate_key( $customer_id ) {
         if ( ! $customer_id ) {
             return;
         }
@@ -228,68 +228,68 @@ 
         return 'wpi_trans_' . $customer_id;
     }
 
-	/**
-	 * Save data.
-	 */
-	public function save_data() {
-		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+    /**
+     * Save data.
+     */
+    public function save_data() {
+        // Dirty if something changed - prevents saving nothing new.
+        if ( $this->_dirty && $this->has_session() ) {
 
             set_transient( $this->generate_key( $this->_customer_id ), $this->_data, $this->_session_expiration );
 
-			$this->_dirty = false;
-		}
-	}
-
-	/**
-	 * Destroy all session data.
-	 */
-	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
-		$this->forget_session();
-	}
-
-	/**
-	 * Forget all session data without destroying it.
-	 */
-	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
-
-		wpinv_empty_cart();
-
-		$this->_data        = array();
-		$this->_dirty       = false;
-		$this->_customer_id = $this->generate_customer_id();
-	}
-
-	/**
-	 * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
-	 *
-	 * @param int $uid User ID.
-	 * @return string
-	 */
-	public function nonce_user_logged_out( $uid ) {
-
-		// Check if one of our nonces.
-		if ( substr( $uid, 0, 5 ) === 'wpinv' || substr( $uid, 0, 7 ) === 'getpaid' ) {
-			return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
-		}
-
-		return $uid;
-	}
-
-	/**
-	 * Returns the session.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param mixed  $default Default session value.
-	 * @return string|array
-	 */
-	public function get_session( $customer_id, $default = false ) {
-
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
-			return array();
-		}
+            $this->_dirty = false;
+        }
+    }
+
+    /**
+     * Destroy all session data.
+     */
+    public function destroy_session() {
+        $this->delete_session( $this->_customer_id );
+        $this->forget_session();
+    }
+
+    /**
+     * Forget all session data without destroying it.
+     */
+    public function forget_session() {
+        $this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+
+        wpinv_empty_cart();
+
+        $this->_data        = array();
+        $this->_dirty       = false;
+        $this->_customer_id = $this->generate_customer_id();
+    }
+
+    /**
+     * When a user is logged out, ensure they have a unique nonce by using the customer/session ID.
+     *
+     * @param int $uid User ID.
+     * @return string
+     */
+    public function nonce_user_logged_out( $uid ) {
+
+        // Check if one of our nonces.
+        if ( substr( $uid, 0, 5 ) === 'wpinv' || substr( $uid, 0, 7 ) === 'getpaid' ) {
+            return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
+        }
+
+        return $uid;
+    }
+
+    /**
+     * Returns the session.
+     *
+     * @param string $customer_id Customer ID.
+     * @param mixed  $default Default session value.
+     * @return string|array
+     */
+    public function get_session( $customer_id, $default = false ) {
+
+        if ( defined( 'WP_SETUP_CONFIG' ) ) {
+            return array();
+        }
 
         $key = $this->generate_key( $customer_id );
         $value = get_transient( $key );
@@ -298,30 +298,30 @@ 
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
-	}
+        return maybe_unserialize( $value );
+    }
 
-	/**
-	 * Delete the session from the cache and database.
-	 *
-	 * @param int $customer_id Customer ID.
-	 */
-	public function delete_session( $customer_id ) {
+    /**
+     * Delete the session from the cache and database.
+     *
+     * @param int $customer_id Customer ID.
+     */
+    public function delete_session( $customer_id ) {
 
         $key = $this->generate_key( $customer_id );
 
-		delete_transient( $key );
-	}
+        delete_transient( $key );
+    }
 
-	/**
-	 * Update the session expiry timestamp.
-	 *
-	 * @param string $customer_id Customer ID.
-	 * @param int    $timestamp Timestamp to expire the cookie.
-	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+    /**
+     * Update the session expiry timestamp.
+     *
+     * @param string $customer_id Customer ID.
+     * @param int    $timestamp Timestamp to expire the cookie.
+     */
+    public function update_session_timestamp( $customer_id, $timestamp ) {
 
         set_transient( $this->generate_key( $customer_id ), maybe_serialize( $this->_data ), $timestamp );
 
-	}
+    }
 }

Spacing +58 added lines, -58 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Session handler class.
@@ -54,11 +54,11 @@ 
 	 */
 	public function old__construct() {
 
-	    $this->_cookie = apply_filters( 'wpinv_cookie', 'wpinv_session_' . COOKIEHASH );
-        add_action( 'init', array( $this, 'init' ), -1 );
-		add_action( 'wp_logout', array( $this, 'destroy_session' ) );
-		add_action( 'wp', array( $this, 'set_customer_session_cookie' ), 10 );
-		add_action( 'shutdown', array( $this, 'save_data' ), 20 );
+	    $this->_cookie = apply_filters('wpinv_cookie', 'wpinv_session_' . COOKIEHASH);
+        add_action('init', array($this, 'init'), -1);
+		add_action('wp_logout', array($this, 'destroy_session'));
+		add_action('wp', array($this, 'set_customer_session_cookie'), 10);
+		add_action('shutdown', array($this, 'save_data'), 20);
 
 	}
 
@@ -70,8 +70,8 @@ 
 	public function init() {
 		$this->init_session_cookie();
 
-		if ( ! is_user_logged_in() ) {
-			add_filter( 'nonce_user_logged_out', array( $this, 'nonce_user_logged_out' ), 10, 2 );
+		if (!is_user_logged_in()) {
+			add_filter('nonce_user_logged_out', array($this, 'nonce_user_logged_out'), 10, 2);
 		}
 	}
 
@@ -83,7 +83,7 @@ 
 	public function init_session_cookie() {
 		$cookie = $this->get_session_cookie();
 
-		if ( $cookie ) {
+		if ($cookie) {
 			$this->_customer_id        = $cookie[0];
 			$this->_session_expiration = $cookie[1];
 			$this->_session_expiring   = $cookie[2];
@@ -91,17 +91,17 @@ 
 			$this->_data               = $this->get_session_data();
 
 			// If the user logs in, update session.
-			if ( is_user_logged_in() && get_current_user_id() != $this->_customer_id ) {
+			if (is_user_logged_in() && get_current_user_id() != $this->_customer_id) {
 				$this->_customer_id = get_current_user_id();
 				$this->_dirty       = true;
 				$this->save_data();
-				$this->set_customer_session_cookie( true );
+				$this->set_customer_session_cookie(true);
 			}
 
 			// Update session if its close to expiring.
-			if ( time() > $this->_session_expiring ) {
+			if (time() > $this->_session_expiring) {
 				$this->set_session_expiration();
-				$this->update_session_timestamp( $this->_customer_id, $this->_session_expiration );
+				$this->update_session_timestamp($this->_customer_id, $this->_session_expiration);
 			}
 		} else {
 			$this->set_session_expiration();
@@ -119,25 +119,25 @@ 
 	 *
 	 * @param bool $set Should the session cookie be set.
 	 */
-	public function set_customer_session_cookie( $set ) {
-		if ( $set ) {
+	public function set_customer_session_cookie($set) {
+		if ($set) {
 			$to_hash           = $this->_customer_id . '|' . $this->_session_expiration;
-			$cookie_hash       = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+			$cookie_hash       = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 			$cookie_value      = $this->_customer_id . '||' . $this->_session_expiration . '||' . $this->_session_expiring . '||' . $cookie_hash;
 			$this->_has_cookie = true;
 
-			if ( ! isset( $_COOKIE[ $this->_cookie ] ) || $_COOKIE[ $this->_cookie ] !== $cookie_value ) {
-				$this->setcookie( $this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true );
+			if (!isset($_COOKIE[$this->_cookie]) || $_COOKIE[$this->_cookie] !== $cookie_value) {
+				$this->setcookie($this->_cookie, $cookie_value, $this->_session_expiration, $this->use_secure_cookie(), true);
 			}
 		}
 	}
 
-	public function setcookie( $name, $value, $expire = 0, $secure = false, $httponly = false ) {
-        if ( ! headers_sent() ) {
-            setcookie( $name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters( 'wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure ) );
-        } elseif ( defined( 'WP_DEBUG' ) && WP_DEBUG ) {
-            headers_sent( $file, $line );
-            trigger_error( "{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE ); // @codingStandardsIgnoreLine
+	public function setcookie($name, $value, $expire = 0, $secure = false, $httponly = false) {
+        if (!headers_sent()) {
+            setcookie($name, $value, $expire, COOKIEPATH ? COOKIEPATH : '/', COOKIE_DOMAIN, $secure, apply_filters('wpinv_cookie_httponly', $httponly, $name, $value, $expire, $secure));
+        } elseif (defined('WP_DEBUG') && WP_DEBUG) {
+            headers_sent($file, $line);
+            trigger_error("{$name} cookie cannot be set - headers already sent by {$file} on line {$line}", E_USER_NOTICE); // @codingStandardsIgnoreLine
         }
     }
 
@@ -148,8 +148,8 @@ 
 	 * @return bool
 	 */
 	protected function use_secure_cookie() {
-        $is_https = false !== strstr( get_option( 'home' ), 'https:' );
-		return apply_filters( 'wpinv_session_use_secure_cookie', $is_https && is_ssl() );
+        $is_https = false !== strstr(get_option('home'), 'https:');
+		return apply_filters('wpinv_session_use_secure_cookie', $is_https && is_ssl());
 	}
 
 	/**
@@ -158,15 +158,15 @@ 
 	 * @return bool
 	 */
 	public function has_session() {
-		return isset( $_COOKIE[ $this->_cookie ] ) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
+		return isset($_COOKIE[$this->_cookie]) || $this->_has_cookie || is_user_logged_in(); // @codingStandardsIgnoreLine.
 	}
 
 	/**
 	 * Set session expiration.
 	 */
 	public function set_session_expiration() {
-		$this->_session_expiring   = time() + intval( apply_filters( 'wpinv_session_expiring', 60 * 60 * 47 ) ); // 47 Hours.
-		$this->_session_expiration = time() + intval( apply_filters( 'wpinv_session_expiration', 60 * 60 * 48 ) ); // 48 Hours.
+		$this->_session_expiring   = time() + intval(apply_filters('wpinv_session_expiring', 60 * 60 * 47)); // 47 Hours.
+		$this->_session_expiration = time() + intval(apply_filters('wpinv_session_expiration', 60 * 60 * 48)); // 48 Hours.
 	}
 
 	/**
@@ -176,8 +176,8 @@ 
 	 */
 	public function generate_customer_id() {
 		require_once ABSPATH . 'wp-includes/class-phpass.php';
-		$hasher      = new PasswordHash( 8, false );
-		return md5( $hasher->get_random_bytes( 32 ) );
+		$hasher = new PasswordHash(8, false);
+		return md5($hasher->get_random_bytes(32));
 	}
 
 	/**
@@ -188,27 +188,27 @@ 
 	 * @return bool|array
 	 */
 	public function get_session_cookie() {
-		$cookie_value = isset( $_COOKIE[ $this->_cookie ] ) ? wp_unslash( $_COOKIE[ $this->_cookie ] ) : false; // @codingStandardsIgnoreLine.
+		$cookie_value = isset($_COOKIE[$this->_cookie]) ? wp_unslash($_COOKIE[$this->_cookie]) : false; // @codingStandardsIgnoreLine.
 
-		if ( empty( $cookie_value ) || ! is_string( $cookie_value ) ) {
+		if (empty($cookie_value) || !is_string($cookie_value)) {
 			return false;
 		}
 
-		list( $customer_id, $session_expiration, $session_expiring, $cookie_hash ) = explode( '||', $cookie_value );
+		list($customer_id, $session_expiration, $session_expiring, $cookie_hash) = explode('||', $cookie_value);
 
-		if ( empty( $customer_id ) ) {
+		if (empty($customer_id)) {
 			return false;
 		}
 
 		// Validate hash.
 		$to_hash = $customer_id . '|' . $session_expiration;
-		$hash    = hash_hmac( 'md5', $to_hash, wp_hash( $to_hash ) );
+		$hash    = hash_hmac('md5', $to_hash, wp_hash($to_hash));
 
-		if ( empty( $cookie_hash ) || ! hash_equals( $hash, $cookie_hash ) ) {
+		if (empty($cookie_hash) || !hash_equals($hash, $cookie_hash)) {
 			return false;
 		}
 
-		return array( $customer_id, $session_expiration, $session_expiring, $cookie_hash );
+		return array($customer_id, $session_expiration, $session_expiring, $cookie_hash);
 	}
 
 	/**
@@ -217,11 +217,11 @@ 
 	 * @return array
 	 */
 	public function get_session_data() {
-		return $this->has_session() ? (array) $this->get_session( $this->_customer_id ) : array();
+		return $this->has_session() ? (array) $this->get_session($this->_customer_id) : array();
 	}
 
-	public function generate_key( $customer_id ) {
-        if ( ! $customer_id ) {
+	public function generate_key($customer_id) {
+        if (!$customer_id) {
             return;
         }
 
@@ -233,9 +233,9 @@ 
 	 */
 	public function save_data() {
 		// Dirty if something changed - prevents saving nothing new.
-		if ( $this->_dirty && $this->has_session() ) {
+		if ($this->_dirty && $this->has_session()) {
 
-            set_transient( $this->generate_key( $this->_customer_id ), $this->_data, $this->_session_expiration );
+            set_transient($this->generate_key($this->_customer_id), $this->_data, $this->_session_expiration);
 
 			$this->_dirty = false;
 		}
@@ -245,7 +245,7 @@ 
 	 * Destroy all session data.
 	 */
 	public function destroy_session() {
-		$this->delete_session( $this->_customer_id );
+		$this->delete_session($this->_customer_id);
 		$this->forget_session();
 	}
 
@@ -253,7 +253,7 @@ 
 	 * Forget all session data without destroying it.
 	 */
 	public function forget_session() {
-		$this->setcookie( $this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true );
+		$this->setcookie($this->_cookie, '', time() - YEAR_IN_SECONDS, $this->use_secure_cookie(), true);
 
 		wpinv_empty_cart();
 
@@ -268,10 +268,10 @@ 
 	 * @param int $uid User ID.
 	 * @return string
 	 */
-	public function nonce_user_logged_out( $uid ) {
+	public function nonce_user_logged_out($uid) {
 
 		// Check if one of our nonces.
-		if ( substr( $uid, 0, 5 ) === 'wpinv' || substr( $uid, 0, 7 ) === 'getpaid' ) {
+		if (substr($uid, 0, 5) === 'wpinv' || substr($uid, 0, 7) === 'getpaid') {
 			return $this->has_session() && $this->_customer_id ? $this->_customer_id : $uid;
 		}
 
@@ -285,20 +285,20 @@ 
 	 * @param mixed  $default Default session value.
 	 * @return string|array
 	 */
-	public function get_session( $customer_id, $default = false ) {
+	public function get_session($customer_id, $default = false) {
 
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return array();
 		}
 
-        $key = $this->generate_key( $customer_id );
-        $value = get_transient( $key );
+        $key = $this->generate_key($customer_id);
+        $value = get_transient($key);
 
-        if ( ! $value ) {
+        if (!$value) {
             $value = $default;
         }
 
-		return maybe_unserialize( $value );
+		return maybe_unserialize($value);
 	}
 
 	/**
@@ -306,11 +306,11 @@ 
 	 *
 	 * @param int $customer_id Customer ID.
 	 */
-	public function delete_session( $customer_id ) {
+	public function delete_session($customer_id) {
 
-        $key = $this->generate_key( $customer_id );
+        $key = $this->generate_key($customer_id);
 
-		delete_transient( $key );
+		delete_transient($key);
 	}
 
 	/**
@@ -319,9 +319,9 @@ 
 	 * @param string $customer_id Customer ID.
 	 * @param int    $timestamp Timestamp to expire the cookie.
 	 */
-	public function update_session_timestamp( $customer_id, $timestamp ) {
+	public function update_session_timestamp($customer_id, $timestamp) {
 
-        set_transient( $this->generate_key( $customer_id ), maybe_serialize( $this->_data ), $timestamp );
+        set_transient($this->generate_key($customer_id), maybe_serialize($this->_data), $timestamp);
 
 	}
 }

includes/admin/class-getpaid-metaboxes.php

Indentation +243 added lines, -243 removed lines

@@ -12,280 +12,280 @@
  */
 class GetPaid_Metaboxes {
 
-	/**
-	 * Only save metaboxes once.
-	 *
-	 * @var boolean
-	 */
-	private static $saved_meta_boxes = false;
+    /**
+     * Only save metaboxes once.
+     *
+     * @var boolean
+     */
+    private static $saved_meta_boxes = false;
 
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
+     * Hook in methods.
+     */
+    public static function init() {
 
-		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 50, 2 );
+        // Register metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 50, 2 );
 
-		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
+        // Remove metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
 
-		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
+        // Rename metaboxes.
+        add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
 
-		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
-	}
+        // Save metaboxes.
+        add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+    }
 
-	/**
-	 * Register core metaboxes.
-	 */
-	public static function add_meta_boxes( $post_type, $post ) {
+    /**
+     * Register core metaboxes.
+     */
+    public static function add_meta_boxes( $post_type, $post ) {
 
-		// For invoices.
-		self::add_invoice_meta_boxes( $post_type, $post );
+        // For invoices.
+        self::add_invoice_meta_boxes( $post_type, $post );
 
-		// For payment forms.
-		self::add_payment_form_meta_boxes( $post_type, $post );
+        // For payment forms.
+        self::add_payment_form_meta_boxes( $post_type, $post );
 
-		// For invoice items.
-		self::add_item_meta_boxes( $post_type );
+        // For invoice items.
+        self::add_item_meta_boxes( $post_type );
 
-		// For invoice discounts.
-		if ( 'wpi_discount' === $post_type ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
-		}
+        // For invoice discounts.
+        if ( 'wpi_discount' === $post_type ) {
+            add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+        }
 
-	}
+    }
 
-	/**
-	 * Register core metaboxes.
-	 */
-	protected static function add_payment_form_meta_boxes( $post_type, $post ) {
+    /**
+     * Register core metaboxes.
+     */
+    protected static function add_payment_form_meta_boxes( $post_type, $post ) {
 
-		// For payment forms.
-		if ( 'wpi_payment_form' === $post_type ) {
+        // For payment forms.
+        if ( 'wpi_payment_form' === $post_type ) {
 
-			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+            // Design payment form.
+            add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
 
-			// Payment form information.
-			if ( wpinv_get_default_payment_form() !== $post->ID ) {
-				add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
-			}
+            // Payment form information.
+            if ( wpinv_get_default_payment_form() !== $post->ID ) {
+                add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+            }
 }
 
-	}
-
-	/**
-	 * Register core metaboxes.
-	 */
-	protected static function add_item_meta_boxes( $post_type ) {
+    }
 
-		if ( 'wpi_item' === $post_type ) {
-
-			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
-
-			// If taxes are enabled, register the tax metabox.
-			if ( wpinv_use_taxes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
-			}
+    /**
+     * Register core metaboxes.
+     */
+    protected static function add_item_meta_boxes( $post_type ) {
 
-			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+        if ( 'wpi_item' === $post_type ) {
 
-			// Item description.
-			add_meta_box( 'postexcerpt', __( 'Item Description', 'invoicing' ), 'GetPaid_Meta_Box_Description::output', 'wpi_item', 'normal' );
-		}
+            // Item details.
+            add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
 
-	}
+            // If taxes are enabled, register the tax metabox.
+            if ( wpinv_use_taxes() ) {
+                add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+            }
 
-	/**
-	 * Register invoice metaboxes.
-	 */
-	protected static function add_invoice_meta_boxes( $post_type, $post ) {
+            // Item info.
+            add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
 
-		// For invoices...
-		if ( getpaid_is_invoice_post_type( $post_type ) ) {
-			$invoice = new WPInv_Invoice( $post );
+            // Item description.
+            add_meta_box( 'postexcerpt', __( 'Item Description', 'invoicing' ), 'GetPaid_Meta_Box_Description::output', 'wpi_item', 'normal' );
+        }
 
-			// Resend invoice.
-			if ( ! $invoice->is_draft() ) {
+    }
 
-				add_meta_box(
-					'wpinv-mb-resend-invoice',
-					sprintf(
-						// translators: %s is the invoice type.
-						__( 'Resend %s', 'invoicing' ),
-						ucfirst( $invoice->get_invoice_quote_type() )
-					),
-					'GetPaid_Meta_Box_Resend_Invoice::output',
-					$post_type,
-					'side',
-					'low'
-				);
+    /**
+     * Register invoice metaboxes.
+     */
+    protected static function add_invoice_meta_boxes( $post_type, $post ) {
+
+        // For invoices...
+        if ( getpaid_is_invoice_post_type( $post_type ) ) {
+            $invoice = new WPInv_Invoice( $post );
+
+            // Resend invoice.
+            if ( ! $invoice->is_draft() ) {
+
+                add_meta_box(
+                    'wpinv-mb-resend-invoice',
+                    sprintf(
+                        // translators: %s is the invoice type.
+                        __( 'Resend %s', 'invoicing' ),
+                        ucfirst( $invoice->get_invoice_quote_type() )
+                    ),
+                    'GetPaid_Meta_Box_Resend_Invoice::output',
+                    $post_type,
+                    'side',
+                    'low'
+                );
+
+            }
+
+            // Subscriptions.
+            $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+            if ( ! empty( $subscriptions ) ) {
+
+                if ( is_array( $subscriptions ) ) {
+                    add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
+                } else {
+                    add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
+                }
+
+                if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
+                    add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
+                }
+}
 
-			}
+            // Invoice details.
+            add_meta_box(
+                'wpinv-details',
+                sprintf(
+                    // translators: %s is the invoice type.
+                    __( '%s Details', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'GetPaid_Meta_Box_Invoice_Details::output',
+                $post_type,
+                'side'
+            );
+
+            // Payment details.
+            add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
+
+            // Billing details.
+            add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
+
+            // Invoice items.
+            add_meta_box(
+                'wpinv-items',
+                sprintf(
+                    // translators: %s is the invoice type.
+                    __( '%s Items', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'GetPaid_Meta_Box_Invoice_Items::output',
+                $post_type,
+                'normal',
+                'high'
+            );
+
+            // Invoice notes.
+            add_meta_box(
+                'wpinv-notes',
+                sprintf(
+                    // translators: %s is the invoice type.
+                    __( '%s Notes', 'invoicing' ),
+                    ucfirst( $invoice->get_invoice_quote_type() )
+                ),
+                'WPInv_Meta_Box_Notes::output',
+                $post_type,
+                'side',
+                'low'
+            );
+
+            // Shipping Address.
+            if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
+                add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
+            }
+
+            // Payment form information.
+            if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
+                add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
+            }
+}
 
-			// Subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-			if ( ! empty( $subscriptions ) ) {
+    }
 
-				if ( is_array( $subscriptions ) ) {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
-				} else {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
-				}
+    /**
+     * Remove some metaboxes.
+     */
+    public static function remove_meta_boxes() {
+        remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+        remove_meta_box( 'postexcerpt', 'wpi_item', 'normal' );
+    }
 
-				if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
-					add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
-				}
-}
+    /**
+     * Rename other metaboxes.
+     */
+    public static function rename_meta_boxes() {
 
-			// Invoice details.
-			add_meta_box(
-				'wpinv-details',
-				sprintf(
-					// translators: %s is the invoice type.
-					__( '%s Details', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'GetPaid_Meta_Box_Invoice_Details::output',
-				$post_type,
-				'side'
-			);
-
-			// Payment details.
-			add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
-
-			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
-
-			// Invoice items.
-			add_meta_box(
-				'wpinv-items',
-				sprintf(
-					// translators: %s is the invoice type.
-					__( '%s Items', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'GetPaid_Meta_Box_Invoice_Items::output',
-				$post_type,
-				'normal',
-				'high'
-			);
-
-			// Invoice notes.
-			add_meta_box(
-				'wpinv-notes',
-				sprintf(
-					// translators: %s is the invoice type.
-					__( '%s Notes', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
-				),
-				'WPInv_Meta_Box_Notes::output',
-				$post_type,
-				'side',
-				'low'
-			);
-
-			// Shipping Address.
-			if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
-				add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
-			}
-
-			// Payment form information.
-			if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
-			}
-}
+    }
 
-	}
-
-	/**
-	 * Remove some metaboxes.
-	 */
-	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
-		remove_meta_box( 'postexcerpt', 'wpi_item', 'normal' );
-	}
-
-	/**
-	 * Rename other metaboxes.
-	 */
-	public static function rename_meta_boxes() {
-
-	}
-
-	/**
-	 * Check if we're saving, then trigger an action based on the post type.
-	 *
-	 * @param  int    $post_id Post ID.
-	 * @param  object $post Post object.
-	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_kses_post_deep( wp_unslash( $_POST ) );
-
-		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
-			return;
-		}
-
-		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
-			return;
-		}
-
-		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
-			return;
-		}
-
-		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
-			return;
-		}
-
-		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
-			return;
-		}
-
-		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			return;
-		}
-
-		if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
-
-			// We need this save event to run once to avoid potential endless loops.
-			self::$saved_meta_boxes = true;
-
-			return GetPaid_Meta_Box_Invoice_Address::save( $post_id, wp_kses_post_deep( $_POST ) );
-
-		}
-
-		// Ensure this is our post type.
-		$post_types_map = array(
-			'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
-			'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
-			'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
-		);
-
-		// Is this our post type?
-		if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
-			return;
-		}
-
-		// We need this save event to run once to avoid potential endless loops.
-		self::$saved_meta_boxes = true;
-
-		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
-
-	}
+    /**
+     * Check if we're saving, then trigger an action based on the post type.
+     *
+     * @param  int    $post_id Post ID.
+     * @param  object $post Post object.
+     */
+    public static function save_meta_boxes( $post_id, $post ) {
+        $post_id = absint( $post_id );
+        $data    = wp_kses_post_deep( wp_unslash( $_POST ) );
+
+        // Do not save for ajax requests.
+        if ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+            return;
+        }
+
+        // $post_id and $post are required
+        if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+            return;
+        }
+
+        // Dont' save meta boxes for revisions or autosaves.
+        if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+            return;
+        }
+
+        // Check the nonce.
+        if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+            return;
+        }
+
+        // Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
+        if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+            return;
+        }
+
+        // Check user has permission to edit.
+        if ( ! current_user_can( 'edit_post', $post_id ) ) {
+            return;
+        }
+
+        if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+
+            // We need this save event to run once to avoid potential endless loops.
+            self::$saved_meta_boxes = true;
+
+            return GetPaid_Meta_Box_Invoice_Address::save( $post_id, wp_kses_post_deep( $_POST ) );
+
+        }
+
+        // Ensure this is our post type.
+        $post_types_map = array(
+            'wpi_item'         => 'GetPaid_Meta_Box_Item_Details',
+            'wpi_payment_form' => 'GetPaid_Meta_Box_Payment_Form',
+            'wpi_discount'     => 'GetPaid_Meta_Box_Discount_Details',
+        );
+
+        // Is this our post type?
+        if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
+            return;
+        }
+
+        // We need this save event to run once to avoid potential endless loops.
+        self::$saved_meta_boxes = true;
+
+        // Save the post.
+        $class = $post_types_map[ $post->post_type ];
+        $class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
+
+    }
 
 }

Spacing +64 added lines, -64 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Metaboxes Admin Class
@@ -25,35 +25,35 @@ 
 	public static function init() {
 
 		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 50, 2 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 50, 2);
 
 		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30);
 
 		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45);
 
 		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+		add_action('save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2);
 	}
 
 	/**
 	 * Register core metaboxes.
 	 */
-	public static function add_meta_boxes( $post_type, $post ) {
+	public static function add_meta_boxes($post_type, $post) {
 
 		// For invoices.
-		self::add_invoice_meta_boxes( $post_type, $post );
+		self::add_invoice_meta_boxes($post_type, $post);
 
 		// For payment forms.
-		self::add_payment_form_meta_boxes( $post_type, $post );
+		self::add_payment_form_meta_boxes($post_type, $post);
 
 		// For invoice items.
-		self::add_item_meta_boxes( $post_type );
+		self::add_item_meta_boxes($post_type);
 
 		// For invoice discounts.
-		if ( 'wpi_discount' === $post_type ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+		if ('wpi_discount' === $post_type) {
+			add_meta_box('wpinv_discount_details', __('Discount Details', 'invoicing'), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high');
 		}
 
 	}
@@ -61,17 +61,17 @@ 
 	/**
 	 * Register core metaboxes.
 	 */
-	protected static function add_payment_form_meta_boxes( $post_type, $post ) {
+	protected static function add_payment_form_meta_boxes($post_type, $post) {
 
 		// For payment forms.
-		if ( 'wpi_payment_form' === $post_type ) {
+		if ('wpi_payment_form' === $post_type) {
 
 			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+			add_meta_box('wpinv-payment-form-design', __('Payment Form', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal');
 
 			// Payment form information.
-			if ( wpinv_get_default_payment_form() !== $post->ID ) {
-				add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+			if (wpinv_get_default_payment_form() !== $post->ID) {
+				add_meta_box('wpinv-payment-form-info', __('Details', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side');
 			}
 }
 
@@ -80,23 +80,23 @@ 
 	/**
 	 * Register core metaboxes.
 	 */
-	protected static function add_item_meta_boxes( $post_type ) {
+	protected static function add_item_meta_boxes($post_type) {
 
-		if ( 'wpi_item' === $post_type ) {
+		if ('wpi_item' === $post_type) {
 
 			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+			add_meta_box('wpinv_item_details', __('Item Details', 'invoicing'), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high');
 
 			// If taxes are enabled, register the tax metabox.
-			if ( wpinv_use_taxes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+			if (wpinv_use_taxes()) {
+				add_meta_box('wpinv_item_vat', __('Tax', 'invoicing'), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high');
 			}
 
 			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+			add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core');
 
 			// Item description.
-			add_meta_box( 'postexcerpt', __( 'Item Description', 'invoicing' ), 'GetPaid_Meta_Box_Description::output', 'wpi_item', 'normal' );
+			add_meta_box('postexcerpt', __('Item Description', 'invoicing'), 'GetPaid_Meta_Box_Description::output', 'wpi_item', 'normal');
 		}
 
 	}
@@ -104,21 +104,21 @@ 
 	/**
 	 * Register invoice metaboxes.
 	 */
-	protected static function add_invoice_meta_boxes( $post_type, $post ) {
+	protected static function add_invoice_meta_boxes($post_type, $post) {
 
 		// For invoices...
-		if ( getpaid_is_invoice_post_type( $post_type ) ) {
-			$invoice = new WPInv_Invoice( $post );
+		if (getpaid_is_invoice_post_type($post_type)) {
+			$invoice = new WPInv_Invoice($post);
 
 			// Resend invoice.
-			if ( ! $invoice->is_draft() ) {
+			if (!$invoice->is_draft()) {
 
 				add_meta_box(
 					'wpinv-mb-resend-invoice',
 					sprintf(
 						// translators: %s is the invoice type.
-						__( 'Resend %s', 'invoicing' ),
-						ucfirst( $invoice->get_invoice_quote_type() )
+						__('Resend %s', 'invoicing'),
+						ucfirst($invoice->get_invoice_quote_type())
 					),
 					'GetPaid_Meta_Box_Resend_Invoice::output',
 					$post_type,
@@ -129,17 +129,17 @@ 
 			}
 
 			// Subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-			if ( ! empty( $subscriptions ) ) {
+			$subscriptions = getpaid_get_invoice_subscriptions($invoice);
+			if (!empty($subscriptions)) {
 
-				if ( is_array( $subscriptions ) ) {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Related Subscriptions', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced' );
+				if (is_array($subscriptions)) {
+					add_meta_box('wpinv-mb-subscriptions', __('Related Subscriptions', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_related', $post_type, 'advanced');
 				} else {
-					add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced' );
+					add_meta_box('wpinv-mb-subscriptions', __('Subscription Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output', $post_type, 'advanced');
 				}
 
-				if ( getpaid_count_subscription_invoices( $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id() ) > 1 ) {
-					add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced' );
+				if (getpaid_count_subscription_invoices($invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id()) > 1) {
+					add_meta_box('wpinv-mb-subscription-invoices', __('Related Payments', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', $post_type, 'advanced');
 				}
 }
 
@@ -148,8 +148,8 @@ 
 				'wpinv-details',
 				sprintf(
 					// translators: %s is the invoice type.
-					__( '%s Details', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Details', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'GetPaid_Meta_Box_Invoice_Details::output',
 				$post_type,
@@ -157,18 +157,18 @@ 
 			);
 
 			// Payment details.
-			add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default' );
+			add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', $post_type, 'side', 'default');
 
 			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high' );
+			add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Address::output', $post_type, 'normal', 'high');
 
 			// Invoice items.
 			add_meta_box(
 				'wpinv-items',
 				sprintf(
 					// translators: %s is the invoice type.
-					__( '%s Items', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Items', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'GetPaid_Meta_Box_Invoice_Items::output',
 				$post_type,
@@ -181,8 +181,8 @@ 
 				'wpinv-notes',
 				sprintf(
 					// translators: %s is the invoice type.
-					__( '%s Notes', 'invoicing' ),
-					ucfirst( $invoice->get_invoice_quote_type() )
+					__('%s Notes', 'invoicing'),
+					ucfirst($invoice->get_invoice_quote_type())
 				),
 				'WPInv_Meta_Box_Notes::output',
 				$post_type,
@@ -191,13 +191,13 @@ 
 			);
 
 			// Shipping Address.
-			if ( get_post_meta( $invoice->get_id(), 'shipping_address', true ) ) {
-				add_meta_box( 'wpinv-invoice-shipping-details', __( 'Shipping Address', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high' );
+			if (get_post_meta($invoice->get_id(), 'shipping_address', true)) {
+				add_meta_box('wpinv-invoice-shipping-details', __('Shipping Address', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Shipping_Address::output', $post_type, 'side', 'high');
 			}
 
 			// Payment form information.
-			if ( get_post_meta( $invoice->get_id(), 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high' );
+			if (get_post_meta($invoice->get_id(), 'payment_form_data', true)) {
+				add_meta_box('wpinv-invoice-payment-form-details', __('Payment Form Details', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_details', $post_type, 'side', 'high');
 			}
 }
 
@@ -207,8 +207,8 @@ 
 	 * Remove some metaboxes.
 	 */
 	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
-		remove_meta_box( 'postexcerpt', 'wpi_item', 'normal' );
+		remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
+		remove_meta_box('postexcerpt', 'wpi_item', 'normal');
 	}
 
 	/**
@@ -224,46 +224,46 @@ 
 	 * @param  int    $post_id Post ID.
 	 * @param  object $post Post object.
 	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_kses_post_deep( wp_unslash( $_POST ) );
+	public static function save_meta_boxes($post_id, $post) {
+		$post_id = absint($post_id);
+		$data    = wp_kses_post_deep(wp_unslash($_POST));
 
 		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+		if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
 			return;
 		}
 
 		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+		if (empty($post_id) || empty($post) || self::$saved_meta_boxes) {
 			return;
 		}
 
 		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+		if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
 			return;
 		}
 
 		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+		if (empty($data['getpaid_meta_nonce']) || !wp_verify_nonce($data['getpaid_meta_nonce'], 'getpaid_meta_nonce')) {
 			return;
 		}
 
 		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+		if (empty($data['post_ID']) || absint($data['post_ID']) !== $post_id) {
 			return;
 		}
 
 		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if (!current_user_can('edit_post', $post_id)) {
 			return;
 		}
 
-		if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+		if (getpaid_is_invoice_post_type($post->post_type)) {
 
 			// We need this save event to run once to avoid potential endless loops.
 			self::$saved_meta_boxes = true;
 
-			return GetPaid_Meta_Box_Invoice_Address::save( $post_id, wp_kses_post_deep( $_POST ) );
+			return GetPaid_Meta_Box_Invoice_Address::save($post_id, wp_kses_post_deep($_POST));
 
 		}
 
@@ -275,7 +275,7 @@ 
 		);
 
 		// Is this our post type?
-		if ( ! isset( $post_types_map[ $post->post_type ] ) ) {
+		if (!isset($post_types_map[$post->post_type])) {
 			return;
 		}
 
@@ -283,8 +283,8 @@ 
 		self::$saved_meta_boxes = true;
 
 		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, wp_kses_post_deep( $_POST ), $post );
+		$class = $post_types_map[$post->post_type];
+		$class::save($post_id, wp_kses_post_deep($_POST), $post);
 
 	}
 

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

Indentation +83 added lines, -83 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,87 +11,87 @@ 
  */
 class AUI_Component_Alert {
 
-	/**
-	 * Build the component.
-	 * 
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function get($args = array()){
-		global $aui_bs5;
-		$defaults = array(
-			'type'       => 'info',
-			'class'      => '',
-			'icon' => '',
-			'heading'    => '',
-			'content'    => '',
-			'footer'     => '',
-			'dismissible'=> false,
-			'data'       => '',
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( ! empty( $args['content'] ) ) {
-			$type = sanitize_html_class( $args['type'] );
-			if($type=='error'){$type='danger';}
-			$icon = !empty($args['icon']) ? "<i class='".esc_attr($args['icon'])."'></i>" : '';
-
-			// set default icon
-			if(!$icon && $args['icon']!==false && $type){
-				if($type=='danger'){$icon = '<i class="fas fa-exclamation-circle"></i>';}
-				elseif($type=='warning'){$icon = '<i class="fas fa-exclamation-triangle"></i>';}
-				elseif($type=='success'){$icon = '<i class="fas fa-check-circle"></i>';}
-				elseif($type=='info'){$icon = '<i class="fas fa-info-circle"></i>';}
-			}
-
-			$data = '';
-			$class = !empty($args['class']) ? esc_attr($args['class']) : '';
-			if($args['dismissible']){$class .= " alert-dismissible fade show";}
-
-			// open
-			$output .= '<div class="alert alert-' . $type . ' '.$class.'" role="alert" '.$data.'>';
-
-			// heading
-			if ( ! empty( $args['heading'] ) ) {
-				$output .= '<h4 class="alert-heading">' . $args['heading'] . '</h4>';
-			}
-
-			// icon
-			if ( ! empty( $icon) ) {
-				$output .= $icon." ";
-			}
-
-			// content
-			$output .= $args['content'];
-
-			// dismissible
-			if($args['dismissible']){
-
-				if ( $aui_bs5 ) {
-					$output .= '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>';
-				}else{
-					$output .= '<button type="button" class="close" data-dismiss="alert" aria-label="Close">';
-					$output .= '<span aria-hidden="true">&times;</span>';
-					$output .= '</button>';
-				}
-			}
-
-			// footer
-			if ( ! empty( $args['footer'] ) ) {
-				$output .= '<hr>';
-				$output .= '<p class="mb-0">' . $args['footer'] . '</p>';
-			}
-
-			// close
-			$output .= '</div>';
-		}
-
-		return $output;
-	}
+    /**
+     * Build the component.
+     * 
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function get($args = array()){
+        global $aui_bs5;
+        $defaults = array(
+            'type'       => 'info',
+            'class'      => '',
+            'icon' => '',
+            'heading'    => '',
+            'content'    => '',
+            'footer'     => '',
+            'dismissible'=> false,
+            'data'       => '',
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        if ( ! empty( $args['content'] ) ) {
+            $type = sanitize_html_class( $args['type'] );
+            if($type=='error'){$type='danger';}
+            $icon = !empty($args['icon']) ? "<i class='".esc_attr($args['icon'])."'></i>" : '';
+
+            // set default icon
+            if(!$icon && $args['icon']!==false && $type){
+                if($type=='danger'){$icon = '<i class="fas fa-exclamation-circle"></i>';}
+                elseif($type=='warning'){$icon = '<i class="fas fa-exclamation-triangle"></i>';}
+                elseif($type=='success'){$icon = '<i class="fas fa-check-circle"></i>';}
+                elseif($type=='info'){$icon = '<i class="fas fa-info-circle"></i>';}
+            }
+
+            $data = '';
+            $class = !empty($args['class']) ? esc_attr($args['class']) : '';
+            if($args['dismissible']){$class .= " alert-dismissible fade show";}
+
+            // open
+            $output .= '<div class="alert alert-' . $type . ' '.$class.'" role="alert" '.$data.'>';
+
+            // heading
+            if ( ! empty( $args['heading'] ) ) {
+                $output .= '<h4 class="alert-heading">' . $args['heading'] . '</h4>';
+            }
+
+            // icon
+            if ( ! empty( $icon) ) {
+                $output .= $icon." ";
+            }
+
+            // content
+            $output .= $args['content'];
+
+            // dismissible
+            if($args['dismissible']){
+
+                if ( $aui_bs5 ) {
+                    $output .= '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>';
+                }else{
+                    $output .= '<button type="button" class="close" data-dismiss="alert" aria-label="Close">';
+                    $output .= '<span aria-hidden="true">&times;</span>';
+                    $output .= '</button>';
+                }
+            }
+
+            // footer
+            if ( ! empty( $args['footer'] ) ) {
+                $output .= '<hr>';
+                $output .= '<p class="mb-0">' . $args['footer'] . '</p>';
+            }
+
+            // close
+            $output .= '</div>';
+        }
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +21 added lines, -21 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function get($args = array()){
+	public static function get($args = array()) {
 		global $aui_bs5;
 		$defaults = array(
 			'type'       => 'info',
@@ -34,47 +34,47 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( ! empty( $args['content'] ) ) {
-			$type = sanitize_html_class( $args['type'] );
-			if($type=='error'){$type='danger';}
-			$icon = !empty($args['icon']) ? "<i class='".esc_attr($args['icon'])."'></i>" : '';
+		if (!empty($args['content'])) {
+			$type = sanitize_html_class($args['type']);
+			if ($type == 'error') {$type = 'danger'; }
+			$icon = !empty($args['icon']) ? "<i class='" . esc_attr($args['icon']) . "'></i>" : '';
 
 			// set default icon
-			if(!$icon && $args['icon']!==false && $type){
-				if($type=='danger'){$icon = '<i class="fas fa-exclamation-circle"></i>';}
-				elseif($type=='warning'){$icon = '<i class="fas fa-exclamation-triangle"></i>';}
-				elseif($type=='success'){$icon = '<i class="fas fa-check-circle"></i>';}
-				elseif($type=='info'){$icon = '<i class="fas fa-info-circle"></i>';}
+			if (!$icon && $args['icon'] !== false && $type) {
+				if ($type == 'danger') {$icon = '<i class="fas fa-exclamation-circle"></i>'; }
+				elseif ($type == 'warning') {$icon = '<i class="fas fa-exclamation-triangle"></i>'; }
+				elseif ($type == 'success') {$icon = '<i class="fas fa-check-circle"></i>'; }
+				elseif ($type == 'info') {$icon = '<i class="fas fa-info-circle"></i>'; }
 			}
 
 			$data = '';
 			$class = !empty($args['class']) ? esc_attr($args['class']) : '';
-			if($args['dismissible']){$class .= " alert-dismissible fade show";}
+			if ($args['dismissible']) {$class .= " alert-dismissible fade show"; }
 
 			// open
-			$output .= '<div class="alert alert-' . $type . ' '.$class.'" role="alert" '.$data.'>';
+			$output .= '<div class="alert alert-' . $type . ' ' . $class . '" role="alert" ' . $data . '>';
 
 			// heading
-			if ( ! empty( $args['heading'] ) ) {
+			if (!empty($args['heading'])) {
 				$output .= '<h4 class="alert-heading">' . $args['heading'] . '</h4>';
 			}
 
 			// icon
-			if ( ! empty( $icon) ) {
-				$output .= $icon." ";
+			if (!empty($icon)) {
+				$output .= $icon . " ";
 			}
 
 			// content
 			$output .= $args['content'];
 
 			// dismissible
-			if($args['dismissible']){
+			if ($args['dismissible']) {
 
-				if ( $aui_bs5 ) {
+				if ($aui_bs5) {
 					$output .= '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>';
-				}else{
+				} else {
 					$output .= '<button type="button" class="close" data-dismiss="alert" aria-label="Close">';
 					$output .= '<span aria-hidden="true">&times;</span>';
 					$output .= '</button>';
@@ -82,7 +82,7 @@ 
 			}
 
 			// footer
-			if ( ! empty( $args['footer'] ) ) {
+			if (!empty($args['footer'])) {
 				$output .= '<hr>';
 				$output .= '<p class="mb-0">' . $args['footer'] . '</p>';
 			}

Braces +2 added lines, -5 removed lines

@@ -43,10 +43,7 @@ 
 
 			// set default icon
 			if(!$icon && $args['icon']!==false && $type){
-				if($type=='danger'){$icon = '<i class="fas fa-exclamation-circle"></i>';}
-				elseif($type=='warning'){$icon = '<i class="fas fa-exclamation-triangle"></i>';}
-				elseif($type=='success'){$icon = '<i class="fas fa-check-circle"></i>';}
-				elseif($type=='info'){$icon = '<i class="fas fa-info-circle"></i>';}
+				if($type=='danger'){$icon = '<i class="fas fa-exclamation-circle"></i>';} elseif($type=='warning'){$icon = '<i class="fas fa-exclamation-triangle"></i>';} elseif($type=='success'){$icon = '<i class="fas fa-check-circle"></i>';} elseif($type=='info'){$icon = '<i class="fas fa-info-circle"></i>';}
 			}
 
 			$data = '';
@@ -74,7 +71,7 @@ 
 
 				if ( $aui_bs5 ) {
 					$output .= '<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>';
-				}else{
+				} else{
 					$output .= '<button type="button" class="close" data-dismiss="alert" aria-label="Close">';
 					$output .= '<span aria-hidden="true">&times;</span>';
 					$output .= '</button>';

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

Braces +6 added lines, -6 removed lines

@@ -99,7 +99,7 @@ 
 			if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
 				$size = 'lg';
 				$args['class'] .= ' form-control-lg';
-			}elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
+			} elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
 				$size = 'sm';
 				$args['class'] .= ' form-control-sm';
 			}
@@ -248,7 +248,7 @@ 
 						$help_text = '';
 						//$label_args['class'] .= ' d-inline ';
 						$args['wrap_class'] .= ' align-items-center ';
-					}else{
+					} else{
 
 					}
 
@@ -282,7 +282,7 @@ 
 				$switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
 				if ( $aui_bs5 ) {
 					$wrap_class = $args['switch'] ? 'form-check form-switch' . $switch_size_class : 'form-check';
-				}else{
+				} else{
 					$wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class :  'custom-checkbox' ;
 				}
 				if ( ! empty( $args['label_force_left'] ) ) {
@@ -356,7 +356,7 @@ 
 			if ( ! $args['no_wrap'] ) {
 				if ( ! empty( $args['form_group_class'] ) ) {
 					$fg_class = esc_attr( $args['form_group_class'] );
-				}else{
+				} else{
 					$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 				}
 				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : $fg_class;
@@ -759,7 +759,7 @@ 
 		if ( ! $args['no_wrap'] ) {
 			if ( ! empty( $args['form_group_class'] ) ) {
 				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
+			} else{
 				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 			}
 			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : $fg_class;
@@ -1051,7 +1051,7 @@ 
 		if ( ! $args['no_wrap'] ) {
 			if ( ! empty( $args['form_group_class'] ) ) {
 				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
+			} else{
 				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 			}
 			$wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;

Indentation +1284 added lines, -1284 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,1303 +11,1303 @@ 
  */
 class AUI_Component_Input {
 
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function input( $args = array() ) {
-		global $aui_bs5;
-
-		$defaults = array(
-			'type'                     => 'text',
-			'name'                     => '',
-			'class'                    => '',
-			'wrap_class'               => '',
-			'id'                       => '',
-			'placeholder'              => '',
-			'title'                    => '',
-			'value'                    => '',
-			'required'                 => false,
-			'size'                     => '', // sm, lg, small, large
-			'clear_icon'               => '', // true will show a clear icon, can't be used with input_group_right
-			'with_hidden'              => false, // Append hidden field for single checkbox.
-			'label'                    => '',
-			'label_after'              => false,
-			'label_class'              => '',
-			'label_col'                => '2',
-			'label_type'               => '', // top, horizontal, empty = hidden
-			'label_force_left'         => false, // used to force checkbox label left when using horizontal
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'                => '',
-			'validation_text'          => '',
-			'validation_pattern'       => '',
-			'no_wrap'                  => false,
-			'input_group_right'        => '',
-			'input_group_left'         => '',
-			'input_group_right_inside' => false,
-			// forces the input group inside the input
-			'input_group_left_inside'  => false,
-			// forces the input group inside the input
-			'form_group_class'         => '',
-			'step'                     => '',
-			'switch'                   => false,
-			// to show checkbox as a switch
-			'checked'                  => false,
-			// set a checkbox or radio as selected
-			'password_toggle'          => true,
-			// toggle view/hide password
-			'element_require'          => '',
-			// [%element_id%] == "1"
-			'extra_attributes'         => array(),
-			// an array of extra attributes
-			'wrap_attributes'          => array()
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( ! empty( $args['type'] ) ) {
-			// hidden label option needs to be empty
-			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-			$type = sanitize_html_class( $args['type'] );
-
-			$help_text   = '';
-			$label       = '';
-			$label_after = $args['label_after'];
-			$label_args  = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-
-			// floating labels need label after
-			if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
-				$label_after         = true;
-				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-			}
-
-			// size
-			$size = '';
-			if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
-				$size = 'lg';
-				$args['class'] .= ' form-control-lg';
-			}elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
-				$size = 'sm';
-				$args['class'] .= ' form-control-sm';
-			}
-
-			// clear function
-			$clear_function = 'jQuery(this).parent().parent().find(\'input\').val(\'\');';
-
-			// Some special sauce for files
-			if ( $type == 'file' ) {
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= ' custom-file-input ';
-			} elseif ( $type == 'checkbox' ) {
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= $aui_bs5 ? ' form-check-input c-pointer ' : ' custom-control-input c-pointer ';
-			} elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
-				$orig_type = $type;
-				$type = 'text';
-				$args['class'] .= ' bg-initial '; // @todo not sure why we have this?
-				$clear_function .= "jQuery(this).parent().parent().find('input[name=\'" . esc_attr( $args['name'] ) . "\']').trigger('change');";
-
-				$args['extra_attributes']['data-aui-init'] = 'flatpickr';
-
-				// Disable native datetime inputs.
-				$disable_mobile_attr = isset( $args['extra_attributes']['data-disable-mobile'] ) ? $args['extra_attributes']['data-disable-mobile'] : 'true';
-				$disable_mobile_attr = apply_filters( 'aui_flatpickr_disable_disable_mobile_attr', $disable_mobile_attr, $args );
-
-				$args['extra_attributes']['data-disable-mobile'] = $disable_mobile_attr;
-
-				// set a way to clear field if empty
-				if ( $args['input_group_right'] === '' && $args['clear_icon'] !== false ) {
-					$args['input_group_right_inside'] = true;
-					$args['clear_icon'] = true;
-				}
-
-				// enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_flatpickr();
-			} else if ( $type == 'iconpicker' ) {
-				$type = 'text';
-
-				// Validate FA icon.
-				$args['value'] = AUI_Component_Helper::sanitize_fa_icon( $args['value'], $args );
-
-				$args['extra_attributes']['data-aui-init'] = 'iconpicker';
-				$args['extra_attributes']['data-placement'] = 'bottomRight';
-
-				$args['input_group_right'] = '<span class="input-group-addon input-group-text c-pointer"></span>';
-
-				// Enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_iconpicker();
-			}
-
-			if ( $type == 'checkbox' && ( ( ! empty( $args['name'] ) && strpos( $args['name'], '[' ) === false ) || ! empty( $args['with_hidden'] ) ) ) {
-				$output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
-			}
-
-			// allow clear icon
-			if ( $args['input_group_right'] === '' && $args['clear_icon'] ) {
-				$font_size = $size == 'sm' ? '1.3' : ( $size == 'lg' ? '1.65' : '1.5' );
-				$args['input_group_right_inside'] = true;
-				$align_class = $aui_bs5 ? ' h-100 py-0' : '';
-				$args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none ' . $align_class . '" onclick="' . $clear_function . '"><span style="font-size: ' . $font_size . 'rem" aria-hidden="true" class="' . ( $aui_bs5 ? 'btn-close' : 'close' ) . '">' . ( $aui_bs5 ? '' : '&times;' ) . '</span></span>';
-			}
-
-			// open/type
-			$output .= '<input type="' . $type . '" ';
-
-			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
-			}
-
-			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
-			}
-
-			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
-			}
-
-			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
-			}
-
-			// value
-			if ( ! empty( $args['value'] ) ) {
-				$output .= AUI_Component_Helper::value( $args['value'] );
-			}
-
-			// checked, for radio and checkboxes
-			if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
-				$output .= ' checked ';
-			}
-
-			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
-			}
-
-			// step (for numbers)
-			if ( ! empty( $args['step'] ) ) {
-				$output .= ' step="' . $args['step'] . '" ';
-			}
-
-			// required
-			if ( ! empty( $args['required'] ) ) {
-				$output .= ' required ';
-			}
-
-			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= $aui_bs5 &&  $type == 'checkbox' ? ' class="' . $class . '" ' : ' class="form-control ' . $class . '" ';
-
-			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes( $args );
-
-			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-			}
-
-			// close
-			$output .= '>';
-
-			// help text
-			if ( ! empty( $args['help_text'] ) ) {
-				$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
-			}
-
-			// label
-			if ( ! empty( $args['label'] ) ) {
-				$label_base_class = '';
-				if ( $type == 'file' ) {
-					$label_base_class = ' custom-file-label';
-				} elseif ( $type == 'checkbox' ) {
-					if ( ! empty( $args['label_force_left'] ) ) {
-						$label_args['title'] = wp_kses_post( $args['help_text'] );
-						$help_text = '';
-						//$label_args['class'] .= ' d-inline ';
-						$args['wrap_class'] .= ' align-items-center ';
-					}else{
-
-					}
-
-					$label_base_class = $aui_bs5 ? ' form-check-label' : ' custom-control-label';
-				}
-				$label_args['class'] .= $label_base_class;
-				$temp_label_args = $label_args;
-				if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
-				$label = self::label( $temp_label_args, $type );
-			}
-
-
-
-
-			// set help text in the correct position
-			if ( $label_after ) {
-				$output .= $label . $help_text;
-			}
-
-			// some input types need a separate wrap
-			if ( $type == 'file' ) {
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => $aui_bs5 ? 'mb-3 custom-file' : 'form-group custom-file'
-				) );
-			} elseif ( $type == 'checkbox' ) {
-
-				$label_args['title'] = $args['label'];
-				$label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
-				$label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
-				$switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
-				if ( $aui_bs5 ) {
-					$wrap_class = $args['switch'] ? 'form-check form-switch' . $switch_size_class : 'form-check';
-				}else{
-					$wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class :  'custom-checkbox' ;
-				}
-				if ( ! empty( $args['label_force_left'] ) ) {
-					$wrap_class .= $aui_bs5 ? '' : ' d-flex align-content-center';
-					$label = str_replace(array("form-check-label","custom-control-label"),"", self::label( $label_args, 'cb' ) );
-				}
-				$output     = self::wrap( array(
-					'content' => $output,
-					'class'   => $aui_bs5 ? $wrap_class : 'custom-control ' . $wrap_class
-				) );
-
-				if ( $args['label_type'] == 'horizontal' ) {
-					$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-					$output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
-				}
-			} elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
-
-
-				// allow password field to toggle view
-				$args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function input( $args = array() ) {
+        global $aui_bs5;
+
+        $defaults = array(
+            'type'                     => 'text',
+            'name'                     => '',
+            'class'                    => '',
+            'wrap_class'               => '',
+            'id'                       => '',
+            'placeholder'              => '',
+            'title'                    => '',
+            'value'                    => '',
+            'required'                 => false,
+            'size'                     => '', // sm, lg, small, large
+            'clear_icon'               => '', // true will show a clear icon, can't be used with input_group_right
+            'with_hidden'              => false, // Append hidden field for single checkbox.
+            'label'                    => '',
+            'label_after'              => false,
+            'label_class'              => '',
+            'label_col'                => '2',
+            'label_type'               => '', // top, horizontal, empty = hidden
+            'label_force_left'         => false, // used to force checkbox label left when using horizontal
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'help_text'                => '',
+            'validation_text'          => '',
+            'validation_pattern'       => '',
+            'no_wrap'                  => false,
+            'input_group_right'        => '',
+            'input_group_left'         => '',
+            'input_group_right_inside' => false,
+            // forces the input group inside the input
+            'input_group_left_inside'  => false,
+            // forces the input group inside the input
+            'form_group_class'         => '',
+            'step'                     => '',
+            'switch'                   => false,
+            // to show checkbox as a switch
+            'checked'                  => false,
+            // set a checkbox or radio as selected
+            'password_toggle'          => true,
+            // toggle view/hide password
+            'element_require'          => '',
+            // [%element_id%] == "1"
+            'extra_attributes'         => array(),
+            // an array of extra attributes
+            'wrap_attributes'          => array()
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        if ( ! empty( $args['type'] ) ) {
+            // hidden label option needs to be empty
+            $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+            $type = sanitize_html_class( $args['type'] );
+
+            $help_text   = '';
+            $label       = '';
+            $label_after = $args['label_after'];
+            $label_args  = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+
+            // floating labels need label after
+            if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
+                $label_after         = true;
+                $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+            }
+
+            // size
+            $size = '';
+            if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
+                $size = 'lg';
+                $args['class'] .= ' form-control-lg';
+            }elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
+                $size = 'sm';
+                $args['class'] .= ' form-control-sm';
+            }
+
+            // clear function
+            $clear_function = 'jQuery(this).parent().parent().find(\'input\').val(\'\');';
+
+            // Some special sauce for files
+            if ( $type == 'file' ) {
+                $label_after = true; // if type file we need the label after
+                $args['class'] .= ' custom-file-input ';
+            } elseif ( $type == 'checkbox' ) {
+                $label_after = true; // if type file we need the label after
+                $args['class'] .= $aui_bs5 ? ' form-check-input c-pointer ' : ' custom-control-input c-pointer ';
+            } elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
+                $orig_type = $type;
+                $type = 'text';
+                $args['class'] .= ' bg-initial '; // @todo not sure why we have this?
+                $clear_function .= "jQuery(this).parent().parent().find('input[name=\'" . esc_attr( $args['name'] ) . "\']').trigger('change');";
+
+                $args['extra_attributes']['data-aui-init'] = 'flatpickr';
+
+                // Disable native datetime inputs.
+                $disable_mobile_attr = isset( $args['extra_attributes']['data-disable-mobile'] ) ? $args['extra_attributes']['data-disable-mobile'] : 'true';
+                $disable_mobile_attr = apply_filters( 'aui_flatpickr_disable_disable_mobile_attr', $disable_mobile_attr, $args );
+
+                $args['extra_attributes']['data-disable-mobile'] = $disable_mobile_attr;
+
+                // set a way to clear field if empty
+                if ( $args['input_group_right'] === '' && $args['clear_icon'] !== false ) {
+                    $args['input_group_right_inside'] = true;
+                    $args['clear_icon'] = true;
+                }
+
+                // enqueue the script
+                $aui_settings = AyeCode_UI_Settings::instance();
+                $aui_settings->enqueue_flatpickr();
+            } else if ( $type == 'iconpicker' ) {
+                $type = 'text';
+
+                // Validate FA icon.
+                $args['value'] = AUI_Component_Helper::sanitize_fa_icon( $args['value'], $args );
+
+                $args['extra_attributes']['data-aui-init'] = 'iconpicker';
+                $args['extra_attributes']['data-placement'] = 'bottomRight';
+
+                $args['input_group_right'] = '<span class="input-group-addon input-group-text c-pointer"></span>';
+
+                // Enqueue the script
+                $aui_settings = AyeCode_UI_Settings::instance();
+                $aui_settings->enqueue_iconpicker();
+            }
+
+            if ( $type == 'checkbox' && ( ( ! empty( $args['name'] ) && strpos( $args['name'], '[' ) === false ) || ! empty( $args['with_hidden'] ) ) ) {
+                $output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+            }
+
+            // allow clear icon
+            if ( $args['input_group_right'] === '' && $args['clear_icon'] ) {
+                $font_size = $size == 'sm' ? '1.3' : ( $size == 'lg' ? '1.65' : '1.5' );
+                $args['input_group_right_inside'] = true;
+                $align_class = $aui_bs5 ? ' h-100 py-0' : '';
+                $args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none ' . $align_class . '" onclick="' . $clear_function . '"><span style="font-size: ' . $font_size . 'rem" aria-hidden="true" class="' . ( $aui_bs5 ? 'btn-close' : 'close' ) . '">' . ( $aui_bs5 ? '' : '&times;' ) . '</span></span>';
+            }
+
+            // open/type
+            $output .= '<input type="' . $type . '" ';
+
+            // name
+            if ( ! empty( $args['name'] ) ) {
+                $output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+            }
+
+            // id
+            if ( ! empty( $args['id'] ) ) {
+                $output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+            }
+
+            // placeholder
+            if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
+                $output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+            }
+
+            // title
+            if ( ! empty( $args['title'] ) ) {
+                $output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+            }
+
+            // value
+            if ( ! empty( $args['value'] ) ) {
+                $output .= AUI_Component_Helper::value( $args['value'] );
+            }
+
+            // checked, for radio and checkboxes
+            if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
+                $output .= ' checked ';
+            }
+
+            // validation text
+            if ( ! empty( $args['validation_text'] ) ) {
+                $output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
+                $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+            }
+
+            // validation_pattern
+            if ( ! empty( $args['validation_pattern'] ) ) {
+                $output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+            }
+
+            // step (for numbers)
+            if ( ! empty( $args['step'] ) ) {
+                $output .= ' step="' . $args['step'] . '" ';
+            }
+
+            // required
+            if ( ! empty( $args['required'] ) ) {
+                $output .= ' required ';
+            }
+
+            // class
+            $class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+            $output .= $aui_bs5 &&  $type == 'checkbox' ? ' class="' . $class . '" ' : ' class="form-control ' . $class . '" ';
+
+            // data-attributes
+            $output .= AUI_Component_Helper::data_attributes( $args );
+
+            // extra attributes
+            if ( ! empty( $args['extra_attributes'] ) ) {
+                $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+            }
+
+            // close
+            $output .= '>';
+
+            // help text
+            if ( ! empty( $args['help_text'] ) ) {
+                $help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+            }
+
+            // label
+            if ( ! empty( $args['label'] ) ) {
+                $label_base_class = '';
+                if ( $type == 'file' ) {
+                    $label_base_class = ' custom-file-label';
+                } elseif ( $type == 'checkbox' ) {
+                    if ( ! empty( $args['label_force_left'] ) ) {
+                        $label_args['title'] = wp_kses_post( $args['help_text'] );
+                        $help_text = '';
+                        //$label_args['class'] .= ' d-inline ';
+                        $args['wrap_class'] .= ' align-items-center ';
+                    }else{
+
+                    }
+
+                    $label_base_class = $aui_bs5 ? ' form-check-label' : ' custom-control-label';
+                }
+                $label_args['class'] .= $label_base_class;
+                $temp_label_args = $label_args;
+                if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
+                $label = self::label( $temp_label_args, $type );
+            }
+
+
+
+
+            // set help text in the correct position
+            if ( $label_after ) {
+                $output .= $label . $help_text;
+            }
+
+            // some input types need a separate wrap
+            if ( $type == 'file' ) {
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => $aui_bs5 ? 'mb-3 custom-file' : 'form-group custom-file'
+                ) );
+            } elseif ( $type == 'checkbox' ) {
+
+                $label_args['title'] = $args['label'];
+                $label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
+                $label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
+                $switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
+                if ( $aui_bs5 ) {
+                    $wrap_class = $args['switch'] ? 'form-check form-switch' . $switch_size_class : 'form-check';
+                }else{
+                    $wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class :  'custom-checkbox' ;
+                }
+                if ( ! empty( $args['label_force_left'] ) ) {
+                    $wrap_class .= $aui_bs5 ? '' : ' d-flex align-content-center';
+                    $label = str_replace(array("form-check-label","custom-control-label"),"", self::label( $label_args, 'cb' ) );
+                }
+                $output     = self::wrap( array(
+                    'content' => $output,
+                    'class'   => $aui_bs5 ? $wrap_class : 'custom-control ' . $wrap_class
+                ) );
+
+                if ( $args['label_type'] == 'horizontal' ) {
+                    $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+                    $output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
+                }
+            } elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
+
+
+                // allow password field to toggle view
+                $args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
 onclick="var $el = jQuery(this).find(\'i\');$el.toggleClass(\'fa-eye fa-eye-slash\');
 var $eli = jQuery(this).parent().parent().find(\'input\');
 if($el.hasClass(\'fa-eye\'))
 {$eli.attr(\'type\',\'text\');}
 else{$eli.attr(\'type\',\'password\');}"
 ><i class="far fa-fw fa-eye-slash"></i></span>';
-			}
-
-			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				$group_size = $size == 'lg' ? ' input-group-lg' : '';
-				$group_size = !$group_size && $size == 'sm' ? ' input-group-sm' : $group_size;
-
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
-						'content'                 => $output,
-						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
-						'input_group_left'        => $args['input_group_left'],
-						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
-				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
-						'content'                  => $output,
-						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
-						'input_group_right'        => $args['input_group_right'],
-						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
-				}
-
-			}
-
-			if ( ! $label_after ) {
-				$output .= $help_text;
-			}
-
-
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-				) );
-			}
-
-			if ( ! $label_after ) {
-				$output = $label . $output;
-			}
-
-			// wrap
-			if ( ! $args['no_wrap'] ) {
-				if ( ! empty( $args['form_group_class'] ) ) {
-					$fg_class = esc_attr( $args['form_group_class'] );
-				}else{
-					$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
-				}
-				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : $fg_class;
-				$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-				$output           = self::wrap( array(
-					'content'         => $output,
-					'class'           => $wrap_class,
-					'element_require' => $args['element_require'],
-					'argument_id'     => $args['id'],
-					'wrap_attributes' => $args['wrap_attributes'],
-				) );
-			}
-		}
-
-		return $output;
-	}
-
-	public static function label( $args = array(), $type = '' ) {
-		global $aui_bs5;
-
-		$defaults = array(
-			'title'      => 'div',
-			'for'        => '',
-			'class'      => '',
-			'label_type' => '', // empty = hidden, top, horizontal
-			'label_col'  => '',
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		if ( $args['title'] ) {
-			// maybe hide labels //@todo set a global option for visibility class
-			if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
-				$class = $args['class'];
-			} else {
-				$class = 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' ) . $args['class'];
-			}
-
-			// maybe horizontal
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label ' . $type;
-			}
-
-			if ( $aui_bs5 ) {
-				$class .= ' form-label';
-			}
-
-			// open
-			$output .= '<label';
-
-			// for
-			if ( ! empty( $args['for'] ) ) {
-				$output .= ' for="' . esc_attr( $args['for'] ) . '"';
-			}
-
-			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
-			$output .= $class != "" ? ' class="' . $class . '"' : '';
-
-			// close
-			$output .= '>';
-
-			// title, don't escape fully as can contain html
-			if ( ! empty( $args['title'] ) ) {
-				$output .= wp_kses_post( $args['title'] );
-			}
-
-			// close wrap
-			$output .= '</label>';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Wrap some content in a HTML wrapper.
-	 *
-	 * @param array $args
-	 *
-	 * @return string
-	 */
-	public static function wrap( $args = array() ) {
-		global $aui_bs5;
-		$defaults = array(
-			'type'                     => 'div',
-			'class'                    => $aui_bs5 ? 'mb-3' : 'form-group',
-			'content'                  => '',
-			'input_group_left'         => '',
-			'input_group_right'        => '',
-			'input_group_left_inside'  => false,
-			'input_group_right_inside' => false,
-			'element_require'          => '',
-			'argument_id'              => '',
-			'wrap_attributes'          => array()
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( $args['type'] ) {
-
-			// open
-			$output .= '<' . sanitize_html_class( $args['type'] );
-
-			// element require
-			if ( ! empty( $args['element_require'] ) ) {
-				$output .= AUI_Component_Helper::element_require( $args['element_require'] );
-				$args['class'] .= " aui-conditional-field";
-			}
-
-			// argument_id
-			if ( ! empty( $args['argument_id'] ) ) {
-				$output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
-			}
-
-			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="' . $class . '" ';
-
-			// Attributes
-			if ( ! empty( $args['wrap_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
-			}
-
-			// close wrap
-			$output .= '>';
-
-
-			// Input group left
-			if ( ! empty( $args['input_group_left'] ) ) {
-				$position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
-				$output .= $aui_bs5 ? $input_group_left : '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
+            }
+
+            // input group wraps
+            if ( $args['input_group_left'] || $args['input_group_right'] ) {
+                $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+                $group_size = $size == 'lg' ? ' input-group-lg' : '';
+                $group_size = !$group_size && $size == 'sm' ? ' input-group-sm' : $group_size;
+
+                if ( $args['input_group_left'] ) {
+                    $output = self::wrap( array(
+                        'content'                 => $output,
+                        'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
+                        'input_group_left'        => $args['input_group_left'],
+                        'input_group_left_inside' => $args['input_group_left_inside']
+                    ) );
+                }
+                if ( $args['input_group_right'] ) {
+                    $output = self::wrap( array(
+                        'content'                  => $output,
+                        'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
+                        'input_group_right'        => $args['input_group_right'],
+                        'input_group_right_inside' => $args['input_group_right_inside']
+                    ) );
+                }
+
+            }
+
+            if ( ! $label_after ) {
+                $output .= $help_text;
+            }
+
+
+            if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
+                ) );
+            }
+
+            if ( ! $label_after ) {
+                $output = $label . $output;
+            }
+
+            // wrap
+            if ( ! $args['no_wrap'] ) {
+                if ( ! empty( $args['form_group_class'] ) ) {
+                    $fg_class = esc_attr( $args['form_group_class'] );
+                }else{
+                    $fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
+                }
+                $form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : $fg_class;
+                $wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+                $wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+                $output           = self::wrap( array(
+                    'content'         => $output,
+                    'class'           => $wrap_class,
+                    'element_require' => $args['element_require'],
+                    'argument_id'     => $args['id'],
+                    'wrap_attributes' => $args['wrap_attributes'],
+                ) );
+            }
+        }
+
+        return $output;
+    }
+
+    public static function label( $args = array(), $type = '' ) {
+        global $aui_bs5;
+
+        $defaults = array(
+            'title'      => 'div',
+            'for'        => '',
+            'class'      => '',
+            'label_type' => '', // empty = hidden, top, horizontal
+            'label_col'  => '',
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        if ( $args['title'] ) {
+            // maybe hide labels //@todo set a global option for visibility class
+            if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
+                $class = $args['class'];
+            } else {
+                $class = 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' ) . $args['class'];
+            }
+
+            // maybe horizontal
+            if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
+                $class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label ' . $type;
+            }
+
+            if ( $aui_bs5 ) {
+                $class .= ' form-label';
+            }
+
+            // open
+            $output .= '<label';
+
+            // for
+            if ( ! empty( $args['for'] ) ) {
+                $output .= ' for="' . esc_attr( $args['for'] ) . '"';
+            }
+
+            // class
+            $class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
+            $output .= $class != "" ? ' class="' . $class . '"' : '';
+
+            // close
+            $output .= '>';
+
+            // title, don't escape fully as can contain html
+            if ( ! empty( $args['title'] ) ) {
+                $output .= wp_kses_post( $args['title'] );
+            }
+
+            // close wrap
+            $output .= '</label>';
+        }
+
+        return $output;
+    }
+
+    /**
+     * Wrap some content in a HTML wrapper.
+     *
+     * @param array $args
+     *
+     * @return string
+     */
+    public static function wrap( $args = array() ) {
+        global $aui_bs5;
+        $defaults = array(
+            'type'                     => 'div',
+            'class'                    => $aui_bs5 ? 'mb-3' : 'form-group',
+            'content'                  => '',
+            'input_group_left'         => '',
+            'input_group_right'        => '',
+            'input_group_left_inside'  => false,
+            'input_group_right_inside' => false,
+            'element_require'          => '',
+            'argument_id'              => '',
+            'wrap_attributes'          => array()
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        if ( $args['type'] ) {
+
+            // open
+            $output .= '<' . sanitize_html_class( $args['type'] );
+
+            // element require
+            if ( ! empty( $args['element_require'] ) ) {
+                $output .= AUI_Component_Helper::element_require( $args['element_require'] );
+                $args['class'] .= " aui-conditional-field";
+            }
+
+            // argument_id
+            if ( ! empty( $args['argument_id'] ) ) {
+                $output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
+            }
+
+            // class
+            $class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+            $output .= ' class="' . $class . '" ';
+
+            // Attributes
+            if ( ! empty( $args['wrap_attributes'] ) ) {
+                $output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
+            }
+
+            // close wrap
+            $output .= '>';
+
+
+            // Input group left
+            if ( ! empty( $args['input_group_left'] ) ) {
+                $position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
+                $input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+                $output .= $aui_bs5 ? $input_group_left : '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
 //				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
-			}
+            }
 
-			// content
-			$output .= $args['content'];
+            // content
+            $output .= $args['content'];
 
-			// Input group right
-			if ( ! empty( $args['input_group_right'] ) ) {
-				$position_class    = ! empty( $args['input_group_right_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
-				$output .= $aui_bs5 ? str_replace( 'input-group-text','input-group-text top-0 end-0', $input_group_right ) : '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
+            // Input group right
+            if ( ! empty( $args['input_group_right'] ) ) {
+                $position_class    = ! empty( $args['input_group_right_inside'] ) ? 'position-absolute h-100' : '';
+                $input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+                $output .= $aui_bs5 ? str_replace( 'input-group-text','input-group-text top-0 end-0', $input_group_right ) : '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
 //				$output .= '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
-			}
-
-
-			// close wrap
-			$output .= '</' . sanitize_html_class( $args['type'] ) . '>';
-
-
-		} else {
-			$output = $args['content'];
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function textarea( $args = array() ) {
-		global $aui_bs5;
-
-		$defaults = array(
-			'name'               => '',
-			'class'              => '',
-			'wrap_class'         => '',
-			'id'                 => '',
-			'placeholder'        => '',
-			'title'              => '',
-			'value'              => '',
-			'required'           => false,
-			'label'              => '',
-			'label_after'        => false,
-			'label_class'        => '',
-			'label_type'         => '',
-			'label_col'          => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'input_group_right'        => '',
-			'input_group_left'         => '',
-			'input_group_right_inside' => false,
-			'form_group_class'      => '',
-			'help_text'          => '',
-			'validation_text'    => '',
-			'validation_pattern' => '',
-			'no_wrap'            => false,
-			'rows'               => '',
-			'wysiwyg'            => false,
-			'allow_tags'         => false,
-			// Allow HTML tags
-			'element_require'    => '',
-			// [%element_id%] == "1"
-			'extra_attributes'   => array(),
-			// an array of extra attributes
-			'wrap_attributes'    => array(),
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		$label = '';
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-		// floating labels don't work with wysiwyg so set it as top
-		if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
-			$args['label_type'] = 'top';
-		}
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
-			$label_after         = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$label .= self::label( $label_args );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-			$label .= '<div class="' . $input_col . '">';
-		}
-
-		if ( ! empty( $args['wysiwyg'] ) ) {
-			ob_start();
-			$content   = $args['value'];
-			$editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
-			$settings  = array(
-				'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
-				'quicktags'     => false,
-				'media_buttons' => false,
-				'editor_class'  => 'form-control',
-				'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
-				'teeny'         => true,
-			);
-
-			// maybe set settings if array
-			if ( is_array( $args['wysiwyg'] ) ) {
-				$settings = wp_parse_args( $args['wysiwyg'], $settings );
-			}
-
-			wp_editor( $content, $editor_id, $settings );
-			$output .= ob_get_clean();
-		} else {
-
-			// open
-			$output .= '<textarea ';
-
-			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
-			}
-
-			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
-			}
-
-			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
-			}
-
-			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
-			}
-
-			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
-			}
-
-			// required
-			if ( ! empty( $args['required'] ) ) {
-				$output .= ' required ';
-			}
-
-			// rows
-			if ( ! empty( $args['rows'] ) ) {
-				$output .= ' rows="' . absint( $args['rows'] ) . '" ';
-			}
-
-
-			// class
-			$class = ! empty( $args['class'] ) ? $args['class'] : '';
-			$output .= ' class="form-control ' . $class . '" ';
-
-			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-			}
-
-			// close tag
-			$output .= '>';
-
-			// value
-			if ( ! empty( $args['value'] ) ) {
-				if ( ! empty( $args['allow_tags'] ) ) {
-					$output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
-				} else {
-					$output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
-				}
-			}
-
-			// closing tag
-			$output .= '</textarea>';
-
-
-			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
-						'content'                 => $output,
-						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_left'        => $args['input_group_left'],
-						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
-				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
-						'content'                  => $output,
-						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-						'input_group_right'        => $args['input_group_right'],
-						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
-				}
-
-			}
-
-
-		}
-
-		if ( ! empty( $args['label'] ) && $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$output .= self::label( $label_args );
-		}
-
-		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$output .= AUI_Component_Helper::help_text( $args['help_text'] );
-		}
-
-		if ( ! $label_after ) {
-			$output = $label . $output;
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output .= '</div>';
-		}
-
-
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			if ( ! empty( $args['form_group_class'] ) ) {
-				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
-				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
-			}
-			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : $fg_class;
-			$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output           = self::wrap( array(
-				'content'         => $output,
-				'class'           => $wrap_class,
-				'element_require' => $args['element_require'],
-				'argument_id'     => $args['id'],
-				'wrap_attributes' => $args['wrap_attributes'],
-			) );
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function select( $args = array() ) {
-		global $aui_bs5, $aui_has_select2, $aui_select2_enqueued;
-
-		$defaults = array(
-			'class'            => '',
-			'wrap_class'       => '',
-			'id'               => '',
-			'title'            => '',
-			'value'            => '',
-			// can be an array or a string
-			'required'         => false,
-			'label'            => '',
-			'label_after'      => false,
-			'label_type'       => '',
-			'label_col'        => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'label_class'      => '',
-			'help_text'        => '',
-			'placeholder'      => '',
-			'options'          => array(),
-			// array or string
-			'icon'             => '',
-			'multiple'         => false,
-			'select2'          => false,
-			'no_wrap'          => false,
-			'input_group_right' => '',
-			'input_group_left' => '',
-			'input_group_right_inside' => false, // forces the input group inside the input
-			'input_group_left_inside' => false, // forces the input group inside the input
-			'form_group_class'  => '',
-			'element_require'  => '',
-			// [%element_id%] == "1"
-			'extra_attributes' => array(),
-			// an array of extra attributes
-			'wrap_attributes'  => array(),
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		// for now lets hide floating labels
-		if ( $args['label_type'] == 'floating' ) {
-			$args['label_type'] = 'hidden';
-		}
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if ( $args['label_type'] == 'floating' ) {
-			$label_after         = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// Maybe setup select2
-		$is_select2 = false;
-		if ( ! empty( $args['select2'] ) ) {
-			$args['class'] .= ' aui-select2';
-			$is_select2 = true;
-		} elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
-			$is_select2 = true;
-		}
-
-		if ( $is_select2 && ! $aui_has_select2 ) {
-			$aui_has_select2 = true;
-			$conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
-
-			// Enqueue the script,
-			if ( empty( $aui_select2_enqueued ) && $conditional_select2 === true ) {
-				$aui_select2_enqueued = true;
-
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_select2();
-			}
-		}
-
-		// select2 tags
-		if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
-			$args['data-tags']             = 'true';
-			$args['data-token-separators'] = "[',']";
-			$args['multiple']              = true;
-		}
-
-		// select2 placeholder
-		if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
-			$args['data-placeholder'] = esc_attr( $args['placeholder'] );
-			$args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
-		}
-
-		// Set hidden input to save empty value for multiselect.
-		if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
-			$output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value="" data-ignore-rule/>';
-		}
-
-		// open/type
-		$output .= '<select ';
-
-		// style
-		if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
-			$output .= " style='width:100%;' ";
-		}
-
-		// element require
-		if ( ! empty( $args['element_require'] ) ) {
-			$output .= AUI_Component_Helper::element_require( $args['element_require'] );
-			$args['class'] .= " aui-conditional-field";
-		}
-
-		// class
-		$class = ! empty( $args['class'] ) ? $args['class'] : '';
-		$select_class = $aui_bs5 ? 'form-select ' : 'custom-select ';
-		$output .= AUI_Component_Helper::class_attr( $select_class . $class );
-
-		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
-		}
-
-		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] );
-		}
-
-		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
-
-		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-		}
-
-		// required
-		if ( ! empty( $args['required'] ) ) {
-			$output .= ' required';
-		}
-
-		// multiple
-		if ( ! empty( $args['multiple'] ) ) {
-			$output .= ' multiple';
-		}
-
-		// close opening tag
-		$output .= '>';
-
-		// placeholder
-		if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
-			$output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
-		} elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
-			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
-		}
-
-		// Options
-		if ( ! empty( $args['options'] ) ) {
-
-			if ( ! is_array( $args['options'] ) ) {
-				$output .= $args['options']; // not the preferred way but an option
-			} else {
-				foreach ( $args['options'] as $val => $name ) {
-					$selected = '';
-					if ( is_array( $name ) ) {
-						if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-
-							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
-						} else {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-							$option_value = isset( $name['value'] ) ? $name['value'] : '';
-							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
-							if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
-								$selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
-							} elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
-								$selected = selected( $option_value, $args['value'], false );
-							}
-
-							$output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
-						}
-					} else {
-						if ( ! empty( $args['value'] ) ) {
-							if ( is_array( $args['value'] ) ) {
-								$selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $args['value'], $val, false );
-							}
-						} elseif ( $args['value'] === $val ) {
-							$selected = selected( $args['value'], $val, false );
-						}
-						$output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
-					}
-				}
-			}
-
-		}
-
-		// closing tag
-		$output .= '</select>';
-
-		$label = '';
-		$help_text = '';
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
-			$label_args = array(
-				'title'      => $args['label'],
-				'for'        => $args['id'],
-				'class'      => $args['label_class'] . " ",
-				'label_type' => $args['label_type'],
-				'label_col'  => $args['label_col']
-			);
-			$label = self::label( $label_args );
-		}
-
-		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
-		}
-
-		// input group wraps
-		if ( $args['input_group_left'] || $args['input_group_right'] ) {
-			$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-			if ( $args['input_group_left'] ) {
-				$output = self::wrap( array(
-					'content'                 => $output,
-					'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-					'input_group_left'        => $args['input_group_left'],
-					'input_group_left_inside' => $args['input_group_left_inside']
-				) );
-			}
-			if ( $args['input_group_right'] ) {
-				$output = self::wrap( array(
-					'content'                  => $output,
-					'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
-					'input_group_right'        => $args['input_group_right'],
-					'input_group_right_inside' => $args['input_group_right_inside']
-				) );
-			}
-
-		}
-
-		if ( ! $label_after ) {
-			$output .= $help_text;
-		}
-
-
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output = self::wrap( array(
-				'content' => $output,
-				'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-			) );
-		}
-
-		if ( ! $label_after ) {
-			$output = $label . $output;
-		}
-
-		// maybe horizontal label
+            }
+
+
+            // close wrap
+            $output .= '</' . sanitize_html_class( $args['type'] ) . '>';
+
+
+        } else {
+            $output = $args['content'];
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function textarea( $args = array() ) {
+        global $aui_bs5;
+
+        $defaults = array(
+            'name'               => '',
+            'class'              => '',
+            'wrap_class'         => '',
+            'id'                 => '',
+            'placeholder'        => '',
+            'title'              => '',
+            'value'              => '',
+            'required'           => false,
+            'label'              => '',
+            'label_after'        => false,
+            'label_class'        => '',
+            'label_type'         => '',
+            'label_col'          => '',
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'input_group_right'        => '',
+            'input_group_left'         => '',
+            'input_group_right_inside' => false,
+            'form_group_class'      => '',
+            'help_text'          => '',
+            'validation_text'    => '',
+            'validation_pattern' => '',
+            'no_wrap'            => false,
+            'rows'               => '',
+            'wysiwyg'            => false,
+            'allow_tags'         => false,
+            // Allow HTML tags
+            'element_require'    => '',
+            // [%element_id%] == "1"
+            'extra_attributes'   => array(),
+            // an array of extra attributes
+            'wrap_attributes'    => array(),
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        $label = '';
+
+        // hidden label option needs to be empty
+        $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+        // floating labels don't work with wysiwyg so set it as top
+        if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
+            $args['label_type'] = 'top';
+        }
+
+        $label_after = $args['label_after'];
+
+        // floating labels need label after
+        if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
+            $label_after         = true;
+            $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+        }
+
+        // label
+        if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+        } elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+            $label_args = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+            $label .= self::label( $label_args );
+        }
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+            $label .= '<div class="' . $input_col . '">';
+        }
+
+        if ( ! empty( $args['wysiwyg'] ) ) {
+            ob_start();
+            $content   = $args['value'];
+            $editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
+            $settings  = array(
+                'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
+                'quicktags'     => false,
+                'media_buttons' => false,
+                'editor_class'  => 'form-control',
+                'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
+                'teeny'         => true,
+            );
+
+            // maybe set settings if array
+            if ( is_array( $args['wysiwyg'] ) ) {
+                $settings = wp_parse_args( $args['wysiwyg'], $settings );
+            }
+
+            wp_editor( $content, $editor_id, $settings );
+            $output .= ob_get_clean();
+        } else {
+
+            // open
+            $output .= '<textarea ';
+
+            // name
+            if ( ! empty( $args['name'] ) ) {
+                $output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+            }
+
+            // id
+            if ( ! empty( $args['id'] ) ) {
+                $output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+            }
+
+            // placeholder
+            if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
+                $output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+            }
+
+            // title
+            if ( ! empty( $args['title'] ) ) {
+                $output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+            }
+
+            // validation text
+            if ( ! empty( $args['validation_text'] ) ) {
+                $output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
+                $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+            }
+
+            // validation_pattern
+            if ( ! empty( $args['validation_pattern'] ) ) {
+                $output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+            }
+
+            // required
+            if ( ! empty( $args['required'] ) ) {
+                $output .= ' required ';
+            }
+
+            // rows
+            if ( ! empty( $args['rows'] ) ) {
+                $output .= ' rows="' . absint( $args['rows'] ) . '" ';
+            }
+
+
+            // class
+            $class = ! empty( $args['class'] ) ? $args['class'] : '';
+            $output .= ' class="form-control ' . $class . '" ';
+
+            // extra attributes
+            if ( ! empty( $args['extra_attributes'] ) ) {
+                $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+            }
+
+            // close tag
+            $output .= '>';
+
+            // value
+            if ( ! empty( $args['value'] ) ) {
+                if ( ! empty( $args['allow_tags'] ) ) {
+                    $output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
+                } else {
+                    $output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
+                }
+            }
+
+            // closing tag
+            $output .= '</textarea>';
+
+
+            // input group wraps
+            if ( $args['input_group_left'] || $args['input_group_right'] ) {
+                $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+                if ( $args['input_group_left'] ) {
+                    $output = self::wrap( array(
+                        'content'                 => $output,
+                        'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                        'input_group_left'        => $args['input_group_left'],
+                        'input_group_left_inside' => $args['input_group_left_inside']
+                    ) );
+                }
+                if ( $args['input_group_right'] ) {
+                    $output = self::wrap( array(
+                        'content'                  => $output,
+                        'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                        'input_group_right'        => $args['input_group_right'],
+                        'input_group_right_inside' => $args['input_group_right_inside']
+                    ) );
+                }
+
+            }
+
+
+        }
+
+        if ( ! empty( $args['label'] ) && $label_after ) {
+            $label_args = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+            $output .= self::label( $label_args );
+        }
+
+        // help text
+        if ( ! empty( $args['help_text'] ) ) {
+            $output .= AUI_Component_Helper::help_text( $args['help_text'] );
+        }
+
+        if ( ! $label_after ) {
+            $output = $label . $output;
+        }
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $output .= '</div>';
+        }
+
+
+        // wrap
+        if ( ! $args['no_wrap'] ) {
+            if ( ! empty( $args['form_group_class'] ) ) {
+                $fg_class = esc_attr( $args['form_group_class'] );
+            }else{
+                $fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
+            }
+            $form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : $fg_class;
+            $wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+            $wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+            $output           = self::wrap( array(
+                'content'         => $output,
+                'class'           => $wrap_class,
+                'element_require' => $args['element_require'],
+                'argument_id'     => $args['id'],
+                'wrap_attributes' => $args['wrap_attributes'],
+            ) );
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function select( $args = array() ) {
+        global $aui_bs5, $aui_has_select2, $aui_select2_enqueued;
+
+        $defaults = array(
+            'class'            => '',
+            'wrap_class'       => '',
+            'id'               => '',
+            'title'            => '',
+            'value'            => '',
+            // can be an array or a string
+            'required'         => false,
+            'label'            => '',
+            'label_after'      => false,
+            'label_type'       => '',
+            'label_col'        => '',
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'label_class'      => '',
+            'help_text'        => '',
+            'placeholder'      => '',
+            'options'          => array(),
+            // array or string
+            'icon'             => '',
+            'multiple'         => false,
+            'select2'          => false,
+            'no_wrap'          => false,
+            'input_group_right' => '',
+            'input_group_left' => '',
+            'input_group_right_inside' => false, // forces the input group inside the input
+            'input_group_left_inside' => false, // forces the input group inside the input
+            'form_group_class'  => '',
+            'element_require'  => '',
+            // [%element_id%] == "1"
+            'extra_attributes' => array(),
+            // an array of extra attributes
+            'wrap_attributes'  => array(),
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        // for now lets hide floating labels
+        if ( $args['label_type'] == 'floating' ) {
+            $args['label_type'] = 'hidden';
+        }
+
+        // hidden label option needs to be empty
+        $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+
+        $label_after = $args['label_after'];
+
+        // floating labels need label after
+        if ( $args['label_type'] == 'floating' ) {
+            $label_after         = true;
+            $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+        }
+
+        // Maybe setup select2
+        $is_select2 = false;
+        if ( ! empty( $args['select2'] ) ) {
+            $args['class'] .= ' aui-select2';
+            $is_select2 = true;
+        } elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
+            $is_select2 = true;
+        }
+
+        if ( $is_select2 && ! $aui_has_select2 ) {
+            $aui_has_select2 = true;
+            $conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
+
+            // Enqueue the script,
+            if ( empty( $aui_select2_enqueued ) && $conditional_select2 === true ) {
+                $aui_select2_enqueued = true;
+
+                $aui_settings = AyeCode_UI_Settings::instance();
+                $aui_settings->enqueue_select2();
+            }
+        }
+
+        // select2 tags
+        if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
+            $args['data-tags']             = 'true';
+            $args['data-token-separators'] = "[',']";
+            $args['multiple']              = true;
+        }
+
+        // select2 placeholder
+        if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
+            $args['data-placeholder'] = esc_attr( $args['placeholder'] );
+            $args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
+        }
+
+        // Set hidden input to save empty value for multiselect.
+        if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
+            $output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value="" data-ignore-rule/>';
+        }
+
+        // open/type
+        $output .= '<select ';
+
+        // style
+        if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
+            $output .= " style='width:100%;' ";
+        }
+
+        // element require
+        if ( ! empty( $args['element_require'] ) ) {
+            $output .= AUI_Component_Helper::element_require( $args['element_require'] );
+            $args['class'] .= " aui-conditional-field";
+        }
+
+        // class
+        $class = ! empty( $args['class'] ) ? $args['class'] : '';
+        $select_class = $aui_bs5 ? 'form-select ' : 'custom-select ';
+        $output .= AUI_Component_Helper::class_attr( $select_class . $class );
+
+        // name
+        if ( ! empty( $args['name'] ) ) {
+            $output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
+        }
+
+        // id
+        if ( ! empty( $args['id'] ) ) {
+            $output .= AUI_Component_Helper::id( $args['id'] );
+        }
+
+        // title
+        if ( ! empty( $args['title'] ) ) {
+            $output .= AUI_Component_Helper::title( $args['title'] );
+        }
+
+        // data-attributes
+        $output .= AUI_Component_Helper::data_attributes( $args );
+
+        // aria-attributes
+        $output .= AUI_Component_Helper::aria_attributes( $args );
+
+        // extra attributes
+        if ( ! empty( $args['extra_attributes'] ) ) {
+            $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+        }
+
+        // required
+        if ( ! empty( $args['required'] ) ) {
+            $output .= ' required';
+        }
+
+        // multiple
+        if ( ! empty( $args['multiple'] ) ) {
+            $output .= ' multiple';
+        }
+
+        // close opening tag
+        $output .= '>';
+
+        // placeholder
+        if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
+            $output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
+        } elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
+            $output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
+        }
+
+        // Options
+        if ( ! empty( $args['options'] ) ) {
+
+            if ( ! is_array( $args['options'] ) ) {
+                $output .= $args['options']; // not the preferred way but an option
+            } else {
+                foreach ( $args['options'] as $val => $name ) {
+                    $selected = '';
+                    if ( is_array( $name ) ) {
+                        if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
+                            $option_label = isset( $name['label'] ) ? $name['label'] : '';
+
+                            $output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
+                        } else {
+                            $option_label = isset( $name['label'] ) ? $name['label'] : '';
+                            $option_value = isset( $name['value'] ) ? $name['value'] : '';
+                            $extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
+                            if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
+                                $selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
+                            } elseif ( ! empty( $args['value'] ) ) {
+                                $selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
+                            } elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
+                                $selected = selected( $option_value, $args['value'], false );
+                            }
+
+                            $output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
+                        }
+                    } else {
+                        if ( ! empty( $args['value'] ) ) {
+                            if ( is_array( $args['value'] ) ) {
+                                $selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
+                            } elseif ( ! empty( $args['value'] ) ) {
+                                $selected = selected( $args['value'], $val, false );
+                            }
+                        } elseif ( $args['value'] === $val ) {
+                            $selected = selected( $args['value'], $val, false );
+                        }
+                        $output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+                    }
+                }
+            }
+
+        }
+
+        // closing tag
+        $output .= '</select>';
+
+        $label = '';
+        $help_text = '';
+        // label
+        if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+        } elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+            $label_args = array(
+                'title'      => $args['label'],
+                'for'        => $args['id'],
+                'class'      => $args['label_class'] . " ",
+                'label_type' => $args['label_type'],
+                'label_col'  => $args['label_col']
+            );
+            $label = self::label( $label_args );
+        }
+
+        // help text
+        if ( ! empty( $args['help_text'] ) ) {
+            $help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+        }
+
+        // input group wraps
+        if ( $args['input_group_left'] || $args['input_group_right'] ) {
+            $w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+            if ( $args['input_group_left'] ) {
+                $output = self::wrap( array(
+                    'content'                 => $output,
+                    'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                    'input_group_left'        => $args['input_group_left'],
+                    'input_group_left_inside' => $args['input_group_left_inside']
+                ) );
+            }
+            if ( $args['input_group_right'] ) {
+                $output = self::wrap( array(
+                    'content'                  => $output,
+                    'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
+                    'input_group_right'        => $args['input_group_right'],
+                    'input_group_right_inside' => $args['input_group_right_inside']
+                ) );
+            }
+
+        }
+
+        if ( ! $label_after ) {
+            $output .= $help_text;
+        }
+
+
+        if ( $args['label_type'] == 'horizontal' ) {
+            $output = self::wrap( array(
+                'content' => $output,
+                'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
+            ) );
+        }
+
+        if ( ! $label_after ) {
+            $output = $label . $output;
+        }
+
+        // maybe horizontal label
 //		if ( $args['label_type'] == 'horizontal' ) {
 //			$output .= '</div>';
 //		}
 
 
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			if ( ! empty( $args['form_group_class'] ) ) {
-				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
-				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
-			}
-			$wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
-			$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output     = self::wrap( array(
-				'content'         => $output,
-				'class'           => $wrap_class,
-				'element_require' => $args['element_require'],
-				'argument_id'     => $args['id'],
-				'wrap_attributes' => $args['wrap_attributes'],
-			) );
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function radio( $args = array() ) {
-		global $aui_bs5;
-
-		$defaults = array(
-			'class'            => '',
-			'wrap_class'       => '',
-			'id'               => '',
-			'title'            => '',
-			'horizontal'       => false,
-			// sets the lable horizontal
-			'value'            => '',
-			'label'            => '',
-			'label_class'      => '',
-			'label_type'       => '',
-			'label_col'        => '',
-			// sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'        => '',
-			'inline'           => true,
-			'required'         => false,
-			'options'          => array(),
-			'icon'             => '',
-			'no_wrap'          => false,
-			'element_require'  => '',
-			// [%element_id%] == "1"
-			'extra_attributes' => array(),
-			// an array of extra attributes
-			'wrap_attributes'  => array()
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		// for now lets use horizontal for floating
-		if ( $args['label_type'] == 'floating' ) {
-			$args['label_type'] = 'horizontal';
-		}
-
-		$label_args = array(
-			'title'      => $args['label'],
-			'class'      => $args['label_class'] . " pt-0 ",
-			'label_type' => $args['label_type'],
-			'label_col'  => $args['label_col']
-		);
-
-		if ( $args['label_type'] == 'top' || $args['label_type'] == 'hidden' ) {
-			$label_args['class'] .= 'd-block ';
-
-			if ( $args['label_type'] == 'hidden' ) {
-				$label_args['class'] .= 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' );
-			}
-		}
-
-		$output = '';
-
-		// label before
-		if ( ! empty( $args['label'] ) ) {
-			$output .= self::label( $label_args, 'radio' );
-		}
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
-			$output .= '<div class="' . $input_col . '">';
-		}
-
-		if ( ! empty( $args['options'] ) ) {
-			$count = 0;
-			foreach ( $args['options'] as $value => $label ) {
-				$option_args            = $args;
-				$option_args['value']   = $value;
-				$option_args['label']   = $label;
-				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option( $option_args, $count );
-				$count ++;
-			}
-		}
-
-		// help text
-		$help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
-		$output .= $help_text;
-
-		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output .= '</div>';
-		}
-
-		// wrap
-		$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
-		$wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
-		$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-		$output     = self::wrap( array(
-			'content'         => $output,
-			'class'           => $wrap_class,
-			'element_require' => $args['element_require'],
-			'argument_id'     => $args['id'],
-			'wrap_attributes' => $args['wrap_attributes'],
-		) );
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function radio_option( $args = array(), $count = '' ) {
-		$defaults = array(
-			'class'            => '',
-			'id'               => '',
-			'title'            => '',
-			'value'            => '',
-			'required'         => false,
-			'inline'           => true,
-			'label'            => '',
-			'options'          => array(),
-			'icon'             => '',
-			'no_wrap'          => false,
-			'extra_attributes' => array() // an array of extra attributes
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-		// open/type
-		$output .= '<input type="radio"';
-
-		// class
-		$output .= ' class="form-check-input" ';
-
-		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'] );
-		}
-
-		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] . $count );
-		}
-
-		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
-		}
-
-		// value
-		if ( isset( $args['value'] ) ) {
-			$output .= AUI_Component_Helper::value( $args['value'] );
-		}
-
-		// checked, for radio and checkboxes
-		if ( $args['checked'] ) {
-			$output .= ' checked ';
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
-
-		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
-		}
-
-		// required
-		if ( ! empty( $args['required'] ) ) {
-			$output .= ' required';
-		}
-
-		// close opening tag
-		$output .= '>';
-
-		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) ) {
-			$output .= self::label( array(
-				'title' => $args['label'],
-				'for'   => $args['id'] . $count,
-				'class' => 'form-check-label'
-			), 'radio' );
-		}
-
-		// wrap
-		if ( ! $args['no_wrap'] ) {
-			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
-
-			// Unique wrap class
-			$uniq_class = 'fwrap';
-			if ( ! empty( $args['name'] ) ) {
-				$uniq_class .= '-' . $args['name'];
-			} else if ( ! empty( $args['id'] ) ) {
-				$uniq_class .= '-' . $args['id'];
-			}
-
-			if ( isset( $args['value'] ) || $args['value'] !== "" ) {
-				$uniq_class .= '-' . $args['value'];
-			} else {
-				$uniq_class .= '-' . $count;
-			}
-			$wrap_class .= ' ' . sanitize_html_class( $uniq_class );
-
-			$output = self::wrap( array(
-				'content' => $output,
-				'class'   => $wrap_class
-			) );
-		}
-
-		return $output;
-	}
+        // wrap
+        if ( ! $args['no_wrap'] ) {
+            if ( ! empty( $args['form_group_class'] ) ) {
+                $fg_class = esc_attr( $args['form_group_class'] );
+            }else{
+                $fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
+            }
+            $wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
+            $wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+            $output     = self::wrap( array(
+                'content'         => $output,
+                'class'           => $wrap_class,
+                'element_require' => $args['element_require'],
+                'argument_id'     => $args['id'],
+                'wrap_attributes' => $args['wrap_attributes'],
+            ) );
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function radio( $args = array() ) {
+        global $aui_bs5;
+
+        $defaults = array(
+            'class'            => '',
+            'wrap_class'       => '',
+            'id'               => '',
+            'title'            => '',
+            'horizontal'       => false,
+            // sets the lable horizontal
+            'value'            => '',
+            'label'            => '',
+            'label_class'      => '',
+            'label_type'       => '',
+            'label_col'        => '',
+            // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'help_text'        => '',
+            'inline'           => true,
+            'required'         => false,
+            'options'          => array(),
+            'icon'             => '',
+            'no_wrap'          => false,
+            'element_require'  => '',
+            // [%element_id%] == "1"
+            'extra_attributes' => array(),
+            // an array of extra attributes
+            'wrap_attributes'  => array()
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        // for now lets use horizontal for floating
+        if ( $args['label_type'] == 'floating' ) {
+            $args['label_type'] = 'horizontal';
+        }
+
+        $label_args = array(
+            'title'      => $args['label'],
+            'class'      => $args['label_class'] . " pt-0 ",
+            'label_type' => $args['label_type'],
+            'label_col'  => $args['label_col']
+        );
+
+        if ( $args['label_type'] == 'top' || $args['label_type'] == 'hidden' ) {
+            $label_args['class'] .= 'd-block ';
+
+            if ( $args['label_type'] == 'hidden' ) {
+                $label_args['class'] .= 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' );
+            }
+        }
+
+        $output = '';
+
+        // label before
+        if ( ! empty( $args['label'] ) ) {
+            $output .= self::label( $label_args, 'radio' );
+        }
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+            $output .= '<div class="' . $input_col . '">';
+        }
+
+        if ( ! empty( $args['options'] ) ) {
+            $count = 0;
+            foreach ( $args['options'] as $value => $label ) {
+                $option_args            = $args;
+                $option_args['value']   = $value;
+                $option_args['label']   = $label;
+                $option_args['checked'] = $value == $args['value'] ? true : false;
+                $output .= self::radio_option( $option_args, $count );
+                $count ++;
+            }
+        }
+
+        // help text
+        $help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
+        $output .= $help_text;
+
+        // maybe horizontal label
+        if ( $args['label_type'] == 'horizontal' ) {
+            $output .= '</div>';
+        }
+
+        // wrap
+        $fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
+        $wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
+        $wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+        $output     = self::wrap( array(
+            'content'         => $output,
+            'class'           => $wrap_class,
+            'element_require' => $args['element_require'],
+            'argument_id'     => $args['id'],
+            'wrap_attributes' => $args['wrap_attributes'],
+        ) );
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function radio_option( $args = array(), $count = '' ) {
+        $defaults = array(
+            'class'            => '',
+            'id'               => '',
+            'title'            => '',
+            'value'            => '',
+            'required'         => false,
+            'inline'           => true,
+            'label'            => '',
+            'options'          => array(),
+            'icon'             => '',
+            'no_wrap'          => false,
+            'extra_attributes' => array() // an array of extra attributes
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args = wp_parse_args( $args, $defaults );
+
+        $output = '';
+
+        // open/type
+        $output .= '<input type="radio"';
+
+        // class
+        $output .= ' class="form-check-input" ';
+
+        // name
+        if ( ! empty( $args['name'] ) ) {
+            $output .= AUI_Component_Helper::name( $args['name'] );
+        }
+
+        // id
+        if ( ! empty( $args['id'] ) ) {
+            $output .= AUI_Component_Helper::id( $args['id'] . $count );
+        }
+
+        // title
+        if ( ! empty( $args['title'] ) ) {
+            $output .= AUI_Component_Helper::title( $args['title'] );
+        }
+
+        // value
+        if ( isset( $args['value'] ) ) {
+            $output .= AUI_Component_Helper::value( $args['value'] );
+        }
+
+        // checked, for radio and checkboxes
+        if ( $args['checked'] ) {
+            $output .= ' checked ';
+        }
+
+        // data-attributes
+        $output .= AUI_Component_Helper::data_attributes( $args );
+
+        // aria-attributes
+        $output .= AUI_Component_Helper::aria_attributes( $args );
+
+        // extra attributes
+        if ( ! empty( $args['extra_attributes'] ) ) {
+            $output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+        }
+
+        // required
+        if ( ! empty( $args['required'] ) ) {
+            $output .= ' required';
+        }
+
+        // close opening tag
+        $output .= '>';
+
+        // label
+        if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
+        } elseif ( ! empty( $args['label'] ) ) {
+            $output .= self::label( array(
+                'title' => $args['label'],
+                'for'   => $args['id'] . $count,
+                'class' => 'form-check-label'
+            ), 'radio' );
+        }
+
+        // wrap
+        if ( ! $args['no_wrap'] ) {
+            $wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
+
+            // Unique wrap class
+            $uniq_class = 'fwrap';
+            if ( ! empty( $args['name'] ) ) {
+                $uniq_class .= '-' . $args['name'];
+            } else if ( ! empty( $args['id'] ) ) {
+                $uniq_class .= '-' . $args['id'];
+            }
+
+            if ( isset( $args['value'] ) || $args['value'] !== "" ) {
+                $uniq_class .= '-' . $args['value'];
+            } else {
+                $uniq_class .= '-' . $count;
+            }
+            $wrap_class .= ' ' . sanitize_html_class( $uniq_class );
+
+            $output = self::wrap( array(
+                'content' => $output,
+                'class'   => $wrap_class
+            ) );
+        }
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +316 added lines, -316 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function input( $args = array() ) {
+	public static function input($args = array()) {
 		global $aui_bs5;
 
 		$defaults = array(
@@ -69,13 +69,13 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( ! empty( $args['type'] ) ) {
+		if (!empty($args['type'])) {
 			// hidden label option needs to be empty
 			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
-			$type = sanitize_html_class( $args['type'] );
+			$type = sanitize_html_class($args['type']);
 
 			$help_text   = '';
 			$label       = '';
@@ -89,17 +89,17 @@ 
 			);
 
 			// floating labels need label after
-			if ( $args['label_type'] == 'floating' && $type != 'checkbox' ) {
+			if ($args['label_type'] == 'floating' && $type != 'checkbox') {
 				$label_after         = true;
 				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 			}
 
 			// size
 			$size = '';
-			if ( $args['size'] == 'lg' || $args['size'] == 'large' ) {
+			if ($args['size'] == 'lg' || $args['size'] == 'large') {
 				$size = 'lg';
 				$args['class'] .= ' form-control-lg';
-			}elseif ( $args['size'] == 'sm' || $args['size'] == 'small' ) {
+			}elseif ($args['size'] == 'sm' || $args['size'] == 'small') {
 				$size = 'sm';
 				$args['class'] .= ' form-control-sm';
 			}
@@ -108,28 +108,28 @@ 
 			$clear_function = 'jQuery(this).parent().parent().find(\'input\').val(\'\');';
 
 			// Some special sauce for files
-			if ( $type == 'file' ) {
+			if ($type == 'file') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-file-input ';
-			} elseif ( $type == 'checkbox' ) {
+			} elseif ($type == 'checkbox') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= $aui_bs5 ? ' form-check-input c-pointer ' : ' custom-control-input c-pointer ';
-			} elseif ( $type == 'datepicker' || $type == 'timepicker' ) {
+			} elseif ($type == 'datepicker' || $type == 'timepicker') {
 				$orig_type = $type;
 				$type = 'text';
 				$args['class'] .= ' bg-initial '; // @todo not sure why we have this?
-				$clear_function .= "jQuery(this).parent().parent().find('input[name=\'" . esc_attr( $args['name'] ) . "\']').trigger('change');";
+				$clear_function .= "jQuery(this).parent().parent().find('input[name=\'" . esc_attr($args['name']) . "\']').trigger('change');";
 
 				$args['extra_attributes']['data-aui-init'] = 'flatpickr';
 
 				// Disable native datetime inputs.
-				$disable_mobile_attr = isset( $args['extra_attributes']['data-disable-mobile'] ) ? $args['extra_attributes']['data-disable-mobile'] : 'true';
-				$disable_mobile_attr = apply_filters( 'aui_flatpickr_disable_disable_mobile_attr', $disable_mobile_attr, $args );
+				$disable_mobile_attr = isset($args['extra_attributes']['data-disable-mobile']) ? $args['extra_attributes']['data-disable-mobile'] : 'true';
+				$disable_mobile_attr = apply_filters('aui_flatpickr_disable_disable_mobile_attr', $disable_mobile_attr, $args);
 
 				$args['extra_attributes']['data-disable-mobile'] = $disable_mobile_attr;
 
 				// set a way to clear field if empty
-				if ( $args['input_group_right'] === '' && $args['clear_icon'] !== false ) {
+				if ($args['input_group_right'] === '' && $args['clear_icon'] !== false) {
 					$args['input_group_right_inside'] = true;
 					$args['clear_icon'] = true;
 				}
@@ -137,11 +137,11 @@ 
 				// enqueue the script
 				$aui_settings = AyeCode_UI_Settings::instance();
 				$aui_settings->enqueue_flatpickr();
-			} else if ( $type == 'iconpicker' ) {
+			} else if ($type == 'iconpicker') {
 				$type = 'text';
 
 				// Validate FA icon.
-				$args['value'] = AUI_Component_Helper::sanitize_fa_icon( $args['value'], $args );
+				$args['value'] = AUI_Component_Helper::sanitize_fa_icon($args['value'], $args);
 
 				$args['extra_attributes']['data-aui-init'] = 'iconpicker';
 				$args['extra_attributes']['data-placement'] = 'bottomRight';
@@ -153,104 +153,104 @@ 
 				$aui_settings->enqueue_iconpicker();
 			}
 
-			if ( $type == 'checkbox' && ( ( ! empty( $args['name'] ) && strpos( $args['name'], '[' ) === false ) || ! empty( $args['with_hidden'] ) ) ) {
-				$output .= '<input type="hidden" name="' . esc_attr( $args['name'] ) . '" value="0" />';
+			if ($type == 'checkbox' && ((!empty($args['name']) && strpos($args['name'], '[') === false) || !empty($args['with_hidden']))) {
+				$output .= '<input type="hidden" name="' . esc_attr($args['name']) . '" value="0" />';
 			}
 
 			// allow clear icon
-			if ( $args['input_group_right'] === '' && $args['clear_icon'] ) {
-				$font_size = $size == 'sm' ? '1.3' : ( $size == 'lg' ? '1.65' : '1.5' );
+			if ($args['input_group_right'] === '' && $args['clear_icon']) {
+				$font_size = $size == 'sm' ? '1.3' : ($size == 'lg' ? '1.65' : '1.5');
 				$args['input_group_right_inside'] = true;
 				$align_class = $aui_bs5 ? ' h-100 py-0' : '';
-				$args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none ' . $align_class . '" onclick="' . $clear_function . '"><span style="font-size: ' . $font_size . 'rem" aria-hidden="true" class="' . ( $aui_bs5 ? 'btn-close' : 'close' ) . '">' . ( $aui_bs5 ? '' : '&times;' ) . '</span></span>';
+				$args['input_group_right'] = '<span class="input-group-text aui-clear-input c-pointer bg-initial border-0 px-2 d-none ' . $align_class . '" onclick="' . $clear_function . '"><span style="font-size: ' . $font_size . 'rem" aria-hidden="true" class="' . ($aui_bs5 ? 'btn-close' : 'close') . '">' . ($aui_bs5 ? '' : '&times;') . '</span></span>';
 			}
 
 			// open/type
 			$output .= '<input type="' . $type . '" ';
 
 			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			if (isset($args['placeholder']) && '' != $args['placeholder']) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// value
-			if ( ! empty( $args['value'] ) ) {
-				$output .= AUI_Component_Helper::value( $args['value'] );
+			if (!empty($args['value'])) {
+				$output .= AUI_Component_Helper::value($args['value']);
 			}
 
 			// checked, for radio and checkboxes
-			if ( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ) {
+			if (($type == 'checkbox' || $type == 'radio') && $args['checked']) {
 				$output .= ' checked ';
 			}
 
 			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr(addslashes($args['validation_text'])) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . esc_attr($args['validation_pattern']) . '" ';
 			}
 
 			// step (for numbers)
-			if ( ! empty( $args['step'] ) ) {
+			if (!empty($args['step'])) {
 				$output .= ' step="' . $args['step'] . '" ';
 			}
 
 			// required
-			if ( ! empty( $args['required'] ) ) {
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= $aui_bs5 &&  $type == 'checkbox' ? ' class="' . $class . '" ' : ' class="form-control ' . $class . '" ';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
+			$output .= $aui_bs5 && $type == 'checkbox' ? ' class="' . $class . '" ' : ' class="form-control ' . $class . '" ';
 
 			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes( $args );
+			$output .= AUI_Component_Helper::data_attributes($args);
 
 			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			if (!empty($args['extra_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
 			// close
 			$output .= '>';
 
 			// help text
-			if ( ! empty( $args['help_text'] ) ) {
-				$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+			if (!empty($args['help_text'])) {
+				$help_text = AUI_Component_Helper::help_text($args['help_text']);
 			}
 
 			// label
-			if ( ! empty( $args['label'] ) ) {
+			if (!empty($args['label'])) {
 				$label_base_class = '';
-				if ( $type == 'file' ) {
+				if ($type == 'file') {
 					$label_base_class = ' custom-file-label';
-				} elseif ( $type == 'checkbox' ) {
-					if ( ! empty( $args['label_force_left'] ) ) {
-						$label_args['title'] = wp_kses_post( $args['help_text'] );
+				} elseif ($type == 'checkbox') {
+					if (!empty($args['label_force_left'])) {
+						$label_args['title'] = wp_kses_post($args['help_text']);
 						$help_text = '';
 						//$label_args['class'] .= ' d-inline ';
 						$args['wrap_class'] .= ' align-items-center ';
-					}else{
+					} else {
 
 					}
 
@@ -258,49 +258,49 @@ 
 				}
 				$label_args['class'] .= $label_base_class;
 				$temp_label_args = $label_args;
-				if(! empty( $args['label_force_left'] )){$temp_label_args['class'] = $label_base_class." text-muted";}
-				$label = self::label( $temp_label_args, $type );
+				if (!empty($args['label_force_left'])) {$temp_label_args['class'] = $label_base_class . " text-muted"; }
+				$label = self::label($temp_label_args, $type);
 			}
 
 
 
 
 			// set help text in the correct position
-			if ( $label_after ) {
+			if ($label_after) {
 				$output .= $label . $help_text;
 			}
 
 			// some input types need a separate wrap
-			if ( $type == 'file' ) {
-				$output = self::wrap( array(
+			if ($type == 'file') {
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => $aui_bs5 ? 'mb-3 custom-file' : 'form-group custom-file'
-				) );
-			} elseif ( $type == 'checkbox' ) {
+				));
+			} elseif ($type == 'checkbox') {
 
 				$label_args['title'] = $args['label'];
-				$label_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'label' );
-				$label = !empty( $args['label_force_left'] ) ? self::label( $label_args, 'cb' ) : '<div class="' . $label_col . ' col-form-label"></div>';
-				$switch_size_class = $args['switch'] && !is_bool( $args['switch'] ) ? ' custom-switch-'.esc_attr( $args['switch'] ) : '';
-				if ( $aui_bs5 ) {
+				$label_col = AUI_Component_Helper::get_column_class($args['label_col'], 'label');
+				$label = !empty($args['label_force_left']) ? self::label($label_args, 'cb') : '<div class="' . $label_col . ' col-form-label"></div>';
+				$switch_size_class = $args['switch'] && !is_bool($args['switch']) ? ' custom-switch-' . esc_attr($args['switch']) : '';
+				if ($aui_bs5) {
 					$wrap_class = $args['switch'] ? 'form-check form-switch' . $switch_size_class : 'form-check';
-				}else{
-					$wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class :  'custom-checkbox' ;
+				} else {
+					$wrap_class = $args['switch'] ? 'custom-switch' . $switch_size_class : 'custom-checkbox';
 				}
-				if ( ! empty( $args['label_force_left'] ) ) {
+				if (!empty($args['label_force_left'])) {
 					$wrap_class .= $aui_bs5 ? '' : ' d-flex align-content-center';
-					$label = str_replace(array("form-check-label","custom-control-label"),"", self::label( $label_args, 'cb' ) );
+					$label = str_replace(array("form-check-label", "custom-control-label"), "", self::label($label_args, 'cb'));
 				}
-				$output     = self::wrap( array(
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => $aui_bs5 ? $wrap_class : 'custom-control ' . $wrap_class
-				) );
+				));
 
-				if ( $args['label_type'] == 'horizontal' ) {
-					$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+				if ($args['label_type'] == 'horizontal') {
+					$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 					$output    = $label . '<div class="' . $input_col . '">' . $output . '</div>';
 				}
-			} elseif ( $type == 'password' && $args['password_toggle'] && ! $args['input_group_right'] ) {
+			} elseif ($type == 'password' && $args['password_toggle'] && !$args['input_group_right']) {
 
 
 				// allow password field to toggle view
@@ -314,70 +314,70 @@ 
 			}
 
 			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
+			if ($args['input_group_left'] || $args['input_group_right']) {
+				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
 				$group_size = $size == 'lg' ? ' input-group-lg' : '';
 				$group_size = !$group_size && $size == 'sm' ? ' input-group-sm' : $group_size;
 
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content'                 => $output,
 						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
 						'input_group_left'        => $args['input_group_left'],
 						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content'                  => $output,
 						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 . $group_size : 'input-group' . $group_size,
 						'input_group_right'        => $args['input_group_right'],
 						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
 
-			if ( ! $label_after ) {
+			if (!$label_after) {
 				$output .= $help_text;
 			}
 
 
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$output = self::wrap( array(
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$output = self::wrap(array(
 					'content' => $output,
-					'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-				) );
+					'class'   => AUI_Component_Helper::get_column_class($args['label_col'], 'input')
+				));
 			}
 
-			if ( ! $label_after ) {
+			if (!$label_after) {
 				$output = $label . $output;
 			}
 
 			// wrap
-			if ( ! $args['no_wrap'] ) {
-				if ( ! empty( $args['form_group_class'] ) ) {
-					$fg_class = esc_attr( $args['form_group_class'] );
-				}else{
+			if (!$args['no_wrap']) {
+				if (!empty($args['form_group_class'])) {
+					$fg_class = esc_attr($args['form_group_class']);
+				} else {
 					$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 				}
 				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : $fg_class;
 				$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-				$output           = self::wrap( array(
+				$wrap_class       = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+				$output           = self::wrap(array(
 					'content'         => $output,
 					'class'           => $wrap_class,
 					'element_require' => $args['element_require'],
 					'argument_id'     => $args['id'],
 					'wrap_attributes' => $args['wrap_attributes'],
-				) );
+				));
 			}
 		}
 
 		return $output;
 	}
 
-	public static function label( $args = array(), $type = '' ) {
+	public static function label($args = array(), $type = '') {
 		global $aui_bs5;
 
 		$defaults = array(
@@ -391,23 +391,23 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
-		if ( $args['title'] ) {
+		if ($args['title']) {
 			// maybe hide labels //@todo set a global option for visibility class
-			if ( $type == 'file' || $type == 'checkbox' || $type == 'radio' || ! empty( $args['label_type'] ) ) {
+			if ($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type'])) {
 				$class = $args['class'];
 			} else {
-				$class = 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' ) . $args['class'];
+				$class = 'sr-only ' . ($aui_bs5 ? 'visually-hidden ' : '') . $args['class'];
 			}
 
 			// maybe horizontal
-			if ( $args['label_type'] == 'horizontal' && $type != 'checkbox' ) {
-				$class .= ' ' . AUI_Component_Helper::get_column_class( $args['label_col'], 'label' ) . ' col-form-label ' . $type;
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$class .= ' ' . AUI_Component_Helper::get_column_class($args['label_col'], 'label') . ' col-form-label ' . $type;
 			}
 
-			if ( $aui_bs5 ) {
+			if ($aui_bs5) {
 				$class .= ' form-label';
 			}
 
@@ -415,20 +415,20 @@ 
 			$output .= '<label';
 
 			// for
-			if ( ! empty( $args['for'] ) ) {
-				$output .= ' for="' . esc_attr( $args['for'] ) . '"';
+			if (!empty($args['for'])) {
+				$output .= ' for="' . esc_attr($args['for']) . '"';
 			}
 
 			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
+			$class = $class ? AUI_Component_Helper::esc_classes($class) : '';
 			$output .= $class != "" ? ' class="' . $class . '"' : '';
 
 			// close
 			$output .= '>';
 
 			// title, don't escape fully as can contain html
-			if ( ! empty( $args['title'] ) ) {
-				$output .= wp_kses_post( $args['title'] );
+			if (!empty($args['title'])) {
+				$output .= wp_kses_post($args['title']);
 			}
 
 			// close wrap
@@ -445,7 +445,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function wrap( $args = array() ) {
+	public static function wrap($args = array()) {
 		global $aui_bs5;
 		$defaults = array(
 			'type'                     => 'div',
@@ -463,31 +463,31 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( $args['type'] ) {
+		if ($args['type']) {
 
 			// open
-			$output .= '<' . sanitize_html_class( $args['type'] );
+			$output .= '<' . sanitize_html_class($args['type']);
 
 			// element require
-			if ( ! empty( $args['element_require'] ) ) {
-				$output .= AUI_Component_Helper::element_require( $args['element_require'] );
+			if (!empty($args['element_require'])) {
+				$output .= AUI_Component_Helper::element_require($args['element_require']);
 				$args['class'] .= " aui-conditional-field";
 			}
 
 			// argument_id
-			if ( ! empty( $args['argument_id'] ) ) {
-				$output .= ' data-argument="' . esc_attr( $args['argument_id'] ) . '"';
+			if (!empty($args['argument_id'])) {
+				$output .= ' data-argument="' . esc_attr($args['argument_id']) . '"';
 			}
 
 			// class
-			$class = ! empty( $args['class'] ) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
 			$output .= ' class="' . $class . '" ';
 
 			// Attributes
-			if ( ! empty( $args['wrap_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['wrap_attributes'] );
+			if (!empty($args['wrap_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['wrap_attributes']);
 			}
 
 			// close wrap
@@ -495,9 +495,9 @@ 
 
 
 			// Input group left
-			if ( ! empty( $args['input_group_left'] ) ) {
-				$position_class   = ! empty( $args['input_group_left_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos( $args['input_group_left'], '<' ) !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+			if (!empty($args['input_group_left'])) {
+				$position_class   = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
+				$input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
 				$output .= $aui_bs5 ? $input_group_left : '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
 //				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
 			}
@@ -506,16 +506,16 @@ 
 			$output .= $args['content'];
 
 			// Input group right
-			if ( ! empty( $args['input_group_right'] ) ) {
-				$position_class    = ! empty( $args['input_group_right_inside'] ) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos( $args['input_group_right'], '<' ) !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
-				$output .= $aui_bs5 ? str_replace( 'input-group-text','input-group-text top-0 end-0', $input_group_right ) : '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
+			if (!empty($args['input_group_right'])) {
+				$position_class    = !empty($args['input_group_right_inside']) ? 'position-absolute h-100' : '';
+				$input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+				$output .= $aui_bs5 ? str_replace('input-group-text', 'input-group-text top-0 end-0', $input_group_right) : '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
 //				$output .= '<div class="input-group-append ' . $position_class . '" style="top:0;right:0;">' . $input_group_right . '</div>';
 			}
 
 
 			// close wrap
-			$output .= '</' . sanitize_html_class( $args['type'] ) . '>';
+			$output .= '</' . sanitize_html_class($args['type']) . '>';
 
 
 		} else {
@@ -532,7 +532,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function textarea( $args = array() ) {
+	public static function textarea($args = array()) {
 		global $aui_bs5;
 
 		$defaults = array(
@@ -572,7 +572,7 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 		$label = '';
 
@@ -580,21 +580,21 @@ 
 		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
 		// floating labels don't work with wysiwyg so set it as top
-		if ( $args['label_type'] == 'floating' && ! empty( $args['wysiwyg'] ) ) {
+		if ($args['label_type'] == 'floating' && !empty($args['wysiwyg'])) {
 			$args['label_type'] = 'top';
 		}
 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if ( $args['label_type'] == 'floating' && empty( $args['wysiwyg'] ) ) {
+		if ($args['label_type'] == 'floating' && empty($args['wysiwyg'])) {
 			$label_after         = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -602,34 +602,34 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$label .= self::label( $label_args );
+			$label .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+		if ($args['label_type'] == 'horizontal') {
+			$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 			$label .= '<div class="' . $input_col . '">';
 		}
 
-		if ( ! empty( $args['wysiwyg'] ) ) {
+		if (!empty($args['wysiwyg'])) {
 			ob_start();
 			$content   = $args['value'];
-			$editor_id = ! empty( $args['id'] ) ? sanitize_html_class( $args['id'] ) : 'wp_editor';
+			$editor_id = !empty($args['id']) ? sanitize_html_class($args['id']) : 'wp_editor';
 			$settings  = array(
-				'textarea_rows' => ! empty( absint( $args['rows'] ) ) ? absint( $args['rows'] ) : 4,
+				'textarea_rows' => !empty(absint($args['rows'])) ? absint($args['rows']) : 4,
 				'quicktags'     => false,
 				'media_buttons' => false,
 				'editor_class'  => 'form-control',
-				'textarea_name' => ! empty( $args['name'] ) ? sanitize_html_class( $args['name'] ) : sanitize_html_class( $args['id'] ),
+				'textarea_name' => !empty($args['name']) ? sanitize_html_class($args['name']) : sanitize_html_class($args['id']),
 				'teeny'         => true,
 			);
 
 			// maybe set settings if array
-			if ( is_array( $args['wysiwyg'] ) ) {
-				$settings = wp_parse_args( $args['wysiwyg'], $settings );
+			if (is_array($args['wysiwyg'])) {
+				$settings = wp_parse_args($args['wysiwyg'], $settings);
 			}
 
-			wp_editor( $content, $editor_id, $settings );
+			wp_editor($content, $editor_id, $settings);
 			$output .= ob_get_clean();
 		} else {
 
@@ -637,65 +637,65 @@ 
 			$output .= '<textarea ';
 
 			// name
-			if ( ! empty( $args['name'] ) ) {
-				$output .= ' name="' . esc_attr( $args['name'] ) . '" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if ( ! empty( $args['id'] ) ) {
-				$output .= ' id="' . sanitize_html_class( $args['id'] ) . '" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] ) {
-				$output .= ' placeholder="' . esc_attr( $args['placeholder'] ) . '" ';
+			if (isset($args['placeholder']) && '' != $args['placeholder']) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if ( ! empty( $args['title'] ) ) {
-				$output .= ' title="' . esc_attr( $args['title'] ) . '" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// validation text
-			if ( ! empty( $args['validation_text'] ) ) {
-				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr( addslashes( $args['validation_text'] ) ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr(addslashes($args['validation_text'])) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if ( ! empty( $args['validation_pattern'] ) ) {
-				$output .= ' pattern="' . esc_attr( $args['validation_pattern'] ) . '" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . esc_attr($args['validation_pattern']) . '" ';
 			}
 
 			// required
-			if ( ! empty( $args['required'] ) ) {
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// rows
-			if ( ! empty( $args['rows'] ) ) {
-				$output .= ' rows="' . absint( $args['rows'] ) . '" ';
+			if (!empty($args['rows'])) {
+				$output .= ' rows="' . absint($args['rows']) . '" ';
 			}
 
 
 			// class
-			$class = ! empty( $args['class'] ) ? $args['class'] : '';
+			$class = !empty($args['class']) ? $args['class'] : '';
 			$output .= ' class="form-control ' . $class . '" ';
 
 			// extra attributes
-			if ( ! empty( $args['extra_attributes'] ) ) {
-				$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+			if (!empty($args['extra_attributes'])) {
+				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
 			// close tag
 			$output .= '>';
 
 			// value
-			if ( ! empty( $args['value'] ) ) {
-				if ( ! empty( $args['allow_tags'] ) ) {
-					$output .= AUI_Component_Helper::sanitize_html_field( $args['value'], $args ); // Sanitize HTML.
+			if (!empty($args['value'])) {
+				if (!empty($args['allow_tags'])) {
+					$output .= AUI_Component_Helper::sanitize_html_field($args['value'], $args); // Sanitize HTML.
 				} else {
-					$output .= AUI_Component_Helper::sanitize_textarea_field( $args['value'] );
+					$output .= AUI_Component_Helper::sanitize_textarea_field($args['value']);
 				}
 			}
 
@@ -704,23 +704,23 @@ 
 
 
 			// input group wraps
-			if ( $args['input_group_left'] || $args['input_group_right'] ) {
-				$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-				if ( $args['input_group_left'] ) {
-					$output = self::wrap( array(
+			if ($args['input_group_left'] || $args['input_group_right']) {
+				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content'                 => $output,
 						'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_left'        => $args['input_group_left'],
 						'input_group_left_inside' => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if ( $args['input_group_right'] ) {
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content'                  => $output,
 						'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_right'        => $args['input_group_right'],
 						'input_group_right_inside' => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
@@ -728,7 +728,7 @@ 
 
 		}
 
-		if ( ! empty( $args['label'] ) && $label_after ) {
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -736,41 +736,41 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$output .= AUI_Component_Helper::help_text( $args['help_text'] );
+		if (!empty($args['help_text'])) {
+			$output .= AUI_Component_Helper::help_text($args['help_text']);
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output = $label . $output;
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
-			if ( ! empty( $args['form_group_class'] ) ) {
-				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
+		if (!$args['no_wrap']) {
+			if (!empty($args['form_group_class'])) {
+				$fg_class = esc_attr($args['form_group_class']);
+			} else {
 				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 			}
 			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : $fg_class;
 			$wrap_class       = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class       = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output           = self::wrap( array(
+			$wrap_class       = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			$output           = self::wrap(array(
 				'content'         => $output,
 				'class'           => $wrap_class,
 				'element_require' => $args['element_require'],
 				'argument_id'     => $args['id'],
 				'wrap_attributes' => $args['wrap_attributes'],
-			) );
+			));
 		}
 
 
@@ -784,7 +784,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function select( $args = array() ) {
+	public static function select($args = array()) {
 		global $aui_bs5, $aui_has_select2, $aui_select2_enqueued;
 
 		$defaults = array(
@@ -824,11 +824,11 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// for now lets hide floating labels
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$args['label_type'] = 'hidden';
 		}
 
@@ -839,26 +839,26 @@ 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$label_after         = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// Maybe setup select2
 		$is_select2 = false;
-		if ( ! empty( $args['select2'] ) ) {
+		if (!empty($args['select2'])) {
 			$args['class'] .= ' aui-select2';
 			$is_select2 = true;
-		} elseif ( strpos( $args['class'], 'aui-select2' ) !== false ) {
+		} elseif (strpos($args['class'], 'aui-select2') !== false) {
 			$is_select2 = true;
 		}
 
-		if ( $is_select2 && ! $aui_has_select2 ) {
+		if ($is_select2 && !$aui_has_select2) {
 			$aui_has_select2 = true;
-			$conditional_select2 = apply_filters( 'aui_is_conditional_select2', true );
+			$conditional_select2 = apply_filters('aui_is_conditional_select2', true);
 
 			// Enqueue the script,
-			if ( empty( $aui_select2_enqueued ) && $conditional_select2 === true ) {
+			if (empty($aui_select2_enqueued) && $conditional_select2 === true) {
 				$aui_select2_enqueued = true;
 
 				$aui_settings = AyeCode_UI_Settings::instance();
@@ -867,75 +867,75 @@ 
 		}
 
 		// select2 tags
-		if ( ! empty( $args['select2'] ) && $args['select2'] === 'tags' ) { // triple equals needed here for some reason
+		if (!empty($args['select2']) && $args['select2'] === 'tags') { // triple equals needed here for some reason
 			$args['data-tags']             = 'true';
 			$args['data-token-separators'] = "[',']";
 			$args['multiple']              = true;
 		}
 
 		// select2 placeholder
-		if ( $is_select2 && isset( $args['placeholder'] ) && '' != $args['placeholder'] && empty( $args['data-placeholder'] ) ) {
-			$args['data-placeholder'] = esc_attr( $args['placeholder'] );
-			$args['data-allow-clear'] = isset( $args['data-allow-clear'] ) ? (bool) $args['data-allow-clear'] : true;
+		if ($is_select2 && isset($args['placeholder']) && '' != $args['placeholder'] && empty($args['data-placeholder'])) {
+			$args['data-placeholder'] = esc_attr($args['placeholder']);
+			$args['data-allow-clear'] = isset($args['data-allow-clear']) ? (bool) $args['data-allow-clear'] : true;
 		}
 
 		// Set hidden input to save empty value for multiselect.
-		if ( ! empty( $args['multiple'] ) && ! empty( $args['name'] ) ) {
-			$output .= '<input type="hidden" ' . AUI_Component_Helper::name( $args['name'] ) . ' value="" data-ignore-rule/>';
+		if (!empty($args['multiple']) && !empty($args['name'])) {
+			$output .= '<input type="hidden" ' . AUI_Component_Helper::name($args['name']) . ' value="" data-ignore-rule/>';
 		}
 
 		// open/type
 		$output .= '<select ';
 
 		// style
-		if ( $is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
+		if ($is_select2 && !($args['input_group_left'] || $args['input_group_right'])) {
 			$output .= " style='width:100%;' ";
 		}
 
 		// element require
-		if ( ! empty( $args['element_require'] ) ) {
-			$output .= AUI_Component_Helper::element_require( $args['element_require'] );
+		if (!empty($args['element_require'])) {
+			$output .= AUI_Component_Helper::element_require($args['element_require']);
 			$args['class'] .= " aui-conditional-field";
 		}
 
 		// class
-		$class = ! empty( $args['class'] ) ? $args['class'] : '';
+		$class = !empty($args['class']) ? $args['class'] : '';
 		$select_class = $aui_bs5 ? 'form-select ' : 'custom-select ';
-		$output .= AUI_Component_Helper::class_attr( $select_class . $class );
+		$output .= AUI_Component_Helper::class_attr($select_class . $class);
 
 		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'], $args['multiple'] );
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name'], $args['multiple']);
 		}
 
 		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] );
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id']);
 		}
 
 		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
+		if (!empty($args['title'])) {
+			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
+		$output .= AUI_Component_Helper::data_attributes($args);
 
 		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
+		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		if (!empty($args['extra_attributes'])) {
+			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if ( ! empty( $args['required'] ) ) {
+		if (!empty($args['required'])) {
 			$output .= ' required';
 		}
 
 		// multiple
-		if ( ! empty( $args['multiple'] ) ) {
+		if (!empty($args['multiple'])) {
 			$output .= ' multiple';
 		}
 
@@ -943,50 +943,50 @@ 
 		$output .= '>';
 
 		// placeholder
-		if ( isset( $args['placeholder'] ) && '' != $args['placeholder'] && ! $is_select2 ) {
-			$output .= '<option value="" disabled selected hidden>' . esc_attr( $args['placeholder'] ) . '</option>';
-		} elseif ( $is_select2 && ! empty( $args['placeholder'] ) ) {
+		if (isset($args['placeholder']) && '' != $args['placeholder'] && !$is_select2) {
+			$output .= '<option value="" disabled selected hidden>' . esc_attr($args['placeholder']) . '</option>';
+		} elseif ($is_select2 && !empty($args['placeholder'])) {
 			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
 		}
 
 		// Options
-		if ( ! empty( $args['options'] ) ) {
+		if (!empty($args['options'])) {
 
-			if ( ! is_array( $args['options'] ) ) {
+			if (!is_array($args['options'])) {
 				$output .= $args['options']; // not the preferred way but an option
 			} else {
-				foreach ( $args['options'] as $val => $name ) {
+				foreach ($args['options'] as $val => $name) {
 					$selected = '';
-					if ( is_array( $name ) ) {
-						if ( isset( $name['optgroup'] ) && ( $name['optgroup'] == 'start' || $name['optgroup'] == 'end' ) ) {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
+					if (is_array($name)) {
+						if (isset($name['optgroup']) && ($name['optgroup'] == 'start' || $name['optgroup'] == 'end')) {
+							$option_label = isset($name['label']) ? $name['label'] : '';
 
-							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr( $option_label ) . '">' : '</optgroup>';
+							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
 						} else {
-							$option_label = isset( $name['label'] ) ? $name['label'] : '';
-							$option_value = isset( $name['value'] ) ? $name['value'] : '';
-							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes( $name['extra_attributes'] ) : '';
-							if ( ! empty( $args['multiple'] ) && ! empty( $args['value'] ) && is_array( $args['value'] ) ) {
-								$selected = in_array( $option_value, stripslashes_deep( $args['value'] ) ) ? "selected" : "";
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $option_value, stripslashes_deep( $args['value'] ), false );
-							} elseif ( empty( $args['value'] ) && $args['value'] === $option_value ) {
-								$selected = selected( $option_value, $args['value'], false );
+							$option_label = isset($name['label']) ? $name['label'] : '';
+							$option_value = isset($name['value']) ? $name['value'] : '';
+							$extra_attributes = !empty($name['extra_attributes']) ? AUI_Component_Helper::extra_attributes($name['extra_attributes']) : '';
+							if (!empty($args['multiple']) && !empty($args['value']) && is_array($args['value'])) {
+								$selected = in_array($option_value, stripslashes_deep($args['value'])) ? "selected" : "";
+							} elseif (!empty($args['value'])) {
+								$selected = selected($option_value, stripslashes_deep($args['value']), false);
+							} elseif (empty($args['value']) && $args['value'] === $option_value) {
+								$selected = selected($option_value, $args['value'], false);
 							}
 
-							$output .= '<option value="' . esc_attr( $option_value ) . '" ' . $selected . ' '.$extra_attributes .'>' . $option_label . '</option>';
+							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . ' ' . $extra_attributes . '>' . $option_label . '</option>';
 						}
 					} else {
-						if ( ! empty( $args['value'] ) ) {
-							if ( is_array( $args['value'] ) ) {
-								$selected = in_array( $val, $args['value'] ) ? 'selected="selected"' : '';
-							} elseif ( ! empty( $args['value'] ) ) {
-								$selected = selected( $args['value'], $val, false );
+						if (!empty($args['value'])) {
+							if (is_array($args['value'])) {
+								$selected = in_array($val, $args['value']) ? 'selected="selected"' : '';
+							} elseif (!empty($args['value'])) {
+								$selected = selected($args['value'], $val, false);
 							}
-						} elseif ( $args['value'] === $val ) {
-							$selected = selected( $args['value'], $val, false );
+						} elseif ($args['value'] === $val) {
+							$selected = selected($args['value'], $val, false);
 						}
-						$output .= '<option value="' . esc_attr( $val ) . '" ' . $selected . '>' . esc_attr( $name ) . '</option>';
+						$output .= '<option value="' . esc_attr($val) . '" ' . $selected . '>' . esc_attr($name) . '</option>';
 					}
 				}
 			}
@@ -999,8 +999,8 @@ 
 		$label = '';
 		$help_text = '';
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) && ! $label_after ) {
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -1008,49 +1008,49 @@ 
 				'label_type' => $args['label_type'],
 				'label_col'  => $args['label_col']
 			);
-			$label = self::label( $label_args );
+			$label = self::label($label_args);
 		}
 
 		// help text
-		if ( ! empty( $args['help_text'] ) ) {
-			$help_text = AUI_Component_Helper::help_text( $args['help_text'] );
+		if (!empty($args['help_text'])) {
+			$help_text = AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// input group wraps
-		if ( $args['input_group_left'] || $args['input_group_right'] ) {
-			$w100 = strpos( $args['class'], 'w-100' ) !== false ? ' w-100' : '';
-			if ( $args['input_group_left'] ) {
-				$output = self::wrap( array(
+		if ($args['input_group_left'] || $args['input_group_right']) {
+			$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+			if ($args['input_group_left']) {
+				$output = self::wrap(array(
 					'content'                 => $output,
 					'class'                   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 					'input_group_left'        => $args['input_group_left'],
 					'input_group_left_inside' => $args['input_group_left_inside']
-				) );
+				));
 			}
-			if ( $args['input_group_right'] ) {
-				$output = self::wrap( array(
+			if ($args['input_group_right']) {
+				$output = self::wrap(array(
 					'content'                  => $output,
 					'class'                    => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 					'input_group_right'        => $args['input_group_right'],
 					'input_group_right_inside' => $args['input_group_right_inside']
-				) );
+				));
 			}
 
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output .= $help_text;
 		}
 
 
-		if ( $args['label_type'] == 'horizontal' ) {
-			$output = self::wrap( array(
+		if ($args['label_type'] == 'horizontal') {
+			$output = self::wrap(array(
 				'content' => $output,
-				'class'   => AUI_Component_Helper::get_column_class( $args['label_col'], 'input' )
-			) );
+				'class'   => AUI_Component_Helper::get_column_class($args['label_col'], 'input')
+			));
 		}
 
-		if ( ! $label_after ) {
+		if (!$label_after) {
 			$output = $label . $output;
 		}
 
@@ -1061,21 +1061,21 @@ 
 
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
-			if ( ! empty( $args['form_group_class'] ) ) {
-				$fg_class = esc_attr( $args['form_group_class'] );
-			}else{
+		if (!$args['no_wrap']) {
+			if (!empty($args['form_group_class'])) {
+				$fg_class = esc_attr($args['form_group_class']);
+			} else {
 				$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 			}
 			$wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
-			$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-			$output     = self::wrap( array(
+			$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+			$output     = self::wrap(array(
 				'content'         => $output,
 				'class'           => $wrap_class,
 				'element_require' => $args['element_require'],
 				'argument_id'     => $args['id'],
 				'wrap_attributes' => $args['wrap_attributes'],
-			) );
+			));
 		}
 
 
@@ -1089,7 +1089,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio( $args = array() ) {
+	public static function radio($args = array()) {
 		global $aui_bs5;
 
 		$defaults = array(
@@ -1121,10 +1121,10 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		// for now lets use horizontal for floating
-		if ( $args['label_type'] == 'floating' ) {
+		if ($args['label_type'] == 'floating') {
 			$args['label_type'] = 'horizontal';
 		}
 
@@ -1135,59 +1135,59 @@ 
 			'label_col'  => $args['label_col']
 		);
 
-		if ( $args['label_type'] == 'top' || $args['label_type'] == 'hidden' ) {
+		if ($args['label_type'] == 'top' || $args['label_type'] == 'hidden') {
 			$label_args['class'] .= 'd-block ';
 
-			if ( $args['label_type'] == 'hidden' ) {
-				$label_args['class'] .= 'sr-only ' . ( $aui_bs5 ? 'visually-hidden ' : '' );
+			if ($args['label_type'] == 'hidden') {
+				$label_args['class'] .= 'sr-only ' . ($aui_bs5 ? 'visually-hidden ' : '');
 			}
 		}
 
 		$output = '';
 
 		// label before
-		if ( ! empty( $args['label'] ) ) {
-			$output .= self::label( $label_args, 'radio' );
+		if (!empty($args['label'])) {
+			$output .= self::label($label_args, 'radio');
 		}
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
-			$input_col = AUI_Component_Helper::get_column_class( $args['label_col'], 'input' );
+		if ($args['label_type'] == 'horizontal') {
+			$input_col = AUI_Component_Helper::get_column_class($args['label_col'], 'input');
 			$output .= '<div class="' . $input_col . '">';
 		}
 
-		if ( ! empty( $args['options'] ) ) {
+		if (!empty($args['options'])) {
 			$count = 0;
-			foreach ( $args['options'] as $value => $label ) {
+			foreach ($args['options'] as $value => $label) {
 				$option_args            = $args;
 				$option_args['value']   = $value;
 				$option_args['label']   = $label;
 				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option( $option_args, $count );
-				$count ++;
+				$output .= self::radio_option($option_args, $count);
+				$count++;
 			}
 		}
 
 		// help text
-		$help_text = ! empty( $args['help_text'] ) ? AUI_Component_Helper::help_text( $args['help_text'] ) : '';
+		$help_text = !empty($args['help_text']) ? AUI_Component_Helper::help_text($args['help_text']) : '';
 		$output .= $help_text;
 
 		// maybe horizontal label
-		if ( $args['label_type'] == 'horizontal' ) {
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 		// wrap
 		$fg_class = $aui_bs5 ? 'mb-3' : 'form-group';
 		$wrap_class = $args['label_type'] == 'horizontal' ? $fg_class . ' row' : $fg_class;
-		$wrap_class = ! empty( $args['wrap_class'] ) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
-		$output     = self::wrap( array(
+		$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
+		$output     = self::wrap(array(
 			'content'         => $output,
 			'class'           => $wrap_class,
 			'element_require' => $args['element_require'],
 			'argument_id'     => $args['id'],
 			'wrap_attributes' => $args['wrap_attributes'],
-		) );
+		));
 
 
 		return $output;
@@ -1200,7 +1200,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio_option( $args = array(), $count = '' ) {
+	public static function radio_option($args = array(), $count = '') {
 		$defaults = array(
 			'class'            => '',
 			'id'               => '',
@@ -1218,7 +1218,7 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$output = '';
 
@@ -1229,43 +1229,43 @@ 
 		$output .= ' class="form-check-input" ';
 
 		// name
-		if ( ! empty( $args['name'] ) ) {
-			$output .= AUI_Component_Helper::name( $args['name'] );
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name']);
 		}
 
 		// id
-		if ( ! empty( $args['id'] ) ) {
-			$output .= AUI_Component_Helper::id( $args['id'] . $count );
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id'] . $count);
 		}
 
 		// title
-		if ( ! empty( $args['title'] ) ) {
-			$output .= AUI_Component_Helper::title( $args['title'] );
+		if (!empty($args['title'])) {
+			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// value
-		if ( isset( $args['value'] ) ) {
-			$output .= AUI_Component_Helper::value( $args['value'] );
+		if (isset($args['value'])) {
+			$output .= AUI_Component_Helper::value($args['value']);
 		}
 
 		// checked, for radio and checkboxes
-		if ( $args['checked'] ) {
+		if ($args['checked']) {
 			$output .= ' checked ';
 		}
 
 		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes( $args );
+		$output .= AUI_Component_Helper::data_attributes($args);
 
 		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes( $args );
+		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if ( ! empty( $args['extra_attributes'] ) ) {
-			$output .= AUI_Component_Helper::extra_attributes( $args['extra_attributes'] );
+		if (!empty($args['extra_attributes'])) {
+			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if ( ! empty( $args['required'] ) ) {
+		if (!empty($args['required'])) {
 			$output .= ' required';
 		}
 
@@ -1273,38 +1273,38 @@ 
 		$output .= '>';
 
 		// label
-		if ( ! empty( $args['label'] ) && is_array( $args['label'] ) ) {
-		} elseif ( ! empty( $args['label'] ) ) {
-			$output .= self::label( array(
+		if (!empty($args['label']) && is_array($args['label'])) {
+		} elseif (!empty($args['label'])) {
+			$output .= self::label(array(
 				'title' => $args['label'],
 				'for'   => $args['id'] . $count,
 				'class' => 'form-check-label'
-			), 'radio' );
+			), 'radio');
 		}
 
 		// wrap
-		if ( ! $args['no_wrap'] ) {
+		if (!$args['no_wrap']) {
 			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
 
 			// Unique wrap class
 			$uniq_class = 'fwrap';
-			if ( ! empty( $args['name'] ) ) {
+			if (!empty($args['name'])) {
 				$uniq_class .= '-' . $args['name'];
-			} else if ( ! empty( $args['id'] ) ) {
+			} else if (!empty($args['id'])) {
 				$uniq_class .= '-' . $args['id'];
 			}
 
-			if ( isset( $args['value'] ) || $args['value'] !== "" ) {
+			if (isset($args['value']) || $args['value'] !== "") {
 				$uniq_class .= '-' . $args['value'];
 			} else {
 				$uniq_class .= '-' . $count;
 			}
-			$wrap_class .= ' ' . sanitize_html_class( $uniq_class );
+			$wrap_class .= ' ' . sanitize_html_class($uniq_class);
 
-			$output = self::wrap( array(
+			$output = self::wrap(array(
 				'content' => $output,
 				'class'   => $wrap_class
-			) );
+			));
 		}
 
 		return $output;