AyeCode / invoicing

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

Indentation +2 added lines, -2 removed lines

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

Spacing +2 added lines, -2 removed lines

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

vendor/ayecode/wp-ayecode-ui/includes/inc/bs-conversion.php

Spacing +6 added lines, -6 removed lines

@@ -13,10 +13,10 @@ 
  *
  * @return array|mixed|string|string[]
  */
-function aui_bs_convert_sd_output( $output, $instance = '', $args = '', $sd = '' ) {
+function aui_bs_convert_sd_output($output, $instance = '', $args = '', $sd = '') {
 	global $aui_bs5;
 
-	if ( $aui_bs5 ) {
+	if ($aui_bs5) {
 
 		$convert = array(
 			'ml-'                   => 'ms-',
@@ -57,9 +57,9 @@ 
 			'class="close"' => 'class="btn-close"',
 			'<span aria-hidden="true">&times;</span>' => '',
 		);
-		$output  = str_replace(
-			array_keys( $convert ),
-			array_values( $convert ),
+		$output = str_replace(
+			array_keys($convert),
+			array_values($convert),
 			$output
 		);
 	}
@@ -67,4 +67,4 @@ 
 	return $output;
 }
 
-add_filter( 'wp_super_duper_widget_output', 'aui_bs_convert_sd_output', 10, 4 ); //$output, $instance, $args, $this
+add_filter('wp_super_duper_widget_output', 'aui_bs_convert_sd_output', 10, 4); //$output, $instance, $args, $this

Indentation +53 added lines, -53 removed lines

@@ -14,64 +14,64 @@
  * @return array|mixed|string|string[]
  */
 function aui_bs_convert_sd_output( $output, $instance = '', $args = '', $sd = '' ) {
-	global $aui_bs5;
+    global $aui_bs5;
 
-	if ( $aui_bs5 ) {
+    if ( $aui_bs5 ) {
 
-		$convert = array(
-			'ml-'                   => 'ms-',
-			'mr-'                   => 'me-',
-			'pl-'                   => 'ps-',
-			'pr-'                   => 'pe-',
-			' form-row'              => ' row',
-			' embed-responsive-item' => '',
-			' embed-responsive' => ' ratio',
-			'-1by1'    => '-1x1',
-			'-4by3'    => '-4x3',
-			'-16by9'    => '-16x9',
-			'-21by9'    => '-21x9',
-			'geodir-lightbox-image' => 'aui-lightbox-image',
-			' badge-'   => ' text-bg-',
-			'form-group'   => 'mb-3',
-			'custom-select'   => 'form-select',
-			'float-left'   => 'float-start',
-			'float-right'   => 'float-end',
-			'text-left'    => 'text-start',
-			'text-sm-left'    => 'text-sm-start',
-			'text-md-left'    => 'text-md-start',
-			'text-lg-left'    => 'text-lg-start',
-			'text-right'    => 'text-end',
-			'text-sm-right'    => 'text-sm-end',
-			'text-md-right'    => 'text-md-end',
-			'text-lg-right'    => 'text-lg-end',
-			'border-right'    => 'border-end',
-			'border-left'    => 'border-start',
-			'font-weight-'  => 'fw-',
-			'btn-block'     => 'w-100',
-			'rounded-left'  => 'rounded-start',
-			'rounded-right'  => 'rounded-end',
-			'font-italic' => 'fst-italic',
+        $convert = array(
+            'ml-'                   => 'ms-',
+            'mr-'                   => 'me-',
+            'pl-'                   => 'ps-',
+            'pr-'                   => 'pe-',
+            ' form-row'              => ' row',
+            ' embed-responsive-item' => '',
+            ' embed-responsive' => ' ratio',
+            '-1by1'    => '-1x1',
+            '-4by3'    => '-4x3',
+            '-16by9'    => '-16x9',
+            '-21by9'    => '-21x9',
+            'geodir-lightbox-image' => 'aui-lightbox-image',
+            ' badge-'   => ' text-bg-',
+            'form-group'   => 'mb-3',
+            'custom-select'   => 'form-select',
+            'float-left'   => 'float-start',
+            'float-right'   => 'float-end',
+            'text-left'    => 'text-start',
+            'text-sm-left'    => 'text-sm-start',
+            'text-md-left'    => 'text-md-start',
+            'text-lg-left'    => 'text-lg-start',
+            'text-right'    => 'text-end',
+            'text-sm-right'    => 'text-sm-end',
+            'text-md-right'    => 'text-md-end',
+            'text-lg-right'    => 'text-lg-end',
+            'border-right'    => 'border-end',
+            'border-left'    => 'border-start',
+            'font-weight-'  => 'fw-',
+            'btn-block'     => 'w-100',
+            'rounded-left'  => 'rounded-start',
+            'rounded-right'  => 'rounded-end',
+            'font-italic' => 'fst-italic',
 
 //			'custom-control custom-checkbox'    => 'form-check',
-			// data
-			' data-toggle=' => ' data-bs-toggle=',
-			'data-ride=' => 'data-bs-ride=',
-			'data-controlnav=' => 'data-bs-controlnav=',
-			'data-slide='   => 'data-bs-slide=',
-			'data-slide-to=' => 'data-bs-slide-to=',
-			'data-target='  => 'data-bs-target=',
-			'data-dismiss="modal"'  => 'data-bs-dismiss="modal"',
-			'class="close"' => 'class="btn-close"',
-			'<span aria-hidden="true">&times;</span>' => '',
-		);
-		$output  = str_replace(
-			array_keys( $convert ),
-			array_values( $convert ),
-			$output
-		);
-	}
+            // data
+            ' data-toggle=' => ' data-bs-toggle=',
+            'data-ride=' => 'data-bs-ride=',
+            'data-controlnav=' => 'data-bs-controlnav=',
+            'data-slide='   => 'data-bs-slide=',
+            'data-slide-to=' => 'data-bs-slide-to=',
+            'data-target='  => 'data-bs-target=',
+            'data-dismiss="modal"'  => 'data-bs-dismiss="modal"',
+            'class="close"' => 'class="btn-close"',
+            '<span aria-hidden="true">&times;</span>' => '',
+        );
+        $output  = str_replace(
+            array_keys( $convert ),
+            array_values( $convert ),
+            $output
+        );
+    }
 
-	return $output;
+    return $output;
 }
 
 add_filter( 'wp_super_duper_widget_output', 'aui_bs_convert_sd_output', 10, 4 ); //$output, $instance, $args, $this

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-pagination.php

Indentation +108 added lines, -108 removed lines

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

Spacing +32 added lines, -32 removed lines

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

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

Indentation +467 added lines, -467 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,470 +11,470 @@ 
  */
 class AUI_Component_Helper {
 
-	/**
-	 * A component helper for generating a input name.
-	 *
-	 * @param $text
-	 * @param $multiple bool If the name is set to be multiple but no brackets found then we add some.
-	 *
-	 * @return string
-	 */
-	public static function name( $text, $multiple = false ) {
-		$output = '';
-
-		if ( $text ) {
-			$is_multiple = strpos( $text, '[' ) === false && $multiple ? '[]' : '';
-			$output      = ' name="' . esc_attr( $text ) . $is_multiple . '" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item id.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function id( $text ) {
-		$output = '';
-
-		if ( $text ) {
-			$output = ' id="' . sanitize_html_class( $text ) . '" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item title.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function title( $text ) {
-		$output = '';
-
-		if ( $text ) {
-			$output = ' title="' . esc_attr( $text ) . '" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item value.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function value( $text ) {
-		$output = '';
-
-		if ( $text !== null && $text !== false ) {
-			$output = ' value="' . esc_attr( wp_unslash( $text ) ) . '" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item class attribute.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function class_attr( $text ) {
-		$output = '';
-
-		if ( $text ) {
-			$classes = self::esc_classes( $text );
-			if ( ! empty( $classes ) ) {
-				$output = ' class="' . $classes . '" ';
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Escape a string of classes.
-	 *
-	 * @param $text
-	 *
-	 * @return string
-	 */
-	public static function esc_classes( $text ) {
-		$output = '';
-
-		if ( $text ) {
-			$classes = explode( " ", $text );
-			$classes = array_map( "trim", $classes );
-			$classes = array_map( "sanitize_html_class", $classes );
-			if ( ! empty( $classes ) ) {
-				$output = implode( " ", $classes );
-			}
-		}
-
-		return $output;
-
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function data_attributes( $args ) {
-		$output = '';
-
-		if ( ! empty( $args ) ) {
-
-			foreach ( $args as $key => $val ) {
-				if ( substr( $key, 0, 5 ) === "data-" ) {
-					$output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function aria_attributes( $args ) {
-		$output = '';
-
-		if ( ! empty( $args ) ) {
-
-			foreach ( $args as $key => $val ) {
-				if ( substr( $key, 0, 5 ) === "aria-" ) {
-					$output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Build a font awesome icon from a class.
-	 *
-	 * @param $class
-	 * @param bool $space_after
-	 * @param array $extra_attributes An array of extra attributes.
-	 *
-	 * @return string
-	 */
-	public static function icon( $class, $space_after = false, $extra_attributes = array() ) {
-		$output = '';
-
-		if ( $class ) {
-			$classes = self::esc_classes( $class );
-			if ( ! empty( $classes ) ) {
-				$output = '<i class="' . $classes . '" ';
-				// extra attributes
-				if ( ! empty( $extra_attributes ) ) {
-					$output .= AUI_Component_Helper::extra_attributes( $extra_attributes );
-				}
-				$output .= '></i>';
-				if ( $space_after ) {
-					$output .= " ";
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function extra_attributes( $args ) {
-		$output = '';
-
-		if ( ! empty( $args ) ) {
-
-			if ( is_array( $args ) ) {
-				foreach ( $args as $key => $val ) {
-					$output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
-				}
-			} else {
-				$output .= ' ' . $args . ' ';
-			}
-
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function help_text( $text ) {
-		$output = '';
-
-		if ( $text ) {
-			$output .= '<small class="form-text text-muted d-block">' . wp_kses_post( $text ) . '</small>';
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Replace element require context with JS.
-	 *
-	 * @param $input
-	 *
-	 * @return string|void
-	 */
-	public static function element_require( $input ) {
-
-		$input = str_replace( "'", '"', $input );// we only want double quotes
-
-		$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
-			"jQuery(form).find('[data-argument=\"",
-			"\"]').find('input,select,textarea').val()",
-			"\"]').find('input:checked').val()",
-		), $input ) );
-
-		if ( $output ) {
-			$output = ' data-element-require="' . $output . '" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Navigates through an array, object, or scalar, and removes slashes from the values.
-	 *
-	 * @since 0.1.41
-	 *
-	 * @param mixed $value The value to be stripped.
-	 * @param array $input Input Field.
-	 *
-	 * @return mixed Stripped value.
-	 */
-	public static function sanitize_html_field( $value, $input = array() ) {
-		$original = $value;
-
-		if ( is_array( $value ) ) {
-			foreach ( $value as $index => $item ) {
-				$value[ $index ] = self::_sanitize_html_field( $value, $input );
-			}
-		} elseif ( is_object( $value ) ) {
-			$object_vars = get_object_vars( $value );
-
-			foreach ( $object_vars as $property_name => $property_value ) {
-				$value->$property_name = self::_sanitize_html_field( $property_value, $input );
-			}
-		} else {
-			$value = self::_sanitize_html_field( $value, $input );
-		}
-
-		/**
-		 * Filters content and keeps only allowable HTML elements.
-		 *
-		 * @since 0.1.41
-		 *
-		 * @param string|array $value Content to filter through kses.
-		 * @param string|array $value Original content without filter.
-		 * @param array $input Input Field.
-		 */
-		return apply_filters( 'ayecode_ui_sanitize_html_field', $value, $original, $input );
-	}
-
-	/**
-	 * Filters content and keeps only allowable HTML elements.
-	 *
-	 * This function makes sure that only the allowed HTML element names, attribute
-	 * names and attribute values plus only sane HTML entities will occur in
-	 * $string. You have to remove any slashes from PHP's magic quotes before you
-	 * call this function.
-	 *
-	 * The default allowed protocols are 'http', 'https', 'ftp', 'mailto', 'news',
-	 * 'irc', 'gopher', 'nntp', 'feed', 'telnet, 'mms', 'rtsp' and 'svn'. This
-	 * covers all common link protocols, except for 'javascript' which should not
-	 * be allowed for untrusted users.
-	 *
-	 * @since 0.1.41
-	 *
-	 * @param string|array $value Content to filter through kses.
-	 * @param array $input Input Field.
-	 *
-	 * @return string Filtered content with only allowed HTML elements.
-	 */
-	public static function _sanitize_html_field( $value, $input = array() ) {
-		if ( $value === '' ) {
-			return $value;
-		}
-
-		$allowed_html = self::kses_allowed_html( 'post', $input );
-
-		if ( ! is_array( $allowed_html ) ) {
-			$allowed_html = wp_kses_allowed_html( 'post' );
-		}
-
-		$filtered = trim( wp_unslash( $value ) );
-		$filtered = wp_kses( $filtered, $allowed_html );
-		$filtered = balanceTags( $filtered ); // Balances tags
-
-		return $filtered;
-	}
-
-	/**
-	 * Returns an array of allowed HTML tags and attributes for a given context.
-	 *
-	 * @since 0.1.41
-	 *
-	 * @param string|array $context The context for which to retrieve tags. Allowed values are 'post',
-	 *                              'strip', 'data', 'entities', or the name of a field filter such as
-	 *                              'pre_user_description'.
-	 * @param array $input Input.
-	 *
-	 * @return array Array of allowed HTML tags and their allowed attributes.
-	 */
-	public static function kses_allowed_html( $context = 'post', $input = array() ) {
-		$allowed_html = wp_kses_allowed_html( $context );
-
-		if ( is_array( $allowed_html ) ) {
-			// <iframe>
-			if ( ! isset( $allowed_html['iframe'] ) && $context == 'post' ) {
-				$allowed_html['iframe'] = array(
-					'class'           => true,
-					'id'              => true,
-					'src'             => true,
-					'width'           => true,
-					'height'          => true,
-					'frameborder'     => true,
-					'marginwidth'     => true,
-					'marginheight'    => true,
-					'scrolling'       => true,
-					'style'           => true,
-					'title'           => true,
-					'allow'           => true,
-					'allowfullscreen' => true,
-					'data-*'          => true,
-				);
-			}
-		}
-
-		/**
-		 * Filters the allowed html tags.
-		 *
-		 * @since 0.1.41
-		 *
-		 * @param array[]|string $allowed_html Allowed html tags.
-		 * @param @param string|array $context The context for which to retrieve tags.
-		 * @param array $input Input field.
-		 */
-		return apply_filters( 'ayecode_ui_kses_allowed_html', $allowed_html, $context, $input );
-	}
-
-	public static function get_column_class( $label_number = 2, $type = 'label' ) {
-
-		$class = '';
-
-		// set default if empty
-		if( $label_number === '' ){
-			$label_number = 2;
-		}
-
-		if ( $label_number && $label_number < 12 && $label_number > 0 ) {
-			if ( $type == 'label' ) {
-				$class = 'col-sm-' . absint( $label_number );
-			} elseif ( $type == 'input' ) {
-				$class = 'col-sm-' . ( 12 - absint( $label_number ) );
-			}
-		}
-
-		return $class;
-	}
-
-	/**
-	 * Sanitizes a multiline string from user input or from the database.
-	 *
-	 * Emulate the WP native sanitize_textarea_field function in a %%variable%% safe way.
-	 *
-	 * @see   https://core.trac.wordpress.org/browser/trunk/src/wp-includes/formatting.php for the original
-	 *
-	 * @since 0.1.66
-	 *
-	 * @param string $str String to sanitize.
-	 * @return string Sanitized string.
-	 */
-	public static function sanitize_textarea_field( $str ) {
-		$filtered = self::_sanitize_text_fields( $str, true );
-
-		/**
-		 * Filters a sanitized textarea field string.
-		 *
-		 * @see https://core.trac.wordpress.org/browser/trunk/src/wp-includes/formatting.php
-		 *
-		 * @param string $filtered The sanitized string.
-		 * @param string $str      The string prior to being sanitized.
-		 */
-		return apply_filters( 'sanitize_textarea_field', $filtered, $str );
-	}
-
-	/**
-	 * Internal helper function to sanitize a string from user input or from the db.
-	 *
-	 * @since 0.1.66
-	 * @access private
-	 *
-	 * @param string $str           String to sanitize.
-	 * @param bool   $keep_newlines Optional. Whether to keep newlines. Default: false.
-	 * @return string Sanitized string.
-	 */
-	public static function _sanitize_text_fields( $str, $keep_newlines = false ) {
-		if ( is_object( $str ) || is_array( $str ) ) {
-			return '';
-		}
-
-		$str = (string) $str;
-
-		$filtered = wp_check_invalid_utf8( $str );
-
-		if ( strpos( $filtered, '<' ) !== false ) {
-			$filtered = wp_pre_kses_less_than( $filtered );
-			// This will strip extra whitespace for us.
-			$filtered = wp_strip_all_tags( $filtered, false );
-
-			// Use HTML entities in a special case to make sure no later
-			// newline stripping stage could lead to a functional tag.
-			$filtered = str_replace( "<\n", "&lt;\n", $filtered );
-		}
-
-		if ( ! $keep_newlines ) {
-			$filtered = preg_replace( '/[\r\n\t ]+/', ' ', $filtered );
-		}
-		$filtered = trim( $filtered );
-
-		$found = false;
-		while ( preg_match( '`[^%](%[a-f0-9]{2})`i', $filtered, $match ) ) {
-			$filtered = str_replace( $match[1], '', $filtered );
-			$found = true;
-		}
-		unset( $match );
-
-		if ( $found ) {
-			// Strip out the whitespace that may now exist after removing the octets.
-			$filtered = trim( preg_replace( '` +`', ' ', $filtered ) );
-		}
-
-		return $filtered;
-	}
+    /**
+     * A component helper for generating a input name.
+     *
+     * @param $text
+     * @param $multiple bool If the name is set to be multiple but no brackets found then we add some.
+     *
+     * @return string
+     */
+    public static function name( $text, $multiple = false ) {
+        $output = '';
+
+        if ( $text ) {
+            $is_multiple = strpos( $text, '[' ) === false && $multiple ? '[]' : '';
+            $output      = ' name="' . esc_attr( $text ) . $is_multiple . '" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item id.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function id( $text ) {
+        $output = '';
+
+        if ( $text ) {
+            $output = ' id="' . sanitize_html_class( $text ) . '" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item title.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function title( $text ) {
+        $output = '';
+
+        if ( $text ) {
+            $output = ' title="' . esc_attr( $text ) . '" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item value.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function value( $text ) {
+        $output = '';
+
+        if ( $text !== null && $text !== false ) {
+            $output = ' value="' . esc_attr( wp_unslash( $text ) ) . '" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item class attribute.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function class_attr( $text ) {
+        $output = '';
+
+        if ( $text ) {
+            $classes = self::esc_classes( $text );
+            if ( ! empty( $classes ) ) {
+                $output = ' class="' . $classes . '" ';
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Escape a string of classes.
+     *
+     * @param $text
+     *
+     * @return string
+     */
+    public static function esc_classes( $text ) {
+        $output = '';
+
+        if ( $text ) {
+            $classes = explode( " ", $text );
+            $classes = array_map( "trim", $classes );
+            $classes = array_map( "sanitize_html_class", $classes );
+            if ( ! empty( $classes ) ) {
+                $output = implode( " ", $classes );
+            }
+        }
+
+        return $output;
+
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function data_attributes( $args ) {
+        $output = '';
+
+        if ( ! empty( $args ) ) {
+
+            foreach ( $args as $key => $val ) {
+                if ( substr( $key, 0, 5 ) === "data-" ) {
+                    $output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function aria_attributes( $args ) {
+        $output = '';
+
+        if ( ! empty( $args ) ) {
+
+            foreach ( $args as $key => $val ) {
+                if ( substr( $key, 0, 5 ) === "aria-" ) {
+                    $output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build a font awesome icon from a class.
+     *
+     * @param $class
+     * @param bool $space_after
+     * @param array $extra_attributes An array of extra attributes.
+     *
+     * @return string
+     */
+    public static function icon( $class, $space_after = false, $extra_attributes = array() ) {
+        $output = '';
+
+        if ( $class ) {
+            $classes = self::esc_classes( $class );
+            if ( ! empty( $classes ) ) {
+                $output = '<i class="' . $classes . '" ';
+                // extra attributes
+                if ( ! empty( $extra_attributes ) ) {
+                    $output .= AUI_Component_Helper::extra_attributes( $extra_attributes );
+                }
+                $output .= '></i>';
+                if ( $space_after ) {
+                    $output .= " ";
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function extra_attributes( $args ) {
+        $output = '';
+
+        if ( ! empty( $args ) ) {
+
+            if ( is_array( $args ) ) {
+                foreach ( $args as $key => $val ) {
+                    $output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
+                }
+            } else {
+                $output .= ' ' . $args . ' ';
+            }
+
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function help_text( $text ) {
+        $output = '';
+
+        if ( $text ) {
+            $output .= '<small class="form-text text-muted d-block">' . wp_kses_post( $text ) . '</small>';
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Replace element require context with JS.
+     *
+     * @param $input
+     *
+     * @return string|void
+     */
+    public static function element_require( $input ) {
+
+        $input = str_replace( "'", '"', $input );// we only want double quotes
+
+        $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+            "jQuery(form).find('[data-argument=\"",
+            "\"]').find('input,select,textarea').val()",
+            "\"]').find('input:checked').val()",
+        ), $input ) );
+
+        if ( $output ) {
+            $output = ' data-element-require="' . $output . '" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * Navigates through an array, object, or scalar, and removes slashes from the values.
+     *
+     * @since 0.1.41
+     *
+     * @param mixed $value The value to be stripped.
+     * @param array $input Input Field.
+     *
+     * @return mixed Stripped value.
+     */
+    public static function sanitize_html_field( $value, $input = array() ) {
+        $original = $value;
+
+        if ( is_array( $value ) ) {
+            foreach ( $value as $index => $item ) {
+                $value[ $index ] = self::_sanitize_html_field( $value, $input );
+            }
+        } elseif ( is_object( $value ) ) {
+            $object_vars = get_object_vars( $value );
+
+            foreach ( $object_vars as $property_name => $property_value ) {
+                $value->$property_name = self::_sanitize_html_field( $property_value, $input );
+            }
+        } else {
+            $value = self::_sanitize_html_field( $value, $input );
+        }
+
+        /**
+         * Filters content and keeps only allowable HTML elements.
+         *
+         * @since 0.1.41
+         *
+         * @param string|array $value Content to filter through kses.
+         * @param string|array $value Original content without filter.
+         * @param array $input Input Field.
+         */
+        return apply_filters( 'ayecode_ui_sanitize_html_field', $value, $original, $input );
+    }
+
+    /**
+     * Filters content and keeps only allowable HTML elements.
+     *
+     * This function makes sure that only the allowed HTML element names, attribute
+     * names and attribute values plus only sane HTML entities will occur in
+     * $string. You have to remove any slashes from PHP's magic quotes before you
+     * call this function.
+     *
+     * The default allowed protocols are 'http', 'https', 'ftp', 'mailto', 'news',
+     * 'irc', 'gopher', 'nntp', 'feed', 'telnet, 'mms', 'rtsp' and 'svn'. This
+     * covers all common link protocols, except for 'javascript' which should not
+     * be allowed for untrusted users.
+     *
+     * @since 0.1.41
+     *
+     * @param string|array $value Content to filter through kses.
+     * @param array $input Input Field.
+     *
+     * @return string Filtered content with only allowed HTML elements.
+     */
+    public static function _sanitize_html_field( $value, $input = array() ) {
+        if ( $value === '' ) {
+            return $value;
+        }
+
+        $allowed_html = self::kses_allowed_html( 'post', $input );
+
+        if ( ! is_array( $allowed_html ) ) {
+            $allowed_html = wp_kses_allowed_html( 'post' );
+        }
+
+        $filtered = trim( wp_unslash( $value ) );
+        $filtered = wp_kses( $filtered, $allowed_html );
+        $filtered = balanceTags( $filtered ); // Balances tags
+
+        return $filtered;
+    }
+
+    /**
+     * Returns an array of allowed HTML tags and attributes for a given context.
+     *
+     * @since 0.1.41
+     *
+     * @param string|array $context The context for which to retrieve tags. Allowed values are 'post',
+     *                              'strip', 'data', 'entities', or the name of a field filter such as
+     *                              'pre_user_description'.
+     * @param array $input Input.
+     *
+     * @return array Array of allowed HTML tags and their allowed attributes.
+     */
+    public static function kses_allowed_html( $context = 'post', $input = array() ) {
+        $allowed_html = wp_kses_allowed_html( $context );
+
+        if ( is_array( $allowed_html ) ) {
+            // <iframe>
+            if ( ! isset( $allowed_html['iframe'] ) && $context == 'post' ) {
+                $allowed_html['iframe'] = array(
+                    'class'           => true,
+                    'id'              => true,
+                    'src'             => true,
+                    'width'           => true,
+                    'height'          => true,
+                    'frameborder'     => true,
+                    'marginwidth'     => true,
+                    'marginheight'    => true,
+                    'scrolling'       => true,
+                    'style'           => true,
+                    'title'           => true,
+                    'allow'           => true,
+                    'allowfullscreen' => true,
+                    'data-*'          => true,
+                );
+            }
+        }
+
+        /**
+         * Filters the allowed html tags.
+         *
+         * @since 0.1.41
+         *
+         * @param array[]|string $allowed_html Allowed html tags.
+         * @param @param string|array $context The context for which to retrieve tags.
+         * @param array $input Input field.
+         */
+        return apply_filters( 'ayecode_ui_kses_allowed_html', $allowed_html, $context, $input );
+    }
+
+    public static function get_column_class( $label_number = 2, $type = 'label' ) {
+
+        $class = '';
+
+        // set default if empty
+        if( $label_number === '' ){
+            $label_number = 2;
+        }
+
+        if ( $label_number && $label_number < 12 && $label_number > 0 ) {
+            if ( $type == 'label' ) {
+                $class = 'col-sm-' . absint( $label_number );
+            } elseif ( $type == 'input' ) {
+                $class = 'col-sm-' . ( 12 - absint( $label_number ) );
+            }
+        }
+
+        return $class;
+    }
+
+    /**
+     * Sanitizes a multiline string from user input or from the database.
+     *
+     * Emulate the WP native sanitize_textarea_field function in a %%variable%% safe way.
+     *
+     * @see   https://core.trac.wordpress.org/browser/trunk/src/wp-includes/formatting.php for the original
+     *
+     * @since 0.1.66
+     *
+     * @param string $str String to sanitize.
+     * @return string Sanitized string.
+     */
+    public static function sanitize_textarea_field( $str ) {
+        $filtered = self::_sanitize_text_fields( $str, true );
+
+        /**
+         * Filters a sanitized textarea field string.
+         *
+         * @see https://core.trac.wordpress.org/browser/trunk/src/wp-includes/formatting.php
+         *
+         * @param string $filtered The sanitized string.
+         * @param string $str      The string prior to being sanitized.
+         */
+        return apply_filters( 'sanitize_textarea_field', $filtered, $str );
+    }
+
+    /**
+     * Internal helper function to sanitize a string from user input or from the db.
+     *
+     * @since 0.1.66
+     * @access private
+     *
+     * @param string $str           String to sanitize.
+     * @param bool   $keep_newlines Optional. Whether to keep newlines. Default: false.
+     * @return string Sanitized string.
+     */
+    public static function _sanitize_text_fields( $str, $keep_newlines = false ) {
+        if ( is_object( $str ) || is_array( $str ) ) {
+            return '';
+        }
+
+        $str = (string) $str;
+
+        $filtered = wp_check_invalid_utf8( $str );
+
+        if ( strpos( $filtered, '<' ) !== false ) {
+            $filtered = wp_pre_kses_less_than( $filtered );
+            // This will strip extra whitespace for us.
+            $filtered = wp_strip_all_tags( $filtered, false );
+
+            // Use HTML entities in a special case to make sure no later
+            // newline stripping stage could lead to a functional tag.
+            $filtered = str_replace( "<\n", "&lt;\n", $filtered );
+        }
+
+        if ( ! $keep_newlines ) {
+            $filtered = preg_replace( '/[\r\n\t ]+/', ' ', $filtered );
+        }
+        $filtered = trim( $filtered );
+
+        $found = false;
+        while ( preg_match( '`[^%](%[a-f0-9]{2})`i', $filtered, $match ) ) {
+            $filtered = str_replace( $match[1], '', $filtered );
+            $found = true;
+        }
+        unset( $match );
+
+        if ( $found ) {
+            // Strip out the whitespace that may now exist after removing the octets.
+            $filtered = trim( preg_replace( '` +`', ' ', $filtered ) );
+        }
+
+        return $filtered;
+    }
 }
\ No newline at end of file

Spacing +103 added lines, -103 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -19,12 +19,12 @@ 
 	 *
 	 * @return string
 	 */
-	public static function name( $text, $multiple = false ) {
+	public static function name($text, $multiple = false) {
 		$output = '';
 
-		if ( $text ) {
-			$is_multiple = strpos( $text, '[' ) === false && $multiple ? '[]' : '';
-			$output      = ' name="' . esc_attr( $text ) . $is_multiple . '" ';
+		if ($text) {
+			$is_multiple = strpos($text, '[') === false && $multiple ? '[]' : '';
+			$output      = ' name="' . esc_attr($text) . $is_multiple . '" ';
 		}
 
 		return $output;
@@ -37,11 +37,11 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function id( $text ) {
+	public static function id($text) {
 		$output = '';
 
-		if ( $text ) {
-			$output = ' id="' . sanitize_html_class( $text ) . '" ';
+		if ($text) {
+			$output = ' id="' . sanitize_html_class($text) . '" ';
 		}
 
 		return $output;
@@ -54,11 +54,11 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function title( $text ) {
+	public static function title($text) {
 		$output = '';
 
-		if ( $text ) {
-			$output = ' title="' . esc_attr( $text ) . '" ';
+		if ($text) {
+			$output = ' title="' . esc_attr($text) . '" ';
 		}
 
 		return $output;
@@ -71,11 +71,11 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function value( $text ) {
+	public static function value($text) {
 		$output = '';
 
-		if ( $text !== null && $text !== false ) {
-			$output = ' value="' . esc_attr( wp_unslash( $text ) ) . '" ';
+		if ($text !== null && $text !== false) {
+			$output = ' value="' . esc_attr(wp_unslash($text)) . '" ';
 		}
 
 		return $output;
@@ -88,12 +88,12 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function class_attr( $text ) {
+	public static function class_attr($text) {
 		$output = '';
 
-		if ( $text ) {
-			$classes = self::esc_classes( $text );
-			if ( ! empty( $classes ) ) {
+		if ($text) {
+			$classes = self::esc_classes($text);
+			if (!empty($classes)) {
 				$output = ' class="' . $classes . '" ';
 			}
 		}
@@ -108,15 +108,15 @@ 
 	 *
 	 * @return string
 	 */
-	public static function esc_classes( $text ) {
+	public static function esc_classes($text) {
 		$output = '';
 
-		if ( $text ) {
-			$classes = explode( " ", $text );
-			$classes = array_map( "trim", $classes );
-			$classes = array_map( "sanitize_html_class", $classes );
-			if ( ! empty( $classes ) ) {
-				$output = implode( " ", $classes );
+		if ($text) {
+			$classes = explode(" ", $text);
+			$classes = array_map("trim", $classes);
+			$classes = array_map("sanitize_html_class", $classes);
+			if (!empty($classes)) {
+				$output = implode(" ", $classes);
 			}
 		}
 
@@ -129,14 +129,14 @@ 
 	 *
 	 * @return string
 	 */
-	public static function data_attributes( $args ) {
+	public static function data_attributes($args) {
 		$output = '';
 
-		if ( ! empty( $args ) ) {
+		if (!empty($args)) {
 
-			foreach ( $args as $key => $val ) {
-				if ( substr( $key, 0, 5 ) === "data-" ) {
-					$output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
+			foreach ($args as $key => $val) {
+				if (substr($key, 0, 5) === "data-") {
+					$output .= ' ' . sanitize_html_class($key) . '="' . esc_attr($val) . '" ';
 				}
 			}
 		}
@@ -149,14 +149,14 @@ 
 	 *
 	 * @return string
 	 */
-	public static function aria_attributes( $args ) {
+	public static function aria_attributes($args) {
 		$output = '';
 
-		if ( ! empty( $args ) ) {
+		if (!empty($args)) {
 
-			foreach ( $args as $key => $val ) {
-				if ( substr( $key, 0, 5 ) === "aria-" ) {
-					$output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
+			foreach ($args as $key => $val) {
+				if (substr($key, 0, 5) === "aria-") {
+					$output .= ' ' . sanitize_html_class($key) . '="' . esc_attr($val) . '" ';
 				}
 			}
 		}
@@ -173,19 +173,19 @@ 
 	 *
 	 * @return string
 	 */
-	public static function icon( $class, $space_after = false, $extra_attributes = array() ) {
+	public static function icon($class, $space_after = false, $extra_attributes = array()) {
 		$output = '';
 
-		if ( $class ) {
-			$classes = self::esc_classes( $class );
-			if ( ! empty( $classes ) ) {
+		if ($class) {
+			$classes = self::esc_classes($class);
+			if (!empty($classes)) {
 				$output = '<i class="' . $classes . '" ';
 				// extra attributes
-				if ( ! empty( $extra_attributes ) ) {
-					$output .= AUI_Component_Helper::extra_attributes( $extra_attributes );
+				if (!empty($extra_attributes)) {
+					$output .= AUI_Component_Helper::extra_attributes($extra_attributes);
 				}
 				$output .= '></i>';
-				if ( $space_after ) {
+				if ($space_after) {
 					$output .= " ";
 				}
 			}
@@ -199,14 +199,14 @@ 
 	 *
 	 * @return string
 	 */
-	public static function extra_attributes( $args ) {
+	public static function extra_attributes($args) {
 		$output = '';
 
-		if ( ! empty( $args ) ) {
+		if (!empty($args)) {
 
-			if ( is_array( $args ) ) {
-				foreach ( $args as $key => $val ) {
-					$output .= ' ' . sanitize_html_class( $key ) . '="' . esc_attr( $val ) . '" ';
+			if (is_array($args)) {
+				foreach ($args as $key => $val) {
+					$output .= ' ' . sanitize_html_class($key) . '="' . esc_attr($val) . '" ';
 				}
 			} else {
 				$output .= ' ' . $args . ' ';
@@ -222,11 +222,11 @@ 
 	 *
 	 * @return string
 	 */
-	public static function help_text( $text ) {
+	public static function help_text($text) {
 		$output = '';
 
-		if ( $text ) {
-			$output .= '<small class="form-text text-muted d-block">' . wp_kses_post( $text ) . '</small>';
+		if ($text) {
+			$output .= '<small class="form-text text-muted d-block">' . wp_kses_post($text) . '</small>';
 		}
 
 
@@ -240,17 +240,17 @@ 
 	 *
 	 * @return string|void
 	 */
-	public static function element_require( $input ) {
+	public static function element_require($input) {
 
-		$input = str_replace( "'", '"', $input );// we only want double quotes
+		$input = str_replace("'", '"', $input); // we only want double quotes
 
-		$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+		$output = esc_attr(str_replace(array("[%", "%]", "%:checked]"), array(
 			"jQuery(form).find('[data-argument=\"",
 			"\"]').find('input,select,textarea').val()",
 			"\"]').find('input:checked').val()",
-		), $input ) );
+		), $input));
 
-		if ( $output ) {
+		if ($output) {
 			$output = ' data-element-require="' . $output . '" ';
 		}
 
@@ -267,21 +267,21 @@ 
 	 *
 	 * @return mixed Stripped value.
 	 */
-	public static function sanitize_html_field( $value, $input = array() ) {
+	public static function sanitize_html_field($value, $input = array()) {
 		$original = $value;
 
-		if ( is_array( $value ) ) {
-			foreach ( $value as $index => $item ) {
-				$value[ $index ] = self::_sanitize_html_field( $value, $input );
+		if (is_array($value)) {
+			foreach ($value as $index => $item) {
+				$value[$index] = self::_sanitize_html_field($value, $input);
 			}
-		} elseif ( is_object( $value ) ) {
-			$object_vars = get_object_vars( $value );
+		} elseif (is_object($value)) {
+			$object_vars = get_object_vars($value);
 
-			foreach ( $object_vars as $property_name => $property_value ) {
-				$value->$property_name = self::_sanitize_html_field( $property_value, $input );
+			foreach ($object_vars as $property_name => $property_value) {
+				$value->$property_name = self::_sanitize_html_field($property_value, $input);
 			}
 		} else {
-			$value = self::_sanitize_html_field( $value, $input );
+			$value = self::_sanitize_html_field($value, $input);
 		}
 
 		/**
@@ -293,7 +293,7 @@ 
 		 * @param string|array $value Original content without filter.
 		 * @param array $input Input Field.
 		 */
-		return apply_filters( 'ayecode_ui_sanitize_html_field', $value, $original, $input );
+		return apply_filters('ayecode_ui_sanitize_html_field', $value, $original, $input);
 	}
 
 	/**
@@ -316,20 +316,20 @@ 
 	 *
 	 * @return string Filtered content with only allowed HTML elements.
 	 */
-	public static function _sanitize_html_field( $value, $input = array() ) {
-		if ( $value === '' ) {
+	public static function _sanitize_html_field($value, $input = array()) {
+		if ($value === '') {
 			return $value;
 		}
 
-		$allowed_html = self::kses_allowed_html( 'post', $input );
+		$allowed_html = self::kses_allowed_html('post', $input);
 
-		if ( ! is_array( $allowed_html ) ) {
-			$allowed_html = wp_kses_allowed_html( 'post' );
+		if (!is_array($allowed_html)) {
+			$allowed_html = wp_kses_allowed_html('post');
 		}
 
-		$filtered = trim( wp_unslash( $value ) );
-		$filtered = wp_kses( $filtered, $allowed_html );
-		$filtered = balanceTags( $filtered ); // Balances tags
+		$filtered = trim(wp_unslash($value));
+		$filtered = wp_kses($filtered, $allowed_html);
+		$filtered = balanceTags($filtered); // Balances tags
 
 		return $filtered;
 	}
@@ -346,12 +346,12 @@ 
 	 *
 	 * @return array Array of allowed HTML tags and their allowed attributes.
 	 */
-	public static function kses_allowed_html( $context = 'post', $input = array() ) {
-		$allowed_html = wp_kses_allowed_html( $context );
+	public static function kses_allowed_html($context = 'post', $input = array()) {
+		$allowed_html = wp_kses_allowed_html($context);
 
-		if ( is_array( $allowed_html ) ) {
+		if (is_array($allowed_html)) {
 			// <iframe>
-			if ( ! isset( $allowed_html['iframe'] ) && $context == 'post' ) {
+			if (!isset($allowed_html['iframe']) && $context == 'post') {
 				$allowed_html['iframe'] = array(
 					'class'           => true,
 					'id'              => true,
@@ -380,23 +380,23 @@ 
 		 * @param @param string|array $context The context for which to retrieve tags.
 		 * @param array $input Input field.
 		 */
-		return apply_filters( 'ayecode_ui_kses_allowed_html', $allowed_html, $context, $input );
+		return apply_filters('ayecode_ui_kses_allowed_html', $allowed_html, $context, $input);
 	}
 
-	public static function get_column_class( $label_number = 2, $type = 'label' ) {
+	public static function get_column_class($label_number = 2, $type = 'label') {
 
 		$class = '';
 
 		// set default if empty
-		if( $label_number === '' ){
+		if ($label_number === '') {
 			$label_number = 2;
 		}
 
-		if ( $label_number && $label_number < 12 && $label_number > 0 ) {
-			if ( $type == 'label' ) {
-				$class = 'col-sm-' . absint( $label_number );
-			} elseif ( $type == 'input' ) {
-				$class = 'col-sm-' . ( 12 - absint( $label_number ) );
+		if ($label_number && $label_number < 12 && $label_number > 0) {
+			if ($type == 'label') {
+				$class = 'col-sm-' . absint($label_number);
+			} elseif ($type == 'input') {
+				$class = 'col-sm-' . (12 - absint($label_number));
 			}
 		}
 
@@ -415,8 +415,8 @@ 
 	 * @param string $str String to sanitize.
 	 * @return string Sanitized string.
 	 */
-	public static function sanitize_textarea_field( $str ) {
-		$filtered = self::_sanitize_text_fields( $str, true );
+	public static function sanitize_textarea_field($str) {
+		$filtered = self::_sanitize_text_fields($str, true);
 
 		/**
 		 * Filters a sanitized textarea field string.
@@ -426,7 +426,7 @@ 
 		 * @param string $filtered The sanitized string.
 		 * @param string $str      The string prior to being sanitized.
 		 */
-		return apply_filters( 'sanitize_textarea_field', $filtered, $str );
+		return apply_filters('sanitize_textarea_field', $filtered, $str);
 	}
 
 	/**
@@ -439,40 +439,40 @@ 
 	 * @param bool   $keep_newlines Optional. Whether to keep newlines. Default: false.
 	 * @return string Sanitized string.
 	 */
-	public static function _sanitize_text_fields( $str, $keep_newlines = false ) {
-		if ( is_object( $str ) || is_array( $str ) ) {
+	public static function _sanitize_text_fields($str, $keep_newlines = false) {
+		if (is_object($str) || is_array($str)) {
 			return '';
 		}
 
 		$str = (string) $str;
 
-		$filtered = wp_check_invalid_utf8( $str );
+		$filtered = wp_check_invalid_utf8($str);
 
-		if ( strpos( $filtered, '<' ) !== false ) {
-			$filtered = wp_pre_kses_less_than( $filtered );
+		if (strpos($filtered, '<') !== false) {
+			$filtered = wp_pre_kses_less_than($filtered);
 			// This will strip extra whitespace for us.
-			$filtered = wp_strip_all_tags( $filtered, false );
+			$filtered = wp_strip_all_tags($filtered, false);
 
 			// Use HTML entities in a special case to make sure no later
 			// newline stripping stage could lead to a functional tag.
-			$filtered = str_replace( "<\n", "&lt;\n", $filtered );
+			$filtered = str_replace("<\n", "&lt;\n", $filtered);
 		}
 
-		if ( ! $keep_newlines ) {
-			$filtered = preg_replace( '/[\r\n\t ]+/', ' ', $filtered );
+		if (!$keep_newlines) {
+			$filtered = preg_replace('/[\r\n\t ]+/', ' ', $filtered);
 		}
-		$filtered = trim( $filtered );
+		$filtered = trim($filtered);
 
 		$found = false;
-		while ( preg_match( '`[^%](%[a-f0-9]{2})`i', $filtered, $match ) ) {
-			$filtered = str_replace( $match[1], '', $filtered );
+		while (preg_match('`[^%](%[a-f0-9]{2})`i', $filtered, $match)) {
+			$filtered = str_replace($match[1], '', $filtered);
 			$found = true;
 		}
-		unset( $match );
+		unset($match);
 
-		if ( $found ) {
+		if ($found) {
 			// Strip out the whitespace that may now exist after removing the octets.
-			$filtered = trim( preg_replace( '` +`', ' ', $filtered ) );
+			$filtered = trim(preg_replace('` +`', ' ', $filtered));
 		}
 
 		return $filtered;

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 +1261 added lines, -1261 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,1284 +11,1284 @@ 
  */
 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' : ' custom-control-input ';
-			} 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();
-			} elseif ( $type == 'iconpicker' ) {
-				$type = 'text';
-				//$args['class'] .= ' aui-flatpickr bg-initial ';
+    /**
+     * 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' : ' custom-control-input ';
+            } 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();
+            } elseif ( $type == 'iconpicker' ) {
+                $type = 'text';
+                //$args['class'] .= ' aui-flatpickr bg-initial ';
 //				$args['class'] .= ' bg-initial ';
 
-				$args['extra_attributes']['data-aui-init'] = 'iconpicker';
-				$args['extra_attributes']['data-placement'] = 'bottomRight';
+                $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>';
+                $args['input_group_right'] = '<span class="input-group-addon input-group-text c-pointer"></span>';
 //				$args['input_group_right_inside'] = true;
-				// 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( $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" 
+                // 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( $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;
-		//<label for="exampleInputEmail1">Email address</label>
-		$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 ' . $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 . '" ';
-
-			// 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;
+        //<label for="exampleInputEmail1">Email address</label>
+        $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 ' . $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 . '" ';
+
+            // 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( $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;
-		$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;
-		}
-
-		// 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( $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;
+        $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;
+        }
+
+        // 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']
-		);
-
-		$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']
+        );
+
+        $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 +308 added lines, -308 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' : ' custom-control-input ';
-			} 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,7 +137,7 @@ 
 				// enqueue the script
 				$aui_settings = AyeCode_UI_Settings::instance();
 				$aui_settings->enqueue_flatpickr();
-			} elseif ( $type == 'iconpicker' ) {
+			} elseif ($type == 'iconpicker') {
 				$type = 'text';
 				//$args['class'] .= ' aui-flatpickr bg-initial ';
 //				$args['class'] .= ' bg-initial ';
@@ -152,104 +152,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( $args['validation_text'] ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($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 {
 
 					}
 
@@ -257,49 +257,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
@@ -313,70 +313,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;
 		//<label for="exampleInputEmail1">Email address</label>
 		$defaults = array(
@@ -390,35 +390,35 @@ 
 		/**
 		 * 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 ' . $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 ){ $class .= ' form-label'; }
+			if ($aui_bs5) { $class .= ' form-label'; }
 
 			// open
 			$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 . '" ';
 
 			// close
@@ -426,8 +426,8 @@ 
 
 
 			// 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
@@ -447,7 +447,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function wrap( $args = array() ) {
+	public static function wrap($args = array()) {
 		global $aui_bs5;
 		$defaults = array(
 			'type'                     => 'div',
@@ -465,31 +465,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
@@ -497,9 +497,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>';
 			}
@@ -508,16 +508,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 {
@@ -534,7 +534,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function textarea( $args = array() ) {
+	public static function textarea($args = array()) {
 		global $aui_bs5;
 
 		$defaults = array(
@@ -574,7 +574,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 = '';
 
@@ -582,21 +582,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'],
@@ -604,34 +604,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 {
 
@@ -639,65 +639,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( $args['validation_text'] ) . '\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($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']);
 				}
 			}
 
@@ -706,23 +706,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']
-					) );
+					));
 				}
 
 			}
@@ -730,7 +730,7 @@ 
 
 		}
 
-		if ( ! empty( $args['label'] ) && $label_after ) {
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'      => $args['label'],
 				'for'        => $args['id'],
@@ -738,41 +738,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'],
-			) );
+			));
 		}
 
 
@@ -786,7 +786,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function select( $args = array() ) {
+	public static function select($args = array()) {
 		global $aui_bs5;
 		$defaults = array(
 			'class'            => '',
@@ -825,11 +825,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';
 		}
 
@@ -840,90 +840,90 @@ 
 		$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;
 		}
 
 		// 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 ';
 		}
 
@@ -931,50 +931,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>';
 					}
 				}
 			}
@@ -987,8 +987,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'],
@@ -996,49 +996,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;
 		}
 
@@ -1049,21 +1049,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'],
-			) );
+			));
 		}
 
 
@@ -1077,7 +1077,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio( $args = array() ) {
+	public static function radio($args = array()) {
 		global $aui_bs5;
 
 		$defaults = array(
@@ -1109,10 +1109,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';
 		}
 
@@ -1127,48 +1127,48 @@ 
 
 
 		// 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;
@@ -1181,7 +1181,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'               => '',
@@ -1199,7 +1199,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 = '';
 
@@ -1210,43 +1210,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 ';
 		}
 
@@ -1254,38 +1254,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;

vendor/ayecode/wp-ayecode-ui/example-plugin.php

Indentation +212 added lines, -212 removed lines

@@ -16,222 +16,222 @@
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 class AyeCode_UI_Plugin {
 
-	/**
-	 * AUI Plugin constructor.
-	 *
-	 * @since 1.0.0
-	 */
-	public function __construct() {
-
-		// load AUI
-		require_once( dirname( __FILE__ ) . '/ayecode-ui-loader.php' );
-
-		// Maybe show example page
-		add_action( 'template_redirect', array( $this,'maybe_show_examples' ) );
-	}
-
-	public function maybe_show_examples(){
-		if ( current_user_can( 'manage_options' ) && isset( $_REQUEST['preview-aui'] ) ) {
-			echo "<head>";
-			wp_head();
-			echo "</head>";
-			echo "<body class='bsui'>";
-			echo $this->get_examples();
-			wp_footer();
-			echo "</body>";
-			exit;
-		}
-	}
-
-	public function get_examples(){
-		$output = '';
-
-		// open form
-		$output .= "<form class='p-5 m-5 border rounded bg-white'>";
-
-		$output .= aui()->input(
-			array(
-				'type'             => 'datepicker',
-				'id'               => 'date_example_sm',
-				'size'             => 'sm',
-				'name'             => 'date_example_sm',
-				'label'            => 'Date Input Label (small)',
-				'help_text'        => 'help text',
-				'label_type'       => 'top',
-				'placeholder'      => 'YYYY-MM-DD 00:00',
-				'value'            => '',
-				'extra_attributes' => array(
-					'data-enable-time' => 'true',
-					'data-time_24hr'   => 'true',
-					'data-allow-input' => 'true',
-				),
-			)
-		);
-
-		$output .= aui()->input(
-			array(
-				'type'             => 'datepicker',
-				'id'               => 'date_example',
-				//'size'             => 'smx',
-				'name'             => 'date_example',
-				'label'            => 'Date Input Label',
-				'help_text'        => 'help text',
-				'label_type'       => 'top',
-				'placeholder'      => 'YYYY-MM-DD 00:00',
-				'value'            => '',
-				'extra_attributes' => array(
-					'data-enable-time' => 'true',
-					'data-time_24hr'   => 'true',
-					'data-allow-input' => 'true',
-				),
-			)
-		);
-
-		$output .= aui()->input(
-			array(
-				'type'             => 'datepicker',
-				'id'               => 'date_example_lg',
-				'size'             => 'lg',
-				'name'             => 'date_example_lg',
-				'label'            => 'Date Input Label (large)',
-				'help_text'        => 'help text',
-				'label_type'       => 'top',
-				'placeholder'      => 'YYYY-MM-DD 00:00',
-				'value'            => '',
-				'extra_attributes' => array(
-					'data-enable-time' => 'true',
-					'data-time_24hr'   => 'true',
-					//'data-allow-input' => 'true',
-				),
-			)
-		);
-
-		// input example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'text',
-				'id'    =>  'text-example',
-				'size'             => 'sm',
-				//'clear_icon'    => true,
-				'name'    =>  'text-example',
-				'placeholder'   => 'text placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label',
-				'label_type' => 'top'
-			)
-		);
-
-		$output .= aui()->input(
-			array(
-				'type'  =>  'search',
-				'id'    =>  'text-example',
-				'size'             => 'sm',
-				//'clear_icon'    => true,
-				'name'    =>  'text-example',
-				'placeholder'   => 'text placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label',
-				'label_type' => 'top'
-			)
-		);
-
-		// input example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'url',
-				'id'    =>  'text-example2',
-				'name'    =>  'text-example',
-				'placeholder'   => 'url placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			)
-		);
-
-		// checkbox example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example',
-				'name'    =>  'checkbox-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox checked'
-			)
-		);
-
-		// checkbox example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'checkbox',
-				'id'    =>  'checkbox-example2',
-				'name'    =>  'checkbox-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Checkbox example',
-				'value' =>  '1',
-				'checked'   => false,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Checkbox un-checked'
-			)
-		);
-
-		// switch example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example',
-				'name'    =>  'switch-example',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => true,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch on'
-			)
-		);
-
-		// switch example
-		$output .= aui()->input(
-			array(
-				'type'  =>  'checkbox',
-				'id'    =>  'switch-example2',
-				'name'    =>  'switch-example2',
-				'placeholder'   => 'checkbox-example',
-				'title'   => 'Switch example',
-				'value' =>  '1',
-				'checked'   => false,
-				'switch'    => true,
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Switch off'
-			)
-		);
-
-		// close form
-		$output .= "</form>";
-
-		return $output;
-	}
+    /**
+     * AUI Plugin constructor.
+     *
+     * @since 1.0.0
+     */
+    public function __construct() {
+
+        // load AUI
+        require_once( dirname( __FILE__ ) . '/ayecode-ui-loader.php' );
+
+        // Maybe show example page
+        add_action( 'template_redirect', array( $this,'maybe_show_examples' ) );
+    }
+
+    public function maybe_show_examples(){
+        if ( current_user_can( 'manage_options' ) && isset( $_REQUEST['preview-aui'] ) ) {
+            echo "<head>";
+            wp_head();
+            echo "</head>";
+            echo "<body class='bsui'>";
+            echo $this->get_examples();
+            wp_footer();
+            echo "</body>";
+            exit;
+        }
+    }
+
+    public function get_examples(){
+        $output = '';
+
+        // open form
+        $output .= "<form class='p-5 m-5 border rounded bg-white'>";
+
+        $output .= aui()->input(
+            array(
+                'type'             => 'datepicker',
+                'id'               => 'date_example_sm',
+                'size'             => 'sm',
+                'name'             => 'date_example_sm',
+                'label'            => 'Date Input Label (small)',
+                'help_text'        => 'help text',
+                'label_type'       => 'top',
+                'placeholder'      => 'YYYY-MM-DD 00:00',
+                'value'            => '',
+                'extra_attributes' => array(
+                    'data-enable-time' => 'true',
+                    'data-time_24hr'   => 'true',
+                    'data-allow-input' => 'true',
+                ),
+            )
+        );
+
+        $output .= aui()->input(
+            array(
+                'type'             => 'datepicker',
+                'id'               => 'date_example',
+                //'size'             => 'smx',
+                'name'             => 'date_example',
+                'label'            => 'Date Input Label',
+                'help_text'        => 'help text',
+                'label_type'       => 'top',
+                'placeholder'      => 'YYYY-MM-DD 00:00',
+                'value'            => '',
+                'extra_attributes' => array(
+                    'data-enable-time' => 'true',
+                    'data-time_24hr'   => 'true',
+                    'data-allow-input' => 'true',
+                ),
+            )
+        );
+
+        $output .= aui()->input(
+            array(
+                'type'             => 'datepicker',
+                'id'               => 'date_example_lg',
+                'size'             => 'lg',
+                'name'             => 'date_example_lg',
+                'label'            => 'Date Input Label (large)',
+                'help_text'        => 'help text',
+                'label_type'       => 'top',
+                'placeholder'      => 'YYYY-MM-DD 00:00',
+                'value'            => '',
+                'extra_attributes' => array(
+                    'data-enable-time' => 'true',
+                    'data-time_24hr'   => 'true',
+                    //'data-allow-input' => 'true',
+                ),
+            )
+        );
+
+        // input example
+        $output .= aui()->input(
+            array(
+                'type'  =>  'text',
+                'id'    =>  'text-example',
+                'size'             => 'sm',
+                //'clear_icon'    => true,
+                'name'    =>  'text-example',
+                'placeholder'   => 'text placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label',
+                'label_type' => 'top'
+            )
+        );
+
+        $output .= aui()->input(
+            array(
+                'type'  =>  'search',
+                'id'    =>  'text-example',
+                'size'             => 'sm',
+                //'clear_icon'    => true,
+                'name'    =>  'text-example',
+                'placeholder'   => 'text placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label',
+                'label_type' => 'top'
+            )
+        );
+
+        // input example
+        $output .= aui()->input(
+            array(
+                'type'  =>  'url',
+                'id'    =>  'text-example2',
+                'name'    =>  'text-example',
+                'placeholder'   => 'url placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label'
+            )
+        );
+
+        // checkbox example
+        $output .= aui()->input(
+            array(
+                'type'  =>  'checkbox',
+                'id'    =>  'checkbox-example',
+                'name'    =>  'checkbox-example',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Checkbox example',
+                'value' =>  '1',
+                'checked'   => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Checkbox checked'
+            )
+        );
+
+        // checkbox example
+        $output .= aui()->input(
+            array(
+                'type'  =>  'checkbox',
+                'id'    =>  'checkbox-example2',
+                'name'    =>  'checkbox-example2',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Checkbox example',
+                'value' =>  '1',
+                'checked'   => false,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Checkbox un-checked'
+            )
+        );
+
+        // switch example
+        $output .= aui()->input(
+            array(
+                'type'  =>  'checkbox',
+                'id'    =>  'switch-example',
+                'name'    =>  'switch-example',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Switch example',
+                'value' =>  '1',
+                'checked'   => true,
+                'switch'    => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Switch on'
+            )
+        );
+
+        // switch example
+        $output .= aui()->input(
+            array(
+                'type'  =>  'checkbox',
+                'id'    =>  'switch-example2',
+                'name'    =>  'switch-example2',
+                'placeholder'   => 'checkbox-example',
+                'title'   => 'Switch example',
+                'value' =>  '1',
+                'checked'   => false,
+                'switch'    => true,
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Switch off'
+            )
+        );
+
+        // close form
+        $output .= "</form>";
+
+        return $output;
+    }
 }
 
 new AyeCode_UI_Plugin();
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
 */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
@@ -29,14 +29,14 @@ 
 	public function __construct() {
 
 		// load AUI
-		require_once( dirname( __FILE__ ) . '/ayecode-ui-loader.php' );
+		require_once(dirname(__FILE__) . '/ayecode-ui-loader.php');
 
 		// Maybe show example page
-		add_action( 'template_redirect', array( $this,'maybe_show_examples' ) );
+		add_action('template_redirect', array($this, 'maybe_show_examples'));
 	}
 
-	public function maybe_show_examples(){
-		if ( current_user_can( 'manage_options' ) && isset( $_REQUEST['preview-aui'] ) ) {
+	public function maybe_show_examples() {
+		if (current_user_can('manage_options') && isset($_REQUEST['preview-aui'])) {
 			echo "<head>";
 			wp_head();
 			echo "</head>";
@@ -48,7 +48,7 @@ 
 		}
 	}
 
-	public function get_examples(){
+	public function get_examples() {
 		$output = '';
 
 		// open form

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

Indentation +2 added lines, -2 removed lines

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

Spacing +2 added lines, -2 removed lines

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

includes/admin/class-getpaid-post-types-admin.php

Spacing +245 added lines, -245 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Post types Admin Class
@@ -21,74 +21,74 @@ 
 		GetPaid_Metaboxes::init();
 
 		// Filter the post updated messages.
-		add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
+		add_filter('post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages');
 
 		// Filter post actions.
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
+		add_filter('post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2);
+		add_filter('post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2);
 
 		// Invoice table columns.
-		add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
-		add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
-		add_filter( 'bulk_actions-edit-wpi_invoice', array( __CLASS__, 'invoice_bulk_actions' ) );
-		add_filter( 'handle_bulk_actions-edit-wpi_invoice', array( __CLASS__, 'handle_invoice_bulk_actions' ), 10, 3 );
+		add_filter('manage_wpi_invoice_posts_columns', array(__CLASS__, 'invoice_columns'), 100);
+		add_action('manage_wpi_invoice_posts_custom_column', array(__CLASS__, 'display_invoice_columns'), 10, 2);
+		add_filter('bulk_actions-edit-wpi_invoice', array(__CLASS__, 'invoice_bulk_actions'));
+		add_filter('handle_bulk_actions-edit-wpi_invoice', array(__CLASS__, 'handle_invoice_bulk_actions'), 10, 3);
 
 		// Items table columns.
-		add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
-		add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
-		add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
-		add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
-		add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
+		add_filter('manage_wpi_item_posts_columns', array(__CLASS__, 'item_columns'), 100);
+		add_filter('manage_edit-wpi_item_sortable_columns', array(__CLASS__, 'sortable_item_columns'), 20);
+		add_action('manage_wpi_item_posts_custom_column', array(__CLASS__, 'display_item_columns'), 10, 2);
+		add_action('restrict_manage_posts', array(__CLASS__, 'add_item_filters'), 100);
+		add_action('parse_query', array(__CLASS__, 'filter_item_query'), 100);
+		add_action('request', array(__CLASS__, 'reorder_items'), 100);
 
 		// Payment forms columns.
-		add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
-		add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
+		add_filter('manage_wpi_payment_form_posts_columns', array(__CLASS__, 'payment_form_columns'), 100);
+		add_action('manage_wpi_payment_form_posts_custom_column', array(__CLASS__, 'display_payment_form_columns'), 10, 2);
+		add_filter('display_post_states', array(__CLASS__, 'filter_payment_form_state'), 10, 2);
 
 		// Discount table columns.
-		add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
-		add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
+		add_filter('manage_wpi_discount_posts_columns', array(__CLASS__, 'discount_columns'), 100);
+		add_filter('bulk_actions-edit-wpi_discount', '__return_empty_array', 100);
 
 		// Deleting posts.
-		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
+		add_action('delete_post', array(__CLASS__, 'delete_post'));
+		add_filter('display_post_states', array(__CLASS__, 'filter_discount_state'), 10, 2);
 
-		add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
+		add_filter('display_post_states', array(__CLASS__, 'add_display_post_states'), 10, 2);
 	}
 
 	/**
 	 * Post updated messages.
 	 */
-	public static function post_updated_messages( $messages ) {
+	public static function post_updated_messages($messages) {
 		global $post;
 
 		$messages['wpi_discount'] = array(
 			0  => '',
-			1  => __( 'Discount updated.', 'invoicing' ),
-			2  => __( 'Custom field updated.', 'invoicing' ),
-			3  => __( 'Custom field deleted.', 'invoicing' ),
-			4  => __( 'Discount updated.', 'invoicing' ),
-			5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => __( 'Discount updated.', 'invoicing' ),
-			7  => __( 'Discount saved.', 'invoicing' ),
-			8  => __( 'Discount submitted.', 'invoicing' ),
-			9  => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10 => __( 'Discount draft updated.', 'invoicing' ),
+			1  => __('Discount updated.', 'invoicing'),
+			2  => __('Custom field updated.', 'invoicing'),
+			3  => __('Custom field deleted.', 'invoicing'),
+			4  => __('Discount updated.', 'invoicing'),
+			5  => isset($_GET['revision']) ? wp_sprintf(__('Discount restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6  => __('Discount updated.', 'invoicing'),
+			7  => __('Discount saved.', 'invoicing'),
+			8  => __('Discount submitted.', 'invoicing'),
+			9  => wp_sprintf(__('Discount scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+			10 => __('Discount draft updated.', 'invoicing'),
 		);
 
 		$messages['wpi_payment_form'] = array(
 			0  => '',
-			1  => __( 'Payment Form updated.', 'invoicing' ),
-			2  => __( 'Custom field updated.', 'invoicing' ),
-			3  => __( 'Custom field deleted.', 'invoicing' ),
-			4  => __( 'Payment Form updated.', 'invoicing' ),
-			5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => __( 'Payment Form updated.', 'invoicing' ),
-			7  => __( 'Payment Form saved.', 'invoicing' ),
-			8  => __( 'Payment Form submitted.', 'invoicing' ),
-			9  => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10 => __( 'Payment Form draft updated.', 'invoicing' ),
+			1  => __('Payment Form updated.', 'invoicing'),
+			2  => __('Custom field updated.', 'invoicing'),
+			3  => __('Custom field deleted.', 'invoicing'),
+			4  => __('Payment Form updated.', 'invoicing'),
+			5  => isset($_GET['revision']) ? wp_sprintf(__('Payment Form restored to revision from %s', 'invoicing'), wp_post_revision_title((int) $_GET['revision'], false)) : false,
+			6  => __('Payment Form updated.', 'invoicing'),
+			7  => __('Payment Form saved.', 'invoicing'),
+			8  => __('Payment Form submitted.', 'invoicing'),
+			9  => wp_sprintf(__('Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing'), date_i18n(__('M j, Y @ G:i', 'invoicing'), strtotime($post->post_date))),
+			10 => __('Payment Form draft updated.', 'invoicing'),
 		);
 
 		return $messages;
@@ -98,16 +98,16 @@ 
 	/**
 	 * Post row actions.
 	 */
-	public static function post_row_actions( $actions, $post ) {
+	public static function post_row_actions($actions, $post) {
 
-		$post = get_post( $post );
+		$post = get_post($post);
 
 		// We do not want to edit the default payment form.
-		if ( 'wpi_payment_form' == $post->post_type ) {
+		if ('wpi_payment_form' == $post->post_type) {
 
-			if ( wpinv_get_default_payment_form() === $post->ID ) {
-				unset( $actions['trash'] );
-				unset( $actions['inline hide-if-no-js'] );
+			if (wpinv_get_default_payment_form() === $post->ID) {
+				unset($actions['trash']);
+				unset($actions['inline hide-if-no-js']);
 			}
 
 			$actions['duplicate'] = sprintf(
@@ -124,7 +124,7 @@ 
 						'getpaid-nonce'
 					)
 				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
+				esc_html(__('Duplicate', 'invoicing'))
 			);
 
 			$actions['reset'] = sprintf(
@@ -141,19 +141,19 @@ 
 						'getpaid-nonce'
 					)
 				),
-				esc_html( __( 'Reset Stats', 'invoicing' ) )
+				esc_html(__('Reset Stats', 'invoicing'))
 			);
 		}
 
 		// Link to item payment form.
-		if ( 'wpi_item' == $post->post_type ) {
+		if ('wpi_item' == $post->post_type) {
 
-			if ( in_array( get_post_meta( $post->ID, '_wpinv_type', true ), array( '', 'fee', 'custom' ), true ) ) {
+			if (in_array(get_post_meta($post->ID, '_wpinv_type', true), array('', 'fee', 'custom'), true)) {
 
 				$actions['buy'] = sprintf(
 					'<a href="%1$s">%2$s</a>',
-					esc_url( getpaid_embed_url( false, $post->ID . '|0' ) ),
-					esc_html( __( 'Buy', 'invoicing' ) )
+					esc_url(getpaid_embed_url(false, $post->ID . '|0')),
+					esc_html(__('Buy', 'invoicing'))
 				);
 
 			}
@@ -170,28 +170,28 @@ 
 	 * @param WP_Post $post
      * @return array $actions actions without edit option
      */
-    public static function filter_invoice_row_actions( $actions, $post ) {
+    public static function filter_invoice_row_actions($actions, $post) {
 
-        if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
+        if (getpaid_is_invoice_post_type($post->post_type)) {
 
 			$actions = array();
-			$invoice = new WPInv_Invoice( $post );
+			$invoice = new WPInv_Invoice($post);
 
 			$actions['edit'] = sprintf(
 				'<a href="%1$s">%2$s</a>',
-				esc_url( get_edit_post_link( $invoice->get_id() ) ),
-				esc_html( __( 'Edit', 'invoicing' ) )
+				esc_url(get_edit_post_link($invoice->get_id())),
+				esc_html(__('Edit', 'invoicing'))
 			);
 
-			if ( ! $invoice->is_draft() ) {
+			if (!$invoice->is_draft()) {
 
 				$actions['view'] = sprintf(
 					'<a href="%1$s">%2$s</a>',
-					esc_url( $invoice->get_view_url() ),
+					esc_url($invoice->get_view_url()),
 					sprintf(
 						// translators: %s is the invoice type
-						esc_html__( 'View %s', 'invoicing' ),
-						getpaid_get_post_type_label( $invoice->get_post_type(), false )
+						esc_html__('View %s', 'invoicing'),
+						getpaid_get_post_type_label($invoice->get_post_type(), false)
 					)
 				);
 
@@ -209,7 +209,7 @@ 
 							'getpaid-nonce'
 						)
 					),
-					esc_html( __( 'Send to Customer', 'invoicing' ) )
+					esc_html(__('Send to Customer', 'invoicing'))
 				);
 
 			}
@@ -228,7 +228,7 @@ 
 						'getpaid-nonce'
 					)
 				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
+				esc_html(__('Duplicate', 'invoicing'))
 			);
 
         }
@@ -239,42 +239,42 @@ 
 	/**
 	 * Returns an array of invoice table columns.
 	 */
-	public static function invoice_columns( $columns ) {
+	public static function invoice_columns($columns) {
 
 		$columns = array(
 			'cb'           => $columns['cb'],
-			'number'       => __( 'Invoice', 'invoicing' ),
-			'customer'     => __( 'Customer', 'invoicing' ),
-			'invoice_date' => __( 'Created', 'invoicing' ),
-			'payment_date' => __( 'Completed', 'invoicing' ),
-			'amount'       => __( 'Amount', 'invoicing' ),
-			'recurring'    => __( 'Recurring', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
+			'number'       => __('Invoice', 'invoicing'),
+			'customer'     => __('Customer', 'invoicing'),
+			'invoice_date' => __('Created', 'invoicing'),
+			'payment_date' => __('Completed', 'invoicing'),
+			'amount'       => __('Amount', 'invoicing'),
+			'recurring'    => __('Recurring', 'invoicing'),
+			'status'       => __('Status', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_invoice_table_columns', $columns );
+		return apply_filters('wpi_invoice_table_columns', $columns);
 	}
 
 	/**
 	 * Displays invoice table columns.
 	 */
-	public static function display_invoice_columns( $column_name, $post_id ) {
+	public static function display_invoice_columns($column_name, $post_id) {
 
-		$invoice = new WPInv_Invoice( $post_id );
+		$invoice = new WPInv_Invoice($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'invoice_date':
-				$date_time = esc_attr( $invoice->get_created_date() );
-				$date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
-				echo wp_kses_post( "<span title='$date_time'>$date</span>" );
+				$date_time = esc_attr($invoice->get_created_date());
+				$date      = esc_html(getpaid_format_date_value($date_time, '&mdash;', true));
+				echo wp_kses_post("<span title='$date_time'>$date</span>");
 				break;
 
 			case 'payment_date':
-				if ( $invoice->is_paid() ) {
-					$date_time = esc_attr( $invoice->get_completed_date() );
-					$date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
-					echo wp_kses_post( "<span title='$date_time'>$date</span>" );
+				if ($invoice->is_paid()) {
+					$date_time = esc_attr($invoice->get_completed_date());
+					$date      = esc_html(getpaid_format_date_value($date_time, '&mdash;', true));
+					echo wp_kses_post("<span title='$date_time'>$date</span>");
 				} else {
 					echo '&mdash;';
 				}
@@ -283,61 +283,61 @@ 
 
 			case 'amount':
 				$amount = $invoice->get_total();
-				$formated_amount = wp_kses_post( wpinv_price( $amount, $invoice->get_currency() ) );
+				$formated_amount = wp_kses_post(wpinv_price($amount, $invoice->get_currency()));
 
-				if ( $invoice->is_refunded() ) {
-					$refunded_amount = wpinv_price( 0, $invoice->get_currency() );
-					echo wp_kses_post( "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>" );
+				if ($invoice->is_refunded()) {
+					$refunded_amount = wpinv_price(0, $invoice->get_currency());
+					echo wp_kses_post("<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>");
 				} else {
 
 					$discount = $invoice->get_total_discount();
 
-					if ( ! empty( $discount ) ) {
-						$new_amount = wpinv_price( $amount + $discount, $invoice->get_currency() );
-						echo wp_kses_post( "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>" );
+					if (!empty($discount)) {
+						$new_amount = wpinv_price($amount + $discount, $invoice->get_currency());
+						echo wp_kses_post("<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>");
 					} else {
-						echo wp_kses_post( $formated_amount );
+						echo wp_kses_post($formated_amount);
 					}
 				}
 
 				break;
 
 			case 'status':
-				$status       = esc_html( $invoice->get_status() );
-				$status_label = esc_html( $invoice->get_status_nicename() );
+				$status       = esc_html($invoice->get_status());
+				$status_label = esc_html($invoice->get_status_nicename());
 
 				// If it is paid, show the gateway title.
-				if ( $invoice->is_paid() ) {
-					$gateway = esc_html( $invoice->get_gateway_title() );
-					$gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), esc_html( $gateway ) );
+				if ($invoice->is_paid()) {
+					$gateway = esc_html($invoice->get_gateway_title());
+					$gateway = wp_sprintf(esc_attr__('Paid via %s', 'invoicing'), esc_html($gateway));
 
-					echo wp_kses_post( "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>" );
+					echo wp_kses_post("<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>");
 				} else {
-					echo wp_kses_post( "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>" );
+					echo wp_kses_post("<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>");
 				}
 
 				// If it is not paid, display the overdue and view status.
-				if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+				if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
 					// Invoice view status.
-					if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="' . esc_attr__( 'Viewed by Customer', 'invoicing' ) . '"></i>';
+					if (wpinv_is_invoice_viewed($invoice->get_id())) {
+						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="' . esc_attr__('Viewed by Customer', 'invoicing') . '"></i>';
 					} else {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="' . esc_attr__( 'Not Viewed by Customer', 'invoicing' ) . '"></i>';
+						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="' . esc_attr__('Not Viewed by Customer', 'invoicing') . '"></i>';
 					}
 
 					// Display the overview status.
-					if ( wpinv_get_option( 'overdue_active' ) ) {
+					if (wpinv_get_option('overdue_active')) {
 						$due_date = $invoice->get_due_date();
-						$fomatted = getpaid_format_date( $due_date );
+						$fomatted = getpaid_format_date($due_date);
 
-						if ( ! empty( $fomatted ) ) {
+						if (!empty($fomatted)) {
 							$date = wp_sprintf(
 								// translators: %s is the due date.
-								__( 'Due %s', 'invoicing' ),
+								__('Due %s', 'invoicing'),
 								$fomatted
 							);
-							echo wp_kses_post( "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>" );
+							echo wp_kses_post("<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>");
 						}
 					}
 				}
@@ -345,7 +345,7 @@ 
 				break;
 
 			case 'recurring':
-				if ( $invoice->is_recurring() ) {
+				if ($invoice->is_recurring()) {
 					echo '<i class="fa fa-check" style="color:#43850a;"></i>';
 				} else {
 					echo '<i class="fa fa-times" style="color:#616161;"></i>';
@@ -353,26 +353,26 @@ 
 				break;
 
 			case 'number':
-				$edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
-				$invoice_number  = esc_html( $invoice->get_number() );
-				$invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+				$edit_link       = esc_url(get_edit_post_link($invoice->get_id()));
+				$invoice_number  = esc_html($invoice->get_number());
+				$invoice_details = esc_attr__('View Invoice Details', 'invoicing');
 
-				echo wp_kses_post( "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>" );
+				echo wp_kses_post("<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>");
 
-				do_action( 'getpaid_admin_table_invoice_number_column', $invoice );
+				do_action('getpaid_admin_table_invoice_number_column', $invoice);
 				break;
 
 			case 'customer':
 				$customer_name = $invoice->get_user_full_name();
 
-				if ( empty( $customer_name ) ) {
+				if (empty($customer_name)) {
 					$customer_name = $invoice->get_email();
 				}
 
-				if ( ! empty( $customer_name ) ) {
-					$customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
-					$view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
-					echo wp_kses_post( "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>" );
+				if (!empty($customer_name)) {
+					$customer_details = esc_attr__('View Customer Details', 'invoicing');
+					$view_link        = esc_url(add_query_arg('user_id', $invoice->get_user_id(), admin_url('user-edit.php')));
+					echo wp_kses_post("<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>");
 				} else {
 					echo '<div>&mdash;</div>';
 				}
@@ -386,19 +386,19 @@ 
 	/**
 	 * Displays invoice bulk actions.
 	 */
-	public static function invoice_bulk_actions( $actions ) {
-		$actions['resend-invoice'] = __( 'Send to Customer', 'invoicing' );
+	public static function invoice_bulk_actions($actions) {
+		$actions['resend-invoice'] = __('Send to Customer', 'invoicing');
 		return $actions;
 	}
 
 	/**
 	 * Processes invoice bulk actions.
 	 */
-	public static function handle_invoice_bulk_actions( $redirect_url, $action, $post_ids ) {
+	public static function handle_invoice_bulk_actions($redirect_url, $action, $post_ids) {
 
-		if ( 'resend-invoice' === $action ) {
-			foreach ( $post_ids as $post_id ) {
-				getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $post_id ), true );
+		if ('resend-invoice' === $action) {
+			foreach ($post_ids as $post_id) {
+				getpaid()->get('invoice_emails')->user_invoice(new WPInv_Invoice($post_id), true);
 			}
 		}
 
@@ -409,49 +409,49 @@ 
 	/**
 	 * Returns an array of payment forms table columns.
 	 */
-	public static function payment_form_columns( $columns ) {
+	public static function payment_form_columns($columns) {
 
 		$columns = array(
 			'cb'        => $columns['cb'],
-			'title'     => __( 'Name', 'invoicing' ),
-			'shortcode' => __( 'Shortcode', 'invoicing' ),
-			'earnings'  => __( 'Revenue', 'invoicing' ),
-			'refunds'   => __( 'Refunded', 'invoicing' ),
-			'items'     => __( 'Items', 'invoicing' ),
-			'date'      => __( 'Date', 'invoicing' ),
+			'title'     => __('Name', 'invoicing'),
+			'shortcode' => __('Shortcode', 'invoicing'),
+			'earnings'  => __('Revenue', 'invoicing'),
+			'refunds'   => __('Refunded', 'invoicing'),
+			'items'     => __('Items', 'invoicing'),
+			'date'      => __('Date', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_payment_form_table_columns', $columns );
+		return apply_filters('wpi_payment_form_table_columns', $columns);
 
 	}
 
 	/**
 	 * Displays payment form table columns.
 	 */
-	public static function display_payment_form_columns( $column_name, $post_id ) {
+	public static function display_payment_form_columns($column_name, $post_id) {
 
 		// Retrieve the payment form.
-		$form = new GetPaid_Payment_Form( $post_id );
+		$form = new GetPaid_Payment_Form($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'earnings':
-				echo wp_kses_post( wpinv_price( $form->get_earned() ) );
+				echo wp_kses_post(wpinv_price($form->get_earned()));
 				break;
 
 			case 'refunds':
-				echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
+				echo wp_kses_post(wpinv_price($form->get_refunded()));
 				break;
 
 			case 'refunds':
-				echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
+				echo wp_kses_post(wpinv_price($form->get_refunded()));
 				break;
 
 			case 'shortcode':
-				if ( $form->is_default() ) {
+				if ($form->is_default()) {
 					echo '&mdash;';
 				} else {
-					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
+					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr($form->get_id()) . ']" style="width: 100%;" readonly/>';
 				}
 
 				break;
@@ -459,28 +459,28 @@ 
 			case 'items':
 				$items = $form->get_items();
 
-				if ( $form->is_default() || empty( $items ) ) {
+				if ($form->is_default() || empty($items)) {
 					echo '&mdash;';
 					return;
 				}
 
 				$_items = array();
 
-				foreach ( $items as $item ) {
+				foreach ($items as $item) {
 					$url = $item->get_edit_url();
 
-					if ( empty( $url ) ) {
-						$_items[] = esc_html( $item->get_name() );
+					if (empty($url)) {
+						$_items[] = esc_html($item->get_name());
 					} else {
 						$_items[] = sprintf(
 							'<a href="%s">%s</a>',
-							esc_url( $url ),
-							esc_html( $item->get_name() )
+							esc_url($url),
+							esc_html($item->get_name())
 						);
 					}
 }
 
-				echo wp_kses_post( implode( '<br>', $_items ) );
+				echo wp_kses_post(implode('<br>', $_items));
 
 				break;
 
@@ -491,10 +491,10 @@ 
 	/**
 	 * Filters post states.
 	 */
-	public static function filter_payment_form_state( $post_states, $post ) {
+	public static function filter_payment_form_state($post_states, $post) {
 
-		if ( 'wpi_payment_form' === $post->post_type && wpinv_get_default_payment_form() === $post->ID ) {
-			$post_states['default_form'] = __( 'Default Payment Form', 'invoicing' );
+		if ('wpi_payment_form' === $post->post_type && wpinv_get_default_payment_form() === $post->ID) {
+			$post_states['default_form'] = __('Default Payment Form', 'invoicing');
 		}
 
 		return $post_states;
@@ -504,35 +504,35 @@ 
 	/**
 	 * Returns an array of coupon table columns.
 	 */
-	public static function discount_columns( $columns ) {
+	public static function discount_columns($columns) {
 
 		$columns = array(
 			'cb'          => $columns['cb'],
-			'title'       => __( 'Name', 'invoicing' ),
-			'code'        => __( 'Code', 'invoicing' ),
-			'amount'      => __( 'Amount', 'invoicing' ),
-			'usage'       => __( 'Usage / Limit', 'invoicing' ),
-			'start_date'  => __( 'Start Date', 'invoicing' ),
-			'expiry_date' => __( 'Expiry Date', 'invoicing' ),
+			'title'       => __('Name', 'invoicing'),
+			'code'        => __('Code', 'invoicing'),
+			'amount'      => __('Amount', 'invoicing'),
+			'usage'       => __('Usage / Limit', 'invoicing'),
+			'start_date'  => __('Start Date', 'invoicing'),
+			'expiry_date' => __('Expiry Date', 'invoicing'),
 		);
 
-		return apply_filters( 'wpi_discount_table_columns', $columns );
+		return apply_filters('wpi_discount_table_columns', $columns);
 	}
 
 	/**
 	 * Filters post states.
 	 */
-	public static function filter_discount_state( $post_states, $post ) {
+	public static function filter_discount_state($post_states, $post) {
 
-		if ( 'wpi_discount' === $post->post_type ) {
+		if ('wpi_discount' === $post->post_type) {
 
-			$discount = new WPInv_Discount( $post );
+			$discount = new WPInv_Discount($post);
 
 			$status = $discount->is_expired() ? 'expired' : $discount->get_status();
 
-			if ( 'publish' !== $status ) {
+			if ('publish' !== $status) {
 				return array(
-					'discount_status' => wpinv_discount_status( $status ),
+					'discount_status' => wpinv_discount_status($status),
 				);
 			}
 
@@ -547,30 +547,30 @@ 
 	/**
 	 * Returns an array of items table columns.
 	 */
-	public static function item_columns( $columns ) {
+	public static function item_columns($columns) {
 
 		$columns = array(
 			'cb'        => $columns['cb'],
-			'title'     => __( 'Name', 'invoicing' ),
-			'price'     => __( 'Price', 'invoicing' ),
-			'vat_rule'  => __( 'Tax Rule', 'invoicing' ),
-			'vat_class' => __( 'Tax Class', 'invoicing' ),
-			'type'      => __( 'Type', 'invoicing' ),
-			'shortcode' => __( 'Shortcode', 'invoicing' ),
+			'title'     => __('Name', 'invoicing'),
+			'price'     => __('Price', 'invoicing'),
+			'vat_rule'  => __('Tax Rule', 'invoicing'),
+			'vat_class' => __('Tax Class', 'invoicing'),
+			'type'      => __('Type', 'invoicing'),
+			'shortcode' => __('Shortcode', 'invoicing'),
 		);
 
-		if ( ! wpinv_use_taxes() ) {
-			unset( $columns['vat_rule'] );
-			unset( $columns['vat_class'] );
+		if (!wpinv_use_taxes()) {
+			unset($columns['vat_rule']);
+			unset($columns['vat_class']);
 		}
 
-		return apply_filters( 'wpi_item_table_columns', $columns );
+		return apply_filters('wpi_item_table_columns', $columns);
 	}
 
 	/**
 	 * Returns an array of sortable items table columns.
 	 */
-	public static function sortable_item_columns( $columns ) {
+	public static function sortable_item_columns($columns) {
 
 		return array_merge(
 			$columns,
@@ -587,45 +587,45 @@ 
 	/**
 	 * Displays items table columns.
 	 */
-	public static function display_item_columns( $column_name, $post_id ) {
+	public static function display_item_columns($column_name, $post_id) {
 
-		$item = new WPInv_Item( $post_id );
+		$item = new WPInv_Item($post_id);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 
 			case 'price':
-				if ( ! $item->is_recurring() ) {
-					echo wp_kses_post( $item->get_the_price() );
+				if (!$item->is_recurring()) {
+					echo wp_kses_post($item->get_the_price());
 					break;
 				}
 
 				$price = wp_sprintf(
-					__( '%1$s / %2$s', 'invoicing' ),
+					__('%1$s / %2$s', 'invoicing'),
 					$item->get_the_price(),
-					getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
+					getpaid_get_subscription_period_label($item->get_recurring_period(), $item->get_recurring_interval(), '')
 				);
 
-				if ( $item->get_the_price() == $item->get_the_initial_price() ) {
-					echo wp_kses_post( $price );
+				if ($item->get_the_price() == $item->get_the_initial_price()) {
+					echo wp_kses_post($price);
 					break;
 				}
 
-				echo wp_kses_post( $item->get_the_initial_price() );
+				echo wp_kses_post($item->get_the_initial_price());
 
-				echo '<span class="meta">' . wp_sprintf( esc_html__( 'then %s', 'invoicing' ), wp_kses_post( $price ) ) . '</span>';
+				echo '<span class="meta">' . wp_sprintf(esc_html__('then %s', 'invoicing'), wp_kses_post($price)) . '</span>';
 				break;
 
 			case 'vat_rule':
-				echo wp_kses_post( getpaid_get_tax_rule_label( $item->get_vat_rule() ) );
+				echo wp_kses_post(getpaid_get_tax_rule_label($item->get_vat_rule()));
 				break;
 
 			case 'vat_class':
-				echo wp_kses_post( getpaid_get_tax_class_label( $item->get_vat_class() ) );
+				echo wp_kses_post(getpaid_get_tax_class_label($item->get_vat_class()));
 				break;
 
 			case 'shortcode':
-				if ( $item->is_type( array( '', 'fee', 'custom' ) ) ) {
-					echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
+				if ($item->is_type(array('', 'fee', 'custom'))) {
+					echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr($item->get_id()) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
 				} else {
 					echo '&mdash;';
 				}
@@ -633,7 +633,7 @@ 
 				break;
 
 			case 'type':
-				echo wp_kses_post( wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>' );
+				echo wp_kses_post(wpinv_item_type($item->get_id()) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>');
 				break;
 
 		}
@@ -643,21 +643,21 @@ 
 	/**
 	 * Lets users filter items using taxes.
 	 */
-	public static function add_item_filters( $post_type ) {
+	public static function add_item_filters($post_type) {
 
 		// Abort if we're not dealing with items.
-		if ( 'wpi_item' !== $post_type ) {
+		if ('wpi_item' !== $post_type) {
 			return;
 		}
 
 		// Filter by vat rules.
-		if ( wpinv_use_taxes() ) {
+		if (wpinv_use_taxes()) {
 
 			// Sanitize selected vat rule.
 			$vat_rule   = '';
 			$vat_rules  = getpaid_get_tax_rules();
-			if ( isset( $_GET['vat_rule'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$vat_rule   = sanitize_text_field( $_GET['vat_rule'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			if (isset($_GET['vat_rule'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$vat_rule = sanitize_text_field($_GET['vat_rule']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			}
 
 			// Filter by VAT rule.
@@ -665,13 +665,13 @@ 
 				array(
 					'options'          => array_merge(
 						array(
-							'' => __( 'All Tax Rules', 'invoicing' ),
+							'' => __('All Tax Rules', 'invoicing'),
 						),
 						$vat_rules
 					),
 					'name'             => 'vat_rule',
 					'id'               => 'vat_rule',
-					'selected'         => in_array( $vat_rule, array_keys( $vat_rules ), true ) ? $vat_rule : '',
+					'selected'         => in_array($vat_rule, array_keys($vat_rules), true) ? $vat_rule : '',
 					'show_option_all'  => false,
 					'show_option_none' => false,
 				)
@@ -682,21 +682,21 @@ 
 			// Sanitize selected vat rule.
 			$vat_class   = '';
 			$vat_classes = getpaid_get_tax_classes();
-			if ( isset( $_GET['vat_class'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$vat_class   = sanitize_text_field( $_GET['vat_class'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			if (isset($_GET['vat_class'])) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				$vat_class = sanitize_text_field($_GET['vat_class']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 			}
 
 			wpinv_html_select(
 				array(
 					'options'          => array_merge(
 						array(
-							'' => __( 'All Tax Classes', 'invoicing' ),
+							'' => __('All Tax Classes', 'invoicing'),
 						),
 						$vat_classes
 					),
 					'name'             => 'vat_class',
 					'id'               => 'vat_class',
-					'selected'         => in_array( $vat_class, array_keys( $vat_classes ), true ) ? $vat_class : '',
+					'selected'         => in_array($vat_class, array_keys($vat_classes), true) ? $vat_class : '',
 					'show_option_all'  => false,
 					'show_option_none' => false,
 				)
@@ -705,22 +705,22 @@ 
 		}
 
 		// Filter by item type.
-		$type   = '';
-		if ( isset( $_GET['type'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$type   = sanitize_text_field( $_GET['type'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+		$type = '';
+		if (isset($_GET['type'])) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			$type = sanitize_text_field($_GET['type']); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 		}
 
 		wpinv_html_select(
 			array(
 				'options'          => array_merge(
 					array(
-						'' => __( 'All item types', 'invoicing' ),
+						'' => __('All item types', 'invoicing'),
 					),
 					wpinv_get_item_types()
 				),
 				'name'             => 'type',
 				'id'               => 'type',
-				'selected'         => in_array( $type, wpinv_item_types(), true ) ? $type : '',
+				'selected'         => in_array($type, wpinv_item_types(), true) ? $type : '',
 				'show_option_all'  => false,
 				'show_option_none' => false,
 			)
@@ -731,45 +731,45 @@ 
 	/**
 	 * Filters the item query.
 	 */
-	public static function filter_item_query( $query ) {
+	public static function filter_item_query($query) {
 
 		// modify the query only if it admin and main query.
-		if ( ! ( is_admin() && $query->is_main_query() ) ) {
+		if (!(is_admin() && $query->is_main_query())) {
 			return $query;
 		}
 
 		// we want to modify the query for our items.
-		if ( empty( $query->query['post_type'] ) || 'wpi_item' !== $query->query['post_type'] ) {
+		if (empty($query->query['post_type']) || 'wpi_item' !== $query->query['post_type']) {
 			return $query;
 		}
 
-		if ( empty( $query->query_vars['meta_query'] ) ) {
+		if (empty($query->query_vars['meta_query'])) {
 			$query->query_vars['meta_query'] = array();
 		}
 
 		// Filter vat rule type
-        if ( ! empty( $_GET['vat_rule'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if (!empty($_GET['vat_rule'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_rule',
-                'value'   => sanitize_text_field( $_GET['vat_rule'] ), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                'value'   => sanitize_text_field($_GET['vat_rule']), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 'compare' => '=',
             );
         }
 
         // Filter vat class
-        if ( ! empty( $_GET['vat_class'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if (!empty($_GET['vat_class'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_class',
-                'value'   => sanitize_text_field( $_GET['vat_class'] ), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                'value'   => sanitize_text_field($_GET['vat_class']), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 'compare' => '=',
             );
         }
 
         // Filter item type
-        if ( ! empty( $_GET['type'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        if (!empty($_GET['type'])) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_type',
-                'value'   => sanitize_text_field( $_GET['type'] ), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                'value'   => sanitize_text_field($_GET['type']), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 'compare' => '=',
             );
 		}
@@ -779,15 +779,15 @@ 
 	/**
 	 * Reorders items.
 	 */
-	public static function reorder_items( $vars ) {
+	public static function reorder_items($vars) {
 		global $typenow;
 
-		if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
+		if ('wpi_item' !== $typenow || empty($vars['orderby'])) {
 			return $vars;
 		}
 
 		// By item type.
-		if ( 'type' === $vars['orderby'] ) {
+		if ('type' === $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -798,7 +798,7 @@ 
 		}
 
 		// By vat class.
-		if ( 'vat_class' === $vars['orderby'] ) {
+		if ('vat_class' === $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -809,7 +809,7 @@ 
 		}
 
 		// By vat rule.
-		if ( 'vat_rule' === $vars['orderby'] ) {
+		if ('vat_rule' === $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -820,7 +820,7 @@ 
 		}
 
 		// By price.
-		if ( 'price' === $vars['orderby'] ) {
+		if ('price' === $vars['orderby']) {
 			return array_merge(
 				$vars,
 				array(
@@ -837,27 +837,27 @@ 
 	/**
 	 * Fired when deleting a post.
 	 */
-	public static function delete_post( $post_id ) {
+	public static function delete_post($post_id) {
 
-		switch ( get_post_type( $post_id ) ) {
+		switch (get_post_type($post_id)) {
 
 			case 'wpi_item':
-				do_action( 'getpaid_before_delete_item', new WPInv_Item( $post_id ) );
+				do_action('getpaid_before_delete_item', new WPInv_Item($post_id));
 				break;
 
 			case 'wpi_payment_form':
-				do_action( 'getpaid_before_delete_payment_form', new GetPaid_Payment_Form( $post_id ) );
+				do_action('getpaid_before_delete_payment_form', new GetPaid_Payment_Form($post_id));
 				break;
 
 			case 'wpi_discount':
-				do_action( 'getpaid_before_delete_discount', new WPInv_Discount( $post_id ) );
+				do_action('getpaid_before_delete_discount', new WPInv_Discount($post_id));
 				break;
 
 			case 'wpi_invoice':
-				$invoice = new WPInv_Invoice( $post_id );
-				do_action( 'getpaid_before_delete_invoice', $invoice );
-				$invoice->get_data_store()->delete_items( $invoice );
-				$invoice->get_data_store()->delete_special_fields( $invoice );
+				$invoice = new WPInv_Invoice($post_id);
+				do_action('getpaid_before_delete_invoice', $invoice);
+				$invoice->get_data_store()->delete_items($invoice);
+				$invoice->get_data_store()->delete_special_fields($invoice);
 				break;
 		}
 	}
@@ -870,28 +870,28 @@ 
      *
      * @return mixed
      */
-    public static function add_display_post_states( $post_states, $post ) {
+    public static function add_display_post_states($post_states, $post) {
 
-        if ( wpinv_get_option( 'success_page', 0 ) == $post->ID ) {
-            $post_states['getpaid_success_page'] = __( 'GetPaid Receipt Page', 'invoicing' );
+        if (wpinv_get_option('success_page', 0) == $post->ID) {
+            $post_states['getpaid_success_page'] = __('GetPaid Receipt Page', 'invoicing');
         }
 
-		foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
+		foreach (getpaid_get_invoice_post_types() as $post_type => $label) {
 
-			if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
-				$post_states[ "getpaid_{$post_type}_history_page" ] = sprintf(
-					__( 'GetPaid %s History Page', 'invoicing' ),
+			if (wpinv_get_option("{$post_type}_history_page", 0) == $post->ID) {
+				$post_states["getpaid_{$post_type}_history_page"] = sprintf(
+					__('GetPaid %s History Page', 'invoicing'),
 					$label
 				);
 			}
 }
 
-		if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
-            $post_states['getpaid_invoice_subscription_page'] = __( 'GetPaid Subscription Page', 'invoicing' );
+		if (wpinv_get_option('invoice_subscription_page', 0) == $post->ID) {
+            $post_states['getpaid_invoice_subscription_page'] = __('GetPaid Subscription Page', 'invoicing');
         }
 
-		if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
-            $post_states['getpaid_checkout_page'] = __( 'GetPaid Checkout Page', 'invoicing' );
+		if (wpinv_get_option('checkout_page', 0) == $post->ID) {
+            $post_states['getpaid_checkout_page'] = __('GetPaid Checkout Page', 'invoicing');
         }
 
         return $post_states;

Indentation +795 added lines, -795 removed lines

@@ -13,741 +13,741 @@ 
 class GetPaid_Post_Types_Admin {
 
     /**
-	 * Hook in methods.
-	 */
-	public static function init() {
-
-		// Init metaboxes.
-		GetPaid_Metaboxes::init();
-
-		// Filter the post updated messages.
-		add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
-
-		// Filter post actions.
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
-		add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
-
-		// Invoice table columns.
-		add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
-		add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
-		add_filter( 'bulk_actions-edit-wpi_invoice', array( __CLASS__, 'invoice_bulk_actions' ) );
-		add_filter( 'handle_bulk_actions-edit-wpi_invoice', array( __CLASS__, 'handle_invoice_bulk_actions' ), 10, 3 );
-
-		// Items table columns.
-		add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
-		add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
-		add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
-		add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
-		add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
-		add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
-
-		// Payment forms columns.
-		add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
-		add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
-
-		// Discount table columns.
-		add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
-		add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
-
-		// Deleting posts.
-		add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
-		add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
-
-		add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
-	}
-
-	/**
-	 * Post updated messages.
-	 */
-	public static function post_updated_messages( $messages ) {
-		global $post;
-
-		$messages['wpi_discount'] = array(
-			0  => '',
-			1  => __( 'Discount updated.', 'invoicing' ),
-			2  => __( 'Custom field updated.', 'invoicing' ),
-			3  => __( 'Custom field deleted.', 'invoicing' ),
-			4  => __( 'Discount updated.', 'invoicing' ),
-			5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => __( 'Discount updated.', 'invoicing' ),
-			7  => __( 'Discount saved.', 'invoicing' ),
-			8  => __( 'Discount submitted.', 'invoicing' ),
-			9  => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10 => __( 'Discount draft updated.', 'invoicing' ),
-		);
-
-		$messages['wpi_payment_form'] = array(
-			0  => '',
-			1  => __( 'Payment Form updated.', 'invoicing' ),
-			2  => __( 'Custom field updated.', 'invoicing' ),
-			3  => __( 'Custom field deleted.', 'invoicing' ),
-			4  => __( 'Payment Form updated.', 'invoicing' ),
-			5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => __( 'Payment Form updated.', 'invoicing' ),
-			7  => __( 'Payment Form saved.', 'invoicing' ),
-			8  => __( 'Payment Form submitted.', 'invoicing' ),
-			9  => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
-			10 => __( 'Payment Form draft updated.', 'invoicing' ),
-		);
-
-		return $messages;
-
-	}
-
-	/**
-	 * Post row actions.
-	 */
-	public static function post_row_actions( $actions, $post ) {
-
-		$post = get_post( $post );
-
-		// We do not want to edit the default payment form.
-		if ( 'wpi_payment_form' == $post->post_type ) {
-
-			if ( wpinv_get_default_payment_form() === $post->ID ) {
-				unset( $actions['trash'] );
-				unset( $actions['inline hide-if-no-js'] );
-			}
-
-			$actions['duplicate'] = sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'getpaid-admin-action' => 'duplicate_form',
-								'form_id'              => $post->ID,
-							)
-						),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
-			);
-
-			$actions['reset'] = sprintf(
-				'<a href="%1$s" style="color: #800">%2$s</a>',
-				esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'getpaid-admin-action' => 'reset_form_stats',
-								'form_id'              => $post->ID,
-							)
-						),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				),
-				esc_html( __( 'Reset Stats', 'invoicing' ) )
-			);
-		}
-
-		// Link to item payment form.
-		if ( 'wpi_item' == $post->post_type ) {
-
-			if ( in_array( get_post_meta( $post->ID, '_wpinv_type', true ), array( '', 'fee', 'custom' ), true ) ) {
-
-				$actions['buy'] = sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url( getpaid_embed_url( false, $post->ID . '|0' ) ),
-					esc_html( __( 'Buy', 'invoicing' ) )
-				);
-
-			}
+     * Hook in methods.
+     */
+    public static function init() {
+
+        // Init metaboxes.
+        GetPaid_Metaboxes::init();
+
+        // Filter the post updated messages.
+        add_filter( 'post_updated_messages', 'GetPaid_Post_Types_Admin::post_updated_messages' );
+
+        // Filter post actions.
+        add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::post_row_actions', 10, 2 );
+        add_filter( 'post_row_actions', 'GetPaid_Post_Types_Admin::filter_invoice_row_actions', 90, 2 );
+
+        // Invoice table columns.
+        add_filter( 'manage_wpi_invoice_posts_columns', array( __CLASS__, 'invoice_columns' ), 100 );
+        add_action( 'manage_wpi_invoice_posts_custom_column', array( __CLASS__, 'display_invoice_columns' ), 10, 2 );
+        add_filter( 'bulk_actions-edit-wpi_invoice', array( __CLASS__, 'invoice_bulk_actions' ) );
+        add_filter( 'handle_bulk_actions-edit-wpi_invoice', array( __CLASS__, 'handle_invoice_bulk_actions' ), 10, 3 );
+
+        // Items table columns.
+        add_filter( 'manage_wpi_item_posts_columns', array( __CLASS__, 'item_columns' ), 100 );
+        add_filter( 'manage_edit-wpi_item_sortable_columns', array( __CLASS__, 'sortable_item_columns' ), 20 );
+        add_action( 'manage_wpi_item_posts_custom_column', array( __CLASS__, 'display_item_columns' ), 10, 2 );
+        add_action( 'restrict_manage_posts', array( __CLASS__, 'add_item_filters' ), 100 );
+        add_action( 'parse_query', array( __CLASS__, 'filter_item_query' ), 100 );
+        add_action( 'request', array( __CLASS__, 'reorder_items' ), 100 );
+
+        // Payment forms columns.
+        add_filter( 'manage_wpi_payment_form_posts_columns', array( __CLASS__, 'payment_form_columns' ), 100 );
+        add_action( 'manage_wpi_payment_form_posts_custom_column', array( __CLASS__, 'display_payment_form_columns' ), 10, 2 );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_payment_form_state' ), 10, 2 );
+
+        // Discount table columns.
+        add_filter( 'manage_wpi_discount_posts_columns', array( __CLASS__, 'discount_columns' ), 100 );
+        add_filter( 'bulk_actions-edit-wpi_discount', '__return_empty_array', 100 );
+
+        // Deleting posts.
+        add_action( 'delete_post', array( __CLASS__, 'delete_post' ) );
+        add_filter( 'display_post_states', array( __CLASS__, 'filter_discount_state' ), 10, 2 );
+
+        add_filter( 'display_post_states', array( __CLASS__, 'add_display_post_states' ), 10, 2 );
+    }
+
+    /**
+     * Post updated messages.
+     */
+    public static function post_updated_messages( $messages ) {
+        global $post;
+
+        $messages['wpi_discount'] = array(
+            0  => '',
+            1  => __( 'Discount updated.', 'invoicing' ),
+            2  => __( 'Custom field updated.', 'invoicing' ),
+            3  => __( 'Custom field deleted.', 'invoicing' ),
+            4  => __( 'Discount updated.', 'invoicing' ),
+            5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Discount restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6  => __( 'Discount updated.', 'invoicing' ),
+            7  => __( 'Discount saved.', 'invoicing' ),
+            8  => __( 'Discount submitted.', 'invoicing' ),
+            9  => wp_sprintf( __( 'Discount scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10 => __( 'Discount draft updated.', 'invoicing' ),
+        );
+
+        $messages['wpi_payment_form'] = array(
+            0  => '',
+            1  => __( 'Payment Form updated.', 'invoicing' ),
+            2  => __( 'Custom field updated.', 'invoicing' ),
+            3  => __( 'Custom field deleted.', 'invoicing' ),
+            4  => __( 'Payment Form updated.', 'invoicing' ),
+            5  => isset( $_GET['revision'] ) ? wp_sprintf( __( 'Payment Form restored to revision from %s', 'invoicing' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+            6  => __( 'Payment Form updated.', 'invoicing' ),
+            7  => __( 'Payment Form saved.', 'invoicing' ),
+            8  => __( 'Payment Form submitted.', 'invoicing' ),
+            9  => wp_sprintf( __( 'Payment Form scheduled for: <strong>%1$s</strong>.', 'invoicing' ), date_i18n( __( 'M j, Y @ G:i', 'invoicing' ), strtotime( $post->post_date ) ) ),
+            10 => __( 'Payment Form draft updated.', 'invoicing' ),
+        );
+
+        return $messages;
+
+    }
+
+    /**
+     * Post row actions.
+     */
+    public static function post_row_actions( $actions, $post ) {
+
+        $post = get_post( $post );
+
+        // We do not want to edit the default payment form.
+        if ( 'wpi_payment_form' == $post->post_type ) {
+
+            if ( wpinv_get_default_payment_form() === $post->ID ) {
+                unset( $actions['trash'] );
+                unset( $actions['inline hide-if-no-js'] );
+            }
+
+            $actions['duplicate'] = sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'getpaid-admin-action' => 'duplicate_form',
+                                'form_id'              => $post->ID,
+                            )
+                        ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                ),
+                esc_html( __( 'Duplicate', 'invoicing' ) )
+            );
+
+            $actions['reset'] = sprintf(
+                '<a href="%1$s" style="color: #800">%2$s</a>',
+                esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'getpaid-admin-action' => 'reset_form_stats',
+                                'form_id'              => $post->ID,
+                            )
+                        ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                ),
+                esc_html( __( 'Reset Stats', 'invoicing' ) )
+            );
+        }
+
+        // Link to item payment form.
+        if ( 'wpi_item' == $post->post_type ) {
+
+            if ( in_array( get_post_meta( $post->ID, '_wpinv_type', true ), array( '', 'fee', 'custom' ), true ) ) {
+
+                $actions['buy'] = sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( getpaid_embed_url( false, $post->ID . '|0' ) ),
+                    esc_html( __( 'Buy', 'invoicing' ) )
+                );
+
+            }
 }
 
-		return $actions;
-	}
+        return $actions;
+    }
 
-	/**
+    /**
      * Remove bulk edit option from admin side quote listing
      *
      * @since    1.0.0
      * @param array $actions post actions
-	 * @param WP_Post $post
+     * @param WP_Post $post
      * @return array $actions actions without edit option
      */
     public static function filter_invoice_row_actions( $actions, $post ) {
 
         if ( getpaid_is_invoice_post_type( $post->post_type ) ) {
 
-			$actions = array();
-			$invoice = new WPInv_Invoice( $post );
-
-			$actions['edit'] = sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url( get_edit_post_link( $invoice->get_id() ) ),
-				esc_html( __( 'Edit', 'invoicing' ) )
-			);
-
-			if ( ! $invoice->is_draft() ) {
-
-				$actions['view'] = sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url( $invoice->get_view_url() ),
-					sprintf(
-						// translators: %s is the invoice type
-						esc_html__( 'View %s', 'invoicing' ),
-						getpaid_get_post_type_label( $invoice->get_post_type(), false )
-					)
-				);
-
-				$actions['send'] = sprintf(
-					'<a href="%1$s">%2$s</a>',
-					esc_url(
-						wp_nonce_url(
-							add_query_arg(
-								array(
-									'getpaid-admin-action' => 'send_invoice',
-									'invoice_id'           => $invoice->get_id(),
-								)
-							),
-							'getpaid-nonce',
-							'getpaid-nonce'
-						)
-					),
-					esc_html( __( 'Send to Customer', 'invoicing' ) )
-				);
-
-			}
-
-			$actions['duplicate'] = sprintf(
-				'<a href="%1$s">%2$s</a>',
-				esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'getpaid-admin-action' => 'duplicate_invoice',
-								'invoice_id'           => $post->ID,
-							)
-						),
-						'getpaid-nonce',
-						'getpaid-nonce'
-					)
-				),
-				esc_html( __( 'Duplicate', 'invoicing' ) )
-			);
+            $actions = array();
+            $invoice = new WPInv_Invoice( $post );
+
+            $actions['edit'] = sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url( get_edit_post_link( $invoice->get_id() ) ),
+                esc_html( __( 'Edit', 'invoicing' ) )
+            );
+
+            if ( ! $invoice->is_draft() ) {
+
+                $actions['view'] = sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( $invoice->get_view_url() ),
+                    sprintf(
+                        // translators: %s is the invoice type
+                        esc_html__( 'View %s', 'invoicing' ),
+                        getpaid_get_post_type_label( $invoice->get_post_type(), false )
+                    )
+                );
+
+                $actions['send'] = sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url(
+                        wp_nonce_url(
+                            add_query_arg(
+                                array(
+                                    'getpaid-admin-action' => 'send_invoice',
+                                    'invoice_id'           => $invoice->get_id(),
+                                )
+                            ),
+                            'getpaid-nonce',
+                            'getpaid-nonce'
+                        )
+                    ),
+                    esc_html( __( 'Send to Customer', 'invoicing' ) )
+                );
+
+            }
+
+            $actions['duplicate'] = sprintf(
+                '<a href="%1$s">%2$s</a>',
+                esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'getpaid-admin-action' => 'duplicate_invoice',
+                                'invoice_id'           => $post->ID,
+                            )
+                        ),
+                        'getpaid-nonce',
+                        'getpaid-nonce'
+                    )
+                ),
+                esc_html( __( 'Duplicate', 'invoicing' ) )
+            );
 
         }
 
         return $actions;
-	}
-
-	/**
-	 * Returns an array of invoice table columns.
-	 */
-	public static function invoice_columns( $columns ) {
-
-		$columns = array(
-			'cb'           => $columns['cb'],
-			'number'       => __( 'Invoice', 'invoicing' ),
-			'customer'     => __( 'Customer', 'invoicing' ),
-			'invoice_date' => __( 'Created', 'invoicing' ),
-			'payment_date' => __( 'Completed', 'invoicing' ),
-			'amount'       => __( 'Amount', 'invoicing' ),
-			'recurring'    => __( 'Recurring', 'invoicing' ),
-			'status'       => __( 'Status', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpi_invoice_table_columns', $columns );
-	}
-
-	/**
-	 * Displays invoice table columns.
-	 */
-	public static function display_invoice_columns( $column_name, $post_id ) {
-
-		$invoice = new WPInv_Invoice( $post_id );
-
-		switch ( $column_name ) {
-
-			case 'invoice_date':
-				$date_time = esc_attr( $invoice->get_created_date() );
-				$date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
-				echo wp_kses_post( "<span title='$date_time'>$date</span>" );
-				break;
-
-			case 'payment_date':
-				if ( $invoice->is_paid() ) {
-					$date_time = esc_attr( $invoice->get_completed_date() );
-					$date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
-					echo wp_kses_post( "<span title='$date_time'>$date</span>" );
-				} else {
-					echo '&mdash;';
-				}
-
-				break;
-
-			case 'amount':
-				$amount = $invoice->get_total();
-				$formated_amount = wp_kses_post( wpinv_price( $amount, $invoice->get_currency() ) );
-
-				if ( $invoice->is_refunded() ) {
-					$refunded_amount = wpinv_price( 0, $invoice->get_currency() );
-					echo wp_kses_post( "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>" );
-				} else {
-
-					$discount = $invoice->get_total_discount();
-
-					if ( ! empty( $discount ) ) {
-						$new_amount = wpinv_price( $amount + $discount, $invoice->get_currency() );
-						echo wp_kses_post( "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>" );
-					} else {
-						echo wp_kses_post( $formated_amount );
-					}
-				}
-
-				break;
-
-			case 'status':
-				$status       = esc_html( $invoice->get_status() );
-				$status_label = esc_html( $invoice->get_status_nicename() );
-
-				// If it is paid, show the gateway title.
-				if ( $invoice->is_paid() ) {
-					$gateway = esc_html( $invoice->get_gateway_title() );
-					$gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), esc_html( $gateway ) );
-
-					echo wp_kses_post( "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>" );
-				} else {
-					echo wp_kses_post( "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>" );
-				}
-
-				// If it is not paid, display the overdue and view status.
-				if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-
-					// Invoice view status.
-					if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="' . esc_attr__( 'Viewed by Customer', 'invoicing' ) . '"></i>';
-					} else {
-						echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="' . esc_attr__( 'Not Viewed by Customer', 'invoicing' ) . '"></i>';
-					}
-
-					// Display the overview status.
-					if ( wpinv_get_option( 'overdue_active' ) ) {
-						$due_date = $invoice->get_due_date();
-						$fomatted = getpaid_format_date( $due_date );
-
-						if ( ! empty( $fomatted ) ) {
-							$date = wp_sprintf(
-								// translators: %s is the due date.
-								__( 'Due %s', 'invoicing' ),
-								$fomatted
-							);
-							echo wp_kses_post( "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>" );
-						}
-					}
-				}
-
-				break;
-
-			case 'recurring':
-				if ( $invoice->is_recurring() ) {
-					echo '<i class="fa fa-check" style="color:#43850a;"></i>';
-				} else {
-					echo '<i class="fa fa-times" style="color:#616161;"></i>';
-				}
-				break;
-
-			case 'number':
-				$edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
-				$invoice_number  = esc_html( $invoice->get_number() );
-				$invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
-
-				echo wp_kses_post( "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>" );
-
-				do_action( 'getpaid_admin_table_invoice_number_column', $invoice );
-				break;
-
-			case 'customer':
-				$customer_name = $invoice->get_user_full_name();
-
-				if ( empty( $customer_name ) ) {
-					$customer_name = $invoice->get_email();
-				}
-
-				if ( ! empty( $customer_name ) ) {
-					$customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
-					$view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
-					echo wp_kses_post( "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>" );
-				} else {
-					echo '<div>&mdash;</div>';
-				}
-
-				break;
-
-		}
-
-	}
-
-	/**
-	 * Displays invoice bulk actions.
-	 */
-	public static function invoice_bulk_actions( $actions ) {
-		$actions['resend-invoice'] = __( 'Send to Customer', 'invoicing' );
-		return $actions;
-	}
-
-	/**
-	 * Processes invoice bulk actions.
-	 */
-	public static function handle_invoice_bulk_actions( $redirect_url, $action, $post_ids ) {
-
-		if ( 'resend-invoice' === $action ) {
-			foreach ( $post_ids as $post_id ) {
-				getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $post_id ), true );
-			}
-		}
-
-		return $redirect_url;
-
-	}
-
-	/**
-	 * Returns an array of payment forms table columns.
-	 */
-	public static function payment_form_columns( $columns ) {
-
-		$columns = array(
-			'cb'        => $columns['cb'],
-			'title'     => __( 'Name', 'invoicing' ),
-			'shortcode' => __( 'Shortcode', 'invoicing' ),
-			'earnings'  => __( 'Revenue', 'invoicing' ),
-			'refunds'   => __( 'Refunded', 'invoicing' ),
-			'items'     => __( 'Items', 'invoicing' ),
-			'date'      => __( 'Date', 'invoicing' ),
-		);
-
-		return apply_filters( 'wpi_payment_form_table_columns', $columns );
-
-	}
-
-	/**
-	 * Displays payment form table columns.
-	 */
-	public static function display_payment_form_columns( $column_name, $post_id ) {
-
-		// Retrieve the payment form.
-		$form = new GetPaid_Payment_Form( $post_id );
-
-		switch ( $column_name ) {
-
-			case 'earnings':
-				echo wp_kses_post( wpinv_price( $form->get_earned() ) );
-				break;
-
-			case 'refunds':
-				echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
-				break;
-
-			case 'refunds':
-				echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
-				break;
-
-			case 'shortcode':
-				if ( $form->is_default() ) {
-					echo '&mdash;';
-				} else {
-					echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
-				}
-
-				break;
+    }
+
+    /**
+     * Returns an array of invoice table columns.
+     */
+    public static function invoice_columns( $columns ) {
+
+        $columns = array(
+            'cb'           => $columns['cb'],
+            'number'       => __( 'Invoice', 'invoicing' ),
+            'customer'     => __( 'Customer', 'invoicing' ),
+            'invoice_date' => __( 'Created', 'invoicing' ),
+            'payment_date' => __( 'Completed', 'invoicing' ),
+            'amount'       => __( 'Amount', 'invoicing' ),
+            'recurring'    => __( 'Recurring', 'invoicing' ),
+            'status'       => __( 'Status', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_invoice_table_columns', $columns );
+    }
+
+    /**
+     * Displays invoice table columns.
+     */
+    public static function display_invoice_columns( $column_name, $post_id ) {
+
+        $invoice = new WPInv_Invoice( $post_id );
+
+        switch ( $column_name ) {
+
+            case 'invoice_date':
+                $date_time = esc_attr( $invoice->get_created_date() );
+                $date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
+                echo wp_kses_post( "<span title='$date_time'>$date</span>" );
+                break;
+
+            case 'payment_date':
+                if ( $invoice->is_paid() ) {
+                    $date_time = esc_attr( $invoice->get_completed_date() );
+                    $date      = esc_html( getpaid_format_date_value( $date_time, '&mdash;', true ) );
+                    echo wp_kses_post( "<span title='$date_time'>$date</span>" );
+                } else {
+                    echo '&mdash;';
+                }
+
+                break;
+
+            case 'amount':
+                $amount = $invoice->get_total();
+                $formated_amount = wp_kses_post( wpinv_price( $amount, $invoice->get_currency() ) );
+
+                if ( $invoice->is_refunded() ) {
+                    $refunded_amount = wpinv_price( 0, $invoice->get_currency() );
+                    echo wp_kses_post( "<del>$formated_amount</del>&nbsp;<ins>$refunded_amount</ins>" );
+                } else {
+
+                    $discount = $invoice->get_total_discount();
+
+                    if ( ! empty( $discount ) ) {
+                        $new_amount = wpinv_price( $amount + $discount, $invoice->get_currency() );
+                        echo wp_kses_post( "<del>$new_amount</del>&nbsp;<ins>$formated_amount</ins>" );
+                    } else {
+                        echo wp_kses_post( $formated_amount );
+                    }
+                }
+
+                break;
+
+            case 'status':
+                $status       = esc_html( $invoice->get_status() );
+                $status_label = esc_html( $invoice->get_status_nicename() );
+
+                // If it is paid, show the gateway title.
+                if ( $invoice->is_paid() ) {
+                    $gateway = esc_html( $invoice->get_gateway_title() );
+                    $gateway = wp_sprintf( esc_attr__( 'Paid via %s', 'invoicing' ), esc_html( $gateway ) );
+
+                    echo wp_kses_post( "<mark class='wpi-help-tip getpaid-invoice-status $status' title='$gateway'><span>$status_label</span></mark>" );
+                } else {
+                    echo wp_kses_post( "<mark class='getpaid-invoice-status $status'><span>$status_label</span></mark>" );
+                }
+
+                // If it is not paid, display the overdue and view status.
+                if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+
+                    // Invoice view status.
+                    if ( wpinv_is_invoice_viewed( $invoice->get_id() ) ) {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye wpi-help-tip" title="' . esc_attr__( 'Viewed by Customer', 'invoicing' ) . '"></i>';
+                    } else {
+                        echo '&nbsp;&nbsp;<i class="fa fa-eye-slash wpi-help-tip" title="' . esc_attr__( 'Not Viewed by Customer', 'invoicing' ) . '"></i>';
+                    }
+
+                    // Display the overview status.
+                    if ( wpinv_get_option( 'overdue_active' ) ) {
+                        $due_date = $invoice->get_due_date();
+                        $fomatted = getpaid_format_date( $due_date );
+
+                        if ( ! empty( $fomatted ) ) {
+                            $date = wp_sprintf(
+                                // translators: %s is the due date.
+                                __( 'Due %s', 'invoicing' ),
+                                $fomatted
+                            );
+                            echo wp_kses_post( "<p class='description' style='color: #888;' title='$due_date'>$fomatted</p>" );
+                        }
+                    }
+                }
+
+                break;
+
+            case 'recurring':
+                if ( $invoice->is_recurring() ) {
+                    echo '<i class="fa fa-check" style="color:#43850a;"></i>';
+                } else {
+                    echo '<i class="fa fa-times" style="color:#616161;"></i>';
+                }
+                break;
+
+            case 'number':
+                $edit_link       = esc_url( get_edit_post_link( $invoice->get_id() ) );
+                $invoice_number  = esc_html( $invoice->get_number() );
+                $invoice_details = esc_attr__( 'View Invoice Details', 'invoicing' );
+
+                echo wp_kses_post( "<a href='$edit_link' title='$invoice_details'><strong>$invoice_number</strong></a>" );
+
+                do_action( 'getpaid_admin_table_invoice_number_column', $invoice );
+                break;
+
+            case 'customer':
+                $customer_name = $invoice->get_user_full_name();
+
+                if ( empty( $customer_name ) ) {
+                    $customer_name = $invoice->get_email();
+                }
+
+                if ( ! empty( $customer_name ) ) {
+                    $customer_details = esc_attr__( 'View Customer Details', 'invoicing' );
+                    $view_link        = esc_url( add_query_arg( 'user_id', $invoice->get_user_id(), admin_url( 'user-edit.php' ) ) );
+                    echo wp_kses_post( "<a href='$view_link' title='$customer_details'><span>$customer_name</span></a>" );
+                } else {
+                    echo '<div>&mdash;</div>';
+                }
+
+                break;
 
-			case 'items':
-				$items = $form->get_items();
-
-				if ( $form->is_default() || empty( $items ) ) {
-					echo '&mdash;';
-					return;
-				}
-
-				$_items = array();
-
-				foreach ( $items as $item ) {
-					$url = $item->get_edit_url();
-
-					if ( empty( $url ) ) {
-						$_items[] = esc_html( $item->get_name() );
-					} else {
-						$_items[] = sprintf(
-							'<a href="%s">%s</a>',
-							esc_url( $url ),
-							esc_html( $item->get_name() )
-						);
-					}
+        }
+
+    }
+
+    /**
+     * Displays invoice bulk actions.
+     */
+    public static function invoice_bulk_actions( $actions ) {
+        $actions['resend-invoice'] = __( 'Send to Customer', 'invoicing' );
+        return $actions;
+    }
+
+    /**
+     * Processes invoice bulk actions.
+     */
+    public static function handle_invoice_bulk_actions( $redirect_url, $action, $post_ids ) {
+
+        if ( 'resend-invoice' === $action ) {
+            foreach ( $post_ids as $post_id ) {
+                getpaid()->get( 'invoice_emails' )->user_invoice( new WPInv_Invoice( $post_id ), true );
+            }
+        }
+
+        return $redirect_url;
+
+    }
+
+    /**
+     * Returns an array of payment forms table columns.
+     */
+    public static function payment_form_columns( $columns ) {
+
+        $columns = array(
+            'cb'        => $columns['cb'],
+            'title'     => __( 'Name', 'invoicing' ),
+            'shortcode' => __( 'Shortcode', 'invoicing' ),
+            'earnings'  => __( 'Revenue', 'invoicing' ),
+            'refunds'   => __( 'Refunded', 'invoicing' ),
+            'items'     => __( 'Items', 'invoicing' ),
+            'date'      => __( 'Date', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_payment_form_table_columns', $columns );
+
+    }
+
+    /**
+     * Displays payment form table columns.
+     */
+    public static function display_payment_form_columns( $column_name, $post_id ) {
+
+        // Retrieve the payment form.
+        $form = new GetPaid_Payment_Form( $post_id );
+
+        switch ( $column_name ) {
+
+            case 'earnings':
+                echo wp_kses_post( wpinv_price( $form->get_earned() ) );
+                break;
+
+            case 'refunds':
+                echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
+                break;
+
+            case 'refunds':
+                echo wp_kses_post( wpinv_price( $form->get_refunded() ) );
+                break;
+
+            case 'shortcode':
+                if ( $form->is_default() ) {
+                    echo '&mdash;';
+                } else {
+                    echo '<input onClick="this.select()" type="text" value="[getpaid form=' . esc_attr( $form->get_id() ) . ']" style="width: 100%;" readonly/>';
+                }
+
+                break;
+
+            case 'items':
+                $items = $form->get_items();
+
+                if ( $form->is_default() || empty( $items ) ) {
+                    echo '&mdash;';
+                    return;
+                }
+
+                $_items = array();
+
+                foreach ( $items as $item ) {
+                    $url = $item->get_edit_url();
+
+                    if ( empty( $url ) ) {
+                        $_items[] = esc_html( $item->get_name() );
+                    } else {
+                        $_items[] = sprintf(
+                            '<a href="%s">%s</a>',
+                            esc_url( $url ),
+                            esc_html( $item->get_name() )
+                        );
+                    }
 }
 
-				echo wp_kses_post( implode( '<br>', $_items ) );
+                echo wp_kses_post( implode( '<br>', $_items ) );
+
+                break;
+
+        }
+
+    }
+
+    /**
+     * Filters post states.
+     */
+    public static function filter_payment_form_state( $post_states, $post ) {
+
+        if ( 'wpi_payment_form' === $post->post_type && wpinv_get_default_payment_form() === $post->ID ) {
+            $post_states['default_form'] = __( 'Default Payment Form', 'invoicing' );
+        }
+
+        return $post_states;
+
+    }
+
+    /**
+     * Returns an array of coupon table columns.
+     */
+    public static function discount_columns( $columns ) {
+
+        $columns = array(
+            'cb'          => $columns['cb'],
+            'title'       => __( 'Name', 'invoicing' ),
+            'code'        => __( 'Code', 'invoicing' ),
+            'amount'      => __( 'Amount', 'invoicing' ),
+            'usage'       => __( 'Usage / Limit', 'invoicing' ),
+            'start_date'  => __( 'Start Date', 'invoicing' ),
+            'expiry_date' => __( 'Expiry Date', 'invoicing' ),
+        );
+
+        return apply_filters( 'wpi_discount_table_columns', $columns );
+    }
 
-				break;
+    /**
+     * Filters post states.
+     */
+    public static function filter_discount_state( $post_states, $post ) {
 
-		}
+        if ( 'wpi_discount' === $post->post_type ) {
 
-	}
+            $discount = new WPInv_Discount( $post );
 
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_payment_form_state( $post_states, $post ) {
+            $status = $discount->is_expired() ? 'expired' : $discount->get_status();
 
-		if ( 'wpi_payment_form' === $post->post_type && wpinv_get_default_payment_form() === $post->ID ) {
-			$post_states['default_form'] = __( 'Default Payment Form', 'invoicing' );
-		}
+            if ( 'publish' !== $status ) {
+                return array(
+                    'discount_status' => wpinv_discount_status( $status ),
+                );
+            }
+
+            return array();
+
+        }
+
+        return $post_states;
 
-		return $post_states;
+    }
 
-	}
+    /**
+     * Returns an array of items table columns.
+     */
+    public static function item_columns( $columns ) {
+
+        $columns = array(
+            'cb'        => $columns['cb'],
+            'title'     => __( 'Name', 'invoicing' ),
+            'price'     => __( 'Price', 'invoicing' ),
+            'vat_rule'  => __( 'Tax Rule', 'invoicing' ),
+            'vat_class' => __( 'Tax Class', 'invoicing' ),
+            'type'      => __( 'Type', 'invoicing' ),
+            'shortcode' => __( 'Shortcode', 'invoicing' ),
+        );
+
+        if ( ! wpinv_use_taxes() ) {
+            unset( $columns['vat_rule'] );
+            unset( $columns['vat_class'] );
+        }
 
-	/**
-	 * Returns an array of coupon table columns.
-	 */
-	public static function discount_columns( $columns ) {
+        return apply_filters( 'wpi_item_table_columns', $columns );
+    }
 
-		$columns = array(
-			'cb'          => $columns['cb'],
-			'title'       => __( 'Name', 'invoicing' ),
-			'code'        => __( 'Code', 'invoicing' ),
-			'amount'      => __( 'Amount', 'invoicing' ),
-			'usage'       => __( 'Usage / Limit', 'invoicing' ),
-			'start_date'  => __( 'Start Date', 'invoicing' ),
-			'expiry_date' => __( 'Expiry Date', 'invoicing' ),
-		);
+    /**
+     * Returns an array of sortable items table columns.
+     */
+    public static function sortable_item_columns( $columns ) {
+
+        return array_merge(
+            $columns,
+            array(
+                'price'     => 'price',
+                'vat_rule'  => 'vat_rule',
+                'vat_class' => 'vat_class',
+                'type'      => 'type',
+            )
+        );
 
-		return apply_filters( 'wpi_discount_table_columns', $columns );
-	}
+    }
 
-	/**
-	 * Filters post states.
-	 */
-	public static function filter_discount_state( $post_states, $post ) {
+    /**
+     * Displays items table columns.
+     */
+    public static function display_item_columns( $column_name, $post_id ) {
 
-		if ( 'wpi_discount' === $post->post_type ) {
+        $item = new WPInv_Item( $post_id );
 
-			$discount = new WPInv_Discount( $post );
+        switch ( $column_name ) {
 
-			$status = $discount->is_expired() ? 'expired' : $discount->get_status();
+            case 'price':
+                if ( ! $item->is_recurring() ) {
+                    echo wp_kses_post( $item->get_the_price() );
+                    break;
+                }
 
-			if ( 'publish' !== $status ) {
-				return array(
-					'discount_status' => wpinv_discount_status( $status ),
-				);
-			}
+                $price = wp_sprintf(
+                    __( '%1$s / %2$s', 'invoicing' ),
+                    $item->get_the_price(),
+                    getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
+                );
 
-			return array();
+                if ( $item->get_the_price() == $item->get_the_initial_price() ) {
+                    echo wp_kses_post( $price );
+                    break;
+                }
 
-		}
+                echo wp_kses_post( $item->get_the_initial_price() );
 
-		return $post_states;
+                echo '<span class="meta">' . wp_sprintf( esc_html__( 'then %s', 'invoicing' ), wp_kses_post( $price ) ) . '</span>';
+                break;
 
-	}
+            case 'vat_rule':
+                echo wp_kses_post( getpaid_get_tax_rule_label( $item->get_vat_rule() ) );
+                break;
 
-	/**
-	 * Returns an array of items table columns.
-	 */
-	public static function item_columns( $columns ) {
+            case 'vat_class':
+                echo wp_kses_post( getpaid_get_tax_class_label( $item->get_vat_class() ) );
+                break;
 
-		$columns = array(
-			'cb'        => $columns['cb'],
-			'title'     => __( 'Name', 'invoicing' ),
-			'price'     => __( 'Price', 'invoicing' ),
-			'vat_rule'  => __( 'Tax Rule', 'invoicing' ),
-			'vat_class' => __( 'Tax Class', 'invoicing' ),
-			'type'      => __( 'Type', 'invoicing' ),
-			'shortcode' => __( 'Shortcode', 'invoicing' ),
-		);
+            case 'shortcode':
+                if ( $item->is_type( array( '', 'fee', 'custom' ) ) ) {
+                    echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
+                } else {
+                    echo '&mdash;';
+                }
 
-		if ( ! wpinv_use_taxes() ) {
-			unset( $columns['vat_rule'] );
-			unset( $columns['vat_class'] );
-		}
+                break;
 
-		return apply_filters( 'wpi_item_table_columns', $columns );
-	}
+            case 'type':
+                echo wp_kses_post( wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>' );
+                break;
 
-	/**
-	 * Returns an array of sortable items table columns.
-	 */
-	public static function sortable_item_columns( $columns ) {
-
-		return array_merge(
-			$columns,
-			array(
-				'price'     => 'price',
-				'vat_rule'  => 'vat_rule',
-				'vat_class' => 'vat_class',
-				'type'      => 'type',
-			)
-		);
-
-	}
-
-	/**
-	 * Displays items table columns.
-	 */
-	public static function display_item_columns( $column_name, $post_id ) {
-
-		$item = new WPInv_Item( $post_id );
-
-		switch ( $column_name ) {
-
-			case 'price':
-				if ( ! $item->is_recurring() ) {
-					echo wp_kses_post( $item->get_the_price() );
-					break;
-				}
-
-				$price = wp_sprintf(
-					__( '%1$s / %2$s', 'invoicing' ),
-					$item->get_the_price(),
-					getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' )
-				);
-
-				if ( $item->get_the_price() == $item->get_the_initial_price() ) {
-					echo wp_kses_post( $price );
-					break;
-				}
-
-				echo wp_kses_post( $item->get_the_initial_price() );
-
-				echo '<span class="meta">' . wp_sprintf( esc_html__( 'then %s', 'invoicing' ), wp_kses_post( $price ) ) . '</span>';
-				break;
-
-			case 'vat_rule':
-				echo wp_kses_post( getpaid_get_tax_rule_label( $item->get_vat_rule() ) );
-				break;
-
-			case 'vat_class':
-				echo wp_kses_post( getpaid_get_tax_class_label( $item->get_vat_class() ) );
-				break;
-
-			case 'shortcode':
-				if ( $item->is_type( array( '', 'fee', 'custom' ) ) ) {
-					echo '<input onClick="this.select()" type="text" value="[getpaid item=' . esc_attr( $item->get_id() ) . ' button=\'Buy Now\']" style="width: 100%;" readonly/>';
-				} else {
-					echo '&mdash;';
-				}
-
-				break;
-
-			case 'type':
-				echo wp_kses_post( wpinv_item_type( $item->get_id() ) . '<span class="meta">' . $item->get_custom_singular_name() . '</span>' );
-				break;
-
-		}
-
-	}
-
-	/**
-	 * Lets users filter items using taxes.
-	 */
-	public static function add_item_filters( $post_type ) {
-
-		// Abort if we're not dealing with items.
-		if ( 'wpi_item' !== $post_type ) {
-			return;
-		}
-
-		// Filter by vat rules.
-		if ( wpinv_use_taxes() ) {
-
-			// Sanitize selected vat rule.
-			$vat_rule   = '';
-			$vat_rules  = getpaid_get_tax_rules();
-			if ( isset( $_GET['vat_rule'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$vat_rule   = sanitize_text_field( $_GET['vat_rule'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-
-			// Filter by VAT rule.
-			wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All Tax Rules', 'invoicing' ),
-						),
-						$vat_rules
-					),
-					'name'             => 'vat_rule',
-					'id'               => 'vat_rule',
-					'selected'         => in_array( $vat_rule, array_keys( $vat_rules ), true ) ? $vat_rule : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-				)
-			);
-
-			// Filter by VAT class.
-
-			// Sanitize selected vat rule.
-			$vat_class   = '';
-			$vat_classes = getpaid_get_tax_classes();
-			if ( isset( $_GET['vat_class'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-				$vat_class   = sanitize_text_field( $_GET['vat_class'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			}
-
-			wpinv_html_select(
-				array(
-					'options'          => array_merge(
-						array(
-							'' => __( 'All Tax Classes', 'invoicing' ),
-						),
-						$vat_classes
-					),
-					'name'             => 'vat_class',
-					'id'               => 'vat_class',
-					'selected'         => in_array( $vat_class, array_keys( $vat_classes ), true ) ? $vat_class : '',
-					'show_option_all'  => false,
-					'show_option_none' => false,
-				)
-			);
-
-		}
-
-		// Filter by item type.
-		$type   = '';
-		if ( isset( $_GET['type'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-			$type   = sanitize_text_field( $_GET['type'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
-		}
-
-		wpinv_html_select(
-			array(
-				'options'          => array_merge(
-					array(
-						'' => __( 'All item types', 'invoicing' ),
-					),
-					wpinv_get_item_types()
-				),
-				'name'             => 'type',
-				'id'               => 'type',
-				'selected'         => in_array( $type, wpinv_item_types(), true ) ? $type : '',
-				'show_option_all'  => false,
-				'show_option_none' => false,
-			)
-		);
-
-	}
-
-	/**
-	 * Filters the item query.
-	 */
-	public static function filter_item_query( $query ) {
-
-		// modify the query only if it admin and main query.
-		if ( ! ( is_admin() && $query->is_main_query() ) ) {
-			return $query;
-		}
-
-		// we want to modify the query for our items.
-		if ( empty( $query->query['post_type'] ) || 'wpi_item' !== $query->query['post_type'] ) {
-			return $query;
-		}
-
-		if ( empty( $query->query_vars['meta_query'] ) ) {
-			$query->query_vars['meta_query'] = array();
-		}
-
-		// Filter vat rule type
+        }
+
+    }
+
+    /**
+     * Lets users filter items using taxes.
+     */
+    public static function add_item_filters( $post_type ) {
+
+        // Abort if we're not dealing with items.
+        if ( 'wpi_item' !== $post_type ) {
+            return;
+        }
+
+        // Filter by vat rules.
+        if ( wpinv_use_taxes() ) {
+
+            // Sanitize selected vat rule.
+            $vat_rule   = '';
+            $vat_rules  = getpaid_get_tax_rules();
+            if ( isset( $_GET['vat_rule'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $vat_rule   = sanitize_text_field( $_GET['vat_rule'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+
+            // Filter by VAT rule.
+            wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All Tax Rules', 'invoicing' ),
+                        ),
+                        $vat_rules
+                    ),
+                    'name'             => 'vat_rule',
+                    'id'               => 'vat_rule',
+                    'selected'         => in_array( $vat_rule, array_keys( $vat_rules ), true ) ? $vat_rule : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                )
+            );
+
+            // Filter by VAT class.
+
+            // Sanitize selected vat rule.
+            $vat_class   = '';
+            $vat_classes = getpaid_get_tax_classes();
+            if ( isset( $_GET['vat_class'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+                $vat_class   = sanitize_text_field( $_GET['vat_class'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            }
+
+            wpinv_html_select(
+                array(
+                    'options'          => array_merge(
+                        array(
+                            '' => __( 'All Tax Classes', 'invoicing' ),
+                        ),
+                        $vat_classes
+                    ),
+                    'name'             => 'vat_class',
+                    'id'               => 'vat_class',
+                    'selected'         => in_array( $vat_class, array_keys( $vat_classes ), true ) ? $vat_class : '',
+                    'show_option_all'  => false,
+                    'show_option_none' => false,
+                )
+            );
+
+        }
+
+        // Filter by item type.
+        $type   = '';
+        if ( isset( $_GET['type'] ) ) {  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+            $type   = sanitize_text_field( $_GET['type'] );  // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        }
+
+        wpinv_html_select(
+            array(
+                'options'          => array_merge(
+                    array(
+                        '' => __( 'All item types', 'invoicing' ),
+                    ),
+                    wpinv_get_item_types()
+                ),
+                'name'             => 'type',
+                'id'               => 'type',
+                'selected'         => in_array( $type, wpinv_item_types(), true ) ? $type : '',
+                'show_option_all'  => false,
+                'show_option_none' => false,
+            )
+        );
+
+    }
+
+    /**
+     * Filters the item query.
+     */
+    public static function filter_item_query( $query ) {
+
+        // modify the query only if it admin and main query.
+        if ( ! ( is_admin() && $query->is_main_query() ) ) {
+            return $query;
+        }
+
+        // we want to modify the query for our items.
+        if ( empty( $query->query['post_type'] ) || 'wpi_item' !== $query->query['post_type'] ) {
+            return $query;
+        }
+
+        if ( empty( $query->query_vars['meta_query'] ) ) {
+            $query->query_vars['meta_query'] = array();
+        }
+
+        // Filter vat rule type
         if ( ! empty( $_GET['vat_rule'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
             $query->query_vars['meta_query'][] = array(
                 'key'     => '_wpinv_vat_rule',
@@ -772,101 +772,101 @@ 
                 'value'   => sanitize_text_field( $_GET['type'] ), // phpcs:ignore WordPress.Security.NonceVerification.Recommended
                 'compare' => '=',
             );
-		}
-
-		$query->query_vars['meta_query'][] = array(
-			'key'     => '_wpinv_one_time',
-			'compare' => 'NOT EXISTS',
-		);
-	}
-
-	/**
-	 * Reorders items.
-	 */
-	public static function reorder_items( $vars ) {
-		global $typenow;
-
-		if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
-			return $vars;
-		}
-
-		// By item type.
-		if ( 'type' === $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_type',
-					'orderby'  => 'meta_value',
-				)
-			);
-		}
-
-		// By vat class.
-		if ( 'vat_class' === $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_class',
-					'orderby'  => 'meta_value',
-				)
-			);
-		}
-
-		// By vat rule.
-		if ( 'vat_rule' === $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_vat_rule',
-					'orderby'  => 'meta_value',
-				)
-			);
-		}
-
-		// By price.
-		if ( 'price' === $vars['orderby'] ) {
-			return array_merge(
-				$vars,
-				array(
-					'meta_key' => '_wpinv_price',
-					'orderby'  => 'meta_value_num',
-				)
-			);
-		}
-
-		return $vars;
-
-	}
-
-	/**
-	 * Fired when deleting a post.
-	 */
-	public static function delete_post( $post_id ) {
-
-		switch ( get_post_type( $post_id ) ) {
-
-			case 'wpi_item':
-				do_action( 'getpaid_before_delete_item', new WPInv_Item( $post_id ) );
-				break;
-
-			case 'wpi_payment_form':
-				do_action( 'getpaid_before_delete_payment_form', new GetPaid_Payment_Form( $post_id ) );
-				break;
-
-			case 'wpi_discount':
-				do_action( 'getpaid_before_delete_discount', new WPInv_Discount( $post_id ) );
-				break;
-
-			case 'wpi_invoice':
-				$invoice = new WPInv_Invoice( $post_id );
-				do_action( 'getpaid_before_delete_invoice', $invoice );
-				$invoice->get_data_store()->delete_items( $invoice );
-				$invoice->get_data_store()->delete_special_fields( $invoice );
-				break;
-		}
-	}
-
-	/**
+        }
+
+        $query->query_vars['meta_query'][] = array(
+            'key'     => '_wpinv_one_time',
+            'compare' => 'NOT EXISTS',
+        );
+    }
+
+    /**
+     * Reorders items.
+     */
+    public static function reorder_items( $vars ) {
+        global $typenow;
+
+        if ( 'wpi_item' !== $typenow || empty( $vars['orderby'] ) ) {
+            return $vars;
+        }
+
+        // By item type.
+        if ( 'type' === $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_type',
+                    'orderby'  => 'meta_value',
+                )
+            );
+        }
+
+        // By vat class.
+        if ( 'vat_class' === $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_class',
+                    'orderby'  => 'meta_value',
+                )
+            );
+        }
+
+        // By vat rule.
+        if ( 'vat_rule' === $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_vat_rule',
+                    'orderby'  => 'meta_value',
+                )
+            );
+        }
+
+        // By price.
+        if ( 'price' === $vars['orderby'] ) {
+            return array_merge(
+                $vars,
+                array(
+                    'meta_key' => '_wpinv_price',
+                    'orderby'  => 'meta_value_num',
+                )
+            );
+        }
+
+        return $vars;
+
+    }
+
+    /**
+     * Fired when deleting a post.
+     */
+    public static function delete_post( $post_id ) {
+
+        switch ( get_post_type( $post_id ) ) {
+
+            case 'wpi_item':
+                do_action( 'getpaid_before_delete_item', new WPInv_Item( $post_id ) );
+                break;
+
+            case 'wpi_payment_form':
+                do_action( 'getpaid_before_delete_payment_form', new GetPaid_Payment_Form( $post_id ) );
+                break;
+
+            case 'wpi_discount':
+                do_action( 'getpaid_before_delete_discount', new WPInv_Discount( $post_id ) );
+                break;
+
+            case 'wpi_invoice':
+                $invoice = new WPInv_Invoice( $post_id );
+                do_action( 'getpaid_before_delete_invoice', $invoice );
+                $invoice->get_data_store()->delete_items( $invoice );
+                $invoice->get_data_store()->delete_special_fields( $invoice );
+                break;
+        }
+    }
+
+    /**
      * Add a post display state for special GetPaid pages in the page list table.
      *
      * @param array   $post_states An array of post display states.
@@ -880,21 +880,21 @@ 
             $post_states['getpaid_success_page'] = __( 'GetPaid Receipt Page', 'invoicing' );
         }
 
-		foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
+        foreach ( getpaid_get_invoice_post_types() as $post_type => $label ) {
 
-			if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
-				$post_states[ "getpaid_{$post_type}_history_page" ] = sprintf(
-					__( 'GetPaid %s History Page', 'invoicing' ),
-					$label
-				);
-			}
+            if ( wpinv_get_option( "{$post_type}_history_page", 0 ) == $post->ID ) {
+                $post_states[ "getpaid_{$post_type}_history_page" ] = sprintf(
+                    __( 'GetPaid %s History Page', 'invoicing' ),
+                    $label
+                );
+            }
 }
 
-		if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
+        if ( wpinv_get_option( 'invoice_subscription_page', 0 ) == $post->ID ) {
             $post_states['getpaid_invoice_subscription_page'] = __( 'GetPaid Subscription Page', 'invoicing' );
         }
 
-		if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
+        if ( wpinv_get_option( 'checkout_page', 0 ) == $post->ID ) {
             $post_states['getpaid_checkout_page'] = __( 'GetPaid Checkout Page', 'invoicing' );
         }