AyeCode / invoicing

templates/invoice/line-totals.php

Indentation +5 added lines, -5 removed lines

@@ -52,27 +52,27 @@
 
                                 // Total Fee.
                                 if ( 'fee' === $key ) {
-								wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
                                 }
 
                                 // Total discount.
                                 if ( 'discount' === $key ) {
-								wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
                                 }
 
                                 // Shipping.
                                 if ( 'shipping' === $key ) {
-								wpinv_the_price( $invoice->get_shipping(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_shipping(), $invoice->get_currency() );
                                 }
 
                                 // Sub total.
                                 if ( 'subtotal' === $key ) {
-								wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
                                 }
 
                                 // Total.
                                 if ( 'total' === $key ) {
-								wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+                                wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
                                 }
 
                                 // Fires when printing a cart total.

Spacing +29 added lines, -29 removed lines

@@ -9,26 +9,26 @@ 
  * @var WPInv_Invoice $invoice
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Totals rows.
-$totals = getpaid_invoice_totals_rows( $invoice );
+$totals = getpaid_invoice_totals_rows($invoice);
 
-do_action( 'getpaid_before_invoice_line_totals', $invoice, $totals );
+do_action('getpaid_before_invoice_line_totals', $invoice, $totals);
 
 ?>
 <div class='getpaid-invoice-line-totals'>
     <div class="row">
         <div class="col-12 offset-sm-6 col-sm-6 border-sm-left pl-sm-0">
 
-            <?php foreach ( $totals as $key => $label ) : ?>
+            <?php foreach ($totals as $key => $label) : ?>
 
-                <div class="getpaid-invoice-line-totals-col <?php echo esc_attr( $key ); ?>">
+                <div class="getpaid-invoice-line-totals-col <?php echo esc_attr($key); ?>">
 
                     <div class="form-row row">
 
                         <div class="col-8 getpaid-invoice-line-totals-label">
-                            <?php echo esc_html( $label ); ?>
+                            <?php echo esc_html($label); ?>
                         </div>
 
                         <div class="col-4 getpaid-invoice-line-totals-value pl-0">
@@ -36,62 +36,62 @@ 
                             <?php
 
                                 // Total tax.
-                                if ( 'tax' === $key ) {
-                                    wpinv_the_price( $invoice->get_total_tax(), $invoice->get_currency() );
+                                if ('tax' === $key) {
+                                    wpinv_the_price($invoice->get_total_tax(), $invoice->get_currency());
 
-                                    if ( wpinv_use_taxes() && ! $invoice->get_disable_taxes() ) {
+                                    if (wpinv_use_taxes() && !$invoice->get_disable_taxes()) {
 
                                         $taxes = $invoice->get_total_tax();
-                                        if ( empty( $taxes ) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $invoice->get_country() ) ) {
+                                        if (empty($taxes) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction($invoice->get_country())) {
                                             echo ' <em class="text-muted small">';
-                                            _x( '(Reverse charged)', 'This is a legal term for reverse charging tax in the EU', 'invoicing' );
+                                            _x('(Reverse charged)', 'This is a legal term for reverse charging tax in the EU', 'invoicing');
                                             echo '</em>';
                                         }
                                     }
                                 }
 
                                 // Check if field starts with tax__.
-                                if ( 0 === strpos( $key, 'tax__' ) ) {
-                                    $tax_amount = $invoice->get_tax_total_by_name( str_replace( 'tax__', '', $key ) );
-                                    wpinv_the_price( $tax_amount, $invoice->get_currency() );
+                                if (0 === strpos($key, 'tax__')) {
+                                    $tax_amount = $invoice->get_tax_total_by_name(str_replace('tax__', '', $key));
+                                    wpinv_the_price($tax_amount, $invoice->get_currency());
 
-                                    if ( wpinv_use_taxes() && ! $invoice->get_disable_taxes() ) {
+                                    if (wpinv_use_taxes() && !$invoice->get_disable_taxes()) {
 
-                                        if ( empty( $tax_amount ) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction( $invoice->get_country() ) ) {
+                                        if (empty($tax_amount) && GetPaid_Payment_Form_Submission_Taxes::is_eu_transaction($invoice->get_country())) {
                                             echo ' <em class="text-muted small">';
-                                            _x( '(Reverse charged)', 'This is a legal term for reverse charging tax in the EU', 'invoicing' );
+                                            _x('(Reverse charged)', 'This is a legal term for reverse charging tax in the EU', 'invoicing');
                                             echo '</em>';
                                         }
                                     }
                                 }
 
                                 // Total Fee.
-                                if ( 'fee' === $key ) {
-								wpinv_the_price( $invoice->get_total_fees(), $invoice->get_currency() );
+                                if ('fee' === $key) {
+								wpinv_the_price($invoice->get_total_fees(), $invoice->get_currency());
                                 }
 
                                 // Total discount.
-                                if ( 'discount' === $key ) {
-								wpinv_the_price( $invoice->get_total_discount(), $invoice->get_currency() );
+                                if ('discount' === $key) {
+								wpinv_the_price($invoice->get_total_discount(), $invoice->get_currency());
                                 }
 
                                 // Shipping.
-                                if ( 'shipping' === $key ) {
-								wpinv_the_price( $invoice->get_shipping(), $invoice->get_currency() );
+                                if ('shipping' === $key) {
+								wpinv_the_price($invoice->get_shipping(), $invoice->get_currency());
                                 }
 
                                 // Sub total.
-                                if ( 'subtotal' === $key ) {
-								wpinv_the_price( $invoice->get_subtotal(), $invoice->get_currency() );
+                                if ('subtotal' === $key) {
+								wpinv_the_price($invoice->get_subtotal(), $invoice->get_currency());
                                 }
 
                                 // Total.
-                                if ( 'total' === $key ) {
-								wpinv_the_price( $invoice->get_total(), $invoice->get_currency() );
+                                if ('total' === $key) {
+								wpinv_the_price($invoice->get_total(), $invoice->get_currency());
                                 }
 
                                 // Fires when printing a cart total.
-                                do_action( "getpaid_invoice_cart_totals_$key", $invoice );
+                                do_action("getpaid_invoice_cart_totals_$key", $invoice);
 
                             ?>
 
@@ -105,4 +105,4 @@ 
     </div>
 </div> <!-- end .getpaid-invoice-line-totals -->
 
-<?php do_action( 'getpaid_after_invoice_line_totals', $invoice, $totals ); ?>
+<?php do_action('getpaid_after_invoice_line_totals', $invoice, $totals); ?>

includes/reports/class-getpaid-reports-helper.php

Indentation +276 added lines, -276 removed lines

@@ -12,294 +12,294 @@
  */
 class GetPaid_Reports_Helper {
 
-	/**
-	 * Get report totals such as invoice totals and discount amounts.
-	 *
-	 * Data example:
-	 *
-	 * 'subtotal' => array(
-	 *     'type'     => 'invoice_data',
-	 *     'function' => 'SUM',
-	 *     'name'     => 'subtotal'
-	 * )
-	 *
-	 * @param  array $args
-	 * @return mixed depending on query_type
-	 */
-	public static function get_invoice_report_data( $args = array() ) {
-		global $wpdb;
-
-		$default_args = array(
-			'data'                  => array(), // The data to retrieve.
-			'where'                 => array(), // An array of where queries.
-			'query_type'            => 'get_row', // wpdb query to run.
-			'group_by'              => '', // What to group results by.
-			'order_by'              => '', // What to order by.
-			'limit'                 => '', // Results limit.
-			'filter_range'          => array(), // An array of before and after dates to limit results by.
-			'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
-			'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
-			'parent_invoice_status' => false, // Optionally filter by parent invoice status.
-		);
-
-		$args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
-		$args         = wp_parse_args( $args, $default_args );
-
-		extract( $args );
-
-		if ( empty( $data ) ) {
-			return '';
-		}
-
-		$query           = array();
-		$query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
-		$query['from']   = "FROM {$wpdb->posts} AS posts";
-		$query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
-
-		$query['where']  = "
+    /**
+     * Get report totals such as invoice totals and discount amounts.
+     *
+     * Data example:
+     *
+     * 'subtotal' => array(
+     *     'type'     => 'invoice_data',
+     *     'function' => 'SUM',
+     *     'name'     => 'subtotal'
+     * )
+     *
+     * @param  array $args
+     * @return mixed depending on query_type
+     */
+    public static function get_invoice_report_data( $args = array() ) {
+        global $wpdb;
+
+        $default_args = array(
+            'data'                  => array(), // The data to retrieve.
+            'where'                 => array(), // An array of where queries.
+            'query_type'            => 'get_row', // wpdb query to run.
+            'group_by'              => '', // What to group results by.
+            'order_by'              => '', // What to order by.
+            'limit'                 => '', // Results limit.
+            'filter_range'          => array(), // An array of before and after dates to limit results by.
+            'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
+            'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
+            'parent_invoice_status' => false, // Optionally filter by parent invoice status.
+        );
+
+        $args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
+        $args         = wp_parse_args( $args, $default_args );
+
+        extract( $args );
+
+        if ( empty( $data ) ) {
+            return '';
+        }
+
+        $query           = array();
+        $query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
+        $query['from']   = "FROM {$wpdb->posts} AS posts";
+        $query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
+
+        $query['where']  = "
 			WHERE 	posts.post_type 	IN ( '" . implode( "','", $invoice_types ) . "' )
 			";
 
-		if ( ! empty( $invoice_status ) ) {
-			$query['where'] .= "
+        if ( ! empty( $invoice_status ) ) {
+            $query['where'] .= "
 				AND 	posts.post_status 	IN ( '" . implode( "','", $invoice_status ) . "' )
 			";
-		}
-
-		if ( ! empty( $parent_invoice_status ) ) {
-			if ( ! empty( $invoice_status ) ) {
-				$query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
-			} else {
-				$query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
-			}
-		}
-
-		if ( ! empty( $filter_range['before'] ) ) {
-			$query['where'] .= "
+        }
+
+        if ( ! empty( $parent_invoice_status ) ) {
+            if ( ! empty( $invoice_status ) ) {
+                $query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
+            } else {
+                $query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
+            }
+        }
+
+        if ( ! empty( $filter_range['before'] ) ) {
+            $query['where'] .= "
 				AND 	posts.post_date <= '" . gmdate( 'Y-m-d 23:59:59', strtotime( $filter_range['before'] ) ) . "'
 			";
-		}
+        }
 
-		if ( ! empty( $filter_range['after'] ) ) {
-			$query['where'] .= "
+        if ( ! empty( $filter_range['after'] ) ) {
+            $query['where'] .= "
 				AND 	posts.post_date >= '" . gmdate( 'Y-m-d 00:00:00', strtotime( $filter_range['after'] ) ) . "'
 			";
-		}
+        }
 
-		if ( ! empty( $where ) ) {
+        if ( ! empty( $where ) ) {
 
-			foreach ( $where as $value ) {
+            foreach ( $where as $value ) {
 
-				if ( strtolower( $value['operator'] ) === 'in' || strtolower( $value['operator'] ) === 'not in' ) {
-
-					if ( is_array( $value['value'] ) ) {
-						$value['value'] = implode( "','", $value['value'] );
-					}
-
-					if ( ! empty( $value['value'] ) ) {
-						$where_value = "{$value['operator']} ('{$value['value']}')";
-					}
-				} else {
-					$where_value = "{$value['operator']} '{$value['value']}'";
-				}
-
-				if ( ! empty( $where_value ) ) {
-					$query['where'] .= " AND {$value['key']} {$where_value}";
-				}
-			}
-		}
-
-		if ( $group_by ) {
-			$query['group_by'] = "GROUP BY {$group_by}";
-		}
-
-		if ( $order_by ) {
-			$query['order_by'] = "ORDER BY {$order_by}";
-		}
-
-		if ( $limit ) {
-			$query['limit'] = "LIMIT {$limit}";
-		}
-
-		$query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
-		$query = implode( ' ', $query );
-
-		return self::execute( $query_type, $query );
-
-	}
-
-	/**
-	 * Prepares the data to select.
-	 *
-	 *
-	 * @param  array $data
-	 * @return array
-	 */
-	public static function prepare_invoice_data( $data ) {
-
-		$prepared = array();
-
-		foreach ( $data as $raw_key => $value ) {
-			$key      = sanitize_key( $raw_key );
-			$distinct = '';
-
-			if ( isset( $value['distinct'] ) ) {
-				$distinct = 'DISTINCT';
-			}
-
-			$get_key = self::get_invoice_table_key( $key, $value['type'] );
-
-			if ( false === $get_key ) {
-				// Skip to the next foreach iteration else the query will be invalid.
-				continue;
-			}
-
-			if ( ! empty( $value['function'] ) ) {
-				$get = "{$value['function']}({$distinct} {$get_key})";
-			} else {
-				$get = "{$distinct} {$get_key}";
-			}
-
-			$prepared[] = "{$get} as {$value['name']}";
-		}
-
-		return $prepared;
-
-	}
-
-	/**
-	 * Prepares the joins to use.
-	 *
-	 *
-	 * @param  array $data
-	 * @param  bool $with_parent
-	 * @return array
-	 */
-	public static function prepare_invoice_joins( $data, $with_parent ) {
-		global $wpdb;
-
-		$prepared = array();
-
-		foreach ( $data as $raw_key => $value ) {
-			$join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
-			$type      = isset( $value['type'] ) ? $value['type'] : false;
-			$key       = sanitize_key( $raw_key );
-
-			switch ( $type ) {
-				case 'meta':
-					$prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
-					break;
-				case 'parent_meta':
-					$prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
-					break;
-				case 'invoice_data':
-					$prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
-					break;
-				case 'invoice_item':
-					$prepared['invoice_items'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoice_items AS invoice_items ON posts.ID = invoice_items.post_id";
-					break;
-			}
-		}
-
-		if ( $with_parent ) {
-			$prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
-		}
-
-		return $prepared;
-
-	}
-
-	/**
-	 * Retrieves the appropriate table key to use.
-	 *
-	 *
-	 * @param  string $key
-	 * @param  string $table
-	 * @return string|false
-	 */
-	public static function get_invoice_table_key( $key, $table ) {
-
-		$keys = array(
-			'meta'         => "meta_{$key}.meta_value",
-			'parent_meta'  => "parent_meta_{$key}.meta_value",
-			'post_data'    => "posts.{$key}",
-			'invoice_data' => "invoices.{$key}",
-			'invoice_item' => "invoice_items.{$key}",
-		);
-
-		return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
-
-	}
-
-	/**
-	 * Executes a query and caches the result for a minute.
-	 *
-	 *
-	 * @param  string $query_type
-	 * @param  string $query
-	 * @return mixed depending on query_type
-	 */
-	public static function execute( $query_type, $query ) {
-		global $wpdb;
-
-		$query_hash = md5( $query_type . $query );
-		$result     = self::get_cached_query( $query_hash );
-		if ( $result === false ) {
-			self::enable_big_selects();
-
-			$result = $wpdb->$query_type( $query );
-			self::set_cached_query( $query_hash, $result );
-		}
-
-		return $result;
-
-	}
-
-	/**
-	 * Enables big mysql selects for reports, just once for this session.
-	 */
-	protected static function enable_big_selects() {
-		static $big_selects = false;
-
-		global $wpdb;
-
-		if ( ! $big_selects ) {
-			$wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
-			$big_selects = true;
-		}
-	}
-
-	/**
-	 * Get the cached query result or null if it's not in the cache.
-	 *
-	 * @param string $query_hash The query hash.
-	 *
-	 * @return mixed|false The cache contents on success, false on failure to retrieve contents.
-	 */
-	protected static function get_cached_query( $query_hash ) {
-
-		return wp_cache_get(
-			$query_hash,
-			strtolower( __CLASS__ )
-		);
-
-	}
-
-	/**
-	 * Set the cached query result.
-	 *
-	 * @param string $query_hash The query hash.
-	 * @param mixed  $data The data to cache.
-	 */
-	protected static function set_cached_query( $query_hash, $data ) {
-
-		wp_cache_set(
-			$query_hash,
-			$data,
-			strtolower( __CLASS__ ),
-			MINUTE_IN_SECONDS
-		);
-
-	}
+                if ( strtolower( $value['operator'] ) === 'in' || strtolower( $value['operator'] ) === 'not in' ) {
+
+                    if ( is_array( $value['value'] ) ) {
+                        $value['value'] = implode( "','", $value['value'] );
+                    }
+
+                    if ( ! empty( $value['value'] ) ) {
+                        $where_value = "{$value['operator']} ('{$value['value']}')";
+                    }
+                } else {
+                    $where_value = "{$value['operator']} '{$value['value']}'";
+                }
+
+                if ( ! empty( $where_value ) ) {
+                    $query['where'] .= " AND {$value['key']} {$where_value}";
+                }
+            }
+        }
+
+        if ( $group_by ) {
+            $query['group_by'] = "GROUP BY {$group_by}";
+        }
+
+        if ( $order_by ) {
+            $query['order_by'] = "ORDER BY {$order_by}";
+        }
+
+        if ( $limit ) {
+            $query['limit'] = "LIMIT {$limit}";
+        }
+
+        $query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
+        $query = implode( ' ', $query );
+
+        return self::execute( $query_type, $query );
+
+    }
+
+    /**
+     * Prepares the data to select.
+     *
+     *
+     * @param  array $data
+     * @return array
+     */
+    public static function prepare_invoice_data( $data ) {
+
+        $prepared = array();
+
+        foreach ( $data as $raw_key => $value ) {
+            $key      = sanitize_key( $raw_key );
+            $distinct = '';
+
+            if ( isset( $value['distinct'] ) ) {
+                $distinct = 'DISTINCT';
+            }
+
+            $get_key = self::get_invoice_table_key( $key, $value['type'] );
+
+            if ( false === $get_key ) {
+                // Skip to the next foreach iteration else the query will be invalid.
+                continue;
+            }
+
+            if ( ! empty( $value['function'] ) ) {
+                $get = "{$value['function']}({$distinct} {$get_key})";
+            } else {
+                $get = "{$distinct} {$get_key}";
+            }
+
+            $prepared[] = "{$get} as {$value['name']}";
+        }
+
+        return $prepared;
+
+    }
+
+    /**
+     * Prepares the joins to use.
+     *
+     *
+     * @param  array $data
+     * @param  bool $with_parent
+     * @return array
+     */
+    public static function prepare_invoice_joins( $data, $with_parent ) {
+        global $wpdb;
+
+        $prepared = array();
+
+        foreach ( $data as $raw_key => $value ) {
+            $join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
+            $type      = isset( $value['type'] ) ? $value['type'] : false;
+            $key       = sanitize_key( $raw_key );
+
+            switch ( $type ) {
+                case 'meta':
+                    $prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
+                    break;
+                case 'parent_meta':
+                    $prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
+                    break;
+                case 'invoice_data':
+                    $prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
+                    break;
+                case 'invoice_item':
+                    $prepared['invoice_items'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoice_items AS invoice_items ON posts.ID = invoice_items.post_id";
+                    break;
+            }
+        }
+
+        if ( $with_parent ) {
+            $prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
+        }
+
+        return $prepared;
+
+    }
+
+    /**
+     * Retrieves the appropriate table key to use.
+     *
+     *
+     * @param  string $key
+     * @param  string $table
+     * @return string|false
+     */
+    public static function get_invoice_table_key( $key, $table ) {
+
+        $keys = array(
+            'meta'         => "meta_{$key}.meta_value",
+            'parent_meta'  => "parent_meta_{$key}.meta_value",
+            'post_data'    => "posts.{$key}",
+            'invoice_data' => "invoices.{$key}",
+            'invoice_item' => "invoice_items.{$key}",
+        );
+
+        return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
+
+    }
+
+    /**
+     * Executes a query and caches the result for a minute.
+     *
+     *
+     * @param  string $query_type
+     * @param  string $query
+     * @return mixed depending on query_type
+     */
+    public static function execute( $query_type, $query ) {
+        global $wpdb;
+
+        $query_hash = md5( $query_type . $query );
+        $result     = self::get_cached_query( $query_hash );
+        if ( $result === false ) {
+            self::enable_big_selects();
+
+            $result = $wpdb->$query_type( $query );
+            self::set_cached_query( $query_hash, $result );
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Enables big mysql selects for reports, just once for this session.
+     */
+    protected static function enable_big_selects() {
+        static $big_selects = false;
+
+        global $wpdb;
+
+        if ( ! $big_selects ) {
+            $wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
+            $big_selects = true;
+        }
+    }
+
+    /**
+     * Get the cached query result or null if it's not in the cache.
+     *
+     * @param string $query_hash The query hash.
+     *
+     * @return mixed|false The cache contents on success, false on failure to retrieve contents.
+     */
+    protected static function get_cached_query( $query_hash ) {
+
+        return wp_cache_get(
+            $query_hash,
+            strtolower( __CLASS__ )
+        );
+
+    }
+
+    /**
+     * Set the cached query result.
+     *
+     * @param string $query_hash The query hash.
+     * @param mixed  $data The data to cache.
+     */
+    protected static function set_cached_query( $query_hash, $data ) {
+
+        wp_cache_set(
+            $query_hash,
+            $data,
+            strtolower( __CLASS__ ),
+            MINUTE_IN_SECONDS
+        );
+
+    }
 
 }

Spacing +64 added lines, -64 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Helper Class.
@@ -26,7 +26,7 @@ 
 	 * @param  array $args
 	 * @return mixed depending on query_type
 	 */
-	public static function get_invoice_report_data( $args = array() ) {
+	public static function get_invoice_report_data($args = array()) {
 		global $wpdb;
 
 		$default_args = array(
@@ -37,94 +37,94 @@ 
 			'order_by'              => '', // What to order by.
 			'limit'                 => '', // Results limit.
 			'filter_range'          => array(), // An array of before and after dates to limit results by.
-			'invoice_types'         => array( 'wpi_invoice' ), // An array of post types to retrieve.
-			'invoice_status'        => array( 'publish', 'wpi-processing', 'wpi-onhold' ),
+			'invoice_types'         => array('wpi_invoice'), // An array of post types to retrieve.
+			'invoice_status'        => array('publish', 'wpi-processing', 'wpi-onhold'),
 			'parent_invoice_status' => false, // Optionally filter by parent invoice status.
 		);
 
-		$args         = apply_filters( 'getpaid_reports_get_invoice_report_data_args', $args );
-		$args         = wp_parse_args( $args, $default_args );
+		$args         = apply_filters('getpaid_reports_get_invoice_report_data_args', $args);
+		$args         = wp_parse_args($args, $default_args);
 
-		extract( $args );
+		extract($args);
 
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			return '';
 		}
 
 		$query           = array();
-		$query['select'] = 'SELECT ' . implode( ',', self::prepare_invoice_data( $data ) );
+		$query['select'] = 'SELECT ' . implode(',', self::prepare_invoice_data($data));
 		$query['from']   = "FROM {$wpdb->posts} AS posts";
-		$query['join']   = implode( ' ', self::prepare_invoice_joins( $data + $where, ! empty( $parent_invoice_status ) ) );
+		$query['join']   = implode(' ', self::prepare_invoice_joins($data + $where, !empty($parent_invoice_status)));
 
 		$query['where']  = "
-			WHERE 	posts.post_type 	IN ( '" . implode( "','", $invoice_types ) . "' )
+			WHERE 	posts.post_type 	IN ( '" . implode("','", $invoice_types) . "' )
 			";
 
-		if ( ! empty( $invoice_status ) ) {
+		if (!empty($invoice_status)) {
 			$query['where'] .= "
-				AND 	posts.post_status 	IN ( '" . implode( "','", $invoice_status ) . "' )
+				AND 	posts.post_status 	IN ( '" . implode("','", $invoice_status) . "' )
 			";
 		}
 
-		if ( ! empty( $parent_invoice_status ) ) {
-			if ( ! empty( $invoice_status ) ) {
-				$query['where'] .= " AND ( parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) OR parent.ID IS NULL ) ";
+		if (!empty($parent_invoice_status)) {
+			if (!empty($invoice_status)) {
+				$query['where'] .= " AND ( parent.post_status IN ( '" . implode("','", $parent_invoice_status) . "' ) OR parent.ID IS NULL ) ";
 			} else {
-				$query['where'] .= " AND parent.post_status IN ( '" . implode( "','", $parent_invoice_status ) . "' ) ";
+				$query['where'] .= " AND parent.post_status IN ( '" . implode("','", $parent_invoice_status) . "' ) ";
 			}
 		}
 
-		if ( ! empty( $filter_range['before'] ) ) {
+		if (!empty($filter_range['before'])) {
 			$query['where'] .= "
-				AND 	posts.post_date <= '" . gmdate( 'Y-m-d 23:59:59', strtotime( $filter_range['before'] ) ) . "'
+				AND 	posts.post_date <= '" . gmdate('Y-m-d 23:59:59', strtotime($filter_range['before'])) . "'
 			";
 		}
 
-		if ( ! empty( $filter_range['after'] ) ) {
+		if (!empty($filter_range['after'])) {
 			$query['where'] .= "
-				AND 	posts.post_date >= '" . gmdate( 'Y-m-d 00:00:00', strtotime( $filter_range['after'] ) ) . "'
+				AND 	posts.post_date >= '" . gmdate('Y-m-d 00:00:00', strtotime($filter_range['after'])) . "'
 			";
 		}
 
-		if ( ! empty( $where ) ) {
+		if (!empty($where)) {
 
-			foreach ( $where as $value ) {
+			foreach ($where as $value) {
 
-				if ( strtolower( $value['operator'] ) === 'in' || strtolower( $value['operator'] ) === 'not in' ) {
+				if (strtolower($value['operator']) === 'in' || strtolower($value['operator']) === 'not in') {
 
-					if ( is_array( $value['value'] ) ) {
-						$value['value'] = implode( "','", $value['value'] );
+					if (is_array($value['value'])) {
+						$value['value'] = implode("','", $value['value']);
 					}
 
-					if ( ! empty( $value['value'] ) ) {
+					if (!empty($value['value'])) {
 						$where_value = "{$value['operator']} ('{$value['value']}')";
 					}
 				} else {
 					$where_value = "{$value['operator']} '{$value['value']}'";
 				}
 
-				if ( ! empty( $where_value ) ) {
+				if (!empty($where_value)) {
 					$query['where'] .= " AND {$value['key']} {$where_value}";
 				}
 			}
 		}
 
-		if ( $group_by ) {
+		if ($group_by) {
 			$query['group_by'] = "GROUP BY {$group_by}";
 		}
 
-		if ( $order_by ) {
+		if ($order_by) {
 			$query['order_by'] = "ORDER BY {$order_by}";
 		}
 
-		if ( $limit ) {
+		if ($limit) {
 			$query['limit'] = "LIMIT {$limit}";
 		}
 
-		$query = apply_filters( 'getpaid_reports_get_invoice_report_query', $query, $data );
-		$query = implode( ' ', $query );
+		$query = apply_filters('getpaid_reports_get_invoice_report_query', $query, $data);
+		$query = implode(' ', $query);
 
-		return self::execute( $query_type, $query );
+		return self::execute($query_type, $query);
 
 	}
 
@@ -135,26 +135,26 @@ 
 	 * @param  array $data
 	 * @return array
 	 */
-	public static function prepare_invoice_data( $data ) {
+	public static function prepare_invoice_data($data) {
 
 		$prepared = array();
 
-		foreach ( $data as $raw_key => $value ) {
-			$key      = sanitize_key( $raw_key );
+		foreach ($data as $raw_key => $value) {
+			$key      = sanitize_key($raw_key);
 			$distinct = '';
 
-			if ( isset( $value['distinct'] ) ) {
+			if (isset($value['distinct'])) {
 				$distinct = 'DISTINCT';
 			}
 
-			$get_key = self::get_invoice_table_key( $key, $value['type'] );
+			$get_key = self::get_invoice_table_key($key, $value['type']);
 
-			if ( false === $get_key ) {
+			if (false === $get_key) {
 				// Skip to the next foreach iteration else the query will be invalid.
 				continue;
 			}
 
-			if ( ! empty( $value['function'] ) ) {
+			if (!empty($value['function'])) {
 				$get = "{$value['function']}({$distinct} {$get_key})";
 			} else {
 				$get = "{$distinct} {$get_key}";
@@ -175,22 +175,22 @@ 
 	 * @param  bool $with_parent
 	 * @return array
 	 */
-	public static function prepare_invoice_joins( $data, $with_parent ) {
+	public static function prepare_invoice_joins($data, $with_parent) {
 		global $wpdb;
 
 		$prepared = array();
 
-		foreach ( $data as $raw_key => $value ) {
-			$join_type = isset( $value['join_type'] ) ? $value['join_type'] : 'INNER';
-			$type      = isset( $value['type'] ) ? $value['type'] : false;
-			$key       = sanitize_key( $raw_key );
+		foreach ($data as $raw_key => $value) {
+			$join_type = isset($value['join_type']) ? $value['join_type'] : 'INNER';
+			$type      = isset($value['type']) ? $value['type'] : false;
+			$key       = sanitize_key($raw_key);
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'meta':
-					$prepared[ "meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
+					$prepared["meta_{$key}"] = "{$join_type} JOIN {$wpdb->postmeta} AS meta_{$key} ON ( posts.ID = meta_{$key}.post_id AND meta_{$key}.meta_key = '{$raw_key}' )";
 					break;
 				case 'parent_meta':
-					$prepared[ "parent_meta_{$key}" ] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
+					$prepared["parent_meta_{$key}"] = "{$join_type} JOIN {$wpdb->postmeta} AS parent_meta_{$key} ON (posts.post_parent = parent_meta_{$key}.post_id) AND (parent_meta_{$key}.meta_key = '{$raw_key}')";
 					break;
 				case 'invoice_data':
 					$prepared['invoices'] = "{$join_type} JOIN {$wpdb->prefix}getpaid_invoices AS invoices ON posts.ID = invoices.post_id";
@@ -201,7 +201,7 @@ 
 			}
 		}
 
-		if ( $with_parent ) {
+		if ($with_parent) {
 			$prepared['parent'] = "LEFT JOIN {$wpdb->posts} AS parent ON posts.post_parent = parent.ID";
 		}
 
@@ -217,7 +217,7 @@ 
 	 * @param  string $table
 	 * @return string|false
 	 */
-	public static function get_invoice_table_key( $key, $table ) {
+	public static function get_invoice_table_key($key, $table) {
 
 		$keys = array(
 			'meta'         => "meta_{$key}.meta_value",
@@ -227,7 +227,7 @@ 
 			'invoice_item' => "invoice_items.{$key}",
 		);
 
-		return isset( $keys[ $table ] ) ? $keys[ $table ] : false;
+		return isset($keys[$table]) ? $keys[$table] : false;
 
 	}
 
@@ -239,16 +239,16 @@ 
 	 * @param  string $query
 	 * @return mixed depending on query_type
 	 */
-	public static function execute( $query_type, $query ) {
+	public static function execute($query_type, $query) {
 		global $wpdb;
 
-		$query_hash = md5( $query_type . $query );
-		$result     = self::get_cached_query( $query_hash );
-		if ( $result === false ) {
+		$query_hash = md5($query_type . $query);
+		$result     = self::get_cached_query($query_hash);
+		if ($result === false) {
 			self::enable_big_selects();
 
-			$result = $wpdb->$query_type( $query );
-			self::set_cached_query( $query_hash, $result );
+			$result = $wpdb->$query_type($query);
+			self::set_cached_query($query_hash, $result);
 		}
 
 		return $result;
@@ -263,8 +263,8 @@ 
 
 		global $wpdb;
 
-		if ( ! $big_selects ) {
-			$wpdb->query( 'SET SESSION SQL_BIG_SELECTS=1' );
+		if (!$big_selects) {
+			$wpdb->query('SET SESSION SQL_BIG_SELECTS=1');
 			$big_selects = true;
 		}
 	}
@@ -276,11 +276,11 @@ 
 	 *
 	 * @return mixed|false The cache contents on success, false on failure to retrieve contents.
 	 */
-	protected static function get_cached_query( $query_hash ) {
+	protected static function get_cached_query($query_hash) {
 
 		return wp_cache_get(
 			$query_hash,
-			strtolower( __CLASS__ )
+			strtolower(__CLASS__)
 		);
 
 	}
@@ -291,12 +291,12 @@ 
 	 * @param string $query_hash The query hash.
 	 * @param mixed  $data The data to cache.
 	 */
-	protected static function set_cached_query( $query_hash, $data ) {
+	protected static function set_cached_query($query_hash, $data) {
 
 		wp_cache_set(
 			$query_hash,
 			$data,
-			strtolower( __CLASS__ ),
+			strtolower(__CLASS__),
 			MINUTE_IN_SECONDS
 		);
 

includes/class-getpaid-daily-maintenance.php

Indentation +139 added lines, -139 removed lines

@@ -12,144 +12,144 @@
  */
 class GetPaid_Daily_Maintenance {
 
-	/**
-	 * Class constructor.
-	 */
-	public function __construct() {
-
-		// Clear deprecated events.
-		add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
-
-		// (Maybe) schedule a cron that runs daily.
-		add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
-
-		// Fired everyday at 7 a.m (this might vary for sites with few visitors)
-		add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'check_renewing_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
-
-	}
-
-	/**
-	 * Schedules a cron to run every day at 7 a.m
-	 *
-	 */
-	public function maybe_create_scheduled_event() {
-
-		if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
-			$timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
-			wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
-		}
-
-	}
-
-	/**
-	 * Clears deprecated events.
-	 *
-	 */
-	public function maybe_clear_deprecated_events() {
-
-		if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
-			update_option( 'wpinv_cleared_old_events', 1 );
-		}
-
-	}
-
-	/**
-	 * Fires the old hook for backwards compatibility.
-	 *
-	 */
-	public function backwards_compat() {
-		do_action( 'wpinv_register_schedule_event_daily' );
-	}
-
-	/**
-	 * Checks for subscriptions that are scheduled to renew.
-	 *
-	 */
-	public function check_renewing_subscriptions() {
-
-		// Fetch subscriptions that expire today.
-		$args  = array(
-			'number'             => -1,
-			'count_total'        => false,
-			'status'             => 'trialling active',
-			'date_expires_query' => array(
-				array(
-					'year'    => gmdate( 'Y' ),
-					'month'   => gmdate( 'n' ),
-					'day'     => gmdate( 'j' ),
-					'compare' => '=',
-				),
-			),
-		);
-
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
-
-		foreach ( $subscriptions->get_results() as $subscription ) {
-
-			/** @var WPInv_Subscription $subscription */
-			if ( $subscription->is_last_renewal() ) {
-				$subscription->complete();
-			} else {
-				do_action( 'getpaid_should_renew_subscription', $subscription );
-			}
-		}
-
-	}
-
-	/**
-	 * Expires expired subscriptions.
-	 *
-	 */
-	public function maybe_expire_subscriptions() {
-
-		// Fetch expired subscriptions (skips those that expire today).
-		$args  = array(
-			'number'             => -1,
-			'count_total'        => false,
-			'status'             => 'trialling active failing cancelled',
-			'date_expires_query' => array(
-				'before'    => 'yesterday',
-				'inclusive' => false,
-			),
-		);
-
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
-
-		foreach ( $subscriptions->get_results() as $subscription ) {
-			if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', false, $subscription ) ) {
-				$subscription->set_status( 'expired' );
-				$subscription->save();
-			}
-		}
-
-	}
-
-	/**
-	 * Logs cron runs.
-	 *
-	 */
-	public function log_cron_run() {
-		wpinv_error_log( 'GetPaid Daily Cron', false );
-	}
-
-	/**
-	 * Updates GeoIP databases.
-	 *
-	 */
-	public function maybe_update_geoip_databases() {
-		$updated = get_transient( 'getpaid_updated_geoip_databases' );
-
-		if ( false === $updated ) {
-			set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
-			do_action( 'getpaid_update_geoip_databases' );
-		}
-
-	}
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
+
+        // Clear deprecated events.
+        add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
+
+        // (Maybe) schedule a cron that runs daily.
+        add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
+
+        // Fired everyday at 7 a.m (this might vary for sites with few visitors)
+        add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'check_renewing_subscriptions' ) );
+        add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
+
+    }
+
+    /**
+     * Schedules a cron to run every day at 7 a.m
+     *
+     */
+    public function maybe_create_scheduled_event() {
+
+        if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
+            $timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
+            wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
+        }
+
+    }
+
+    /**
+     * Clears deprecated events.
+     *
+     */
+    public function maybe_clear_deprecated_events() {
+
+        if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
+            wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
+            wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
+            update_option( 'wpinv_cleared_old_events', 1 );
+        }
+
+    }
+
+    /**
+     * Fires the old hook for backwards compatibility.
+     *
+     */
+    public function backwards_compat() {
+        do_action( 'wpinv_register_schedule_event_daily' );
+    }
+
+    /**
+     * Checks for subscriptions that are scheduled to renew.
+     *
+     */
+    public function check_renewing_subscriptions() {
+
+        // Fetch subscriptions that expire today.
+        $args  = array(
+            'number'             => -1,
+            'count_total'        => false,
+            'status'             => 'trialling active',
+            'date_expires_query' => array(
+                array(
+                    'year'    => gmdate( 'Y' ),
+                    'month'   => gmdate( 'n' ),
+                    'day'     => gmdate( 'j' ),
+                    'compare' => '=',
+                ),
+            ),
+        );
+
+        $subscriptions = new GetPaid_Subscriptions_Query( $args );
+
+        foreach ( $subscriptions->get_results() as $subscription ) {
+
+            /** @var WPInv_Subscription $subscription */
+            if ( $subscription->is_last_renewal() ) {
+                $subscription->complete();
+            } else {
+                do_action( 'getpaid_should_renew_subscription', $subscription );
+            }
+        }
+
+    }
+
+    /**
+     * Expires expired subscriptions.
+     *
+     */
+    public function maybe_expire_subscriptions() {
+
+        // Fetch expired subscriptions (skips those that expire today).
+        $args  = array(
+            'number'             => -1,
+            'count_total'        => false,
+            'status'             => 'trialling active failing cancelled',
+            'date_expires_query' => array(
+                'before'    => 'yesterday',
+                'inclusive' => false,
+            ),
+        );
+
+        $subscriptions = new GetPaid_Subscriptions_Query( $args );
+
+        foreach ( $subscriptions->get_results() as $subscription ) {
+            if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', false, $subscription ) ) {
+                $subscription->set_status( 'expired' );
+                $subscription->save();
+            }
+        }
+
+    }
+
+    /**
+     * Logs cron runs.
+     *
+     */
+    public function log_cron_run() {
+        wpinv_error_log( 'GetPaid Daily Cron', false );
+    }
+
+    /**
+     * Updates GeoIP databases.
+     *
+     */
+    public function maybe_update_geoip_databases() {
+        $updated = get_transient( 'getpaid_updated_geoip_databases' );
+
+        if ( false === $updated ) {
+            set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
+            do_action( 'getpaid_update_geoip_databases' );
+        }
+
+    }
 
 }

Spacing +34 added lines, -34 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Daily maintenance class.
@@ -18,17 +18,17 @@ 
 	public function __construct() {
 
 		// Clear deprecated events.
-		add_action( 'wp', array( $this, 'maybe_clear_deprecated_events' ) );
+		add_action('wp', array($this, 'maybe_clear_deprecated_events'));
 
 		// (Maybe) schedule a cron that runs daily.
-		add_action( 'wp', array( $this, 'maybe_create_scheduled_event' ) );
+		add_action('wp', array($this, 'maybe_create_scheduled_event'));
 
 		// Fired everyday at 7 a.m (this might vary for sites with few visitors)
-		add_action( 'getpaid_daily_maintenance', array( $this, 'log_cron_run' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'backwards_compat' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_expire_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'check_renewing_subscriptions' ) );
-		add_action( 'getpaid_daily_maintenance', array( $this, 'maybe_update_geoip_databases' ) );
+		add_action('getpaid_daily_maintenance', array($this, 'log_cron_run'));
+		add_action('getpaid_daily_maintenance', array($this, 'backwards_compat'));
+		add_action('getpaid_daily_maintenance', array($this, 'maybe_expire_subscriptions'));
+		add_action('getpaid_daily_maintenance', array($this, 'check_renewing_subscriptions'));
+		add_action('getpaid_daily_maintenance', array($this, 'maybe_update_geoip_databases'));
 
 	}
 
@@ -38,9 +38,9 @@ 
 	 */
 	public function maybe_create_scheduled_event() {
 
-		if ( ! wp_next_scheduled( 'getpaid_daily_maintenance' ) ) {
-			$timestamp = strtotime( 'tomorrow 07:00:00', current_time( 'timestamp' ) );
-			wp_schedule_event( $timestamp, 'daily', 'getpaid_daily_maintenance' );
+		if (!wp_next_scheduled('getpaid_daily_maintenance')) {
+			$timestamp = strtotime('tomorrow 07:00:00', current_time('timestamp'));
+			wp_schedule_event($timestamp, 'daily', 'getpaid_daily_maintenance');
 		}
 
 	}
@@ -51,10 +51,10 @@ 
 	 */
 	public function maybe_clear_deprecated_events() {
 
-		if ( ! get_option( 'wpinv_cleared_old_events' ) ) {
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_twicedaily' );
-			wp_clear_scheduled_hook( 'wpinv_register_schedule_event_daily' );
-			update_option( 'wpinv_cleared_old_events', 1 );
+		if (!get_option('wpinv_cleared_old_events')) {
+			wp_clear_scheduled_hook('wpinv_register_schedule_event_twicedaily');
+			wp_clear_scheduled_hook('wpinv_register_schedule_event_daily');
+			update_option('wpinv_cleared_old_events', 1);
 		}
 
 	}
@@ -64,7 +64,7 @@ 
 	 *
 	 */
 	public function backwards_compat() {
-		do_action( 'wpinv_register_schedule_event_daily' );
+		do_action('wpinv_register_schedule_event_daily');
 	}
 
 	/**
@@ -74,29 +74,29 @@ 
 	public function check_renewing_subscriptions() {
 
 		// Fetch subscriptions that expire today.
-		$args  = array(
+		$args = array(
 			'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active',
 			'date_expires_query' => array(
 				array(
-					'year'    => gmdate( 'Y' ),
-					'month'   => gmdate( 'n' ),
-					'day'     => gmdate( 'j' ),
+					'year'    => gmdate('Y'),
+					'month'   => gmdate('n'),
+					'day'     => gmdate('j'),
 					'compare' => '=',
 				),
 			),
 		);
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-		foreach ( $subscriptions->get_results() as $subscription ) {
+		foreach ($subscriptions->get_results() as $subscription) {
 
 			/** @var WPInv_Subscription $subscription */
-			if ( $subscription->is_last_renewal() ) {
+			if ($subscription->is_last_renewal()) {
 				$subscription->complete();
 			} else {
-				do_action( 'getpaid_should_renew_subscription', $subscription );
+				do_action('getpaid_should_renew_subscription', $subscription);
 			}
 		}
 
@@ -109,7 +109,7 @@ 
 	public function maybe_expire_subscriptions() {
 
 		// Fetch expired subscriptions (skips those that expire today).
-		$args  = array(
+		$args = array(
 			'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active failing cancelled',
@@ -119,11 +119,11 @@ 
 			),
 		);
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-		foreach ( $subscriptions->get_results() as $subscription ) {
-			if ( apply_filters( 'getpaid_daily_maintenance_should_expire_subscription', false, $subscription ) ) {
-				$subscription->set_status( 'expired' );
+		foreach ($subscriptions->get_results() as $subscription) {
+			if (apply_filters('getpaid_daily_maintenance_should_expire_subscription', false, $subscription)) {
+				$subscription->set_status('expired');
 				$subscription->save();
 			}
 		}
@@ -135,7 +135,7 @@ 
 	 *
 	 */
 	public function log_cron_run() {
-		wpinv_error_log( 'GetPaid Daily Cron', false );
+		wpinv_error_log('GetPaid Daily Cron', false);
 	}
 
 	/**
@@ -143,11 +143,11 @@ 
 	 *
 	 */
 	public function maybe_update_geoip_databases() {
-		$updated = get_transient( 'getpaid_updated_geoip_databases' );
+		$updated = get_transient('getpaid_updated_geoip_databases');
 
-		if ( false === $updated ) {
-			set_transient( 'getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS );
-			do_action( 'getpaid_update_geoip_databases' );
+		if (false === $updated) {
+			set_transient('getpaid_updated_geoip_databases', 1, 15 * DAY_IN_SECONDS);
+			do_action('getpaid_update_geoip_databases');
 		}
 
 	}

templates/subscriptions/subscription-details.php

Indentation +46 added lines, -46 removed lines

@@ -39,62 +39,62 @@ 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+                        switch ( $key ) {
 
-						case 'status':
-							echo esc_html( $subscription->get_status_label() );
-							break;
+                        case 'status':
+                            echo esc_html( $subscription->get_status_label() );
+                            break;
 
-						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
-							break;
+                        case 'start_date':
+                            echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+                            break;
 
-						case 'expiry_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
-							break;
+                        case 'expiry_date':
+                            echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
+                            break;
 
-						case 'initial_amount':
-							echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
+                        case 'initial_amount':
+                            echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
 
-							if ( $subscription->has_trial_period() ) {
+                            if ( $subscription->has_trial_period() ) {
 
-								echo "<small class='text-muted'>&nbsp;";
-								printf(
-									esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
-									esc_html( $subscription->get_trial_period() )
-								);
-								echo '</small>';
+                                echo "<small class='text-muted'>&nbsp;";
+                                printf(
+                                    esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
+                                    esc_html( $subscription->get_trial_period() )
+                                );
+                                echo '</small>';
 
-							}
+                            }
 
-							break;
+                            break;
 
-						case 'recurring_amount':
-							$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-							$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-							echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
-							break;
+                        case 'recurring_amount':
+                            $frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+                            $amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
+                            echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
+                            break;
 
-						case 'item':
-							if ( empty( $subscription_group ) ) {
-								echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
-							} else {
-								$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-								echo wp_kses_post( implode( ' | ', $markup ) );
-							}
+                        case 'item':
+                            if ( empty( $subscription_group ) ) {
+                                echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+                            } else {
+                                $markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
+                                echo wp_kses_post( implode( ' | ', $markup ) );
+                            }
 
-							break;
+                            break;
 
-						case 'payments':
-							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+                        case 'payments':
+                            $max_activations = (int) $subscription->get_bill_times();
+                            echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
 
-							break;
+                            break;
 
-						}
-						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
+                        }
+                        do_action( "getpaid_render_single_subscription_column_$key", $subscription );
 
-					?>
+                    ?>
 				</td>
 
 			</tr>
@@ -121,17 +121,17 @@ 
 <span class="form-text">
 
 	<?php
-		if ( $subscription->can_cancel() ) {
-		printf(
+        if ( $subscription->can_cancel() ) {
+        printf(
             '<a href="%s" class="btn btn-danger btn-sm" onclick="return confirm(\'%s\')">%s</a>&nbsp;&nbsp;',
             esc_url( $subscription->get_cancel_url() ),
             esc_attr__( 'Are you sure you want to cancel this subscription?', 'invoicing' ),
             esc_html__( 'Cancel Subscription', 'invoicing' )
         );
-		}
+        }
 
-		do_action( 'getpaid-single-subscription-page-actions', $subscription );
-	?>
+        do_action( 'getpaid-single-subscription-page-actions', $subscription );
+    ?>
 
 	<a href="<?php echo esc_url( getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) ); ?>" class="btn btn-secondary btn-sm"><?php esc_html_e( 'Go Back', 'invoicing' ); ?></a>
 </span>

Switch Indentation +48 added lines, -48 removed lines

@@ -1,4 +1,4 @@ 
-<?php
+    <?php
 
 /**
  * Template that prints a single subscription's details
@@ -10,19 +10,19 @@ 
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+    defined( 'ABSPATH' ) || exit;
 
-do_action( 'getpaid_single_subscription_before_notices', $subscription );
+    do_action( 'getpaid_single_subscription_before_notices', $subscription );
 
-// Display errors and notices.
-wpinv_print_errors();
+    // Display errors and notices.
+    wpinv_print_errors();
 
-$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
-$subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+    $subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
+    $subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
 
-do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
+    do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
 
-?>
+    ?>
 
 <h2 class="mb-1 h4"><?php esc_html_e( 'Subscription Details', 'invoicing' ); ?></h2>
 <table class="table table-bordered">
@@ -39,59 +39,59 @@ 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+						    switch ( $key ) {
 
-						case 'status':
-							echo esc_html( $subscription->get_status_label() );
-							break;
+						        case 'status':
+							        echo esc_html( $subscription->get_status_label() );
+							        break;
 
-						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
-							break;
+						        case 'start_date':
+							        echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+							        break;
 
-						case 'expiry_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
-							break;
+						        case 'expiry_date':
+							        echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
+							        break;
 
-						case 'initial_amount':
-							echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
+						        case 'initial_amount':
+							        echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
 
-							if ( $subscription->has_trial_period() ) {
+							        if ( $subscription->has_trial_period() ) {
 
-								echo "<small class='text-muted'>&nbsp;";
-								printf(
-									esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
-									esc_html( $subscription->get_trial_period() )
-								);
-								echo '</small>';
+								        echo "<small class='text-muted'>&nbsp;";
+								        printf(
+									        esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
+									        esc_html( $subscription->get_trial_period() )
+								        );
+								        echo '</small>';
 
-							}
+							        }
 
-							break;
+							        break;
 
-						case 'recurring_amount':
-							$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-							$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-							echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
-							break;
+						        case 'recurring_amount':
+							        $frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+							        $amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
+							        echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
+							        break;
 
-						case 'item':
-							if ( empty( $subscription_group ) ) {
-								echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
-							} else {
-								$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-								echo wp_kses_post( implode( ' | ', $markup ) );
-							}
+						        case 'item':
+							        if ( empty( $subscription_group ) ) {
+								        echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+							        } else {
+								        $markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
+								        echo wp_kses_post( implode( ' | ', $markup ) );
+							        }
 
-							break;
+							        break;
 
-						case 'payments':
-							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+						        case 'payments':
+							        $max_activations = (int) $subscription->get_bill_times();
+							        echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
 
-							break;
+							        break;
 
-						}
+						    }
 						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
 
 					?>

Spacing +40 added lines, -40 removed lines

@@ -10,58 +10,58 @@ 
  * @var WPInv_Subscriptions_Widget $widget
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-do_action( 'getpaid_single_subscription_before_notices', $subscription );
+do_action('getpaid_single_subscription_before_notices', $subscription);
 
 // Display errors and notices.
 wpinv_print_errors();
 
-$subscription_groups = getpaid_get_invoice_subscription_groups( $subscription->get_parent_invoice_id() );
-$subscription_group  = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+$subscription_groups = getpaid_get_invoice_subscription_groups($subscription->get_parent_invoice_id());
+$subscription_group  = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
 
-do_action( 'getpaid_before_single_subscription', $subscription, $subscription_groups );
+do_action('getpaid_before_single_subscription', $subscription, $subscription_groups);
 
 ?>
 
-<h2 class="mb-1 h4"><?php esc_html_e( 'Subscription Details', 'invoicing' ); ?></h2>
+<h2 class="mb-1 h4"><?php esc_html_e('Subscription Details', 'invoicing'); ?></h2>
 <table class="table table-bordered">
 	<tbody>
 
-		<?php foreach ( $widget->get_single_subscription_columns( $subscription ) as $key => $label ) : ?>
+		<?php foreach ($widget->get_single_subscription_columns($subscription) as $key => $label) : ?>
 
-			<tr class="getpaid-subscription-meta-<?php echo esc_attr( $key ); ?>">
+			<tr class="getpaid-subscription-meta-<?php echo esc_attr($key); ?>">
 
 				<th class="font-weight-bold" style="width: 35%">
-					<?php echo esc_html( $label ); ?>
+					<?php echo esc_html($label); ?>
 				</th>
 
 				<td style="width: 65%">
 					<?php
 
-						switch ( $key ) {
+						switch ($key) {
 
 						case 'status':
-							echo esc_html( $subscription->get_status_label() );
+							echo esc_html($subscription->get_status_label());
 							break;
 
 						case 'start_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_date_created() ) );
+							echo esc_html(getpaid_format_date_value($subscription->get_date_created()));
 							break;
 
 						case 'expiry_date':
-							echo esc_html( getpaid_format_date_value( $subscription->get_next_renewal_date() ) );
+							echo esc_html(getpaid_format_date_value($subscription->get_next_renewal_date()));
 							break;
 
 						case 'initial_amount':
-							echo wp_kses_post( wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() ) );
+							echo wp_kses_post(wpinv_price($subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency()));
 
-							if ( $subscription->has_trial_period() ) {
+							if ($subscription->has_trial_period()) {
 
 								echo "<small class='text-muted'>&nbsp;";
 								printf(
-									esc_html_x( '( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing' ),
-									esc_html( $subscription->get_trial_period() )
+									esc_html_x('( %1$s trial )', 'Subscription trial period. (e.g.: 1 month trial)', 'invoicing'),
+									esc_html($subscription->get_trial_period())
 								);
 								echo '</small>';
 
@@ -70,29 +70,29 @@ 
 							break;
 
 						case 'recurring_amount':
-							$frequency = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-							$amount    = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-							echo wp_kses_post( strtolower( "<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>" ) );
+							$frequency = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
+							$amount    = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency());
+							echo wp_kses_post(strtolower("<strong style='font-weight: 500;'>$amount</strong> / <span class='getpaid-item-recurring-period'>$frequency</span>"));
 							break;
 
 						case 'item':
-							if ( empty( $subscription_group ) ) {
-								echo wp_kses_post( WPInv_Subscriptions_List_Table::generate_item_markup( $subscription->get_product_id() ) );
+							if (empty($subscription_group)) {
+								echo wp_kses_post(WPInv_Subscriptions_List_Table::generate_item_markup($subscription->get_product_id()));
 							} else {
-								$markup = array_map( array( 'WPInv_Subscriptions_List_Table', 'generate_item_markup' ), array_keys( $subscription_group['items'] ) );
-								echo wp_kses_post( implode( ' | ', $markup ) );
+								$markup = array_map(array('WPInv_Subscriptions_List_Table', 'generate_item_markup'), array_keys($subscription_group['items']));
+								echo wp_kses_post(implode(' | ', $markup));
 							}
 
 							break;
 
 						case 'payments':
 							$max_activations = (int) $subscription->get_bill_times();
-							echo ( (int) $subscription->get_times_billed() ) . ' / ' . ( empty( $max_activations ) ? '&infin;' : (int) $max_activations );
+							echo ((int) $subscription->get_times_billed()) . ' / ' . (empty($max_activations) ? '&infin;' : (int) $max_activations);
 
 							break;
 
 						}
-						do_action( "getpaid_render_single_subscription_column_$key", $subscription );
+						do_action("getpaid_render_single_subscription_column_$key", $subscription);
 
 					?>
 				</td>
@@ -104,34 +104,34 @@ 
 	</tbody>
 </table>
 
-<?php if ( ! empty( $subscription_group ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Subscription Items', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_item_details_metabox( $subscription ); ?>
+<?php if (!empty($subscription_group)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Subscription Items', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_item_details_metabox($subscription); ?>
 <?php endif; ?>
 
-<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Related Invoices', 'invoicing' ); ?></h2>
+<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Related Invoices', 'invoicing'); ?></h2>
 
-<?php echo wp_kses_post( getpaid_admin_subscription_invoice_details_metabox( $subscription ) ); ?>
+<?php echo wp_kses_post(getpaid_admin_subscription_invoice_details_metabox($subscription)); ?>
 
-<?php if ( 1 < count( $subscription_groups ) ) : ?>
-	<h2 class='mt-5 mb-1 h4'><?php esc_html_e( 'Related Subscriptions', 'invoicing' ); ?></h2>
-	<?php getpaid_admin_subscription_related_subscriptions_metabox( $subscription ); ?>
+<?php if (1 < count($subscription_groups)) : ?>
+	<h2 class='mt-5 mb-1 h4'><?php esc_html_e('Related Subscriptions', 'invoicing'); ?></h2>
+	<?php getpaid_admin_subscription_related_subscriptions_metabox($subscription); ?>
 <?php endif; ?>
 
 <span class="form-text">
 
 	<?php
-		if ( $subscription->can_cancel() ) {
+		if ($subscription->can_cancel()) {
 		printf(
             '<a href="%s" class="btn btn-danger btn-sm" onclick="return confirm(\'%s\')">%s</a>&nbsp;&nbsp;',
-            esc_url( $subscription->get_cancel_url() ),
-            esc_attr__( 'Are you sure you want to cancel this subscription?', 'invoicing' ),
-            esc_html__( 'Cancel Subscription', 'invoicing' )
+            esc_url($subscription->get_cancel_url()),
+            esc_attr__('Are you sure you want to cancel this subscription?', 'invoicing'),
+            esc_html__('Cancel Subscription', 'invoicing')
         );
 		}
 
-		do_action( 'getpaid-single-subscription-page-actions', $subscription );
+		do_action('getpaid-single-subscription-page-actions', $subscription);
 	?>
 
-	<a href="<?php echo esc_url( getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) ); ?>" class="btn btn-secondary btn-sm"><?php esc_html_e( 'Go Back', 'invoicing' ); ?></a>
+	<a href="<?php echo esc_url(getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')))); ?>" class="btn btn-secondary btn-sm"><?php esc_html_e('Go Back', 'invoicing'); ?></a>
 </span>

includes/admin/meta-boxes/class-getpaid-meta-box-invoice-address.php

Indentation +277 added lines, -277 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -16,85 +16,85 @@ 
  */
 class GetPaid_Meta_Box_Invoice_Address {
 
-	/**
-	 * Output the metabox.
-	 *
-	 * @param WP_Post $post
-	 */
-	public static function output( $post ) {
-
-		// Prepare the invoice.
-		$invoice  = new WPInv_Invoice( $post );
-		$customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-		$customer = new WP_User( $customer );
-		$display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-		wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
-
-		// Address fields.
-		$address_fields = array(
-			'first_name' => array(
-				'label' => __( 'First Name', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'last_name'  => array(
-				'label' => __( 'Last Name', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'company'    => array(
-				'label' => __( 'Company', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'vat_number' => array(
-				'label' => __( 'VAT Number', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'address'    => array(
-				'label' => __( 'Address', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'city'       => array(
-				'label' => __( 'City', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'country'    => array(
-				'label'       => __( 'Country', 'invoicing' ),
-				'type'        => 'select',
-				'class'       => 'getpaid-recalculate-prices-on-change',
-				'options'     => wpinv_get_country_list(),
-				'placeholder' => __( 'Choose a country', 'invoicing' ),
-			),
-			'state'      => array(
-				'label' => __( 'State', 'invoicing' ),
-				'type'  => 'text',
-				'class' => 'getpaid-recalculate-prices-on-change',
-			),
-			'zip'        => array(
-				'label' => __( 'Zip', 'invoicing' ),
-				'type'  => 'text',
-			),
-			'phone'      => array(
-				'label' => __( 'Phone', 'invoicing' ),
-				'type'  => 'text',
-			),
-		);
-
-		$states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
-
-		if ( ! empty( $states ) ) {
-			$address_fields['state']['type']        = 'select';
-			$address_fields['state']['options']     = $states;
-			$address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
-		}
-
-		// Maybe remove the VAT field.
-		if ( ! wpinv_use_taxes() ) {
-			unset( $address_fields['vat_number'] );
-		}
-
-		$address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
-		?>
+    /**
+     * Output the metabox.
+     *
+     * @param WP_Post $post
+     */
+    public static function output( $post ) {
+
+        // Prepare the invoice.
+        $invoice  = new WPInv_Invoice( $post );
+        $customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
+        $customer = new WP_User( $customer );
+        $display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
+        wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+
+        // Address fields.
+        $address_fields = array(
+            'first_name' => array(
+                'label' => __( 'First Name', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'last_name'  => array(
+                'label' => __( 'Last Name', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'company'    => array(
+                'label' => __( 'Company', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'vat_number' => array(
+                'label' => __( 'VAT Number', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'address'    => array(
+                'label' => __( 'Address', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'city'       => array(
+                'label' => __( 'City', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'country'    => array(
+                'label'       => __( 'Country', 'invoicing' ),
+                'type'        => 'select',
+                'class'       => 'getpaid-recalculate-prices-on-change',
+                'options'     => wpinv_get_country_list(),
+                'placeholder' => __( 'Choose a country', 'invoicing' ),
+            ),
+            'state'      => array(
+                'label' => __( 'State', 'invoicing' ),
+                'type'  => 'text',
+                'class' => 'getpaid-recalculate-prices-on-change',
+            ),
+            'zip'        => array(
+                'label' => __( 'Zip', 'invoicing' ),
+                'type'  => 'text',
+            ),
+            'phone'      => array(
+                'label' => __( 'Phone', 'invoicing' ),
+                'type'  => 'text',
+            ),
+        );
+
+        $states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+
+        if ( ! empty( $states ) ) {
+            $address_fields['state']['type']        = 'select';
+            $address_fields['state']['options']     = $states;
+            $address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
+        }
+
+        // Maybe remove the VAT field.
+        if ( ! wpinv_use_taxes() ) {
+            unset( $address_fields['vat_number'] );
+        }
+
+        $address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
+        ?>
 
 		<style>
 			#wpinv-address label {
@@ -119,19 +119,19 @@ 
 							<div id="getpaid-invoice-email-wrapper" class="d-none">
 								<input type="hidden" id="getpaid-invoice-create-new-user" name="wpinv_new_user" value="" />
 								<?php
-									aui()->input(
-										array(
-											'type'        => 'text',
-											'id'          => 'getpaid-invoice-new-user-email',
-											'name'        => 'wpinv_email',
-											'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
-											'label_type'  => 'vertical',
-											'placeholder' => 'john@doe.com',
-											'class'       => 'form-control-sm',
-										),
-										true
-									);
-								?>
+                                    aui()->input(
+                                        array(
+                                            'type'        => 'text',
+                                            'id'          => 'getpaid-invoice-new-user-email',
+                                            'name'        => 'wpinv_email',
+                                            'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => 'john@doe.com',
+                                            'class'       => 'form-control-sm',
+                                        ),
+                                        true
+                                    );
+                                ?>
 							</div>
 						</div>
 						<div class="col-12 col-sm-6 form-group mb-3 mt-sm-4">
@@ -155,39 +155,39 @@ 
 							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr( $key ); ?>--wrapper">
 								<?php
 
-									if ( 'select' === $field['type'] ) {
-										aui()->select(
-											array(
-												'id'               => 'wpinv_' . $key,
-												'name'             => 'wpinv_' . $key,
-												'label'            => $field['label'],
-												'label_type'       => 'vertical',
-												'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'            => $invoice->get( $key, 'edit' ),
-												'options'          => $field['options'],
-												'data-allow-clear' => 'false',
-												'select2'          => true,
-											),
-											true
-										);
-									} else {
-										aui()->input(
-											array(
-												'type'        => $field['type'],
-												'id'          => 'wpinv_' . $key,
-												'name'        => 'wpinv_' . $key,
-												'label'       => $field['label'],
-												'label_type'  => 'vertical',
-												'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'       => $invoice->get( $key, 'edit' ),
-											),
-											true
-										);
-									}
-
-								?>
+                                    if ( 'select' === $field['type'] ) {
+                                        aui()->select(
+                                            array(
+                                                'id'               => 'wpinv_' . $key,
+                                                'name'             => 'wpinv_' . $key,
+                                                'label'            => $field['label'],
+                                                'label_type'       => 'vertical',
+                                                'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
+                                                'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
+                                                'value'            => $invoice->get( $key, 'edit' ),
+                                                'options'          => $field['options'],
+                                                'data-allow-clear' => 'false',
+                                                'select2'          => true,
+                                            ),
+                                            true
+                                        );
+                                    } else {
+                                        aui()->input(
+                                            array(
+                                                'type'        => $field['type'],
+                                                'id'          => 'wpinv_' . $key,
+                                                'name'        => 'wpinv_' . $key,
+                                                'label'       => $field['label'],
+                                                'label_type'  => 'vertical',
+                                                'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
+                                                'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
+                                                'value'       => $invoice->get( $key, 'edit' ),
+                                            ),
+                                            true
+                                        );
+                                    }
+
+                                ?>
 							</div>
 						<?php endforeach; ?>
 					</div>
@@ -198,48 +198,48 @@ 
 						<div class="row">
 							<div class="col-12 col-sm-6">
 								<?php
-									aui()->select(
-										array(
-											'id'          => 'wpinv_template',
-											'name'        => 'wpinv_template',
-											'label'       => __( 'Template', 'invoicing' ),
-											'label_type'  => 'vertical',
-											'placeholder' => __( 'Choose a template', 'invoicing' ),
-											'class'       => 'form-control-sm',
-											'value'       => $invoice->get_template( 'edit' ),
-											'options'     => array(
-												'quantity' => __( 'Quantity', 'invoicing' ),
-												'hours'    => __( 'Hours', 'invoicing' ),
-											),
-											'data-allow-clear' => 'false',
-											'select2'     => true,
-										),
-										true
-									);
-								?>
+                                    aui()->select(
+                                        array(
+                                            'id'          => 'wpinv_template',
+                                            'name'        => 'wpinv_template',
+                                            'label'       => __( 'Template', 'invoicing' ),
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => __( 'Choose a template', 'invoicing' ),
+                                            'class'       => 'form-control-sm',
+                                            'value'       => $invoice->get_template( 'edit' ),
+                                            'options'     => array(
+                                                'quantity' => __( 'Quantity', 'invoicing' ),
+                                                'hours'    => __( 'Hours', 'invoicing' ),
+                                            ),
+                                            'data-allow-clear' => 'false',
+                                            'select2'     => true,
+                                        ),
+                                        true
+                                    );
+                                ?>
 							</div>
 							<div class="col-12 col-sm-6">
 								<?php
 
-									// Set currency.
-									aui()->select(
-										array(
-											'id'          => 'wpinv_currency',
-											'name'        => 'wpinv_currency',
-											'label'       => __( 'Currency', 'invoicing' ),
-											'label_type'  => 'vertical',
-											'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
-											'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-											'value'       => $invoice->get_currency( 'edit' ),
-											'required'    => false,
-											'data-allow-clear' => 'false',
-											'select2'     => true,
-											'options'     => wpinv_get_currencies(),
-										),
-										true
-									);
-
-								?>
+                                    // Set currency.
+                                    aui()->select(
+                                        array(
+                                            'id'          => 'wpinv_currency',
+                                            'name'        => 'wpinv_currency',
+                                            'label'       => __( 'Currency', 'invoicing' ),
+                                            'label_type'  => 'vertical',
+                                            'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+                                            'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
+                                            'value'       => $invoice->get_currency( 'edit' ),
+                                            'required'    => false,
+                                            'data-allow-clear' => 'false',
+                                            'select2'     => true,
+                                            'options'     => wpinv_get_currencies(),
+                                        ),
+                                        true
+                                    );
+
+                                ?>
 							</div>
 						</div>
 
@@ -249,123 +249,123 @@ 
 					<div class="row">
 						<div class="col-12 col-sm-6">
 							<?php
-								aui()->input(
-									array(
-										'type'        => 'text',
-										'id'          => 'wpinv_company_id',
-										'name'        => 'wpinv_company_id',
-										'label'       => __( 'Company ID', 'invoicing' ),
-										'label_type'  => 'vertical',
-										'placeholder' => '',
-										'class'       => 'form-control-sm',
-										'value'       => $invoice->get_company_id( 'edit' ),
-									),
-									true
-								);
-							?>
+                                aui()->input(
+                                    array(
+                                        'type'        => 'text',
+                                        'id'          => 'wpinv_company_id',
+                                        'name'        => 'wpinv_company_id',
+                                        'label'       => __( 'Company ID', 'invoicing' ),
+                                        'label_type'  => 'vertical',
+                                        'placeholder' => '',
+                                        'class'       => 'form-control-sm',
+                                        'value'       => $invoice->get_company_id( 'edit' ),
+                                    ),
+                                    true
+                                );
+                            ?>
 						</div>
 					</div>
 
 					<?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
 			</div>
 		<?php
-	}
-
-	/**
-	 * Save meta box data.
-	 *
-	 * @param int $post_id
-	 * @param array $posted the posted data.
-	 */
-	public static function save( $post_id, $posted ) {
-
-		// Prepare the invoice.
-		$invoice = new WPInv_Invoice( $post_id );
-
-		// Load new data.
-		$invoice->set_props(
-			array(
-				'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
-				'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
-				'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
-				'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
-				'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
-				'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
-				'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
-				'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
-				'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
-				'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
-				'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
-				'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
-				'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
-				'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
-				'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
-				'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
-				'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
-				'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
-				'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
-				'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
-				'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
-				'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
-			)
-		);
-
-		// Discount code.
-		if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
-
-			if ( isset( $posted['wpinv_discount_code'] ) ) {
-				$invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
-			}
-
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( $discount->exists() ) {
-				$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
-			} else {
-				$invoice->remove_discount( 'discount_code' );
-			}
-
-			// Recalculate totals.
-			$invoice->recalculate_total();
-
-		}
-
-		// If we're creating a new user...
-		if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
-
-			// Attempt to create the user.
-			$user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
-
-			// If successful, update the invoice author.
-			if ( is_numeric( $user ) ) {
-				$invoice->set_author( $user );
-			} else {
-				wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
-			}
-		}
-
-		// Do not send new invoice notifications.
-		$GLOBALS['wpinv_skip_invoice_notification'] = true;
-
-		// Save the invoice.
-		$invoice->save();
-
-		// Save the user address.
-		getpaid_save_invoice_user_address( $invoice );
-
-		// Undo do not send new invoice notifications.
-		$GLOBALS['wpinv_skip_invoice_notification'] = false;
-
-		// (Maybe) send new user notification.
-		$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-		if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-			wp_send_new_user_notifications( $user, 'user' );
-		}
-
-		if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
-			getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
-		}
-
-		// Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
-	}
+    }
+
+    /**
+     * Save meta box data.
+     *
+     * @param int $post_id
+     * @param array $posted the posted data.
+     */
+    public static function save( $post_id, $posted ) {
+
+        // Prepare the invoice.
+        $invoice = new WPInv_Invoice( $post_id );
+
+        // Load new data.
+        $invoice->set_props(
+            array(
+                'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
+                'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
+                'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
+                'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
+                'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
+                'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
+                'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
+                'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
+                'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
+                'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
+                'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
+                'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
+                'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
+                'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
+                'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
+                'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
+                'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
+                'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
+                'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
+                'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
+                'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
+                'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
+            )
+        );
+
+        // Discount code.
+        if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+
+            if ( isset( $posted['wpinv_discount_code'] ) ) {
+                $invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
+            }
+
+            $discount = new WPInv_Discount( $invoice->get_discount_code() );
+            if ( $discount->exists() ) {
+                $invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+            } else {
+                $invoice->remove_discount( 'discount_code' );
+            }
+
+            // Recalculate totals.
+            $invoice->recalculate_total();
+
+        }
+
+        // If we're creating a new user...
+        if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
+
+            // Attempt to create the user.
+            $user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
+
+            // If successful, update the invoice author.
+            if ( is_numeric( $user ) ) {
+                $invoice->set_author( $user );
+            } else {
+                wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+            }
+        }
+
+        // Do not send new invoice notifications.
+        $GLOBALS['wpinv_skip_invoice_notification'] = true;
+
+        // Save the invoice.
+        $invoice->save();
+
+        // Save the user address.
+        getpaid_save_invoice_user_address( $invoice );
+
+        // Undo do not send new invoice notifications.
+        $GLOBALS['wpinv_skip_invoice_notification'] = false;
+
+        // (Maybe) send new user notification.
+        $should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
+        if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
+            wp_send_new_user_notifications( $user, 'user' );
+        }
+
+        if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
+            getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+        }
+
+        // Fires after an invoice is saved.
+        do_action( 'wpinv_invoice_metabox_saved', $invoice );
+    }
 }

Spacing +98 added lines, -98 removed lines

@@ -7,7 +7,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -21,79 +21,79 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-	public static function output( $post ) {
+	public static function output($post) {
 
 		// Prepare the invoice.
-		$invoice  = new WPInv_Invoice( $post );
-		$customer = $invoice->exists() ? $invoice->get_user_id( 'edit' ) : get_current_user_id();
-		$customer = new WP_User( $customer );
-		$display  = sprintf( _x( '%1$s (%2$s)', 'user dropdown', 'invoicing' ), $customer->display_name, $customer->user_email );
-		wp_nonce_field( 'getpaid_meta_nonce', 'getpaid_meta_nonce' );
+		$invoice  = new WPInv_Invoice($post);
+		$customer = $invoice->exists() ? $invoice->get_user_id('edit') : get_current_user_id();
+		$customer = new WP_User($customer);
+		$display  = sprintf(_x('%1$s (%2$s)', 'user dropdown', 'invoicing'), $customer->display_name, $customer->user_email);
+		wp_nonce_field('getpaid_meta_nonce', 'getpaid_meta_nonce');
 
 		// Address fields.
 		$address_fields = array(
 			'first_name' => array(
-				'label' => __( 'First Name', 'invoicing' ),
+				'label' => __('First Name', 'invoicing'),
 				'type'  => 'text',
 			),
 			'last_name'  => array(
-				'label' => __( 'Last Name', 'invoicing' ),
+				'label' => __('Last Name', 'invoicing'),
 				'type'  => 'text',
 			),
 			'company'    => array(
-				'label' => __( 'Company', 'invoicing' ),
+				'label' => __('Company', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'vat_number' => array(
-				'label' => __( 'VAT Number', 'invoicing' ),
+				'label' => __('VAT Number', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'address'    => array(
-				'label' => __( 'Address', 'invoicing' ),
+				'label' => __('Address', 'invoicing'),
 				'type'  => 'text',
 			),
 			'city'       => array(
-				'label' => __( 'City', 'invoicing' ),
+				'label' => __('City', 'invoicing'),
 				'type'  => 'text',
 			),
 			'country'    => array(
-				'label'       => __( 'Country', 'invoicing' ),
+				'label'       => __('Country', 'invoicing'),
 				'type'        => 'select',
 				'class'       => 'getpaid-recalculate-prices-on-change',
 				'options'     => wpinv_get_country_list(),
-				'placeholder' => __( 'Choose a country', 'invoicing' ),
+				'placeholder' => __('Choose a country', 'invoicing'),
 			),
 			'state'      => array(
-				'label' => __( 'State', 'invoicing' ),
+				'label' => __('State', 'invoicing'),
 				'type'  => 'text',
 				'class' => 'getpaid-recalculate-prices-on-change',
 			),
 			'zip'        => array(
-				'label' => __( 'Zip', 'invoicing' ),
+				'label' => __('Zip', 'invoicing'),
 				'type'  => 'text',
 			),
 			'phone'      => array(
-				'label' => __( 'Phone', 'invoicing' ),
+				'label' => __('Phone', 'invoicing'),
 				'type'  => 'text',
 			),
 		);
 
-		$states = wpinv_get_country_states( $invoice->get_country( 'edit' ) );
+		$states = wpinv_get_country_states($invoice->get_country('edit'));
 
-		if ( ! empty( $states ) ) {
+		if (!empty($states)) {
 			$address_fields['state']['type']        = 'select';
 			$address_fields['state']['options']     = $states;
-			$address_fields['state']['placeholder'] = __( 'Choose a state', 'invoicing' );
+			$address_fields['state']['placeholder'] = __('Choose a state', 'invoicing');
 		}
 
 		// Maybe remove the VAT field.
-		if ( ! wpinv_use_taxes() ) {
-			unset( $address_fields['vat_number'] );
+		if (!wpinv_use_taxes()) {
+			unset($address_fields['vat_number']);
 		}
 
-		$address_fields = apply_filters( 'getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice );
+		$address_fields = apply_filters('getpaid_admin_edit_invoice_address_fields', $address_fields, $invoice);
 		?>
 
 		<style>
@@ -107,11 +107,11 @@ 
 						<div class="col-12 col-sm-6">
 							<div id="getpaid-invoice-user-id-wrapper" class="form-group mb-3">
 								<div>
-									<label for="post_author_override"><?php esc_html_e( 'Customer', 'invoicing' ); ?></label>
+									<label for="post_author_override"><?php esc_html_e('Customer', 'invoicing'); ?></label>
 								</div>
 								<div>
-									<select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e( 'Search for a customer by email or name', 'invoicing' ); ?>">
-										<option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html( $display ); ?> </option>)
+									<select name="post_author_override" id="wpinv_post_author_override" class="getpaid-customer-search form-control regular-text" data-placeholder="<?php esc_attr_e('Search for a customer by email or name', 'invoicing'); ?>">
+										<option selected="selected" value="<?php echo (int) $customer->ID; ?>"><?php echo esc_html($display); ?> </option>)
 									</select>
 								</div>
 							</div>
@@ -124,7 +124,7 @@ 
 											'type'        => 'text',
 											'id'          => 'getpaid-invoice-new-user-email',
 											'name'        => 'wpinv_email',
-											'label'       => __( 'Email', 'invoicing' ) . '<span class="required">*</span>',
+											'label'       => __('Email', 'invoicing') . '<span class="required">*</span>',
 											'label_type'  => 'vertical',
 											'placeholder' => 'john@doe.com',
 											'class'       => 'form-control-sm',
@@ -135,36 +135,36 @@ 
 							</div>
 						</div>
 						<div class="col-12 col-sm-6 form-group mb-3 mt-sm-4">
-							<?php if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) : ?>
+							<?php if (!$invoice->is_paid() && !$invoice->is_refunded()) : ?>
 								<a id="getpaid-invoice-fill-user-details" class="button button-small button-secondary" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-refresh"></i>
-									<?php esc_html_e( 'Fill User Details', 'invoicing' ); ?>
+									<?php esc_html_e('Fill User Details', 'invoicing'); ?>
 								</a>
 								<a id="getpaid-invoice-create-new-user-button" class="button button-small button-secondary" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-plus"></i>
-									<?php esc_html_e( 'Add New User', 'invoicing' ); ?>
+									<?php esc_html_e('Add New User', 'invoicing'); ?>
 								</a>
 								<a id="getpaid-invoice-cancel-create-new-user" class="button button-small button-secondary d-none" href="javascript:void(0)">
 									<i aria-hidden="true" class="fa fa-close"></i>
-									<?php esc_html_e( 'Cancel', 'invoicing' ); ?>
+									<?php esc_html_e('Cancel', 'invoicing'); ?>
 								</a>
 							<?php endif; ?>
 						</div>
 
-						<?php foreach ( $address_fields as $key => $field ) : ?>
-							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr( $key ); ?>--wrapper">
+						<?php foreach ($address_fields as $key => $field) : ?>
+							<div class="col-12 col-sm-6 getpaid-invoice-address-field__<?php echo esc_attr($key); ?>--wrapper">
 								<?php
 
-									if ( 'select' === $field['type'] ) {
+									if ('select' === $field['type']) {
 										aui()->select(
 											array(
 												'id'               => 'wpinv_' . $key,
 												'name'             => 'wpinv_' . $key,
 												'label'            => $field['label'],
 												'label_type'       => 'vertical',
-												'placeholder'      => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'            => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'            => $invoice->get( $key, 'edit' ),
+												'placeholder'      => isset($field['placeholder']) ? $field['placeholder'] : '',
+												'class'            => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
+												'value'            => $invoice->get($key, 'edit'),
 												'options'          => $field['options'],
 												'data-allow-clear' => 'false',
 												'select2'          => true,
@@ -179,9 +179,9 @@ 
 												'name'        => 'wpinv_' . $key,
 												'label'       => $field['label'],
 												'label_type'  => 'vertical',
-												'placeholder' => isset( $field['placeholder'] ) ? $field['placeholder'] : '',
-												'class'       => 'form-control-sm ' . ( isset( $field['class'] ) ? $field['class'] : '' ),
-												'value'       => $invoice->get( $key, 'edit' ),
+												'placeholder' => isset($field['placeholder']) ? $field['placeholder'] : '',
+												'class'       => 'form-control-sm ' . (isset($field['class']) ? $field['class'] : ''),
+												'value'       => $invoice->get($key, 'edit'),
 											),
 											true
 										);
@@ -192,8 +192,8 @@ 
 						<?php endforeach; ?>
 					</div>
 
-					<?php if ( ! apply_filters( 'getpaid_use_new_invoice_items_metabox', false ) ) : ?>
-						<?php do_action( 'wpinv_meta_box_before_invoice_template_row', $invoice->get_id() ); ?>
+					<?php if (!apply_filters('getpaid_use_new_invoice_items_metabox', false)) : ?>
+						<?php do_action('wpinv_meta_box_before_invoice_template_row', $invoice->get_id()); ?>
 
 						<div class="row">
 							<div class="col-12 col-sm-6">
@@ -202,14 +202,14 @@ 
 										array(
 											'id'          => 'wpinv_template',
 											'name'        => 'wpinv_template',
-											'label'       => __( 'Template', 'invoicing' ),
+											'label'       => __('Template', 'invoicing'),
 											'label_type'  => 'vertical',
-											'placeholder' => __( 'Choose a template', 'invoicing' ),
+											'placeholder' => __('Choose a template', 'invoicing'),
 											'class'       => 'form-control-sm',
-											'value'       => $invoice->get_template( 'edit' ),
+											'value'       => $invoice->get_template('edit'),
 											'options'     => array(
-												'quantity' => __( 'Quantity', 'invoicing' ),
-												'hours'    => __( 'Hours', 'invoicing' ),
+												'quantity' => __('Quantity', 'invoicing'),
+												'hours'    => __('Hours', 'invoicing'),
 											),
 											'data-allow-clear' => 'false',
 											'select2'     => true,
@@ -226,11 +226,11 @@ 
 										array(
 											'id'          => 'wpinv_currency',
 											'name'        => 'wpinv_currency',
-											'label'       => __( 'Currency', 'invoicing' ),
+											'label'       => __('Currency', 'invoicing'),
 											'label_type'  => 'vertical',
-											'placeholder' => __( 'Select Invoice Currency', 'invoicing' ),
+											'placeholder' => __('Select Invoice Currency', 'invoicing'),
 											'class'       => 'form-control-sm getpaid-recalculate-prices-on-change',
-											'value'       => $invoice->get_currency( 'edit' ),
+											'value'       => $invoice->get_currency('edit'),
 											'required'    => false,
 											'data-allow-clear' => 'false',
 											'select2'     => true,
@@ -243,7 +243,7 @@ 
 							</div>
 						</div>
 
-						<?php do_action( 'wpinv_meta_box_invoice_template_row', $invoice->get_id() ); ?>
+						<?php do_action('wpinv_meta_box_invoice_template_row', $invoice->get_id()); ?>
 					<?php endif; ?>
 
 					<div class="row">
@@ -254,11 +254,11 @@ 
 										'type'        => 'text',
 										'id'          => 'wpinv_company_id',
 										'name'        => 'wpinv_company_id',
-										'label'       => __( 'Company ID', 'invoicing' ),
+										'label'       => __('Company ID', 'invoicing'),
 										'label_type'  => 'vertical',
 										'placeholder' => '',
 										'class'       => 'form-control-sm',
-										'value'       => $invoice->get_company_id( 'edit' ),
+										'value'       => $invoice->get_company_id('edit'),
 									),
 									true
 								);
@@ -266,7 +266,7 @@ 
 						</div>
 					</div>
 
-					<?php do_action( 'getpaid_after_metabox_invoice_address', $invoice ); ?>
+					<?php do_action('getpaid_after_metabox_invoice_address', $invoice); ?>
 			</div>
 		<?php
 	}
@@ -277,51 +277,51 @@ 
 	 * @param int $post_id
 	 * @param array $posted the posted data.
 	 */
-	public static function save( $post_id, $posted ) {
+	public static function save($post_id, $posted) {
 
 		// Prepare the invoice.
-		$invoice = new WPInv_Invoice( $post_id );
+		$invoice = new WPInv_Invoice($post_id);
 
 		// Load new data.
 		$invoice->set_props(
 			array(
-				'template'       => isset( $posted['wpinv_template'] ) ? wpinv_clean( $posted['wpinv_template'] ) : null,
-				'email_cc'       => isset( $posted['wpinv_cc'] ) ? wpinv_clean( $posted['wpinv_cc'] ) : null,
-				'disable_taxes'  => ! empty( $posted['disable_taxes'] ),
-				'currency'       => isset( $posted['wpinv_currency'] ) ? wpinv_clean( $posted['wpinv_currency'] ) : null,
-				'gateway'        => ( $invoice->needs_payment() && isset( $posted['wpinv_gateway'] ) ) ? wpinv_clean( $posted['wpinv_gateway'] ) : null,
-				'address'        => isset( $posted['wpinv_address'] ) ? wpinv_clean( $posted['wpinv_address'] ) : null,
-				'vat_number'     => isset( $posted['wpinv_vat_number'] ) ? wpinv_clean( $posted['wpinv_vat_number'] ) : null,
-				'company'        => isset( $posted['wpinv_company'] ) ? wpinv_clean( $posted['wpinv_company'] ) : null,
-				'company_id'     => isset( $posted['wpinv_company_id'] ) ? wpinv_clean( $posted['wpinv_company_id'] ) : null,
-				'zip'            => isset( $posted['wpinv_zip'] ) ? wpinv_clean( $posted['wpinv_zip'] ) : null,
-				'state'          => isset( $posted['wpinv_state'] ) ? wpinv_clean( $posted['wpinv_state'] ) : null,
-				'city'           => isset( $posted['wpinv_city'] ) ? wpinv_clean( $posted['wpinv_city'] ) : null,
-				'country'        => isset( $posted['wpinv_country'] ) ? wpinv_clean( $posted['wpinv_country'] ) : null,
-				'phone'          => isset( $posted['wpinv_phone'] ) ? wpinv_clean( $posted['wpinv_phone'] ) : null,
-				'first_name'     => isset( $posted['wpinv_first_name'] ) ? wpinv_clean( $posted['wpinv_first_name'] ) : null,
-				'last_name'      => isset( $posted['wpinv_last_name'] ) ? wpinv_clean( $posted['wpinv_last_name'] ) : null,
-				'author'         => isset( $posted['post_author_override'] ) ? wpinv_clean( $posted['post_author_override'] ) : null,
-				'date_created'   => isset( $posted['date_created'] ) ? wpinv_clean( $posted['date_created'] ) : null,
-				'date_completed' => isset( $posted['wpinv_date_completed'] ) ? wpinv_clean( $posted['wpinv_date_completed'] ) : null,
-				'due_date'       => isset( $posted['wpinv_due_date'] ) ? wpinv_clean( $posted['wpinv_due_date'] ) : null,
-				'number'         => isset( $posted['wpinv_number'] ) ? wpinv_clean( $posted['wpinv_number'] ) : null,
-				'status'         => isset( $posted['wpinv_status'] ) ? wpinv_clean( $posted['wpinv_status'] ) : null,
+				'template'       => isset($posted['wpinv_template']) ? wpinv_clean($posted['wpinv_template']) : null,
+				'email_cc'       => isset($posted['wpinv_cc']) ? wpinv_clean($posted['wpinv_cc']) : null,
+				'disable_taxes'  => !empty($posted['disable_taxes']),
+				'currency'       => isset($posted['wpinv_currency']) ? wpinv_clean($posted['wpinv_currency']) : null,
+				'gateway'        => ($invoice->needs_payment() && isset($posted['wpinv_gateway'])) ? wpinv_clean($posted['wpinv_gateway']) : null,
+				'address'        => isset($posted['wpinv_address']) ? wpinv_clean($posted['wpinv_address']) : null,
+				'vat_number'     => isset($posted['wpinv_vat_number']) ? wpinv_clean($posted['wpinv_vat_number']) : null,
+				'company'        => isset($posted['wpinv_company']) ? wpinv_clean($posted['wpinv_company']) : null,
+				'company_id'     => isset($posted['wpinv_company_id']) ? wpinv_clean($posted['wpinv_company_id']) : null,
+				'zip'            => isset($posted['wpinv_zip']) ? wpinv_clean($posted['wpinv_zip']) : null,
+				'state'          => isset($posted['wpinv_state']) ? wpinv_clean($posted['wpinv_state']) : null,
+				'city'           => isset($posted['wpinv_city']) ? wpinv_clean($posted['wpinv_city']) : null,
+				'country'        => isset($posted['wpinv_country']) ? wpinv_clean($posted['wpinv_country']) : null,
+				'phone'          => isset($posted['wpinv_phone']) ? wpinv_clean($posted['wpinv_phone']) : null,
+				'first_name'     => isset($posted['wpinv_first_name']) ? wpinv_clean($posted['wpinv_first_name']) : null,
+				'last_name'      => isset($posted['wpinv_last_name']) ? wpinv_clean($posted['wpinv_last_name']) : null,
+				'author'         => isset($posted['post_author_override']) ? wpinv_clean($posted['post_author_override']) : null,
+				'date_created'   => isset($posted['date_created']) ? wpinv_clean($posted['date_created']) : null,
+				'date_completed' => isset($posted['wpinv_date_completed']) ? wpinv_clean($posted['wpinv_date_completed']) : null,
+				'due_date'       => isset($posted['wpinv_due_date']) ? wpinv_clean($posted['wpinv_due_date']) : null,
+				'number'         => isset($posted['wpinv_number']) ? wpinv_clean($posted['wpinv_number']) : null,
+				'status'         => isset($posted['wpinv_status']) ? wpinv_clean($posted['wpinv_status']) : null,
 			)
 		);
 
 		// Discount code.
-		if ( ! $invoice->is_paid() && ! $invoice->is_refunded() ) {
+		if (!$invoice->is_paid() && !$invoice->is_refunded()) {
 
-			if ( isset( $posted['wpinv_discount_code'] ) ) {
-				$invoice->set_discount_code( wpinv_clean( $posted['wpinv_discount_code'] ) );
+			if (isset($posted['wpinv_discount_code'])) {
+				$invoice->set_discount_code(wpinv_clean($posted['wpinv_discount_code']));
 			}
 
-			$discount = new WPInv_Discount( $invoice->get_discount_code() );
-			if ( $discount->exists() ) {
-				$invoice->add_discount( getpaid_calculate_invoice_discount( $invoice, $discount ) );
+			$discount = new WPInv_Discount($invoice->get_discount_code());
+			if ($discount->exists()) {
+				$invoice->add_discount(getpaid_calculate_invoice_discount($invoice, $discount));
 			} else {
-				$invoice->remove_discount( 'discount_code' );
+				$invoice->remove_discount('discount_code');
 			}
 
 			// Recalculate totals.
@@ -330,16 +330,16 @@ 
 		}
 
 		// If we're creating a new user...
-		if ( ! empty( $posted['wpinv_new_user'] ) && is_email( stripslashes( $posted['wpinv_email'] ) ) ) {
+		if (!empty($posted['wpinv_new_user']) && is_email(stripslashes($posted['wpinv_email']))) {
 
 			// Attempt to create the user.
-			$user = wpinv_create_user( sanitize_email( stripslashes( $posted['wpinv_email'] ) ), $invoice->get_first_name() . $invoice->get_last_name() );
+			$user = wpinv_create_user(sanitize_email(stripslashes($posted['wpinv_email'])), $invoice->get_first_name() . $invoice->get_last_name());
 
 			// If successful, update the invoice author.
-			if ( is_numeric( $user ) ) {
-				$invoice->set_author( $user );
+			if (is_numeric($user)) {
+				$invoice->set_author($user);
 			} else {
-				wpinv_error_log( $user->get_error_message(), __( 'Invoice add new user', 'invoicing' ), __FILE__, __LINE__ );
+				wpinv_error_log($user->get_error_message(), __('Invoice add new user', 'invoicing'), __FILE__, __LINE__);
 			}
 		}
 
@@ -350,22 +350,22 @@ 
 		$invoice->save();
 
 		// Save the user address.
-		getpaid_save_invoice_user_address( $invoice );
+		getpaid_save_invoice_user_address($invoice);
 
 		// Undo do not send new invoice notifications.
 		$GLOBALS['wpinv_skip_invoice_notification'] = false;
 
 		// (Maybe) send new user notification.
-		$should_send_notification = wpinv_get_option( 'disable_new_user_emails' );
-		if ( ! empty( $user ) && is_numeric( $user ) && apply_filters( 'getpaid_send_new_user_notification', empty( $should_send_notification ) ) ) {
-			wp_send_new_user_notifications( $user, 'user' );
+		$should_send_notification = wpinv_get_option('disable_new_user_emails');
+		if (!empty($user) && is_numeric($user) && apply_filters('getpaid_send_new_user_notification', empty($should_send_notification))) {
+			wp_send_new_user_notifications($user, 'user');
 		}
 
-		if ( ! empty( $posted['send_to_customer'] ) && ! $invoice->is_draft() ) {
-			getpaid()->get( 'invoice_emails' )->user_invoice( $invoice, true );
+		if (!empty($posted['send_to_customer']) && !$invoice->is_draft()) {
+			getpaid()->get('invoice_emails')->user_invoice($invoice, true);
 		}
 
 		// Fires after an invoice is saved.
-		do_action( 'wpinv_invoice_metabox_saved', $invoice );
+		do_action('wpinv_invoice_metabox_saved', $invoice);
 	}
 }

includes/gateways/class-getpaid-manual-gateway.php

Indentation +37 added lines, -37 removed lines

@@ -13,17 +13,17 @@ 
 class GetPaid_Manual_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'manual';
 
     /**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
     protected $supports = array(
         'subscription',
         'addons',
@@ -34,16 +34,16 @@ 
     );
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 11;
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 11;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title        = __( 'Test Gateway', 'invoicing' );
@@ -53,15 +53,15 @@ 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Mark it as paid.
         $invoice->mark_paid();
@@ -91,12 +91,12 @@ 
     }
 
     /**
-	 * (Maybe) renews a manual subscription profile.
-	 *
-	 *
+     * (Maybe) renews a manual subscription profile.
+     *
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
+     */
+    public function maybe_renew_subscription( $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
@@ -116,13 +116,13 @@ 
     }
 
     /**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );

Spacing +21 added lines, -21 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Manual Payment Gateway class.
@@ -46,10 +46,10 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title        = __( 'Test Gateway', 'invoicing' );
-        $this->method_title = __( 'Test Gateway', 'invoicing' );
+        $this->title        = __('Test Gateway', 'invoicing');
+        $this->method_title = __('Test Gateway', 'invoicing');
 
-        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
+        add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
     }
 
     /**
@@ -61,32 +61,32 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Mark it as paid.
         $invoice->mark_paid();
 
         // (Maybe) activate subscriptions.
-        $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+        $subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-        if ( ! empty( $subscriptions ) ) {
-            $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+        if (!empty($subscriptions)) {
+            $subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-            foreach ( $subscriptions as $subscription ) {
-                if ( $subscription->exists() ) {
-                    $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-                    $expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+            foreach ($subscriptions as $subscription) {
+                if ($subscription->exists()) {
+                    $duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+                    $expiry   = gmdate('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-                    $subscription->set_next_renewal_date( $expiry );
-                    $subscription->set_date_created( current_time( 'mysql' ) );
-                    $subscription->set_profile_id( $invoice->generate_key( 'manual_sub_' . $invoice->get_id() . '_' . $subscription->get_id() ) );
+                    $subscription->set_next_renewal_date($expiry);
+                    $subscription->set_date_created(current_time('mysql'));
+                    $subscription->set_profile_id($invoice->generate_key('manual_sub_' . $invoice->get_id() . '_' . $subscription->get_id()));
                     $subscription->activate();
                 }
             }
         }
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -96,10 +96,10 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
+        if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
 
             // Renew the subscription.
             $subscription->add_payment(
@@ -122,10 +122,10 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();

includes/gateways/class-getpaid-bank-transfer-gateway.php

Indentation +244 added lines, -244 removed lines

@@ -13,47 +13,47 @@ 
 class GetPaid_Bank_Transfer_Gateway extends GetPaid_Payment_Gateway {
 
     /**
-	 * Payment method id.
-	 *
-	 * @var string
-	 */
+     * Payment method id.
+     *
+     * @var string
+     */
     public $id = 'bank_transfer';
 
-	/**
-	 * An array of features that this gateway supports.
-	 *
-	 * @var array
-	 */
-	protected $supports = array(
-		'subscription',
-		'addons',
-		'single_subscription_group',
-		'multiple_subscription_groups',
-		'subscription_date_change',
-		'subscription_bill_times_change',
-	);
+    /**
+     * An array of features that this gateway supports.
+     *
+     * @var array
+     */
+    protected $supports = array(
+        'subscription',
+        'addons',
+        'single_subscription_group',
+        'multiple_subscription_groups',
+        'subscription_date_change',
+        'subscription_bill_times_change',
+    );
+
+    /**
+     * Payment method order.
+     *
+     * @var int
+     */
+    public $order = 8;
 
     /**
-	 * Payment method order.
-	 *
-	 * @var int
-	 */
-	public $order = 8;
-
-	/**
-	 * Bank transfer instructions.
-	 */
-	public $instructions;
-
-	/**
-	 * Locale array.
-	 */
-	public $locale;
+     * Bank transfer instructions.
+     */
+    public $instructions;
 
     /**
-	 * Class constructor.
-	 */
-	public function __construct() {
+     * Locale array.
+     */
+    public $locale;
+
+    /**
+     * Class constructor.
+     */
+    public function __construct() {
         parent::__construct();
 
         $this->title                = __( 'Direct bank transfer', 'invoicing' );
@@ -61,24 +61,24 @@ 
         $this->checkout_button_text = __( 'Proceed', 'invoicing' );
         $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
-		add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-		add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
+        add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
+        add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
+        add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
+        add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
+        add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
+        add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
 
     }
 
     /**
-	 * Process Payment.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param array $submission_data Posted checkout fields.
-	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
-	 * @return array
-	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+     * Process Payment.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param array $submission_data Posted checkout fields.
+     * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
+     * @return array
+     */
+    public function process_payment( $invoice, $submission_data, $submission ) {
 
         // Add a transaction id.
         $invoice->set_transaction_id( $invoice->generate_key( 'bt_' ) );
@@ -99,66 +99,66 @@ 
     }
 
     /**
-	 * Output for the order received page.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	public function thankyou_page( $invoice ) {
+     * Output for the order received page.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    public function thankyou_page( $invoice ) {
 
         if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
+            echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
             if ( ! empty( $this->instructions ) ) {
                 echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
-			}
+            }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
         }
 
-	}
+    }
 
     /**
-	 * Add content to the WPI emails.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 * @param string     $email_type Email format: plain text or HTML.
-	 * @param bool     $sent_to_admin Sent to admin.
-	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+     * Add content to the WPI emails.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     * @param string     $email_type Email format: plain text or HTML.
+     * @param bool     $sent_to_admin Sent to admin.
+     */
+    public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
 
-			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
+            echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+            if ( $this->instructions ) {
+                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
             }
 
-			$this->bank_details( $invoice );
+            $this->bank_details( $invoice );
 
-			echo '</div>';
+            echo '</div>';
 
-		}
+        }
 
     }
 
     /**
-	 * Get bank details and place into a list format.
-	 *
-	 * @param WPInv_Invoice $invoice Invoice.
-	 */
-	protected function bank_details( $invoice ) {
+     * Get bank details and place into a list format.
+     *
+     * @param WPInv_Invoice $invoice Invoice.
+     */
+    protected function bank_details( $invoice ) {
 
-		// Get the invoice country and country $locale.
-		$country = $invoice->get_country();
-		$locale  = $this->get_country_locale();
+        // Get the invoice country and country $locale.
+        $country = $invoice->get_country();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
         $bank_fields = array(
             'ac_name'   => __( 'Account Name', 'invoicing' ),
@@ -177,11 +177,11 @@ 
 
             if ( ! empty( $value ) ) {
                 $bank_info[ $field ] = array(
-					'label' => $label,
-					'value' => $value,
-				);
+                    'label' => $label,
+                    'value' => $value,
+                );
             }
-		}
+        }
 
         $bank_info = apply_filters( 'wpinv_bank_info', $bank_info, $invoice );
 
@@ -189,139 +189,139 @@ 
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+        echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+
+        echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+
+        foreach ( $bank_info as $key => $data ) {
+            echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
+        }
+
+        echo '</table>';
+
+    }
 
-		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
+    /**
+     * Get country locale if localized.
+     *
+     * @return array
+     */
+    public function get_country_locale() {
+
+        if ( empty( $this->locale ) ) {
+
+            // Locale information to be used - only those that are not 'Sort Code'.
+            $this->locale = apply_filters(
+                'getpaid_get_bank_transfer_locale',
+                array(
+                    'AU' => array(
+                        'sortcode' => array(
+                            'label' => __( 'BSB', 'invoicing' ),
+                        ),
+                    ),
+                    'CA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank transit number', 'invoicing' ),
+                        ),
+                    ),
+                    'IN' => array(
+                        'sortcode' => array(
+                            'label' => __( 'IFSC', 'invoicing' ),
+                        ),
+                    ),
+                    'IT' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch sort', 'invoicing' ),
+                        ),
+                    ),
+                    'NZ' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'SE' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Bank code', 'invoicing' ),
+                        ),
+                    ),
+                    'US' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Routing number', 'invoicing' ),
+                        ),
+                    ),
+                    'ZA' => array(
+                        'sortcode' => array(
+                            'label' => __( 'Branch code', 'invoicing' ),
+                        ),
+                    ),
+                )
+            );
 
-		foreach ( $bank_info as $key => $data ) {
-			echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
-		}
+        }
 
-		echo '</table>';
+        return $this->locale;
 
     }
 
     /**
-	 * Get country locale if localized.
-	 *
-	 * @return array
-	 */
-	public function get_country_locale() {
-
-		if ( empty( $this->locale ) ) {
-
-			// Locale information to be used - only those that are not 'Sort Code'.
-			$this->locale = apply_filters(
-				'getpaid_get_bank_transfer_locale',
-				array(
-					'AU' => array(
-						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
-						),
-					),
-					'CA' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
-						),
-					),
-					'IN' => array(
-						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
-						),
-					),
-					'IT' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
-						),
-					),
-					'NZ' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'SE' => array(
-						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
-						),
-					),
-					'US' => array(
-						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
-						),
-					),
-					'ZA' => array(
-						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
-						),
-					),
-				)
-			);
-
-		}
-
-		return $this->locale;
-
-	}
-
-	/**
-	 * Filters the gateway settings.
-	 *
-	 * @param array $admin_settings
-	 */
-	public function admin_settings( $admin_settings ) {
+     * Filters the gateway settings.
+     *
+     * @param array $admin_settings
+     */
+    public function admin_settings( $admin_settings ) {
 
         $admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
 
-		$locale  = $this->get_country_locale();
+        $locale  = $this->get_country_locale();
 
-		// Get sortcode label in the $locale array and use appropriate one.
-		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+        // Get sortcode label in the $locale array and use appropriate one.
+        $country  = wpinv_default_billing_country();
+        $sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
 
-		$admin_settings['bank_transfer_ac_name'] = array(
+        $admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
             'name' => __( 'Account Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ac_no'] = array(
+        $admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
             'name' => __( 'Account Number', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bank_name'] = array(
+        $admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
             'name' => __( 'Bank Name', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_ifsc'] = array(
+        $admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
             'name' => __( 'IFSC Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_iban'] = array(
+        $admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
             'name' => __( 'IBAN', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_bic'] = array(
+        $admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
             'name' => __( 'BIC/Swift Code', 'invoicing' ),
-		);
+        );
 
-		$admin_settings['bank_transfer_sort_code'] = array(
-			'type' => 'text',
-			'id'   => 'bank_transfer_sort_code',
-			'name' => $sortcode,
-		);
+        $admin_settings['bank_transfer_sort_code'] = array(
+            'type' => 'text',
+            'id'   => 'bank_transfer_sort_code',
+            'name' => $sortcode,
+        );
 
-		$admin_settings['bank_transfer_info'] = array(
+        $admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
             'name' => __( 'Instructions', 'invoicing' ),
             'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
@@ -331,17 +331,17 @@ 
             'rows' => 5,
         );
 
-		return $admin_settings;
-	}
+        return $admin_settings;
+    }
 
-	/**
-	 * Processes invoice addons.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @param GetPaid_Form_Item[] $items
-	 * @return WPInv_Invoice
-	 */
-	public function process_addons( $invoice, $items ) {
+    /**
+     * Processes invoice addons.
+     *
+     * @param WPInv_Invoice $invoice
+     * @param GetPaid_Form_Item[] $items
+     * @return WPInv_Invoice
+     */
+    public function process_addons( $invoice, $items ) {
 
         foreach ( $items as $item ) {
             $invoice->add_item( $item );
@@ -349,67 +349,67 @@ 
 
         $invoice->recalculate_total();
         $invoice->save();
-	}
+    }
 
-	/**
-	 * (Maybe) renews a bank transfer subscription profile.
-	 *
-	 *
+    /**
+     * (Maybe) renews a bank transfer subscription profile.
+     *
+     *
      * @param WPInv_Subscription $subscription
-	 */
-	public function maybe_renew_subscription( $subscription ) {
+     */
+    public function maybe_renew_subscription( $subscription ) {
 
         // Ensure its our subscription && it's active.
         if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
-			$subscription->create_payment();
+            $subscription->create_payment();
         }
 
     }
 
-	/**
-	 * Process a bank transfer payment.
-	 *
-	 *
+    /**
+     * Process a bank transfer payment.
+     *
+     *
      * @param WPInv_Invoice $invoice
-	 */
-	public function invoice_paid( $invoice ) {
-
-		// Abort if not paid by bank transfer.
-		if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
-			return;
-		}
-
-		// Is it a parent payment?
-		if ( 0 == $invoice->get_parent_id() ) {
-
-			// (Maybe) activate subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
-
-			if ( ! empty( $subscriptions ) ) {
-				$subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
-
-				foreach ( $subscriptions as $subscription ) {
-					if ( $subscription->exists() ) {
-						$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-						$expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
-
-						$subscription->set_next_renewal_date( $expiry );
-						$subscription->set_date_created( current_time( 'mysql' ) );
-						$subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
-						$subscription->activate();
-					}
-				}
-			}
-		} else {
-
-			$subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
-
-			// Renew the subscription.
-			if ( $subscription && $subscription->exists() ) {
-				$subscription->add_payment( array(), $invoice );
-				$subscription->renew( strtotime( $invoice->get_date_created() ) );
-			}
-		}
+     */
+    public function invoice_paid( $invoice ) {
+
+        // Abort if not paid by bank transfer.
+        if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
+            return;
+        }
+
+        // Is it a parent payment?
+        if ( 0 == $invoice->get_parent_id() ) {
+
+            // (Maybe) activate subscriptions.
+            $subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+
+            if ( ! empty( $subscriptions ) ) {
+                $subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+
+                foreach ( $subscriptions as $subscription ) {
+                    if ( $subscription->exists() ) {
+                        $duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
+                        $expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+
+                        $subscription->set_next_renewal_date( $expiry );
+                        $subscription->set_date_created( current_time( 'mysql' ) );
+                        $subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
+                        $subscription->activate();
+                    }
+                }
+            }
+        } else {
+
+            $subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
+
+            // Renew the subscription.
+            if ( $subscription && $subscription->exists() ) {
+                $subscription->add_payment( array(), $invoice );
+                $subscription->renew( strtotime( $invoice->get_date_created() ) );
+            }
+        }
 
     }
 

Spacing +89 added lines, -89 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Bank transfer Payment Gateway class.
@@ -56,17 +56,17 @@ 
 	public function __construct() {
         parent::__construct();
 
-        $this->title                = __( 'Direct bank transfer', 'invoicing' );
-        $this->method_title         = __( 'Bank transfer', 'invoicing' );
-        $this->checkout_button_text = __( 'Proceed', 'invoicing' );
-        $this->instructions         = apply_filters( 'wpinv_bank_instructions', $this->get_option( 'info' ) );
+        $this->title                = __('Direct bank transfer', 'invoicing');
+        $this->method_title         = __('Bank transfer', 'invoicing');
+        $this->checkout_button_text = __('Proceed', 'invoicing');
+        $this->instructions         = apply_filters('wpinv_bank_instructions', $this->get_option('info'));
 
-		add_action( 'wpinv_receipt_end', array( $this, 'thankyou_page' ) );
-		add_action( 'getpaid_invoice_line_items', array( $this, 'thankyou_page' ), 40 );
-		add_action( 'wpinv_pdf_content_billing', array( $this, 'thankyou_page' ), 11 );
-		add_action( 'wpinv_email_invoice_details', array( $this, 'email_instructions' ), 10, 3 );
-		add_action( 'getpaid_should_renew_subscription', array( $this, 'maybe_renew_subscription' ) );
-		add_action( 'getpaid_invoice_status_publish', array( $this, 'invoice_paid' ), 20 );
+		add_action('wpinv_receipt_end', array($this, 'thankyou_page'));
+		add_action('getpaid_invoice_line_items', array($this, 'thankyou_page'), 40);
+		add_action('wpinv_pdf_content_billing', array($this, 'thankyou_page'), 11);
+		add_action('wpinv_email_invoice_details', array($this, 'email_instructions'), 10, 3);
+		add_action('getpaid_should_renew_subscription', array($this, 'maybe_renew_subscription'));
+		add_action('getpaid_invoice_status_publish', array($this, 'invoice_paid'), 20);
 
     }
 
@@ -78,23 +78,23 @@ 
 	 * @param GetPaid_Payment_Form_Submission $submission Checkout submission.
 	 * @return array
 	 */
-	public function process_payment( $invoice, $submission_data, $submission ) {
+	public function process_payment($invoice, $submission_data, $submission) {
 
         // Add a transaction id.
-        $invoice->set_transaction_id( $invoice->generate_key( 'bt_' ) );
+        $invoice->set_transaction_id($invoice->generate_key('bt_'));
 
         // Set it as pending payment.
-        if ( ! $invoice->needs_payment() ) {
+        if (!$invoice->needs_payment()) {
             $invoice->mark_paid();
-        } elseif ( ! $invoice->is_paid() ) {
-            $invoice->set_status( 'wpi-onhold' );
+        } elseif (!$invoice->is_paid()) {
+            $invoice->set_status('wpi-onhold');
         }
 
         // Save it.
         $invoice->save();
 
         // Send to the success page.
-        wpinv_send_to_success_page( array( 'invoice_key' => $invoice->get_key() ) );
+        wpinv_send_to_success_page(array('invoice_key' => $invoice->get_key()));
 
     }
 
@@ -103,17 +103,17 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	public function thankyou_page( $invoice ) {
+	public function thankyou_page($invoice) {
 
-        if ( 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+        if ('bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="mt-4 mb-2 getpaid-bank-transfer-details">' . PHP_EOL;
 
-            if ( ! empty( $this->instructions ) ) {
-                echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) );
+            if (!empty($this->instructions)) {
+                echo wp_kses_post(wpautop(wptexturize($this->instructions)));
 			}
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 
 			echo '</div>';
 
@@ -128,17 +128,17 @@ 
 	 * @param string     $email_type Email format: plain text or HTML.
 	 * @param bool     $sent_to_admin Sent to admin.
 	 */
-	public function email_instructions( $invoice, $email_type, $sent_to_admin ) {
+	public function email_instructions($invoice, $email_type, $sent_to_admin) {
 
-		if ( ! $sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment() ) {
+		if (!$sent_to_admin && 'bank_transfer' === $invoice->get_gateway() && $invoice->needs_payment()) {
 
 			echo '<div class="wpi-email-row getpaid-bank-transfer-details">';
 
-			if ( $this->instructions ) {
-				echo wp_kses_post( wpautop( wptexturize( $this->instructions ) ) . PHP_EOL );
+			if ($this->instructions) {
+				echo wp_kses_post(wpautop(wptexturize($this->instructions)) . PHP_EOL);
             }
 
-			$this->bank_details( $invoice );
+			$this->bank_details($invoice);
 
 			echo '</div>';
 
@@ -151,50 +151,50 @@ 
 	 *
 	 * @param WPInv_Invoice $invoice Invoice.
 	 */
-	protected function bank_details( $invoice ) {
+	protected function bank_details($invoice) {
 
 		// Get the invoice country and country $locale.
 		$country = $invoice->get_country();
 		$locale  = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
         $bank_fields = array(
-            'ac_name'   => __( 'Account Name', 'invoicing' ),
-            'ac_no'     => __( 'Account Number', 'invoicing' ),
-            'bank_name' => __( 'Bank Name', 'invoicing' ),
-            'ifsc'      => __( 'IFSC code', 'invoicing' ),
-            'iban'      => __( 'IBAN', 'invoicing' ),
-            'bic'       => __( 'BIC/Swift code', 'invoicing' ),
+            'ac_name'   => __('Account Name', 'invoicing'),
+            'ac_no'     => __('Account Number', 'invoicing'),
+            'bank_name' => __('Bank Name', 'invoicing'),
+            'ifsc'      => __('IFSC code', 'invoicing'),
+            'iban'      => __('IBAN', 'invoicing'),
+            'bic'       => __('BIC/Swift code', 'invoicing'),
             'sort_code' => $sortcode,
         );
 
         $bank_info = array();
 
-        foreach ( $bank_fields as $field => $label ) {
-            $value = $this->get_option( $field );
+        foreach ($bank_fields as $field => $label) {
+            $value = $this->get_option($field);
 
-            if ( ! empty( $value ) ) {
-                $bank_info[ $field ] = array(
+            if (!empty($value)) {
+                $bank_info[$field] = array(
 					'label' => $label,
 					'value' => $value,
 				);
             }
 		}
 
-        $bank_info = apply_filters( 'wpinv_bank_info', $bank_info, $invoice );
+        $bank_info = apply_filters('wpinv_bank_info', $bank_info, $invoice);
 
-        if ( empty( $bank_info ) ) {
+        if (empty($bank_info)) {
             return;
         }
 
-		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html( apply_filters( 'wpinv_receipt_bank_details_title', __( 'Bank Details', 'invoicing' ), $invoice ) ) . '</h3>' . PHP_EOL;
+		echo '<h3 class="getpaid-bank-transfer-title"> ' . esc_html(apply_filters('wpinv_receipt_bank_details_title', __('Bank Details', 'invoicing'), $invoice)) . '</h3>' . PHP_EOL;
 
 		echo '<table class="table table-bordered getpaid-bank-transfer-details">' . PHP_EOL;
 
-		foreach ( $bank_info as $key => $data ) {
-			echo "<tr class='getpaid-bank-transfer-" . esc_attr( $key ) . "'><th class='font-weight-bold'>" . wp_kses_post( $data['label'] ) . "</th><td class='w-75'>" . wp_kses_post( wptexturize( $data['value'] ) ) . '</td></tr>' . PHP_EOL;
+		foreach ($bank_info as $key => $data) {
+			echo "<tr class='getpaid-bank-transfer-" . esc_attr($key) . "'><th class='font-weight-bold'>" . wp_kses_post($data['label']) . "</th><td class='w-75'>" . wp_kses_post(wptexturize($data['value'])) . '</td></tr>' . PHP_EOL;
 		}
 
 		echo '</table>';
@@ -208,7 +208,7 @@ 
 	 */
 	public function get_country_locale() {
 
-		if ( empty( $this->locale ) ) {
+		if (empty($this->locale)) {
 
 			// Locale information to be used - only those that are not 'Sort Code'.
 			$this->locale = apply_filters(
@@ -216,42 +216,42 @@ 
 				array(
 					'AU' => array(
 						'sortcode' => array(
-							'label' => __( 'BSB', 'invoicing' ),
+							'label' => __('BSB', 'invoicing'),
 						),
 					),
 					'CA' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank transit number', 'invoicing' ),
+							'label' => __('Bank transit number', 'invoicing'),
 						),
 					),
 					'IN' => array(
 						'sortcode' => array(
-							'label' => __( 'IFSC', 'invoicing' ),
+							'label' => __('IFSC', 'invoicing'),
 						),
 					),
 					'IT' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch sort', 'invoicing' ),
+							'label' => __('Branch sort', 'invoicing'),
 						),
 					),
 					'NZ' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'SE' => array(
 						'sortcode' => array(
-							'label' => __( 'Bank code', 'invoicing' ),
+							'label' => __('Bank code', 'invoicing'),
 						),
 					),
 					'US' => array(
 						'sortcode' => array(
-							'label' => __( 'Routing number', 'invoicing' ),
+							'label' => __('Routing number', 'invoicing'),
 						),
 					),
 					'ZA' => array(
 						'sortcode' => array(
-							'label' => __( 'Branch code', 'invoicing' ),
+							'label' => __('Branch code', 'invoicing'),
 						),
 					),
 				)
@@ -268,51 +268,51 @@ 
 	 *
 	 * @param array $admin_settings
 	 */
-	public function admin_settings( $admin_settings ) {
+	public function admin_settings($admin_settings) {
 
-        $admin_settings['bank_transfer_desc']['std']    = __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' );
-		$admin_settings['bank_transfer_active']['desc'] = __( 'Enable bank transfer', 'invoicing' );
+        $admin_settings['bank_transfer_desc']['std'] = __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing');
+		$admin_settings['bank_transfer_active']['desc'] = __('Enable bank transfer', 'invoicing');
 
-		$locale  = $this->get_country_locale();
+		$locale = $this->get_country_locale();
 
 		// Get sortcode label in the $locale array and use appropriate one.
 		$country  = wpinv_default_billing_country();
-		$sortcode = isset( $locale[ $country ]['sortcode']['label'] ) ? $locale[ $country ]['sortcode']['label'] : __( 'Sort code', 'invoicing' );
+		$sortcode = isset($locale[$country]['sortcode']['label']) ? $locale[$country]['sortcode']['label'] : __('Sort code', 'invoicing');
 
 		$admin_settings['bank_transfer_ac_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_name',
-            'name' => __( 'Account Name', 'invoicing' ),
+            'name' => __('Account Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ac_no'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ac_no',
-            'name' => __( 'Account Number', 'invoicing' ),
+            'name' => __('Account Number', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bank_name'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bank_name',
-            'name' => __( 'Bank Name', 'invoicing' ),
+            'name' => __('Bank Name', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_ifsc'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_ifsc',
-            'name' => __( 'IFSC Code', 'invoicing' ),
+            'name' => __('IFSC Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_iban'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_iban',
-            'name' => __( 'IBAN', 'invoicing' ),
+            'name' => __('IBAN', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_bic'] = array(
             'type' => 'text',
             'id'   => 'bank_transfer_bic',
-            'name' => __( 'BIC/Swift Code', 'invoicing' ),
+            'name' => __('BIC/Swift Code', 'invoicing'),
 		);
 
 		$admin_settings['bank_transfer_sort_code'] = array(
@@ -323,10 +323,10 @@ 
 
 		$admin_settings['bank_transfer_info'] = array(
             'id'   => 'bank_transfer_info',
-            'name' => __( 'Instructions', 'invoicing' ),
-            'desc' => __( 'Instructions that will be added to the thank you page and emails.', 'invoicing' ),
+            'name' => __('Instructions', 'invoicing'),
+            'desc' => __('Instructions that will be added to the thank you page and emails.', 'invoicing'),
             'type' => 'textarea',
-            'std'  => __( "Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing' ),
+            'std'  => __("Make your payment directly into our bank account. Please use your Invoice Number as the payment reference. Your invoice won't be processed until the funds have cleared in our account.", 'invoicing'),
             'cols' => 50,
             'rows' => 5,
         );
@@ -341,10 +341,10 @@ 
 	 * @param GetPaid_Form_Item[] $items
 	 * @return WPInv_Invoice
 	 */
-	public function process_addons( $invoice, $items ) {
+	public function process_addons($invoice, $items) {
 
-        foreach ( $items as $item ) {
-            $invoice->add_item( $item );
+        foreach ($items as $item) {
+            $invoice->add_item($item);
         }
 
         $invoice->recalculate_total();
@@ -357,10 +357,10 @@ 
 	 *
      * @param WPInv_Subscription $subscription
 	 */
-	public function maybe_renew_subscription( $subscription ) {
+	public function maybe_renew_subscription($subscription) {
 
         // Ensure its our subscription && it's active.
-        if ( $this->id === $subscription->get_gateway() && $subscription->has_status( 'active trialling' ) ) {
+        if ($this->id === $subscription->get_gateway() && $subscription->has_status('active trialling')) {
 			$subscription->create_payment();
         }
 
@@ -372,42 +372,42 @@ 
 	 *
      * @param WPInv_Invoice $invoice
 	 */
-	public function invoice_paid( $invoice ) {
+	public function invoice_paid($invoice) {
 
 		// Abort if not paid by bank transfer.
-		if ( $this->id !== $invoice->get_gateway() || ! $invoice->is_recurring() ) {
+		if ($this->id !== $invoice->get_gateway() || !$invoice->is_recurring()) {
 			return;
 		}
 
 		// Is it a parent payment?
-		if ( 0 == $invoice->get_parent_id() ) {
+		if (0 == $invoice->get_parent_id()) {
 
 			// (Maybe) activate subscriptions.
-			$subscriptions = getpaid_get_invoice_subscriptions( $invoice );
+			$subscriptions = getpaid_get_invoice_subscriptions($invoice);
 
-			if ( ! empty( $subscriptions ) ) {
-				$subscriptions = is_array( $subscriptions ) ? $subscriptions : array( $subscriptions );
+			if (!empty($subscriptions)) {
+				$subscriptions = is_array($subscriptions) ? $subscriptions : array($subscriptions);
 
-				foreach ( $subscriptions as $subscription ) {
-					if ( $subscription->exists() ) {
-						$duration = strtotime( $subscription->get_expiration() ) - strtotime( $subscription->get_date_created() );
-						$expiry   = gmdate( 'Y-m-d H:i:s', ( current_time( 'timestamp' ) + $duration ) );
+				foreach ($subscriptions as $subscription) {
+					if ($subscription->exists()) {
+						$duration = strtotime($subscription->get_expiration()) - strtotime($subscription->get_date_created());
+						$expiry   = gmdate('Y-m-d H:i:s', (current_time('timestamp') + $duration));
 
-						$subscription->set_next_renewal_date( $expiry );
-						$subscription->set_date_created( current_time( 'mysql' ) );
-						$subscription->set_profile_id( 'bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id() );
+						$subscription->set_next_renewal_date($expiry);
+						$subscription->set_date_created(current_time('mysql'));
+						$subscription->set_profile_id('bt_sub_' . $invoice->get_id() . '_' . $subscription->get_id());
 						$subscription->activate();
 					}
 				}
 			}
 		} else {
 
-			$subscription = getpaid_get_subscription( $invoice->get_subscription_id() );
+			$subscription = getpaid_get_subscription($invoice->get_subscription_id());
 
 			// Renew the subscription.
-			if ( $subscription && $subscription->exists() ) {
-				$subscription->add_payment( array(), $invoice );
-				$subscription->renew( strtotime( $invoice->get_date_created() ) );
+			if ($subscription && $subscription->exists()) {
+				$subscription->add_payment(array(), $invoice);
+				$subscription->renew(strtotime($invoice->get_date_created()));
 			}
 		}
 

vendor/ayecode/wp-font-awesome-settings/wp-font-awesome-settings.php

Braces +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 
 				if( !$version || version_compare($version,'5.999','>')){
 					$url .= 'assets/js/fa-iconpicker-v6.min.js';
-				}else{
+				} else{
 					$url .= 'assets/js/fa-iconpicker-v5.min.js';
 				}
 

Indentation +821 added lines, -821 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,406 +21,406 @@ 
  */
 if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
 
-	/**
-	 * A Class to be able to change settings for Font Awesome.
-	 *
-	 * Class WP_Font_Awesome_Settings
-	 */
-	class WP_Font_Awesome_Settings {
-
-		/**
-		 * Class version version.
-		 *
-		 * @var string
-		 */
-		public $version = '1.1.7';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'font-awesome-settings';
-
-		/**
-		 * Latest version of Font Awesome at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "6.4.2";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'Font Awesome';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		private $settings;
-
-		/**
-		 * WP_Font_Awesome_Settings instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    WP_Font_Awesome_Settings There can be only one!
-		 */
-		private static $instance = null;
-
-		/**
-		 * Main WP_Font_Awesome_Settings Instance.
-		 *
-		 * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return WP_Font_Awesome_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
-				self::$instance = new WP_Font_Awesome_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-					add_action( 'admin_init', array( self::$instance, 'constants' ) );
-					add_action( 'admin_notices', array( self::$instance, 'admin_notices' ) );
-				}
-
-				do_action( 'wp_font_awesome_settings_loaded' );
-			}
-
-			return self::$instance;
-		}
-
-		/**
+    /**
+     * A Class to be able to change settings for Font Awesome.
+     *
+     * Class WP_Font_Awesome_Settings
+     */
+    class WP_Font_Awesome_Settings {
+
+        /**
+         * Class version version.
+         *
+         * @var string
+         */
+        public $version = '1.1.7';
+
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'font-awesome-settings';
+
+        /**
+         * Latest version of Font Awesome at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "6.4.2";
+
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'Font Awesome';
+
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
+
+        /**
+         * WP_Font_Awesome_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    WP_Font_Awesome_Settings There can be only one!
+         */
+        private static $instance = null;
+
+        /**
+         * Main WP_Font_Awesome_Settings Instance.
+         *
+         * Ensures only one instance of WP_Font_Awesome_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return WP_Font_Awesome_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
+                self::$instance = new WP_Font_Awesome_Settings;
+
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+
+                if ( is_admin() ) {
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+                    add_action( 'admin_init', array( self::$instance, 'constants' ) );
+                    add_action( 'admin_notices', array( self::$instance, 'admin_notices' ) );
+                }
+
+                do_action( 'wp_font_awesome_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
          * Define any constants that may be needed by other packages.
          *
-		 * @return void
-		 */
-		public function constants(){
+         * @return void
+         */
+        public function constants(){
 
-			// register iconpicker constant
-			if ( ! defined( 'FAS_ICONPICKER_JS_URL' ) ) {
-				$url = $this->get_path_url();
-				$version = $this->settings['version'];
+            // register iconpicker constant
+            if ( ! defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+                $url = $this->get_path_url();
+                $version = $this->settings['version'];
 
-				if( !$version || version_compare($version,'5.999','>')){
-					$url .= 'assets/js/fa-iconpicker-v6.min.js';
-				}else{
-					$url .= 'assets/js/fa-iconpicker-v5.min.js';
-				}
+                if( !$version || version_compare($version,'5.999','>')){
+                    $url .= 'assets/js/fa-iconpicker-v6.min.js';
+                }else{
+                    $url .= 'assets/js/fa-iconpicker-v5.min.js';
+                }
 
-				define( 'FAS_ICONPICKER_JS_URL', $url );
+                define( 'FAS_ICONPICKER_JS_URL', $url );
 
-			}
+            }
 
             // Set a constant if pro enbaled
-			if ( ! defined( 'FAS_PRO' ) && $this->settings['pro'] ) {
-				define( 'FAS_PRO', true );
-			}
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_path_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
-
-			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
-			}
-
-			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
-
-			return trailingslashit( $url );
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 *
-		 * @since 1.0.8 Settings name wrong - FIXED
-		 */
-		public function init() {
-			// Download fontawesome locally.
-			add_action( 'add_option_wp-font-awesome-settings', array( $this, 'add_option_wp_font_awesome_settings' ), 10, 2 );
-			add_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
-
-			$this->settings = $this->get_settings();
-
-			// Check if the official plugin is active and use that instead if so.
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_head', array( $this, 'add_generator' ), 99 );
-				}
-
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_head', array( $this, 'add_generator' ), 99 );
-				}
-
-				if ( $this->settings['type'] == 'CSS' ) {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-						//add_action( 'wp_footer', array( $this, 'enqueue_style' ), 5000 ); // not sure why this was added, seems to break frontend
-					}
-
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_styles' ), 10, 2 );
-					}
-				} else {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-					}
-
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_scripts' ), 10, 2 );
-					}
-				}
-
-				// remove font awesome if set to do so
-				if ( $this->settings['dequeue'] == '1' ) {
-					add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
-				}
-			}
-
-		}
-
-		/**
-		 * Add FA to the FSE.
-		 *
-		 * @param $editor_settings
-		 * @param $block_editor_context
-		 *
-		 * @return array
-		 */
-		public function enqueue_editor_styles( $editor_settings, $block_editor_context ){
-
-			if ( ! empty( $editor_settings['__unstableResolvedAssets']['styles'] ) ) {
-				$url = $this->get_url();
-				$editor_settings['__unstableResolvedAssets']['styles'] .= "<link rel='stylesheet' id='font-awesome-css'  href='$url' media='all' />";
-			}
-
-			return $editor_settings;
-		}
-
-		/**
-		 * Add FA to the FSE.
-		 *
-		 * @param $editor_settings
-		 * @param $block_editor_context
-		 *
-		 * @return array
-		 */
-		public function enqueue_editor_scripts( $editor_settings, $block_editor_context ){
-
-			$url = $this->get_url();
-			$editor_settings['__unstableResolvedAssets']['scripts'] .= "<script src='$url' id='font-awesome-js'></script>";
-
-			return $editor_settings;
-		}
-
-		/**
-		 * Adds the Font Awesome styles.
-		 */
-		public function enqueue_style() {
-			// build url
-			$url = $this->get_url();
-			$version = ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ? strip_tags( $this->settings['local_version'] ) : null;
-
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
-			wp_register_style( 'font-awesome', $url, array(), $version );
-			wp_enqueue_style( 'font-awesome' );
-
-			// RTL language support CSS.
-			if ( is_rtl() ) {
-				wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
-			}
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_style( 'font-awesome-shims', $url, array(), $version );
-				wp_enqueue_style( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Adds the Font Awesome JS.
-		 */
-		public function enqueue_scripts() {
-			// build url
-			$url = $this->get_url();
-
-			$deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
-			wp_register_script( 'font-awesome', $url, array(), null );
-			wp_enqueue_script( 'font-awesome' );
-
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_script( 'font-awesome-shims' );
-			}
-		}
-
-		/**
-		 * Get the url of the Font Awesome files.
-		 *
-		 * @param bool $shims If this is a shim file or not.
-		 * @param bool $local Load locally if allowed.
-		 *
-		 * @return string The url to the file.
-		 */
-		public function get_url( $shims = false, $local = true ) {
-			$script  = $shims ? 'v4-shims' : 'all';
-			$sub     = $this->settings['pro'] ? 'pro' : 'use';
-			$type    = $this->settings['type'];
-			$version = $this->settings['version'];
-			$kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
-			$url     = '';
-
-			if ( $type == 'KIT' && $kit_url ) {
-				if ( $shims ) {
-					// if its a kit then we don't add shims here
-					return '';
-				}
-				$url .= $kit_url; // CDN
-				$url .= "?wpfas=true"; // set our var so our version is not removed
-			} else {
-				$v = '';
-				// Check and load locally.
-				if ( $local && $this->has_local() ) {
-					$script .= ".min";
-					$v .= '&ver=' . strip_tags( $this->settings['local_version'] );
-					$url .= $this->get_fonts_url(); // Local fonts url.
-				} else {
-					$url .= "https://$sub.fontawesome.com/releases/"; // CDN
-					$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
-				}
-				$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
-				$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
-				$url .= "?wpfas=true" . $v; // set our var so our version is not removed
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Try and remove any other versions of Font Awesome added by other plugins/themes.
-		 *
-		 * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
-		 *
-		 * @param $url
-		 * @param $original_url
-		 * @param $_context
-		 *
-		 * @return string The filtered url.
-		 */
-		public function remove_font_awesome( $url, $original_url, $_context ) {
-
-			if ( $_context == 'display'
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
-			) {// it's a font-awesome-url (probably)
-
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
-					if ( $this->settings['type'] == 'JS' ) {
-						if ( $this->settings['js-pseudo'] ) {
-							$url .= "' data-search-pseudo-elements defer='defer";
-						} else {
-							$url .= "' defer='defer";
-						}
-					}
-				} else {
-					$url = ''; // removing the url removes the file
-				}
-
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		public function register_settings() {
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
-		}
-
-		/**
-		 * Add the WordPress settings menu item.
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
-		 */
-		public function menu_item() {
-			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-			$db_settings = get_option( 'wp-font-awesome-settings' );
-
-			$defaults = array(
-				'type'      => 'CSS', // type to use, CSS or JS or KIT
-				'version'   => '', // latest
-				'enqueue'   => '', // front and backend
-				'shims'     => '0', // default OFF now in 2020
-				'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
-				'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
-				'pro'       => '0', // if pro CDN url should be used
-				'local'     => '0', // Store fonts locally.
-				'local_version' => '', // Local fonts version.
-				'kit-url'   => '', // the kit url
-			);
-
-			$settings = wp_parse_args( $db_settings, $defaults );
-
-			/**
-			 * Filter the Font Awesome settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
-		}
-
-		/**
-		 * The settings page html output.
-		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
-			}
-
-			// a hidden way to force the update of the version number via api instead of waiting the 48 hours
-			if ( isset( $_REQUEST['force-version-check'] ) ) {
-				$this->get_latest_version( $force_api = true );
-			}
-
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				?>
+            if ( ! defined( 'FAS_PRO' ) && $this->settings['pro'] ) {
+                define( 'FAS_PRO', true );
+            }
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_path_url() {
+            $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+            $content_url = untrailingslashit( WP_CONTENT_URL );
+
+            // Replace http:// to https://.
+            if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                $content_url = str_replace( 'http://', 'https://', $content_url );
+            }
+
+            // Check if we are inside a plugin
+            $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+            $url = str_replace( $content_dir, $content_url, $file_dir );
+
+            return trailingslashit( $url );
+        }
+
+        /**
+         * Initiate the settings and add the required action hooks.
+         *
+         * @since 1.0.8 Settings name wrong - FIXED
+         */
+        public function init() {
+            // Download fontawesome locally.
+            add_action( 'add_option_wp-font-awesome-settings', array( $this, 'add_option_wp_font_awesome_settings' ), 10, 2 );
+            add_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+
+            $this->settings = $this->get_settings();
+
+            // Check if the official plugin is active and use that instead if so.
+            if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                    add_action( 'admin_head', array( $this, 'add_generator' ), 99 );
+                }
+
+                if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                    add_action( 'wp_head', array( $this, 'add_generator' ), 99 );
+                }
+
+                if ( $this->settings['type'] == 'CSS' ) {
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+                        //add_action( 'wp_footer', array( $this, 'enqueue_style' ), 5000 ); // not sure why this was added, seems to break frontend
+                    }
+
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+                        add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_styles' ), 10, 2 );
+                    }
+                } else {
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
+                        add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+                    }
+
+                    if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
+                        add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+                        add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_scripts' ), 10, 2 );
+                    }
+                }
+
+                // remove font awesome if set to do so
+                if ( $this->settings['dequeue'] == '1' ) {
+                    add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
+                }
+            }
+
+        }
+
+        /**
+         * Add FA to the FSE.
+         *
+         * @param $editor_settings
+         * @param $block_editor_context
+         *
+         * @return array
+         */
+        public function enqueue_editor_styles( $editor_settings, $block_editor_context ){
+
+            if ( ! empty( $editor_settings['__unstableResolvedAssets']['styles'] ) ) {
+                $url = $this->get_url();
+                $editor_settings['__unstableResolvedAssets']['styles'] .= "<link rel='stylesheet' id='font-awesome-css'  href='$url' media='all' />";
+            }
+
+            return $editor_settings;
+        }
+
+        /**
+         * Add FA to the FSE.
+         *
+         * @param $editor_settings
+         * @param $block_editor_context
+         *
+         * @return array
+         */
+        public function enqueue_editor_scripts( $editor_settings, $block_editor_context ){
+
+            $url = $this->get_url();
+            $editor_settings['__unstableResolvedAssets']['scripts'] .= "<script src='$url' id='font-awesome-js'></script>";
+
+            return $editor_settings;
+        }
+
+        /**
+         * Adds the Font Awesome styles.
+         */
+        public function enqueue_style() {
+            // build url
+            $url = $this->get_url();
+            $version = ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ? strip_tags( $this->settings['local_version'] ) : null;
+
+            wp_deregister_style( 'font-awesome' ); // deregister in case its already there
+            wp_register_style( 'font-awesome', $url, array(), $version );
+            wp_enqueue_style( 'font-awesome' );
+
+            // RTL language support CSS.
+            if ( is_rtl() ) {
+                wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
+            }
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_style( 'font-awesome-shims', $url, array(), $version );
+                wp_enqueue_style( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Adds the Font Awesome JS.
+         */
+        public function enqueue_scripts() {
+            // build url
+            $url = $this->get_url();
+
+            $deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
+            call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
+            wp_register_script( 'font-awesome', $url, array(), null );
+            wp_enqueue_script( 'font-awesome' );
+
+            if ( $this->settings['shims'] ) {
+                $url = $this->get_url( true );
+                call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
+                wp_register_script( 'font-awesome-shims', $url, array(), null );
+                wp_enqueue_script( 'font-awesome-shims' );
+            }
+        }
+
+        /**
+         * Get the url of the Font Awesome files.
+         *
+         * @param bool $shims If this is a shim file or not.
+         * @param bool $local Load locally if allowed.
+         *
+         * @return string The url to the file.
+         */
+        public function get_url( $shims = false, $local = true ) {
+            $script  = $shims ? 'v4-shims' : 'all';
+            $sub     = $this->settings['pro'] ? 'pro' : 'use';
+            $type    = $this->settings['type'];
+            $version = $this->settings['version'];
+            $kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
+            $url     = '';
+
+            if ( $type == 'KIT' && $kit_url ) {
+                if ( $shims ) {
+                    // if its a kit then we don't add shims here
+                    return '';
+                }
+                $url .= $kit_url; // CDN
+                $url .= "?wpfas=true"; // set our var so our version is not removed
+            } else {
+                $v = '';
+                // Check and load locally.
+                if ( $local && $this->has_local() ) {
+                    $script .= ".min";
+                    $v .= '&ver=' . strip_tags( $this->settings['local_version'] );
+                    $url .= $this->get_fonts_url(); // Local fonts url.
+                } else {
+                    $url .= "https://$sub.fontawesome.com/releases/"; // CDN
+                    $url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
+                }
+                $url .= $type == 'CSS' ? 'css/' : 'js/'; // type
+                $url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
+                $url .= "?wpfas=true" . $v; // set our var so our version is not removed
+            }
+
+            return $url;
+        }
+
+        /**
+         * Try and remove any other versions of Font Awesome added by other plugins/themes.
+         *
+         * Uses the clean_url filter to try and remove any other Font Awesome files added, it can also add pseudo-elements flag for the JS version.
+         *
+         * @param $url
+         * @param $original_url
+         * @param $_context
+         *
+         * @return string The filtered url.
+         */
+        public function remove_font_awesome( $url, $original_url, $_context ) {
+
+            if ( $_context == 'display'
+                 && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
+                 && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
+            ) {// it's a font-awesome-url (probably)
+
+                if ( strstr( $url, "wpfas=true" ) !== false ) {
+                    if ( $this->settings['type'] == 'JS' ) {
+                        if ( $this->settings['js-pseudo'] ) {
+                            $url .= "' data-search-pseudo-elements defer='defer";
+                        } else {
+                            $url .= "' defer='defer";
+                        }
+                    }
+                } else {
+                    $url = ''; // removing the url removes the file
+                }
+
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        public function register_settings() {
+            register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
+        }
+
+        /**
+         * Add the WordPress settings menu item.
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
+         */
+        public function menu_item() {
+            $menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
+            call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
+                $this,
+                'settings_page'
+            ) );
+        }
+
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+            $db_settings = get_option( 'wp-font-awesome-settings' );
+
+            $defaults = array(
+                'type'      => 'CSS', // type to use, CSS or JS or KIT
+                'version'   => '', // latest
+                'enqueue'   => '', // front and backend
+                'shims'     => '0', // default OFF now in 2020
+                'js-pseudo' => '0', // if the pseudo elements flag should be set (CPU intensive)
+                'dequeue'   => '0', // if we should try to remove other versions added by other plugins/themes
+                'pro'       => '0', // if pro CDN url should be used
+                'local'     => '0', // Store fonts locally.
+                'local_version' => '', // Local fonts version.
+                'kit-url'   => '', // the kit url
+            );
+
+            $settings = wp_parse_args( $db_settings, $defaults );
+
+            /**
+             * Filter the Font Awesome settings.
+             *
+             * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
+             */
+            return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
+        }
+
+        /**
+         * The settings page html output.
+         */
+        public function settings_page() {
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+            }
+
+            // a hidden way to force the update of the version number via api instead of waiting the 48 hours
+            if ( isset( $_REQUEST['force-version-check'] ) ) {
+                $this->get_latest_version( $force_api = true );
+            }
+
+            if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+                ?>
                 <style>
                     .wpfas-kit-show {
                         display: none;
@@ -446,16 +446,16 @@ 
                     <h1><?php echo $this->name; ?></h1>
                     <form method="post" action="options.php" class="fas-settings-form">
 						<?php
-						settings_fields( 'wp-font-awesome-settings' );
-						do_settings_sections( 'wp-font-awesome-settings' );
-						$table_class = '';
-						if ( $this->settings['type'] ) {
-							$table_class .= 'wpfas-' . sanitize_html_class( strtolower( $this->settings['type'] ) ) . '-set';
-						}
-						if ( ! empty( $this->settings['pro'] ) ) {
-							$table_class .= ' wpfas-has-pro';
-						}
-						?>
+                        settings_fields( 'wp-font-awesome-settings' );
+                        do_settings_sections( 'wp-font-awesome-settings' );
+                        $table_class = '';
+                        if ( $this->settings['type'] ) {
+                            $table_class .= 'wpfas-' . sanitize_html_class( strtolower( $this->settings['type'] ) ) . '-set';
+                        }
+                        if ( ! empty( $this->settings['pro'] ) ) {
+                            $table_class .= ' wpfas-has-pro';
+                        }
+                        ?>
 						<?php if ( $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ) { ?>
 							<?php if ( $this->has_local() ) { ?>
                                 <div class="notice notice-info"><p><strong><?php _e( 'Font Awesome fonts are loading locally.', 'ayecode-connect' ); ?></strong></p></div>
@@ -480,12 +480,12 @@ 
                                 <td>
                                     <input class="regular-text" id="wpfas-kit-url" type="url" name="wp-font-awesome-settings[kit-url]" value="<?php echo esc_attr( $this->settings['kit-url'] ); ?>" placeholder="<?php echo 'https://kit.font';echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
                                     <span><?php
-										echo wp_sprintf(
-											__( 'Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect' ),
-											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
-											'</a>'
-										);
-										?></span>
+                                        echo wp_sprintf(
+                                            __( 'Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect' ),
+                                            '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
+                                            '</a>'
+                                        );
+                                        ?></span>
                                 </td>
                             </tr>
 
@@ -526,14 +526,14 @@ 
                                     <input type="hidden" name="wp-font-awesome-settings[pro]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[pro]" value="1" <?php checked( $this->settings['pro'], '1' ); ?> id="wpfas-pro" onchange="if(jQuery(this).is(':checked')){jQuery('.wpfas-table-settings').addClass('wpfas-has-pro')}else{jQuery('.wpfas-table-settings').removeClass('wpfas-has-pro')}"/>
                                     <span><?php
-										echo wp_sprintf(
-											__( 'Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect' ),
-											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/referral?a=c9b89e1418">',
-											' <i class="fas fa-external-link-alt"></i></a>',
-											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn">',
-											' <i class="fas fa-external-link-alt"></i></a>'
-										);
-										?></span>
+                                        echo wp_sprintf(
+                                            __( 'Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect' ),
+                                            '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/referral?a=c9b89e1418">',
+                                            ' <i class="fas fa-external-link-alt"></i></a>',
+                                            '<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn">',
+                                            ' <i class="fas fa-external-link-alt"></i></a>'
+                                        );
+                                        ?></span>
                                 </td>
                             </tr>
 
@@ -587,8 +587,8 @@ 
                         </table>
                         <div class="fas-buttons">
 							<?php
-							submit_button();
-							?>
+                            submit_button();
+                            ?>
                             <p class="submit"><a href="https://fontawesome.com/referral?a=c9b89e1418" class="button button-secondary"><?php _e('Get 24,000+ more icons with Font Awesome Pro','ayecode-connect'); ?> <i class="fas fa-external-link-alt"></i></a></p>
 
                         </div>
@@ -597,414 +597,414 @@ 
                     <div id="wpfas-version"><?php echo wp_sprintf(__( 'Version: %s (affiliate links provided)', 'ayecode-connect' ), $this->version ); ?></div>
                 </div>
 				<?php
-			}
-		}
-
-		/**
-		 * Check a version number is valid and if so return it or else return an empty string.
-		 *
-		 * @param $version string The version number to check.
-		 *
-		 * @since 1.0.6
-		 *
-		 * @return string Either a valid version number or an empty string.
-		 */
-		public function validate_version_number( $version ) {
-
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
-				// valid
-			} else {
-				$version = '';// not validated
-			}
-
-			return $version;
-		}
-
-
-		/**
-		 * Get the latest version of Font Awesome.
-		 *
-		 * We check for a cached version and if none we will check for a live version via API and then cache it for 48 hours.
-		 *
-		 * @since 1.0.7
-		 * @return mixed|string The latest version number found.
-		 */
-		public function get_latest_version( $force_api = false ) {
-			$latest_version = $this->latest;
-
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
-
-			if ( $cache === false || $force_api ) { // its not set
-				$api_ver = $this->get_latest_version_from_api();
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $api_ver;
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
-				}
-			} elseif ( $this->validate_version_number( $cache ) ) {
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
-					$latest_version = $cache;
-				}
-			}
-
-			// Check and auto download fonts locally.
-			if ( empty( $this->settings['pro'] ) && empty( $this->settings['version'] ) && $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && ! empty( $this->settings['local_version'] ) && ! empty( $latest_version ) ) {
-				if ( version_compare( $latest_version, $this->settings['local_version'], '>' ) && is_admin() && ! wp_doing_ajax() ) {
-					$this->download_package( $latest_version );
-				}
-			}
-
-			return $latest_version;
-		}
-
-		/**
-		 * Get the latest Font Awesome version from the github API.
-		 *
-		 * @since 1.0.7
-		 * @return string The latest version number or `0` on API fail.
-		 */
-		public function get_latest_version_from_api() {
-			$version  = "0";
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
-					$version = $api_response['tag_name'];
-				}
-			}
-
-			return $version;
-		}
-
-		/**
-		 * Inline CSS for RTL language support.
-		 *
-		 * @since 1.0.13
-		 * @return string Inline CSS.
-		 */
-		public function rtl_inline_css() {
-			$inline_css = '[dir=rtl] .fa-address,[dir=rtl] .fa-address-card,[dir=rtl] .fa-adjust,[dir=rtl] .fa-alarm-clock,[dir=rtl] .fa-align-left,[dir=rtl] .fa-align-right,[dir=rtl] .fa-analytics,[dir=rtl] .fa-angle-double-left,[dir=rtl] .fa-angle-double-right,[dir=rtl] .fa-angle-left,[dir=rtl] .fa-angle-right,[dir=rtl] .fa-arrow-alt-circle-left,[dir=rtl] .fa-arrow-alt-circle-right,[dir=rtl] .fa-arrow-alt-from-left,[dir=rtl] .fa-arrow-alt-from-right,[dir=rtl] .fa-arrow-alt-left,[dir=rtl] .fa-arrow-alt-right,[dir=rtl] .fa-arrow-alt-square-left,[dir=rtl] .fa-arrow-alt-square-right,[dir=rtl] .fa-arrow-alt-to-left,[dir=rtl] .fa-arrow-alt-to-right,[dir=rtl] .fa-arrow-circle-left,[dir=rtl] .fa-arrow-circle-right,[dir=rtl] .fa-arrow-from-left,[dir=rtl] .fa-arrow-from-right,[dir=rtl] .fa-arrow-left,[dir=rtl] .fa-arrow-right,[dir=rtl] .fa-arrow-square-left,[dir=rtl] .fa-arrow-square-right,[dir=rtl] .fa-arrow-to-left,[dir=rtl] .fa-arrow-to-right,[dir=rtl] .fa-balance-scale-left,[dir=rtl] .fa-balance-scale-right,[dir=rtl] .fa-bed,[dir=rtl] .fa-bed-bunk,[dir=rtl] .fa-bed-empty,[dir=rtl] .fa-border-left,[dir=rtl] .fa-border-right,[dir=rtl] .fa-calendar-check,[dir=rtl] .fa-caret-circle-left,[dir=rtl] .fa-caret-circle-right,[dir=rtl] .fa-caret-left,[dir=rtl] .fa-caret-right,[dir=rtl] .fa-caret-square-left,[dir=rtl] .fa-caret-square-right,[dir=rtl] .fa-cart-arrow-down,[dir=rtl] .fa-cart-plus,[dir=rtl] .fa-chart-area,[dir=rtl] .fa-chart-bar,[dir=rtl] .fa-chart-line,[dir=rtl] .fa-chart-line-down,[dir=rtl] .fa-chart-network,[dir=rtl] .fa-chart-pie,[dir=rtl] .fa-chart-pie-alt,[dir=rtl] .fa-chart-scatter,[dir=rtl] .fa-check-circle,[dir=rtl] .fa-check-square,[dir=rtl] .fa-chevron-circle-left,[dir=rtl] .fa-chevron-circle-right,[dir=rtl] .fa-chevron-double-left,[dir=rtl] .fa-chevron-double-right,[dir=rtl] .fa-chevron-left,[dir=rtl] .fa-chevron-right,[dir=rtl] .fa-chevron-square-left,[dir=rtl] .fa-chevron-square-right,[dir=rtl] .fa-clock,[dir=rtl] .fa-file,[dir=rtl] .fa-file-alt,[dir=rtl] .fa-file-archive,[dir=rtl] .fa-file-audio,[dir=rtl] .fa-file-chart-line,[dir=rtl] .fa-file-chart-pie,[dir=rtl] .fa-file-code,[dir=rtl] .fa-file-excel,[dir=rtl] .fa-file-image,[dir=rtl] .fa-file-pdf,[dir=rtl] .fa-file-powerpoint,[dir=rtl] .fa-file-video,[dir=rtl] .fa-file-word,[dir=rtl] .fa-flag,[dir=rtl] .fa-folder,[dir=rtl] .fa-folder-open,[dir=rtl] .fa-hand-lizard,[dir=rtl] .fa-hand-point-down,[dir=rtl] .fa-hand-point-left,[dir=rtl] .fa-hand-point-right,[dir=rtl] .fa-hand-point-up,[dir=rtl] .fa-hand-scissors,[dir=rtl] .fa-image,[dir=rtl] .fa-long-arrow-alt-left,[dir=rtl] .fa-long-arrow-alt-right,[dir=rtl] .fa-long-arrow-left,[dir=rtl] .fa-long-arrow-right,[dir=rtl] .fa-luggage-cart,[dir=rtl] .fa-moon,[dir=rtl] .fa-pencil,[dir=rtl] .fa-pencil-alt,[dir=rtl] .fa-play-circle,[dir=rtl] .fa-project-diagram,[dir=rtl] .fa-quote-left,[dir=rtl] .fa-quote-right,[dir=rtl] .fa-shopping-cart,[dir=rtl] .fa-thumbs-down,[dir=rtl] .fa-thumbs-up,[dir=rtl] .fa-user-chart{filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);transform:scale(-1,1)}[dir=rtl] .fa-spin{animation-direction:reverse}';
-
-			return $inline_css;
-		}
-
-		/**
-		 * Show any warnings as an admin notice.
-		 *
-		 * @return void
-		 */
-		public function admin_notices() {
-			$settings = $this->settings;
-
-			if ( defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( ! empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wp-font-awesome-settings' ) {
-					?>
+            }
+        }
+
+        /**
+         * Check a version number is valid and if so return it or else return an empty string.
+         *
+         * @param $version string The version number to check.
+         *
+         * @since 1.0.6
+         *
+         * @return string Either a valid version number or an empty string.
+         */
+        public function validate_version_number( $version ) {
+
+            if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
+                // valid
+            } else {
+                $version = '';// not validated
+            }
+
+            return $version;
+        }
+
+
+        /**
+         * Get the latest version of Font Awesome.
+         *
+         * We check for a cached version and if none we will check for a live version via API and then cache it for 48 hours.
+         *
+         * @since 1.0.7
+         * @return mixed|string The latest version number found.
+         */
+        public function get_latest_version( $force_api = false ) {
+            $latest_version = $this->latest;
+
+            $cache = get_transient( 'wp-font-awesome-settings-version' );
+
+            if ( $cache === false || $force_api ) { // its not set
+                $api_ver = $this->get_latest_version_from_api();
+                if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $api_ver;
+                    set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
+                }
+            } elseif ( $this->validate_version_number( $cache ) ) {
+                if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
+                    $latest_version = $cache;
+                }
+            }
+
+            // Check and auto download fonts locally.
+            if ( empty( $this->settings['pro'] ) && empty( $this->settings['version'] ) && $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && ! empty( $this->settings['local_version'] ) && ! empty( $latest_version ) ) {
+                if ( version_compare( $latest_version, $this->settings['local_version'], '>' ) && is_admin() && ! wp_doing_ajax() ) {
+                    $this->download_package( $latest_version );
+                }
+            }
+
+            return $latest_version;
+        }
+
+        /**
+         * Get the latest Font Awesome version from the github API.
+         *
+         * @since 1.0.7
+         * @return string The latest version number or `0` on API fail.
+         */
+        public function get_latest_version_from_api() {
+            $version  = "0";
+            $response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
+            if ( ! is_wp_error( $response ) && is_array( $response ) ) {
+                $api_response = json_decode( wp_remote_retrieve_body( $response ), true );
+                if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
+                    $version = $api_response['tag_name'];
+                }
+            }
+
+            return $version;
+        }
+
+        /**
+         * Inline CSS for RTL language support.
+         *
+         * @since 1.0.13
+         * @return string Inline CSS.
+         */
+        public function rtl_inline_css() {
+            $inline_css = '[dir=rtl] .fa-address,[dir=rtl] .fa-address-card,[dir=rtl] .fa-adjust,[dir=rtl] .fa-alarm-clock,[dir=rtl] .fa-align-left,[dir=rtl] .fa-align-right,[dir=rtl] .fa-analytics,[dir=rtl] .fa-angle-double-left,[dir=rtl] .fa-angle-double-right,[dir=rtl] .fa-angle-left,[dir=rtl] .fa-angle-right,[dir=rtl] .fa-arrow-alt-circle-left,[dir=rtl] .fa-arrow-alt-circle-right,[dir=rtl] .fa-arrow-alt-from-left,[dir=rtl] .fa-arrow-alt-from-right,[dir=rtl] .fa-arrow-alt-left,[dir=rtl] .fa-arrow-alt-right,[dir=rtl] .fa-arrow-alt-square-left,[dir=rtl] .fa-arrow-alt-square-right,[dir=rtl] .fa-arrow-alt-to-left,[dir=rtl] .fa-arrow-alt-to-right,[dir=rtl] .fa-arrow-circle-left,[dir=rtl] .fa-arrow-circle-right,[dir=rtl] .fa-arrow-from-left,[dir=rtl] .fa-arrow-from-right,[dir=rtl] .fa-arrow-left,[dir=rtl] .fa-arrow-right,[dir=rtl] .fa-arrow-square-left,[dir=rtl] .fa-arrow-square-right,[dir=rtl] .fa-arrow-to-left,[dir=rtl] .fa-arrow-to-right,[dir=rtl] .fa-balance-scale-left,[dir=rtl] .fa-balance-scale-right,[dir=rtl] .fa-bed,[dir=rtl] .fa-bed-bunk,[dir=rtl] .fa-bed-empty,[dir=rtl] .fa-border-left,[dir=rtl] .fa-border-right,[dir=rtl] .fa-calendar-check,[dir=rtl] .fa-caret-circle-left,[dir=rtl] .fa-caret-circle-right,[dir=rtl] .fa-caret-left,[dir=rtl] .fa-caret-right,[dir=rtl] .fa-caret-square-left,[dir=rtl] .fa-caret-square-right,[dir=rtl] .fa-cart-arrow-down,[dir=rtl] .fa-cart-plus,[dir=rtl] .fa-chart-area,[dir=rtl] .fa-chart-bar,[dir=rtl] .fa-chart-line,[dir=rtl] .fa-chart-line-down,[dir=rtl] .fa-chart-network,[dir=rtl] .fa-chart-pie,[dir=rtl] .fa-chart-pie-alt,[dir=rtl] .fa-chart-scatter,[dir=rtl] .fa-check-circle,[dir=rtl] .fa-check-square,[dir=rtl] .fa-chevron-circle-left,[dir=rtl] .fa-chevron-circle-right,[dir=rtl] .fa-chevron-double-left,[dir=rtl] .fa-chevron-double-right,[dir=rtl] .fa-chevron-left,[dir=rtl] .fa-chevron-right,[dir=rtl] .fa-chevron-square-left,[dir=rtl] .fa-chevron-square-right,[dir=rtl] .fa-clock,[dir=rtl] .fa-file,[dir=rtl] .fa-file-alt,[dir=rtl] .fa-file-archive,[dir=rtl] .fa-file-audio,[dir=rtl] .fa-file-chart-line,[dir=rtl] .fa-file-chart-pie,[dir=rtl] .fa-file-code,[dir=rtl] .fa-file-excel,[dir=rtl] .fa-file-image,[dir=rtl] .fa-file-pdf,[dir=rtl] .fa-file-powerpoint,[dir=rtl] .fa-file-video,[dir=rtl] .fa-file-word,[dir=rtl] .fa-flag,[dir=rtl] .fa-folder,[dir=rtl] .fa-folder-open,[dir=rtl] .fa-hand-lizard,[dir=rtl] .fa-hand-point-down,[dir=rtl] .fa-hand-point-left,[dir=rtl] .fa-hand-point-right,[dir=rtl] .fa-hand-point-up,[dir=rtl] .fa-hand-scissors,[dir=rtl] .fa-image,[dir=rtl] .fa-long-arrow-alt-left,[dir=rtl] .fa-long-arrow-alt-right,[dir=rtl] .fa-long-arrow-left,[dir=rtl] .fa-long-arrow-right,[dir=rtl] .fa-luggage-cart,[dir=rtl] .fa-moon,[dir=rtl] .fa-pencil,[dir=rtl] .fa-pencil-alt,[dir=rtl] .fa-play-circle,[dir=rtl] .fa-project-diagram,[dir=rtl] .fa-quote-left,[dir=rtl] .fa-quote-right,[dir=rtl] .fa-shopping-cart,[dir=rtl] .fa-thumbs-down,[dir=rtl] .fa-thumbs-up,[dir=rtl] .fa-user-chart{filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);transform:scale(-1,1)}[dir=rtl] .fa-spin{animation-direction:reverse}';
+
+            return $inline_css;
+        }
+
+        /**
+         * Show any warnings as an admin notice.
+         *
+         * @return void
+         */
+        public function admin_notices() {
+            $settings = $this->settings;
+
+            if ( defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+                if ( ! empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wp-font-awesome-settings' ) {
+                    ?>
                     <div class="notice  notice-error is-dismissible">
                         <p><?php _e( 'The Official Font Awesome Plugin is active, please adjust your settings there.', 'ayecode-connect' ); ?></p>
                     </div>
 					<?php
-				}
-			} else {
-				if ( ! empty( $settings ) ) {
-					if ( $settings['type'] != 'KIT' && $settings['pro'] && ( $settings['version'] == '' || version_compare( $settings['version'], '6', '>=' ) ) ) {
-						$link = admin_url('options-general.php?page=wp-font-awesome-settings');
-						?>
+                }
+            } else {
+                if ( ! empty( $settings ) ) {
+                    if ( $settings['type'] != 'KIT' && $settings['pro'] && ( $settings['version'] == '' || version_compare( $settings['version'], '6', '>=' ) ) ) {
+                        $link = admin_url('options-general.php?page=wp-font-awesome-settings');
+                        ?>
                         <div class="notice  notice-error is-dismissible">
                             <p><?php echo wp_sprintf( __( 'Font Awesome Pro v6 requires the use of a kit, please setup your kit in %ssettings.%s', 'ayecode-connect' ),"<a href='". esc_url_raw( $link )."'>","</a>" ); ?></p>
                         </div>
 						<?php
-					}
-				}
-			}
-		}
-
-		/**
-		 * Handle fontawesome add settings to download fontawesome to store locally.
-		 *
-		 * @since 1.1.1
-		 *
-		 * @param string $option The option name.
-		 * @param mixed  $value  The option value.
-		 */
-		public function add_option_wp_font_awesome_settings( $option, $value ) {
-			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
-				return;
-			}
-
-			if ( ! empty( $value['local'] ) && empty( $value['pro'] ) && ! ( ! empty( $value['type'] ) && $value['type'] == 'KIT' ) ) {
-				$version = isset( $value['version'] ) && $value['version'] ? $value['version'] : $this->get_latest_version();
-
-				if ( ! empty( $version ) ) {
-					$response = $this->download_package( $version, $value );
-
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Handle fontawesome update settings to download fontawesome to store locally.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param mixed $old_value The old option value.
-		 * @param mixed $value     The new option value.
-		 */
-		public function update_option_wp_font_awesome_settings( $old_value, $new_value ) {
-			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
-				return;
-			}
-
-			if ( ! empty( $new_value['local'] ) && empty( $new_value['pro'] ) && ! ( ! empty( $new_value['type'] ) && $new_value['type'] == 'KIT' ) ) {
-				// Old values
-				$old_version = isset( $old_value['version'] ) && $old_value['version'] ? $old_value['version'] : ( isset( $old_value['local_version'] ) ? $old_value['local_version'] : '' );
-				$old_local = isset( $old_value['local'] ) ? (int) $old_value['local'] : 0;
-
-				// New values
-				$new_version = isset( $new_value['version'] ) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
-
-				if ( empty( $old_local ) || $old_version !== $new_version || ! file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
-					$response = $this->download_package( $new_version, $new_value );
-
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
-					}
-				}
-			}
-		}
-
-		/**
-		 * Get the fonts directory local path.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param string Fonts directory local path.
-		 */
-		public function get_fonts_dir() {
-			$upload_dir = wp_upload_dir( null, false );
-
-			return $upload_dir['basedir'] . DIRECTORY_SEPARATOR .  'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
-		}
-
-		/**
-		 * Get the fonts directory local url.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param string Fonts directory local url.
-		 */
-		public function get_fonts_url() {
-			$upload_dir = wp_upload_dir( null, false );
-
-			return $upload_dir['baseurl'] .  '/ayefonts/fa/';
-		}
-
-		/**
-		 * Check whether load locally active.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @return bool True if active else false.
-		 */
-		public function has_local() {
-			if ( ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) && file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Get the WP Filesystem access.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @return object The WP Filesystem.
-		 */
-		public function get_wp_filesystem() {
-			if ( ! function_exists( 'get_filesystem_method' ) ) {
-				require_once( ABSPATH . "/wp-admin/includes/file.php" );
-			}
-
-			$access_type = get_filesystem_method();
-
-			if ( $access_type === 'direct' ) {
-				/* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
-
-				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
-					/* Any problems and we exit */
-					return false;
-				}
-
-				global $wp_filesystem;
-
-				return $wp_filesystem;
-				/* Do our file manipulations below */
-			} else if ( defined( 'FTP_USER' ) ) {
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
-
-				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
-					/* Any problems and we exit */
-					return false;
-				}
-
-				global $wp_filesystem;
-
-				return $wp_filesystem;
-			} else {
-				/* Don't have direct write access. Prompt user with our notice */
-				return false;
-			}
-		}
-
-		/**
-		 * Download the fontawesome package file.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param mixed $version The font awesome.
-		 * @param array $option Fontawesome settings.
-		 * @return WP_ERROR|bool Error on fail and true on success.
-		 */
-		public function download_package( $version, $option = array() ) {
-			$filename = 'fontawesome-free-' . $version . '-web';
-			$url = 'https://use.fontawesome.com/releases/v' . $version . '/' . $filename . '.zip';
-
-			if ( ! function_exists( 'wp_handle_upload' ) ) {
-				require_once ABSPATH . 'wp-admin/includes/file.php';
-			}
-
-			$download_file = download_url( esc_url_raw( $url ) );
-
-			if ( is_wp_error( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( $download_file->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( 'Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect' ) );
-			}
-
-			$response = $this->extract_package( $download_file, $filename, true );
-
-			// Update local version.
-			if ( is_wp_error( $response ) ) {
-				return $response;
-			} else if ( $response ) {
-				if ( empty( $option ) ) {
-					$option = get_option( 'wp-font-awesome-settings' );
-				}
-
-				$option['local_version'] = $version;
-
-				// Remove action to prevent looping.
-				remove_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
-
-				update_option( 'wp-font-awesome-settings', $option );
-
-				return true;
-			}
-
-			return false;
-		}
-
-		/**
-		 * Extract the fontawesome package file.
-		 *
-		 * @since 1.1.0
-		 *
-		 * @param string $package The package file path.
-		 * @param string $dirname Package file name.
-		 * @param bool   $delete_package Delete temp file or not.
-		 * @return WP_Error|bool True on success WP_Error on fail.
-		 */
-		public function extract_package( $package, $dirname = '', $delete_package = false ) {
-			global $wp_filesystem;
-
-			$wp_filesystem = $this->get_wp_filesystem();
-
-			if ( empty( $wp_filesystem ) && isset( $wp_filesystem->errors ) && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( $wp_filesystem->errors->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $wp_filesystem ) ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( 'Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect' ) );
-			}
-
-			$fonts_dir = $this->get_fonts_dir();
-			$fonts_tmp_dir = dirname( $fonts_dir ) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
-
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
-			}
-
-			// Unzip package to working directory.
-			$result = unzip_file( $package, $fonts_tmp_dir );
-
-			if ( is_wp_error( $result ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
-
-				if ( 'incompatible_archive' === $result->get_error_code() ) {
-					return new WP_Error( 'fontawesome_incompatible_archive', __( $result->get_error_message(), 'ayecode-connect' ) );
-				}
-
-				return $result;
-			}
-
-			if ( $wp_filesystem->is_dir( $fonts_dir ) ) {
-				$wp_filesystem->delete( $fonts_dir, true );
-			}
-
-			$extract_dir = $fonts_tmp_dir;
-
-			if ( $dirname && $wp_filesystem->is_dir( $extract_dir . $dirname . DIRECTORY_SEPARATOR ) ) {
-				$extract_dir .= $dirname . DIRECTORY_SEPARATOR;
-			}
-
-			try {
-				$return = $wp_filesystem->move( $extract_dir, $fonts_dir, true );
-			} catch ( Exception $e ) {
-				$return = new WP_Error( 'fontawesome_move_package', __( 'Fail to move font awesome package!', 'ayecode-connect' ) );
-			}
-
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
-			}
-
-			// Once extracted, delete the package if required.
-			if ( $delete_package ) {
-				unlink( $package );
-			}
-
-			return $return;
-		}
-
-		/**
-		 * Output the version in the header.
-		 */
-		public function add_generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-			// Find source plugin/theme.
-			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-				}
-			}
-
-			echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-ac-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
-		}
-	}
-
-	/**
-	 * Run the class if found.
-	 */
-	WP_Font_Awesome_Settings::instance();
+                    }
+                }
+            }
+        }
+
+        /**
+         * Handle fontawesome add settings to download fontawesome to store locally.
+         *
+         * @since 1.1.1
+         *
+         * @param string $option The option name.
+         * @param mixed  $value  The option value.
+         */
+        public function add_option_wp_font_awesome_settings( $option, $value ) {
+            // Do nothing if WordPress is being installed.
+            if ( wp_installing() ) {
+                return;
+            }
+
+            if ( ! empty( $value['local'] ) && empty( $value['pro'] ) && ! ( ! empty( $value['type'] ) && $value['type'] == 'KIT' ) ) {
+                $version = isset( $value['version'] ) && $value['version'] ? $value['version'] : $this->get_latest_version();
+
+                if ( ! empty( $version ) ) {
+                    $response = $this->download_package( $version, $value );
+
+                    if ( is_wp_error( $response ) ) {
+                        add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Handle fontawesome update settings to download fontawesome to store locally.
+         *
+         * @since 1.1.0
+         *
+         * @param mixed $old_value The old option value.
+         * @param mixed $value     The new option value.
+         */
+        public function update_option_wp_font_awesome_settings( $old_value, $new_value ) {
+            // Do nothing if WordPress is being installed.
+            if ( wp_installing() ) {
+                return;
+            }
+
+            if ( ! empty( $new_value['local'] ) && empty( $new_value['pro'] ) && ! ( ! empty( $new_value['type'] ) && $new_value['type'] == 'KIT' ) ) {
+                // Old values
+                $old_version = isset( $old_value['version'] ) && $old_value['version'] ? $old_value['version'] : ( isset( $old_value['local_version'] ) ? $old_value['local_version'] : '' );
+                $old_local = isset( $old_value['local'] ) ? (int) $old_value['local'] : 0;
+
+                // New values
+                $new_version = isset( $new_value['version'] ) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
+
+                if ( empty( $old_local ) || $old_version !== $new_version || ! file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
+                    $response = $this->download_package( $new_version, $new_value );
+
+                    if ( is_wp_error( $response ) ) {
+                        add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+                    }
+                }
+            }
+        }
+
+        /**
+         * Get the fonts directory local path.
+         *
+         * @since 1.1.0
+         *
+         * @param string Fonts directory local path.
+         */
+        public function get_fonts_dir() {
+            $upload_dir = wp_upload_dir( null, false );
+
+            return $upload_dir['basedir'] . DIRECTORY_SEPARATOR .  'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
+        }
+
+        /**
+         * Get the fonts directory local url.
+         *
+         * @since 1.1.0
+         *
+         * @param string Fonts directory local url.
+         */
+        public function get_fonts_url() {
+            $upload_dir = wp_upload_dir( null, false );
+
+            return $upload_dir['baseurl'] .  '/ayefonts/fa/';
+        }
+
+        /**
+         * Check whether load locally active.
+         *
+         * @since 1.1.0
+         *
+         * @return bool True if active else false.
+         */
+        public function has_local() {
+            if ( ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) && file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Get the WP Filesystem access.
+         *
+         * @since 1.1.0
+         *
+         * @return object The WP Filesystem.
+         */
+        public function get_wp_filesystem() {
+            if ( ! function_exists( 'get_filesystem_method' ) ) {
+                require_once( ABSPATH . "/wp-admin/includes/file.php" );
+            }
+
+            $access_type = get_filesystem_method();
+
+            if ( $access_type === 'direct' ) {
+                /* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
+                $creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+
+                /* Initialize the API */
+                if ( ! WP_Filesystem( $creds ) ) {
+                    /* Any problems and we exit */
+                    return false;
+                }
+
+                global $wp_filesystem;
+
+                return $wp_filesystem;
+                /* Do our file manipulations below */
+            } else if ( defined( 'FTP_USER' ) ) {
+                $creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+
+                /* Initialize the API */
+                if ( ! WP_Filesystem( $creds ) ) {
+                    /* Any problems and we exit */
+                    return false;
+                }
+
+                global $wp_filesystem;
+
+                return $wp_filesystem;
+            } else {
+                /* Don't have direct write access. Prompt user with our notice */
+                return false;
+            }
+        }
+
+        /**
+         * Download the fontawesome package file.
+         *
+         * @since 1.1.0
+         *
+         * @param mixed $version The font awesome.
+         * @param array $option Fontawesome settings.
+         * @return WP_ERROR|bool Error on fail and true on success.
+         */
+        public function download_package( $version, $option = array() ) {
+            $filename = 'fontawesome-free-' . $version . '-web';
+            $url = 'https://use.fontawesome.com/releases/v' . $version . '/' . $filename . '.zip';
+
+            if ( ! function_exists( 'wp_handle_upload' ) ) {
+                require_once ABSPATH . 'wp-admin/includes/file.php';
+            }
+
+            $download_file = download_url( esc_url_raw( $url ) );
+
+            if ( is_wp_error( $download_file ) ) {
+                return new WP_Error( 'fontawesome_download_failed', __( $download_file->get_error_message(), 'ayecode-connect' ) );
+            } else if ( empty( $download_file ) ) {
+                return new WP_Error( 'fontawesome_download_failed', __( 'Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect' ) );
+            }
+
+            $response = $this->extract_package( $download_file, $filename, true );
+
+            // Update local version.
+            if ( is_wp_error( $response ) ) {
+                return $response;
+            } else if ( $response ) {
+                if ( empty( $option ) ) {
+                    $option = get_option( 'wp-font-awesome-settings' );
+                }
+
+                $option['local_version'] = $version;
+
+                // Remove action to prevent looping.
+                remove_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+
+                update_option( 'wp-font-awesome-settings', $option );
+
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * Extract the fontawesome package file.
+         *
+         * @since 1.1.0
+         *
+         * @param string $package The package file path.
+         * @param string $dirname Package file name.
+         * @param bool   $delete_package Delete temp file or not.
+         * @return WP_Error|bool True on success WP_Error on fail.
+         */
+        public function extract_package( $package, $dirname = '', $delete_package = false ) {
+            global $wp_filesystem;
+
+            $wp_filesystem = $this->get_wp_filesystem();
+
+            if ( empty( $wp_filesystem ) && isset( $wp_filesystem->errors ) && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
+                return new WP_Error( 'fontawesome_filesystem_error', __( $wp_filesystem->errors->get_error_message(), 'ayecode-connect' ) );
+            } else if ( empty( $wp_filesystem ) ) {
+                return new WP_Error( 'fontawesome_filesystem_error', __( 'Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect' ) );
+            }
+
+            $fonts_dir = $this->get_fonts_dir();
+            $fonts_tmp_dir = dirname( $fonts_dir ) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
+
+            if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
+                $wp_filesystem->delete( $fonts_tmp_dir, true );
+            }
+
+            // Unzip package to working directory.
+            $result = unzip_file( $package, $fonts_tmp_dir );
+
+            if ( is_wp_error( $result ) ) {
+                $wp_filesystem->delete( $fonts_tmp_dir, true );
+
+                if ( 'incompatible_archive' === $result->get_error_code() ) {
+                    return new WP_Error( 'fontawesome_incompatible_archive', __( $result->get_error_message(), 'ayecode-connect' ) );
+                }
+
+                return $result;
+            }
+
+            if ( $wp_filesystem->is_dir( $fonts_dir ) ) {
+                $wp_filesystem->delete( $fonts_dir, true );
+            }
+
+            $extract_dir = $fonts_tmp_dir;
+
+            if ( $dirname && $wp_filesystem->is_dir( $extract_dir . $dirname . DIRECTORY_SEPARATOR ) ) {
+                $extract_dir .= $dirname . DIRECTORY_SEPARATOR;
+            }
+
+            try {
+                $return = $wp_filesystem->move( $extract_dir, $fonts_dir, true );
+            } catch ( Exception $e ) {
+                $return = new WP_Error( 'fontawesome_move_package', __( 'Fail to move font awesome package!', 'ayecode-connect' ) );
+            }
+
+            if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
+                $wp_filesystem->delete( $fonts_tmp_dir, true );
+            }
+
+            // Once extracted, delete the package if required.
+            if ( $delete_package ) {
+                unlink( $package );
+            }
+
+            return $return;
+        }
+
+        /**
+         * Output the version in the header.
+         */
+        public function add_generator() {
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme.
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
+
+            echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-ac-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+        }
+    }
+
+    /**
+     * Run the class if found.
+     */
+    WP_Font_Awesome_Settings::instance();
 }

Spacing +242 added lines, -242 removed lines

@@ -12,14 +12,14 @@ 
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Only add if the class does not already exist.
  */
-if ( ! class_exists( 'WP_Font_Awesome_Settings' ) ) {
+if (!class_exists('WP_Font_Awesome_Settings')) {
 
 	/**
 	 * A Class to be able to change settings for Font Awesome.
@@ -82,19 +82,19 @@ 
 		 * @return WP_Font_Awesome_Settings - Main instance.
 		 */
 		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof WP_Font_Awesome_Settings ) ) {
+			if (!isset(self::$instance) && !(self::$instance instanceof WP_Font_Awesome_Settings)) {
 				self::$instance = new WP_Font_Awesome_Settings;
 
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+				add_action('init', array(self::$instance, 'init')); // set settings
 
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-					add_action( 'admin_init', array( self::$instance, 'constants' ) );
-					add_action( 'admin_notices', array( self::$instance, 'admin_notices' ) );
+				if (is_admin()) {
+					add_action('admin_menu', array(self::$instance, 'menu_item'));
+					add_action('admin_init', array(self::$instance, 'register_settings'));
+					add_action('admin_init', array(self::$instance, 'constants'));
+					add_action('admin_notices', array(self::$instance, 'admin_notices'));
 				}
 
-				do_action( 'wp_font_awesome_settings_loaded' );
+				do_action('wp_font_awesome_settings_loaded');
 			}
 
 			return self::$instance;
@@ -105,26 +105,26 @@ 
          *
 		 * @return void
 		 */
-		public function constants(){
+		public function constants() {
 
 			// register iconpicker constant
-			if ( ! defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+			if (!defined('FAS_ICONPICKER_JS_URL')) {
 				$url = $this->get_path_url();
 				$version = $this->settings['version'];
 
-				if( !$version || version_compare($version,'5.999','>')){
+				if (!$version || version_compare($version, '5.999', '>')) {
 					$url .= 'assets/js/fa-iconpicker-v6.min.js';
-				}else{
+				} else {
 					$url .= 'assets/js/fa-iconpicker-v5.min.js';
 				}
 
-				define( 'FAS_ICONPICKER_JS_URL', $url );
+				define('FAS_ICONPICKER_JS_URL', $url);
 
 			}
 
             // Set a constant if pro enbaled
-			if ( ! defined( 'FAS_PRO' ) && $this->settings['pro'] ) {
-				define( 'FAS_PRO', true );
+			if (!defined('FAS_PRO') && $this->settings['pro']) {
+				define('FAS_PRO', true);
 			}
 		}
 
@@ -134,19 +134,19 @@ 
 		 * @return string
 		 */
 		public function get_path_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
+			$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+			$content_url = untrailingslashit(WP_CONTENT_URL);
 
 			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
+			if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+				$content_url = str_replace('http://', 'https://', $content_url);
 			}
 
 			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
+			$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+			$url = str_replace($content_dir, $content_url, $file_dir);
 
-			return trailingslashit( $url );
+			return trailingslashit($url);
 		}
 
 		/**
@@ -156,45 +156,45 @@ 
 		 */
 		public function init() {
 			// Download fontawesome locally.
-			add_action( 'add_option_wp-font-awesome-settings', array( $this, 'add_option_wp_font_awesome_settings' ), 10, 2 );
-			add_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+			add_action('add_option_wp-font-awesome-settings', array($this, 'add_option_wp_font_awesome_settings'), 10, 2);
+			add_action('update_option_wp-font-awesome-settings', array($this, 'update_option_wp_font_awesome_settings'), 10, 2);
 
 			$this->settings = $this->get_settings();
 
 			// Check if the official plugin is active and use that instead if so.
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-					add_action( 'admin_head', array( $this, 'add_generator' ), 99 );
+			if (!defined('FONTAWESOME_PLUGIN_FILE')) {
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+					add_action('admin_head', array($this, 'add_generator'), 99);
 				}
 
-				if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-					add_action( 'wp_head', array( $this, 'add_generator' ), 99 );
+				if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+					add_action('wp_head', array($this, 'add_generator'), 99);
 				}
 
-				if ( $this->settings['type'] == 'CSS' ) {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
+				if ($this->settings['type'] == 'CSS') {
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+						add_action('wp_enqueue_scripts', array($this, 'enqueue_style'), 5000);
 						//add_action( 'wp_footer', array( $this, 'enqueue_style' ), 5000 ); // not sure why this was added, seems to break frontend
 					}
 
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_styles' ), 10, 2 );
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+						add_action('admin_enqueue_scripts', array($this, 'enqueue_style'), 5000);
+						add_filter('block_editor_settings_all', array($this, 'enqueue_editor_styles'), 10, 2);
 					}
 				} else {
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend' ) {
-						add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'frontend') {
+						add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), 5000);
 					}
 
-					if ( $this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend' ) {
-						add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 5000 );
-						add_filter( 'block_editor_settings_all', array( $this, 'enqueue_editor_scripts' ), 10, 2 );
+					if ($this->settings['enqueue'] == '' || $this->settings['enqueue'] == 'backend') {
+						add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'), 5000);
+						add_filter('block_editor_settings_all', array($this, 'enqueue_editor_scripts'), 10, 2);
 					}
 				}
 
 				// remove font awesome if set to do so
-				if ( $this->settings['dequeue'] == '1' ) {
-					add_action( 'clean_url', array( $this, 'remove_font_awesome' ), 5000, 3 );
+				if ($this->settings['dequeue'] == '1') {
+					add_action('clean_url', array($this, 'remove_font_awesome'), 5000, 3);
 				}
 			}
 
@@ -208,9 +208,9 @@ 
 		 *
 		 * @return array
 		 */
-		public function enqueue_editor_styles( $editor_settings, $block_editor_context ){
+		public function enqueue_editor_styles($editor_settings, $block_editor_context) {
 
-			if ( ! empty( $editor_settings['__unstableResolvedAssets']['styles'] ) ) {
+			if (!empty($editor_settings['__unstableResolvedAssets']['styles'])) {
 				$url = $this->get_url();
 				$editor_settings['__unstableResolvedAssets']['styles'] .= "<link rel='stylesheet' id='font-awesome-css'  href='$url' media='all' />";
 			}
@@ -226,7 +226,7 @@ 
 		 *
 		 * @return array
 		 */
-		public function enqueue_editor_scripts( $editor_settings, $block_editor_context ){
+		public function enqueue_editor_scripts($editor_settings, $block_editor_context) {
 
 			$url = $this->get_url();
 			$editor_settings['__unstableResolvedAssets']['scripts'] .= "<script src='$url' id='font-awesome-js'></script>";
@@ -240,22 +240,22 @@ 
 		public function enqueue_style() {
 			// build url
 			$url = $this->get_url();
-			$version = ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ? strip_tags( $this->settings['local_version'] ) : null;
+			$version = !empty($this->settings['local']) && empty($this->settings['pro']) ? strip_tags($this->settings['local_version']) : null;
 
-			wp_deregister_style( 'font-awesome' ); // deregister in case its already there
-			wp_register_style( 'font-awesome', $url, array(), $version );
-			wp_enqueue_style( 'font-awesome' );
+			wp_deregister_style('font-awesome'); // deregister in case its already there
+			wp_register_style('font-awesome', $url, array(), $version);
+			wp_enqueue_style('font-awesome');
 
 			// RTL language support CSS.
-			if ( is_rtl() ) {
-				wp_add_inline_style( 'font-awesome', $this->rtl_inline_css() );
+			if (is_rtl()) {
+				wp_add_inline_style('font-awesome', $this->rtl_inline_css());
 			}
 
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				wp_deregister_style( 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_style( 'font-awesome-shims', $url, array(), $version );
-				wp_enqueue_style( 'font-awesome-shims' );
+			if ($this->settings['shims']) {
+				$url = $this->get_url(true);
+				wp_deregister_style('font-awesome-shims'); // deregister in case its already there
+				wp_register_style('font-awesome-shims', $url, array(), $version);
+				wp_enqueue_style('font-awesome-shims');
 			}
 		}
 
@@ -267,15 +267,15 @@ 
 			$url = $this->get_url();
 
 			$deregister_function = 'wp' . '_' . 'deregister' . '_' . 'script';
-			call_user_func( $deregister_function, 'font-awesome' ); // deregister in case its already there
-			wp_register_script( 'font-awesome', $url, array(), null );
-			wp_enqueue_script( 'font-awesome' );
+			call_user_func($deregister_function, 'font-awesome'); // deregister in case its already there
+			wp_register_script('font-awesome', $url, array(), null);
+			wp_enqueue_script('font-awesome');
 
-			if ( $this->settings['shims'] ) {
-				$url = $this->get_url( true );
-				call_user_func( $deregister_function, 'font-awesome-shims' ); // deregister in case its already there
-				wp_register_script( 'font-awesome-shims', $url, array(), null );
-				wp_enqueue_script( 'font-awesome-shims' );
+			if ($this->settings['shims']) {
+				$url = $this->get_url(true);
+				call_user_func($deregister_function, 'font-awesome-shims'); // deregister in case its already there
+				wp_register_script('font-awesome-shims', $url, array(), null);
+				wp_enqueue_script('font-awesome-shims');
 			}
 		}
 
@@ -287,16 +287,16 @@ 
 		 *
 		 * @return string The url to the file.
 		 */
-		public function get_url( $shims = false, $local = true ) {
+		public function get_url($shims = false, $local = true) {
 			$script  = $shims ? 'v4-shims' : 'all';
 			$sub     = $this->settings['pro'] ? 'pro' : 'use';
 			$type    = $this->settings['type'];
 			$version = $this->settings['version'];
-			$kit_url = $this->settings['kit-url'] ? esc_url( $this->settings['kit-url'] ) : '';
+			$kit_url = $this->settings['kit-url'] ? esc_url($this->settings['kit-url']) : '';
 			$url     = '';
 
-			if ( $type == 'KIT' && $kit_url ) {
-				if ( $shims ) {
+			if ($type == 'KIT' && $kit_url) {
+				if ($shims) {
 					// if its a kit then we don't add shims here
 					return '';
 				}
@@ -305,13 +305,13 @@ 
 			} else {
 				$v = '';
 				// Check and load locally.
-				if ( $local && $this->has_local() ) {
+				if ($local && $this->has_local()) {
 					$script .= ".min";
-					$v .= '&ver=' . strip_tags( $this->settings['local_version'] );
+					$v .= '&ver=' . strip_tags($this->settings['local_version']);
 					$url .= $this->get_fonts_url(); // Local fonts url.
 				} else {
 					$url .= "https://$sub.fontawesome.com/releases/"; // CDN
-					$url .= ! empty( $version ) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
+					$url .= !empty($version) ? "v" . $version . '/' : "v" . $this->get_latest_version() . '/'; // version
 				}
 				$url .= $type == 'CSS' ? 'css/' : 'js/'; // type
 				$url .= $type == 'CSS' ? $script . '.css' : $script . '.js'; // type
@@ -332,16 +332,16 @@ 
 		 *
 		 * @return string The filtered url.
 		 */
-		public function remove_font_awesome( $url, $original_url, $_context ) {
+		public function remove_font_awesome($url, $original_url, $_context) {
 
-			if ( $_context == 'display'
-			     && ( strstr( $url, "fontawesome" ) !== false || strstr( $url, "font-awesome" ) !== false )
-			     && ( strstr( $url, ".js" ) !== false || strstr( $url, ".css" ) !== false )
+			if ($_context == 'display'
+			     && (strstr($url, "fontawesome") !== false || strstr($url, "font-awesome") !== false)
+			     && (strstr($url, ".js") !== false || strstr($url, ".css") !== false)
 			) {// it's a font-awesome-url (probably)
 
-				if ( strstr( $url, "wpfas=true" ) !== false ) {
-					if ( $this->settings['type'] == 'JS' ) {
-						if ( $this->settings['js-pseudo'] ) {
+				if (strstr($url, "wpfas=true") !== false) {
+					if ($this->settings['type'] == 'JS') {
+						if ($this->settings['js-pseudo']) {
 							$url .= "' data-search-pseudo-elements defer='defer";
 						} else {
 							$url .= "' defer='defer";
@@ -360,7 +360,7 @@ 
 		 * Register the database settings with WordPress.
 		 */
 		public function register_settings() {
-			register_setting( 'wp-font-awesome-settings', 'wp-font-awesome-settings' );
+			register_setting('wp-font-awesome-settings', 'wp-font-awesome-settings');
 		}
 
 		/**
@@ -369,10 +369,10 @@ 
 		 */
 		public function menu_item() {
 			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
+			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'wp-font-awesome-settings', array(
 				$this,
 				'settings_page'
-			) );
+			));
 		}
 
 		/**
@@ -381,7 +381,7 @@ 
 		 * @return array The array of settings.
 		 */
 		public function get_settings() {
-			$db_settings = get_option( 'wp-font-awesome-settings' );
+			$db_settings = get_option('wp-font-awesome-settings');
 
 			$defaults = array(
 				'type'      => 'CSS', // type to use, CSS or JS or KIT
@@ -396,30 +396,30 @@ 
 				'kit-url'   => '', // the kit url
 			);
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+			$settings = wp_parse_args($db_settings, $defaults);
 
 			/**
 			 * Filter the Font Awesome settings.
 			 *
 			 * @todo if we add this filer people might use it and then it defeates the purpose of this class :/
 			 */
-			return $this->settings = apply_filters( 'wp-font-awesome-settings', $settings, $db_settings, $defaults );
+			return $this->settings = apply_filters('wp-font-awesome-settings', $settings, $db_settings, $defaults);
 		}
 
 		/**
 		 * The settings page html output.
 		 */
 		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+			if (!current_user_can('manage_options')) {
+				wp_die(__('You do not have sufficient permissions to access this page.', 'ayecode-connect'));
 			}
 
 			// a hidden way to force the update of the version number via api instead of waiting the 48 hours
-			if ( isset( $_REQUEST['force-version-check'] ) ) {
-				$this->get_latest_version( $force_api = true );
+			if (isset($_REQUEST['force-version-check'])) {
+				$this->get_latest_version($force_api = true);
 			}
 
-			if ( ! defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
+			if (!defined('FONTAWESOME_PLUGIN_FILE')) {
 				?>
                 <style>
                     .wpfas-kit-show {
@@ -446,42 +446,42 @@ 
                     <h1><?php echo $this->name; ?></h1>
                     <form method="post" action="options.php" class="fas-settings-form">
 						<?php
-						settings_fields( 'wp-font-awesome-settings' );
-						do_settings_sections( 'wp-font-awesome-settings' );
+						settings_fields('wp-font-awesome-settings');
+						do_settings_sections('wp-font-awesome-settings');
 						$table_class = '';
-						if ( $this->settings['type'] ) {
-							$table_class .= 'wpfas-' . sanitize_html_class( strtolower( $this->settings['type'] ) ) . '-set';
+						if ($this->settings['type']) {
+							$table_class .= 'wpfas-' . sanitize_html_class(strtolower($this->settings['type'])) . '-set';
 						}
-						if ( ! empty( $this->settings['pro'] ) ) {
+						if (!empty($this->settings['pro'])) {
 							$table_class .= ' wpfas-has-pro';
 						}
 						?>
-						<?php if ( $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) ) { ?>
-							<?php if ( $this->has_local() ) { ?>
-                                <div class="notice notice-info"><p><strong><?php _e( 'Font Awesome fonts are loading locally.', 'ayecode-connect' ); ?></strong></p></div>
+						<?php if ($this->settings['type'] != 'KIT' && !empty($this->settings['local']) && empty($this->settings['pro'])) { ?>
+							<?php if ($this->has_local()) { ?>
+                                <div class="notice notice-info"><p><strong><?php _e('Font Awesome fonts are loading locally.', 'ayecode-connect'); ?></strong></p></div>
 							<?php } else { ?>
-                                <div class="notice notice-error"><p><strong><?php _e( 'Font Awesome fonts are not loading locally!', 'ayecode-connect' ); ?></strong></p></div>
+                                <div class="notice notice-error"><p><strong><?php _e('Font Awesome fonts are not loading locally!', 'ayecode-connect'); ?></strong></p></div>
 							<?php } ?>
 						<?php } ?>
-                        <table class="form-table wpfas-table-settings <?php echo esc_attr( $table_class ); ?>">
+                        <table class="form-table wpfas-table-settings <?php echo esc_attr($table_class); ?>">
                             <tr valign="top">
-                                <th scope="row"><label for="wpfas-type"><?php _e( 'Type', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-type"><?php _e('Type', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <select name="wp-font-awesome-settings[type]" id="wpfas-type" onchange="if(this.value=='KIT'){jQuery('.wpfas-table-settings').addClass('wpfas-kit-set');}else{jQuery('.wpfas-table-settings').removeClass('wpfas-kit-set');}">
-                                        <option value="CSS" <?php selected( $this->settings['type'], 'CSS' ); ?>><?php _e( 'CSS (default)', 'ayecode-connect' ); ?></option>
-                                        <option value="JS" <?php selected( $this->settings['type'], 'JS' ); ?>>JS</option>
-                                        <option value="KIT" <?php selected( $this->settings['type'], 'KIT' ); ?>><?php _e( 'Kits (settings managed on fontawesome.com)', 'ayecode-connect' ); ?></option>
+                                        <option value="CSS" <?php selected($this->settings['type'], 'CSS'); ?>><?php _e('CSS (default)', 'ayecode-connect'); ?></option>
+                                        <option value="JS" <?php selected($this->settings['type'], 'JS'); ?>>JS</option>
+                                        <option value="KIT" <?php selected($this->settings['type'], 'KIT'); ?>><?php _e('Kits (settings managed on fontawesome.com)', 'ayecode-connect'); ?></option>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-show">
-                                <th scope="row"><label for="wpfas-kit-url"><?php _e( 'Kit URL', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-kit-url"><?php _e('Kit URL', 'ayecode-connect'); ?></label></th>
                                 <td>
-                                    <input class="regular-text" id="wpfas-kit-url" type="url" name="wp-font-awesome-settings[kit-url]" value="<?php echo esc_attr( $this->settings['kit-url'] ); ?>" placeholder="<?php echo 'https://kit.font';echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
+                                    <input class="regular-text" id="wpfas-kit-url" type="url" name="wp-font-awesome-settings[kit-url]" value="<?php echo esc_attr($this->settings['kit-url']); ?>" placeholder="<?php echo 'https://kit.font'; echo 'awesome.com/123abc.js'; // this won't pass theme check :(?>"/>
                                     <span><?php
 										echo wp_sprintf(
-											__( 'Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect' ),
+											__('Requires a free account with Font Awesome. %sGet kit url%s', 'ayecode-connect'),
 											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/kits"><i class="fas fa-external-link-alt"></i>',
 											'</a>'
 										);
@@ -490,44 +490,44 @@ 
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
-                                <th scope="row"><label for="wpfas-version"><?php _e( 'Version', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-version"><?php _e('Version', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <select name="wp-font-awesome-settings[version]" id="wpfas-version">
-                                        <option value="" <?php selected( $this->settings['version'], '' ); ?>><?php echo wp_sprintf( __( 'Latest - %s (default)', 'ayecode-connect' ), $this->get_latest_version() ); ?></option>
-                                        <option value="6.1.0" <?php selected( $this->settings['version'], '6.1.0' ); ?>>6.1.0</option>
-                                        <option value="6.0.0" <?php selected( $this->settings['version'], '6.0.0' ); ?>>6.0.0</option>
-                                        <option value="5.15.4" <?php selected( $this->settings['version'], '5.15.4' ); ?>>5.15.4</option>
-                                        <option value="5.6.0" <?php selected( $this->settings['version'], '5.6.0' ); ?>>5.6.0</option>
-                                        <option value="5.5.0" <?php selected( $this->settings['version'], '5.5.0' ); ?>>5.5.0</option>
-                                        <option value="5.4.0" <?php selected( $this->settings['version'], '5.4.0' ); ?>>5.4.0</option>
-                                        <option value="5.3.0" <?php selected( $this->settings['version'], '5.3.0' ); ?>>5.3.0</option>
-                                        <option value="5.2.0" <?php selected( $this->settings['version'], '5.2.0' ); ?>>5.2.0</option>
-                                        <option value="5.1.0" <?php selected( $this->settings['version'], '5.1.0' ); ?>>5.1.0</option>
-                                        <option value="4.7.0" <?php selected( $this->settings['version'], '4.7.0' ); ?>>4.7.1 (CSS only)</option>
+                                        <option value="" <?php selected($this->settings['version'], ''); ?>><?php echo wp_sprintf(__('Latest - %s (default)', 'ayecode-connect'), $this->get_latest_version()); ?></option>
+                                        <option value="6.1.0" <?php selected($this->settings['version'], '6.1.0'); ?>>6.1.0</option>
+                                        <option value="6.0.0" <?php selected($this->settings['version'], '6.0.0'); ?>>6.0.0</option>
+                                        <option value="5.15.4" <?php selected($this->settings['version'], '5.15.4'); ?>>5.15.4</option>
+                                        <option value="5.6.0" <?php selected($this->settings['version'], '5.6.0'); ?>>5.6.0</option>
+                                        <option value="5.5.0" <?php selected($this->settings['version'], '5.5.0'); ?>>5.5.0</option>
+                                        <option value="5.4.0" <?php selected($this->settings['version'], '5.4.0'); ?>>5.4.0</option>
+                                        <option value="5.3.0" <?php selected($this->settings['version'], '5.3.0'); ?>>5.3.0</option>
+                                        <option value="5.2.0" <?php selected($this->settings['version'], '5.2.0'); ?>>5.2.0</option>
+                                        <option value="5.1.0" <?php selected($this->settings['version'], '5.1.0'); ?>>5.1.0</option>
+                                        <option value="4.7.0" <?php selected($this->settings['version'], '4.7.0'); ?>>4.7.1 (CSS only)</option>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr valign="top">
-                                <th scope="row"><label for="wpfas-enqueue"><?php _e( 'Enqueue', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-enqueue"><?php _e('Enqueue', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <select name="wp-font-awesome-settings[enqueue]" id="wpfas-enqueue">
-                                        <option value="" <?php selected( $this->settings['enqueue'], '' ); ?>><?php _e( 'Frontend + Backend (default)', 'ayecode-connect' ); ?></option>
-                                        <option value="frontend" <?php selected( $this->settings['enqueue'], 'frontend' ); ?>><?php _e( 'Frontend', 'ayecode-connect' ); ?></option>
-                                        <option value="backend" <?php selected( $this->settings['enqueue'], 'backend' ); ?>><?php _e( 'Backend', 'ayecode-connect' ); ?></option>
+                                        <option value="" <?php selected($this->settings['enqueue'], ''); ?>><?php _e('Frontend + Backend (default)', 'ayecode-connect'); ?></option>
+                                        <option value="frontend" <?php selected($this->settings['enqueue'], 'frontend'); ?>><?php _e('Frontend', 'ayecode-connect'); ?></option>
+                                        <option value="backend" <?php selected($this->settings['enqueue'], 'backend'); ?>><?php _e('Backend', 'ayecode-connect'); ?></option>
                                     </select>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
                                 <th scope="row"><label
-                                            for="wpfas-pro"><?php _e( 'Enable pro', 'ayecode-connect' ); ?></label></th>
+                                            for="wpfas-pro"><?php _e('Enable pro', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[pro]" value="0"/>
-                                    <input type="checkbox" name="wp-font-awesome-settings[pro]" value="1" <?php checked( $this->settings['pro'], '1' ); ?> id="wpfas-pro" onchange="if(jQuery(this).is(':checked')){jQuery('.wpfas-table-settings').addClass('wpfas-has-pro')}else{jQuery('.wpfas-table-settings').removeClass('wpfas-has-pro')}"/>
+                                    <input type="checkbox" name="wp-font-awesome-settings[pro]" value="1" <?php checked($this->settings['pro'], '1'); ?> id="wpfas-pro" onchange="if(jQuery(this).is(':checked')){jQuery('.wpfas-table-settings').addClass('wpfas-has-pro')}else{jQuery('.wpfas-table-settings').removeClass('wpfas-has-pro')}"/>
                                     <span><?php
 										echo wp_sprintf(
-											__( 'Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect' ),
+											__('Requires a subscription. %sLearn more%s  %sManage my allowed domains%s', 'ayecode-connect'),
 											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/referral?a=c9b89e1418">',
 											' <i class="fas fa-external-link-alt"></i></a>',
 											'<a rel="noopener noreferrer" target="_blank" href="https://fontawesome.com/account/cdn">',
@@ -538,49 +538,49 @@ 
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide wpfas-hide-pro">
-                                <th scope="row"><label for="wpfas-local"><?php _e( 'Load Fonts Locally', 'ayecode-connect' ); ?></label></th>
+                                <th scope="row"><label for="wpfas-local"><?php _e('Load Fonts Locally', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[local]" value="0"/>
-                                    <input type="hidden" name="wp-font-awesome-settings[local_version]" value="<?php echo esc_attr( $this->settings['local_version'] ); ?>"/>
-                                    <input type="checkbox" name="wp-font-awesome-settings[local]" value="1" <?php checked( $this->settings['local'], '1' ); ?> id="wpfas-local"/>
-                                    <span><?php _e( '(For free version only) Load FontAwesome fonts from locally. This downloads FontAwesome fonts from fontawesome.com & stores at the local site.', 'ayecode-connect' ); ?></span>
+                                    <input type="hidden" name="wp-font-awesome-settings[local_version]" value="<?php echo esc_attr($this->settings['local_version']); ?>"/>
+                                    <input type="checkbox" name="wp-font-awesome-settings[local]" value="1" <?php checked($this->settings['local'], '1'); ?> id="wpfas-local"/>
+                                    <span><?php _e('(For free version only) Load FontAwesome fonts from locally. This downloads FontAwesome fonts from fontawesome.com & stores at the local site.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
                                 <th scope="row"><label
-                                            for="wpfas-shims"><?php _e( 'Enable v4 shims compatibility', 'ayecode-connect' ); ?></label>
+                                            for="wpfas-shims"><?php _e('Enable v4 shims compatibility', 'ayecode-connect'); ?></label>
                                 </th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[shims]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[shims]"
-                                           value="1" <?php checked( $this->settings['shims'], '1' ); ?> id="wpfas-shims"/>
-                                    <span><?php _e( 'This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'ayecode-connect' ); ?></span>
+                                           value="1" <?php checked($this->settings['shims'], '1'); ?> id="wpfas-shims"/>
+                                    <span><?php _e('This enables v4 classes to work with v5, sort of like a band-aid until everyone has updated everything to v5.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
                             <tr valign="top" class="wpfas-kit-hide">
                                 <th scope="row"><label
-                                            for="wpfas-js-pseudo"><?php _e( 'Enable JS pseudo elements (not recommended)', 'ayecode-connect' ); ?></label>
+                                            for="wpfas-js-pseudo"><?php _e('Enable JS pseudo elements (not recommended)', 'ayecode-connect'); ?></label>
                                 </th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[js-pseudo]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[js-pseudo]"
-                                           value="1" <?php checked( $this->settings['js-pseudo'], '1' ); ?>
+                                           value="1" <?php checked($this->settings['js-pseudo'], '1'); ?>
                                            id="wpfas-js-pseudo"/>
-                                    <span><?php _e( 'Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'ayecode-connect' ); ?></span>
+                                    <span><?php _e('Used only with the JS version, this will make pseudo-elements work but can be CPU intensive on some sites.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
                             <tr valign="top">
                                 <th scope="row"><label
-                                            for="wpfas-dequeue"><?php _e( 'Dequeue', 'ayecode-connect' ); ?></label></th>
+                                            for="wpfas-dequeue"><?php _e('Dequeue', 'ayecode-connect'); ?></label></th>
                                 <td>
                                     <input type="hidden" name="wp-font-awesome-settings[dequeue]" value="0"/>
                                     <input type="checkbox" name="wp-font-awesome-settings[dequeue]"
-                                           value="1" <?php checked( $this->settings['dequeue'], '1' ); ?>
+                                           value="1" <?php checked($this->settings['dequeue'], '1'); ?>
                                            id="wpfas-dequeue"/>
-                                    <span><?php _e( 'This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'ayecode-connect' ); ?></span>
+                                    <span><?php _e('This will try to dequeue any other Font Awesome versions loaded by other sources if they are added with `font-awesome` or `fontawesome` in the name.', 'ayecode-connect'); ?></span>
                                 </td>
                             </tr>
 
@@ -589,12 +589,12 @@ 
 							<?php
 							submit_button();
 							?>
-                            <p class="submit"><a href="https://fontawesome.com/referral?a=c9b89e1418" class="button button-secondary"><?php _e('Get 24,000+ more icons with Font Awesome Pro','ayecode-connect'); ?> <i class="fas fa-external-link-alt"></i></a></p>
+                            <p class="submit"><a href="https://fontawesome.com/referral?a=c9b89e1418" class="button button-secondary"><?php _e('Get 24,000+ more icons with Font Awesome Pro', 'ayecode-connect'); ?> <i class="fas fa-external-link-alt"></i></a></p>
 
                         </div>
                     </form>
 
-                    <div id="wpfas-version"><?php echo wp_sprintf(__( 'Version: %s (affiliate links provided)', 'ayecode-connect' ), $this->version ); ?></div>
+                    <div id="wpfas-version"><?php echo wp_sprintf(__('Version: %s (affiliate links provided)', 'ayecode-connect'), $this->version); ?></div>
                 </div>
 				<?php
 			}
@@ -609,12 +609,12 @@ 
 		 *
 		 * @return string Either a valid version number or an empty string.
 		 */
-		public function validate_version_number( $version ) {
+		public function validate_version_number($version) {
 
-			if ( version_compare( $version, '0.0.1', '>=' ) >= 0 ) {
+			if (version_compare($version, '0.0.1', '>=') >= 0) {
 				// valid
 			} else {
-				$version = '';// not validated
+				$version = ''; // not validated
 			}
 
 			return $version;
@@ -629,27 +629,27 @@ 
 		 * @since 1.0.7
 		 * @return mixed|string The latest version number found.
 		 */
-		public function get_latest_version( $force_api = false ) {
+		public function get_latest_version($force_api = false) {
 			$latest_version = $this->latest;
 
-			$cache = get_transient( 'wp-font-awesome-settings-version' );
+			$cache = get_transient('wp-font-awesome-settings-version');
 
-			if ( $cache === false || $force_api ) { // its not set
+			if ($cache === false || $force_api) { // its not set
 				$api_ver = $this->get_latest_version_from_api();
-				if ( version_compare( $api_ver, $this->latest, '>=' ) >= 0 ) {
+				if (version_compare($api_ver, $this->latest, '>=') >= 0) {
 					$latest_version = $api_ver;
-					set_transient( 'wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS );
+					set_transient('wp-font-awesome-settings-version', $api_ver, 48 * HOUR_IN_SECONDS);
 				}
-			} elseif ( $this->validate_version_number( $cache ) ) {
-				if ( version_compare( $cache, $this->latest, '>=' ) >= 0 ) {
+			} elseif ($this->validate_version_number($cache)) {
+				if (version_compare($cache, $this->latest, '>=') >= 0) {
 					$latest_version = $cache;
 				}
 			}
 
 			// Check and auto download fonts locally.
-			if ( empty( $this->settings['pro'] ) && empty( $this->settings['version'] ) && $this->settings['type'] != 'KIT' && ! empty( $this->settings['local'] ) && ! empty( $this->settings['local_version'] ) && ! empty( $latest_version ) ) {
-				if ( version_compare( $latest_version, $this->settings['local_version'], '>' ) && is_admin() && ! wp_doing_ajax() ) {
-					$this->download_package( $latest_version );
+			if (empty($this->settings['pro']) && empty($this->settings['version']) && $this->settings['type'] != 'KIT' && !empty($this->settings['local']) && !empty($this->settings['local_version']) && !empty($latest_version)) {
+				if (version_compare($latest_version, $this->settings['local_version'], '>') && is_admin() && !wp_doing_ajax()) {
+					$this->download_package($latest_version);
 				}
 			}
 
@@ -664,10 +664,10 @@ 
 		 */
 		public function get_latest_version_from_api() {
 			$version  = "0";
-			$response = wp_remote_get( "https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest" );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$api_response = json_decode( wp_remote_retrieve_body( $response ), true );
-				if ( isset( $api_response['tag_name'] ) && version_compare( $api_response['tag_name'], $this->latest, '>=' ) >= 0 && empty( $api_response['prerelease'] ) ) {
+			$response = wp_remote_get("https://api.github.com/repos/FortAwesome/Font-Awesome/releases/latest");
+			if (!is_wp_error($response) && is_array($response)) {
+				$api_response = json_decode(wp_remote_retrieve_body($response), true);
+				if (isset($api_response['tag_name']) && version_compare($api_response['tag_name'], $this->latest, '>=') >= 0 && empty($api_response['prerelease'])) {
 					$version = $api_response['tag_name'];
 				}
 			}
@@ -695,21 +695,21 @@ 
 		public function admin_notices() {
 			$settings = $this->settings;
 
-			if ( defined( 'FONTAWESOME_PLUGIN_FILE' ) ) {
-				if ( ! empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'wp-font-awesome-settings' ) {
+			if (defined('FONTAWESOME_PLUGIN_FILE')) {
+				if (!empty($_REQUEST['page']) && $_REQUEST['page'] == 'wp-font-awesome-settings') {
 					?>
                     <div class="notice  notice-error is-dismissible">
-                        <p><?php _e( 'The Official Font Awesome Plugin is active, please adjust your settings there.', 'ayecode-connect' ); ?></p>
+                        <p><?php _e('The Official Font Awesome Plugin is active, please adjust your settings there.', 'ayecode-connect'); ?></p>
                     </div>
 					<?php
 				}
 			} else {
-				if ( ! empty( $settings ) ) {
-					if ( $settings['type'] != 'KIT' && $settings['pro'] && ( $settings['version'] == '' || version_compare( $settings['version'], '6', '>=' ) ) ) {
+				if (!empty($settings)) {
+					if ($settings['type'] != 'KIT' && $settings['pro'] && ($settings['version'] == '' || version_compare($settings['version'], '6', '>='))) {
 						$link = admin_url('options-general.php?page=wp-font-awesome-settings');
 						?>
                         <div class="notice  notice-error is-dismissible">
-                            <p><?php echo wp_sprintf( __( 'Font Awesome Pro v6 requires the use of a kit, please setup your kit in %ssettings.%s', 'ayecode-connect' ),"<a href='". esc_url_raw( $link )."'>","</a>" ); ?></p>
+                            <p><?php echo wp_sprintf(__('Font Awesome Pro v6 requires the use of a kit, please setup your kit in %ssettings.%s', 'ayecode-connect'), "<a href='" . esc_url_raw($link) . "'>", "</a>"); ?></p>
                         </div>
 						<?php
 					}
@@ -725,20 +725,20 @@ 
 		 * @param string $option The option name.
 		 * @param mixed  $value  The option value.
 		 */
-		public function add_option_wp_font_awesome_settings( $option, $value ) {
+		public function add_option_wp_font_awesome_settings($option, $value) {
 			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
+			if (wp_installing()) {
 				return;
 			}
 
-			if ( ! empty( $value['local'] ) && empty( $value['pro'] ) && ! ( ! empty( $value['type'] ) && $value['type'] == 'KIT' ) ) {
-				$version = isset( $value['version'] ) && $value['version'] ? $value['version'] : $this->get_latest_version();
+			if (!empty($value['local']) && empty($value['pro']) && !(!empty($value['type']) && $value['type'] == 'KIT')) {
+				$version = isset($value['version']) && $value['version'] ? $value['version'] : $this->get_latest_version();
 
-				if ( ! empty( $version ) ) {
-					$response = $this->download_package( $version, $value );
+				if (!empty($version)) {
+					$response = $this->download_package($version, $value);
 
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+					if (is_wp_error($response)) {
+						add_settings_error('general', 'fontawesome_download', __('ERROR:', 'ayecode-connect') . ' ' . $response->get_error_message(), 'error');
 					}
 				}
 			}
@@ -752,25 +752,25 @@ 
 		 * @param mixed $old_value The old option value.
 		 * @param mixed $value     The new option value.
 		 */
-		public function update_option_wp_font_awesome_settings( $old_value, $new_value ) {
+		public function update_option_wp_font_awesome_settings($old_value, $new_value) {
 			// Do nothing if WordPress is being installed.
-			if ( wp_installing() ) {
+			if (wp_installing()) {
 				return;
 			}
 
-			if ( ! empty( $new_value['local'] ) && empty( $new_value['pro'] ) && ! ( ! empty( $new_value['type'] ) && $new_value['type'] == 'KIT' ) ) {
+			if (!empty($new_value['local']) && empty($new_value['pro']) && !(!empty($new_value['type']) && $new_value['type'] == 'KIT')) {
 				// Old values
-				$old_version = isset( $old_value['version'] ) && $old_value['version'] ? $old_value['version'] : ( isset( $old_value['local_version'] ) ? $old_value['local_version'] : '' );
-				$old_local = isset( $old_value['local'] ) ? (int) $old_value['local'] : 0;
+				$old_version = isset($old_value['version']) && $old_value['version'] ? $old_value['version'] : (isset($old_value['local_version']) ? $old_value['local_version'] : '');
+				$old_local = isset($old_value['local']) ? (int) $old_value['local'] : 0;
 
 				// New values
-				$new_version = isset( $new_value['version'] ) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
+				$new_version = isset($new_value['version']) && $new_value['version'] ? $new_value['version'] : $this->get_latest_version();
 
-				if ( empty( $old_local ) || $old_version !== $new_version || ! file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
-					$response = $this->download_package( $new_version, $new_value );
+				if (empty($old_local) || $old_version !== $new_version || !file_exists($this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css')) {
+					$response = $this->download_package($new_version, $new_value);
 
-					if ( is_wp_error( $response ) ) {
-						add_settings_error( 'general', 'fontawesome_download', __( 'ERROR:', 'ayecode-connect' ) . ' ' . $response->get_error_message(), 'error' );
+					if (is_wp_error($response)) {
+						add_settings_error('general', 'fontawesome_download', __('ERROR:', 'ayecode-connect') . ' ' . $response->get_error_message(), 'error');
 					}
 				}
 			}
@@ -784,9 +784,9 @@ 
 		 * @param string Fonts directory local path.
 		 */
 		public function get_fonts_dir() {
-			$upload_dir = wp_upload_dir( null, false );
+			$upload_dir = wp_upload_dir(null, false);
 
-			return $upload_dir['basedir'] . DIRECTORY_SEPARATOR .  'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
+			return $upload_dir['basedir'] . DIRECTORY_SEPARATOR . 'ayefonts' . DIRECTORY_SEPARATOR . 'fa' . DIRECTORY_SEPARATOR;
 		}
 
 		/**
@@ -797,9 +797,9 @@ 
 		 * @param string Fonts directory local url.
 		 */
 		public function get_fonts_url() {
-			$upload_dir = wp_upload_dir( null, false );
+			$upload_dir = wp_upload_dir(null, false);
 
-			return $upload_dir['baseurl'] .  '/ayefonts/fa/';
+			return $upload_dir['baseurl'] . '/ayefonts/fa/';
 		}
 
 		/**
@@ -810,7 +810,7 @@ 
 		 * @return bool True if active else false.
 		 */
 		public function has_local() {
-			if ( ! empty( $this->settings['local'] ) && empty( $this->settings['pro'] ) && file_exists( $this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css' ) ) {
+			if (!empty($this->settings['local']) && empty($this->settings['pro']) && file_exists($this->get_fonts_dir() . 'css' . DIRECTORY_SEPARATOR . 'all.css')) {
 				return true;
 			}
 
@@ -825,18 +825,18 @@ 
 		 * @return object The WP Filesystem.
 		 */
 		public function get_wp_filesystem() {
-			if ( ! function_exists( 'get_filesystem_method' ) ) {
-				require_once( ABSPATH . "/wp-admin/includes/file.php" );
+			if (!function_exists('get_filesystem_method')) {
+				require_once(ABSPATH . "/wp-admin/includes/file.php");
 			}
 
 			$access_type = get_filesystem_method();
 
-			if ( $access_type === 'direct' ) {
+			if ($access_type === 'direct') {
 				/* You can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+				$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
 
 				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
+				if (!WP_Filesystem($creds)) {
 					/* Any problems and we exit */
 					return false;
 				}
@@ -845,11 +845,11 @@ 
 
 				return $wp_filesystem;
 				/* Do our file manipulations below */
-			} else if ( defined( 'FTP_USER' ) ) {
-				$creds = request_filesystem_credentials( trailingslashit( site_url() ) . 'wp-admin/', '', false, false, array() );
+			} else if (defined('FTP_USER')) {
+				$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
 
 				/* Initialize the API */
-				if ( ! WP_Filesystem( $creds ) ) {
+				if (!WP_Filesystem($creds)) {
 					/* Any problems and we exit */
 					return false;
 				}
@@ -872,38 +872,38 @@ 
 		 * @param array $option Fontawesome settings.
 		 * @return WP_ERROR|bool Error on fail and true on success.
 		 */
-		public function download_package( $version, $option = array() ) {
+		public function download_package($version, $option = array()) {
 			$filename = 'fontawesome-free-' . $version . '-web';
 			$url = 'https://use.fontawesome.com/releases/v' . $version . '/' . $filename . '.zip';
 
-			if ( ! function_exists( 'wp_handle_upload' ) ) {
+			if (!function_exists('wp_handle_upload')) {
 				require_once ABSPATH . 'wp-admin/includes/file.php';
 			}
 
-			$download_file = download_url( esc_url_raw( $url ) );
+			$download_file = download_url(esc_url_raw($url));
 
-			if ( is_wp_error( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( $download_file->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $download_file ) ) {
-				return new WP_Error( 'fontawesome_download_failed', __( 'Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect' ) );
+			if (is_wp_error($download_file)) {
+				return new WP_Error('fontawesome_download_failed', __($download_file->get_error_message(), 'ayecode-connect'));
+			} else if (empty($download_file)) {
+				return new WP_Error('fontawesome_download_failed', __('Something went wrong in downloading the font awesome to store locally.', 'ayecode-connect'));
 			}
 
-			$response = $this->extract_package( $download_file, $filename, true );
+			$response = $this->extract_package($download_file, $filename, true);
 
 			// Update local version.
-			if ( is_wp_error( $response ) ) {
+			if (is_wp_error($response)) {
 				return $response;
-			} else if ( $response ) {
-				if ( empty( $option ) ) {
-					$option = get_option( 'wp-font-awesome-settings' );
+			} else if ($response) {
+				if (empty($option)) {
+					$option = get_option('wp-font-awesome-settings');
 				}
 
 				$option['local_version'] = $version;
 
 				// Remove action to prevent looping.
-				remove_action( 'update_option_wp-font-awesome-settings', array( $this, 'update_option_wp_font_awesome_settings' ), 10, 2 );
+				remove_action('update_option_wp-font-awesome-settings', array($this, 'update_option_wp_font_awesome_settings'), 10, 2);
 
-				update_option( 'wp-font-awesome-settings', $option );
+				update_option('wp-font-awesome-settings', $option);
 
 				return true;
 			}
@@ -921,60 +921,60 @@ 
 		 * @param bool   $delete_package Delete temp file or not.
 		 * @return WP_Error|bool True on success WP_Error on fail.
 		 */
-		public function extract_package( $package, $dirname = '', $delete_package = false ) {
+		public function extract_package($package, $dirname = '', $delete_package = false) {
 			global $wp_filesystem;
 
 			$wp_filesystem = $this->get_wp_filesystem();
 
-			if ( empty( $wp_filesystem ) && isset( $wp_filesystem->errors ) && is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( $wp_filesystem->errors->get_error_message(), 'ayecode-connect' ) );
-			} else if ( empty( $wp_filesystem ) ) {
-				return new WP_Error( 'fontawesome_filesystem_error', __( 'Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect' ) );
+			if (empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
+				return new WP_Error('fontawesome_filesystem_error', __($wp_filesystem->errors->get_error_message(), 'ayecode-connect'));
+			} else if (empty($wp_filesystem)) {
+				return new WP_Error('fontawesome_filesystem_error', __('Failed to initialise WP_Filesystem while trying to download the Font Awesome package.', 'ayecode-connect'));
 			}
 
 			$fonts_dir = $this->get_fonts_dir();
-			$fonts_tmp_dir = dirname( $fonts_dir ) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
+			$fonts_tmp_dir = dirname($fonts_dir) . DIRECTORY_SEPARATOR . 'fa-tmp' . DIRECTORY_SEPARATOR;
 
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
+			if ($wp_filesystem->is_dir($fonts_tmp_dir)) {
+				$wp_filesystem->delete($fonts_tmp_dir, true);
 			}
 
 			// Unzip package to working directory.
-			$result = unzip_file( $package, $fonts_tmp_dir );
+			$result = unzip_file($package, $fonts_tmp_dir);
 
-			if ( is_wp_error( $result ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
+			if (is_wp_error($result)) {
+				$wp_filesystem->delete($fonts_tmp_dir, true);
 
-				if ( 'incompatible_archive' === $result->get_error_code() ) {
-					return new WP_Error( 'fontawesome_incompatible_archive', __( $result->get_error_message(), 'ayecode-connect' ) );
+				if ('incompatible_archive' === $result->get_error_code()) {
+					return new WP_Error('fontawesome_incompatible_archive', __($result->get_error_message(), 'ayecode-connect'));
 				}
 
 				return $result;
 			}
 
-			if ( $wp_filesystem->is_dir( $fonts_dir ) ) {
-				$wp_filesystem->delete( $fonts_dir, true );
+			if ($wp_filesystem->is_dir($fonts_dir)) {
+				$wp_filesystem->delete($fonts_dir, true);
 			}
 
 			$extract_dir = $fonts_tmp_dir;
 
-			if ( $dirname && $wp_filesystem->is_dir( $extract_dir . $dirname . DIRECTORY_SEPARATOR ) ) {
+			if ($dirname && $wp_filesystem->is_dir($extract_dir . $dirname . DIRECTORY_SEPARATOR)) {
 				$extract_dir .= $dirname . DIRECTORY_SEPARATOR;
 			}
 
 			try {
-				$return = $wp_filesystem->move( $extract_dir, $fonts_dir, true );
-			} catch ( Exception $e ) {
-				$return = new WP_Error( 'fontawesome_move_package', __( 'Fail to move font awesome package!', 'ayecode-connect' ) );
+				$return = $wp_filesystem->move($extract_dir, $fonts_dir, true);
+			} catch (Exception $e) {
+				$return = new WP_Error('fontawesome_move_package', __('Fail to move font awesome package!', 'ayecode-connect'));
 			}
 
-			if ( $wp_filesystem->is_dir( $fonts_tmp_dir ) ) {
-				$wp_filesystem->delete( $fonts_tmp_dir, true );
+			if ($wp_filesystem->is_dir($fonts_tmp_dir)) {
+				$wp_filesystem->delete($fonts_tmp_dir, true);
 			}
 
 			// Once extracted, delete the package if required.
-			if ( $delete_package ) {
-				unlink( $package );
+			if ($delete_package) {
+				unlink($package);
 			}
 
 			return $return;
@@ -984,22 +984,22 @@ 
 		 * Output the version in the header.
 		 */
 		public function add_generator() {
-			$file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-			$plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+			$file = str_replace(array("/", "\\"), "/", realpath(__FILE__));
+			$plugins_dir = str_replace(array("/", "\\"), "/", realpath(WP_PLUGIN_DIR));
 
 			// Find source plugin/theme.
 			$source = array();
-			if ( strpos( $file, $plugins_dir ) !== false ) {
-				$source = explode( "/", plugin_basename( $file ) );
-			} else if ( function_exists( 'get_theme_root' ) ) {
-				$themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+			if (strpos($file, $plugins_dir) !== false) {
+				$source = explode("/", plugin_basename($file));
+			} else if (function_exists('get_theme_root')) {
+				$themes_dir = str_replace(array("/", "\\"), "/", realpath(get_theme_root()));
 
-				if ( strpos( $file, $themes_dir ) !== false ) {
-					$source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+				if (strpos($file, $themes_dir) !== false) {
+					$source = explode("/", ltrim(str_replace($themes_dir, "", $file), "/"));
 				}
 			}
 
-			echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr( $this->version ) . '"' . ( ! empty( $source[0] ) ? ' data-ac-source="' . esc_attr( $source[0] ) . '"' : '' ) . ' />';
+			echo '<meta name="generator" content="WP Font Awesome Settings v' . esc_attr($this->version) . '"' . (!empty($source[0]) ? ' data-ac-source="' . esc_attr($source[0]) . '"' : '') . ' />';
 		}
 	}
 

vendor/ayecode/wp-ayecode-ui/includes/ayecode-ui-settings.php

Braces +16 added lines, -12 removed lines

@@ -462,7 +462,7 @@ 
 
 			if( is_admin() && !$this->is_aui_screen()){
 				// don't add wp-admin scripts if not requested to
-			}else{
+			} else{
 				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
 
 				$rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
@@ -552,7 +552,7 @@ 
 					// custom changes
 					if ( $load_fse ) {
 						wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility) );
-					}else{
+					} else{
 						wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
 
 					}
@@ -576,7 +576,7 @@ 
 			ob_start();
 			if ( $aui_bs5 ) {
 				include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
-			}else{
+			} else{
 				include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
             }
 
@@ -647,7 +647,7 @@ 
 
 			if( is_admin() && !$this->is_aui_screen()){
 				// don't add wp-admin scripts if not requested to
-			}else {
+			} else {
 
 				$js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
 
@@ -662,7 +662,7 @@ 
 				// iconpicker
 				if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
 					wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
-				}else{
+				} else{
 					wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
 				}
 
@@ -1094,7 +1094,7 @@ 
 						$colors[$color['slug']] = esc_attr($color['color']);
 					}
 				}
-			}else{
+			} else{
 				$settings = get_option('aui_options');
 				$colors = array(
 					'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
@@ -1232,9 +1232,9 @@ 
 
 			if($compatibility===true || $compatibility===1){
 				$compatibility = '.bsui';
-			}elseif(!$compatibility){
+			} elseif(!$compatibility){
 				$compatibility = '';
-			}else{
+			} else{
 				$compatibility = esc_attr($compatibility);
 			}
 
@@ -1517,9 +1517,9 @@ 
 
 			if($compatibility===true || $compatibility===1){
 				$compatibility = '.bsui';
-			}elseif(!$compatibility){
+			} elseif(!$compatibility){
 				$compatibility = '';
-			}else{
+			} else{
 				$compatibility = esc_attr($compatibility);
 			}
 
@@ -2385,7 +2385,9 @@ 
 		 * @return mixed
 		 */
 		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
+			if(trim($input) === "") {
+			    return $input;
+			}
 			return preg_replace(
 				array(
 					// Remove comment(s)
@@ -2417,7 +2419,9 @@ 
 		 * @return mixed
 		 */
 		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
+			if(trim($input) === "") {
+			    return $input;
+			}
 			return preg_replace(
 				array(
 					// Remove comment(s)

Indentation +1963 added lines, -1963 removed lines

@@ -13,7 +13,7 @@ 
  * Bail if we are not in WP.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -21,480 +21,480 @@ 
  */
 if ( ! class_exists( 'AyeCode_UI_Settings' ) ) {
 
-	/**
-	 * A Class to be able to change settings for Font Awesome.
-	 *
-	 * Class AyeCode_UI_Settings
-	 * @ver 1.0.0
-	 * @todo decide how to implement textdomain
-	 */
-	class AyeCode_UI_Settings {
-
-		/**
-		 * Class version version.
-		 *
-		 * @var string
-		 */
-		public $version = '0.2.8';
-
-		/**
-		 * Class textdomain.
-		 *
-		 * @var string
-		 */
-		public $textdomain = 'aui';
-
-		/**
-		 * Latest version of Bootstrap at time of publish published.
-		 *
-		 * @var string
-		 */
-		public $latest = "5.2.2";
-
-		/**
-		 * Current version of select2 being used.
-		 *
-		 * @var string
-		 */
-		public $select2_version = "4.0.11";
-
-		/**
-		 * The title.
-		 *
-		 * @var string
-		 */
-		public $name = 'AyeCode UI';
-
-		/**
-		 * The relative url to the assets.
-		 *
-		 * @var string
-		 */
-		public $url = '';
-
-		/**
-		 * Holds the settings values.
-		 *
-		 * @var array
-		 */
-		private $settings;
-
-		/**
-		 * AyeCode_UI_Settings instance.
-		 *
-		 * @access private
-		 * @since  1.0.0
-		 * @var    AyeCode_UI_Settings There can be only one!
-		 */
-		private static $instance = null;
-
-
-		/**
-		 * Main AyeCode_UI_Settings Instance.
-		 *
-		 * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
-		 *
-		 * @since 1.0.0
-		 * @static
-		 * @return AyeCode_UI_Settings - Main instance.
-		 */
-		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
-
-				self::$instance = new AyeCode_UI_Settings;
-
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
-
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
-
-					// Maybe show example page
-					add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
-
-					if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
-						add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
-					}
-				}
+    /**
+     * A Class to be able to change settings for Font Awesome.
+     *
+     * Class AyeCode_UI_Settings
+     * @ver 1.0.0
+     * @todo decide how to implement textdomain
+     */
+    class AyeCode_UI_Settings {
+
+        /**
+         * Class version version.
+         *
+         * @var string
+         */
+        public $version = '0.2.8';
+
+        /**
+         * Class textdomain.
+         *
+         * @var string
+         */
+        public $textdomain = 'aui';
 
-				add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+        /**
+         * Latest version of Bootstrap at time of publish published.
+         *
+         * @var string
+         */
+        public $latest = "5.2.2";
+
+        /**
+         * Current version of select2 being used.
+         *
+         * @var string
+         */
+        public $select2_version = "4.0.11";
 
-				do_action( 'ayecode_ui_settings_loaded' );
-			}
+        /**
+         * The title.
+         *
+         * @var string
+         */
+        public $name = 'AyeCode UI';
 
-			return self::$instance;
-		}
+        /**
+         * The relative url to the assets.
+         *
+         * @var string
+         */
+        public $url = '';
 
-		/**
-		 * Add custom colors to the color selector.
-		 *
-		 * @param $theme_colors
-		 * @param $include_outlines
-		 * @param $include_branding
-		 *
-		 * @return mixed
-		 */
-		public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+        /**
+         * Holds the settings values.
+         *
+         * @var array
+         */
+        private $settings;
 
+        /**
+         * AyeCode_UI_Settings instance.
+         *
+         * @access private
+         * @since  1.0.0
+         * @var    AyeCode_UI_Settings There can be only one!
+         */
+        private static $instance = null;
 
-			$setting = wp_get_global_settings();
 
-			if(!empty($setting['color']['palette']['custom'])){
-				foreach($setting['color']['palette']['custom'] as $color){
-					$theme_colors[$color['slug']] = esc_attr($color['name']);
-				}
-			}
-
-			return $theme_colors;
-		}
-
-		/**
-		 * Setup some constants.
-		 */
-		public function constants(){
-			define( 'AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be" );
-			define( 'AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d' );
-			define( 'AUI_INFO_COLOR_ORIGINAL', '#17a2b8' );
-			define( 'AUI_WARNING_COLOR_ORIGINAL', '#ffc107' );
-			define( 'AUI_DANGER_COLOR_ORIGINAL', '#dc3545' );
-			define( 'AUI_SUCCESS_COLOR_ORIGINAL', '#44c553' );
-			define( 'AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa' );
-			define( 'AUI_DARK_COLOR_ORIGINAL', '#343a40' );
-			define( 'AUI_WHITE_COLOR_ORIGINAL', '#fff' );
-			define( 'AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd' );
-			define( 'AUI_SALMON_COLOR_ORIGINAL', '#ff977a' );
-			define( 'AUI_CYAN_COLOR_ORIGINAL', '#35bdff' );
-			define( 'AUI_GRAY_COLOR_ORIGINAL', '#ced4da' );
-			define( 'AUI_INDIGO_COLOR_ORIGINAL', '#502c6c' );
-			define( 'AUI_ORANGE_COLOR_ORIGINAL', '#orange' );
-			define( 'AUI_BLACK_COLOR_ORIGINAL', '#000' );
-
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
-				define( 'AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SECONDARY_COLOR' ) ) {
-				define( 'AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_INFO_COLOR' ) ) {
-				define( 'AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_WARNING_COLOR' ) ) {
-				define( 'AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_DANGER_COLOR' ) ) {
-				define( 'AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SUCCESS_COLOR' ) ) {
-				define( 'AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_LIGHT_COLOR' ) ) {
-				define( 'AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_DARK_COLOR' ) ) {
-				define( 'AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_WHITE_COLOR' ) ) {
-				define( 'AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_PURPLE_COLOR' ) ) {
-				define( 'AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_SALMON_COLOR' ) ) {
-				define( 'AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_CYAN_COLOR' ) ) {
-				define( 'AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_GRAY_COLOR' ) ) {
-				define( 'AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_INDIGO_COLOR' ) ) {
-				define( 'AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_ORANGE_COLOR' ) ) {
-				define( 'AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL );
-			}
-			if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
-				define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
-			}
-
-		}
-
-		public static function get_colors( $original = false){
-
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
-				return array();
-			}
-			if ( $original ) {
-				return array(
-					'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
-					'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
-					'info'      => AUI_INFO_COLOR_ORIGINAL,
-					'warning'   => AUI_WARNING_COLOR_ORIGINAL,
-					'danger'    => AUI_DANGER_COLOR_ORIGINAL,
-					'success'   => AUI_SUCCESS_COLOR_ORIGINAL,
-					'light'     => AUI_LIGHT_COLOR_ORIGINAL,
-					'dark'      => AUI_DARK_COLOR_ORIGINAL,
-					'white'     => AUI_WHITE_COLOR_ORIGINAL,
-					'purple'    => AUI_PURPLE_COLOR_ORIGINAL,
-					'salmon'    => AUI_SALMON_COLOR_ORIGINAL,
-					'cyan'      => AUI_CYAN_COLOR_ORIGINAL,
-					'gray'      => AUI_GRAY_COLOR_ORIGINAL,
-					'indigo'    => AUI_INDIGO_COLOR_ORIGINAL,
-					'orange'    => AUI_ORANGE_COLOR_ORIGINAL,
-					'black'     => AUI_BLACK_COLOR_ORIGINAL,
-				);
-			}
-
-			return array(
-				'primary'   => AUI_PRIMARY_COLOR,
-				'secondary' => AUI_SECONDARY_COLOR,
-				'info'      => AUI_INFO_COLOR,
-				'warning'   => AUI_WARNING_COLOR,
-				'danger'    => AUI_DANGER_COLOR,
-				'success'   => AUI_SUCCESS_COLOR,
-				'light'     => AUI_LIGHT_COLOR,
-				'dark'      => AUI_DARK_COLOR,
-				'white'     => AUI_WHITE_COLOR,
-				'purple'    => AUI_PURPLE_COLOR,
-				'salmon'    => AUI_SALMON_COLOR,
-				'cyan'      => AUI_CYAN_COLOR,
-				'gray'      => AUI_GRAY_COLOR,
-				'indigo'    => AUI_INDIGO_COLOR,
-				'orange'    => AUI_ORANGE_COLOR,
-				'black'     => AUI_BLACK_COLOR,
-			);
-		}
-
-		/**
-		 * Add admin body class to show when BS5 is active.
-		 *
-		 * @param $classes
-		 *
-		 * @return mixed
-		 */
-		public function add_bs5_admin_body_class( $classes = '' ) {
-			$classes .= ' aui_bs5';
-
-			return $classes;
-		}
-
-		/**
-		 * Add a body class to show when BS5 is active.
-		 *
-		 * @param $classes
-		 *
-		 * @return mixed
-		 */
-		public function add_bs5_body_class( $classes ) {
-			$classes[] = 'aui_bs5';
-
-			return $classes;
-		}
-
-		/**
-		 * Initiate the settings and add the required action hooks.
-		 */
-		public function init() {
+        /**
+         * Main AyeCode_UI_Settings Instance.
+         *
+         * Ensures only one instance of AyeCode_UI_Settings is loaded or can be loaded.
+         *
+         * @since 1.0.0
+         * @static
+         * @return AyeCode_UI_Settings - Main instance.
+         */
+        public static function instance() {
+            if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
+
+                self::$instance = new AyeCode_UI_Settings;
+
+                add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+
+                if ( is_admin() ) {
+                    add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
+                    add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+
+                    // Maybe show example page
+                    add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
+
+                    if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+                        add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
+                    }
+                }
+
+                add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+
+                do_action( 'ayecode_ui_settings_loaded' );
+            }
+
+            return self::$instance;
+        }
+
+        /**
+         * Add custom colors to the color selector.
+         *
+         * @param $theme_colors
+         * @param $include_outlines
+         * @param $include_branding
+         *
+         * @return mixed
+         */
+        public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+
+
+            $setting = wp_get_global_settings();
+
+            if(!empty($setting['color']['palette']['custom'])){
+                foreach($setting['color']['palette']['custom'] as $color){
+                    $theme_colors[$color['slug']] = esc_attr($color['name']);
+                }
+            }
+
+            return $theme_colors;
+        }
+
+        /**
+         * Setup some constants.
+         */
+        public function constants(){
+            define( 'AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be" );
+            define( 'AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d' );
+            define( 'AUI_INFO_COLOR_ORIGINAL', '#17a2b8' );
+            define( 'AUI_WARNING_COLOR_ORIGINAL', '#ffc107' );
+            define( 'AUI_DANGER_COLOR_ORIGINAL', '#dc3545' );
+            define( 'AUI_SUCCESS_COLOR_ORIGINAL', '#44c553' );
+            define( 'AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa' );
+            define( 'AUI_DARK_COLOR_ORIGINAL', '#343a40' );
+            define( 'AUI_WHITE_COLOR_ORIGINAL', '#fff' );
+            define( 'AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd' );
+            define( 'AUI_SALMON_COLOR_ORIGINAL', '#ff977a' );
+            define( 'AUI_CYAN_COLOR_ORIGINAL', '#35bdff' );
+            define( 'AUI_GRAY_COLOR_ORIGINAL', '#ced4da' );
+            define( 'AUI_INDIGO_COLOR_ORIGINAL', '#502c6c' );
+            define( 'AUI_ORANGE_COLOR_ORIGINAL', '#orange' );
+            define( 'AUI_BLACK_COLOR_ORIGINAL', '#000' );
+
+            if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+                define( 'AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_SECONDARY_COLOR' ) ) {
+                define( 'AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_INFO_COLOR' ) ) {
+                define( 'AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_WARNING_COLOR' ) ) {
+                define( 'AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_DANGER_COLOR' ) ) {
+                define( 'AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_SUCCESS_COLOR' ) ) {
+                define( 'AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_LIGHT_COLOR' ) ) {
+                define( 'AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_DARK_COLOR' ) ) {
+                define( 'AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_WHITE_COLOR' ) ) {
+                define( 'AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_PURPLE_COLOR' ) ) {
+                define( 'AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_SALMON_COLOR' ) ) {
+                define( 'AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_CYAN_COLOR' ) ) {
+                define( 'AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_GRAY_COLOR' ) ) {
+                define( 'AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_INDIGO_COLOR' ) ) {
+                define( 'AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_ORANGE_COLOR' ) ) {
+                define( 'AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL );
+            }
+            if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
+                define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
+            }
+
+        }
+
+        public static function get_colors( $original = false){
+
+            if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+                return array();
+            }
+            if ( $original ) {
+                return array(
+                    'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
+                    'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
+                    'info'      => AUI_INFO_COLOR_ORIGINAL,
+                    'warning'   => AUI_WARNING_COLOR_ORIGINAL,
+                    'danger'    => AUI_DANGER_COLOR_ORIGINAL,
+                    'success'   => AUI_SUCCESS_COLOR_ORIGINAL,
+                    'light'     => AUI_LIGHT_COLOR_ORIGINAL,
+                    'dark'      => AUI_DARK_COLOR_ORIGINAL,
+                    'white'     => AUI_WHITE_COLOR_ORIGINAL,
+                    'purple'    => AUI_PURPLE_COLOR_ORIGINAL,
+                    'salmon'    => AUI_SALMON_COLOR_ORIGINAL,
+                    'cyan'      => AUI_CYAN_COLOR_ORIGINAL,
+                    'gray'      => AUI_GRAY_COLOR_ORIGINAL,
+                    'indigo'    => AUI_INDIGO_COLOR_ORIGINAL,
+                    'orange'    => AUI_ORANGE_COLOR_ORIGINAL,
+                    'black'     => AUI_BLACK_COLOR_ORIGINAL,
+                );
+            }
+
+            return array(
+                'primary'   => AUI_PRIMARY_COLOR,
+                'secondary' => AUI_SECONDARY_COLOR,
+                'info'      => AUI_INFO_COLOR,
+                'warning'   => AUI_WARNING_COLOR,
+                'danger'    => AUI_DANGER_COLOR,
+                'success'   => AUI_SUCCESS_COLOR,
+                'light'     => AUI_LIGHT_COLOR,
+                'dark'      => AUI_DARK_COLOR,
+                'white'     => AUI_WHITE_COLOR,
+                'purple'    => AUI_PURPLE_COLOR,
+                'salmon'    => AUI_SALMON_COLOR,
+                'cyan'      => AUI_CYAN_COLOR,
+                'gray'      => AUI_GRAY_COLOR,
+                'indigo'    => AUI_INDIGO_COLOR,
+                'orange'    => AUI_ORANGE_COLOR,
+                'black'     => AUI_BLACK_COLOR,
+            );
+        }
+
+        /**
+         * Add admin body class to show when BS5 is active.
+         *
+         * @param $classes
+         *
+         * @return mixed
+         */
+        public function add_bs5_admin_body_class( $classes = '' ) {
+            $classes .= ' aui_bs5';
+
+            return $classes;
+        }
+
+        /**
+         * Add a body class to show when BS5 is active.
+         *
+         * @param $classes
+         *
+         * @return mixed
+         */
+        public function add_bs5_body_class( $classes ) {
+            $classes[] = 'aui_bs5';
+
+            return $classes;
+        }
+
+        /**
+         * Initiate the settings and add the required action hooks.
+         */
+        public function init() {
             global $aui_bs5;
 
-			// Maybe fix settings
-			if ( ! empty( $_REQUEST['aui-fix-admin'] ) && !empty($_REQUEST['nonce']) && wp_verify_nonce( $_REQUEST['nonce'], "aui-fix-admin" ) ) {
-				$db_settings = get_option( 'ayecode-ui-settings' );
-				if ( ! empty( $db_settings ) ) {
-					$db_settings['css_backend'] = 'compatibility';
-					$db_settings['js_backend'] = 'core-popper';
-					update_option( 'ayecode-ui-settings', $db_settings );
-					wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
-				}
-			}
+            // Maybe fix settings
+            if ( ! empty( $_REQUEST['aui-fix-admin'] ) && !empty($_REQUEST['nonce']) && wp_verify_nonce( $_REQUEST['nonce'], "aui-fix-admin" ) ) {
+                $db_settings = get_option( 'ayecode-ui-settings' );
+                if ( ! empty( $db_settings ) ) {
+                    $db_settings['css_backend'] = 'compatibility';
+                    $db_settings['js_backend'] = 'core-popper';
+                    update_option( 'ayecode-ui-settings', $db_settings );
+                    wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
+                }
+            }
 
-			$this->constants();
-			$this->settings = $this->get_settings();
-			$this->url = $this->get_url();
+            $this->constants();
+            $this->settings = $this->get_settings();
+            $this->url = $this->get_url();
 
             // define the version
-			$aui_bs5 = $this->settings['bs_ver'] === '5';
-
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs-conversion.php' );
-				add_filter( 'admin_body_class', array( $this, 'add_bs5_admin_body_class' ), 99, 1 );
-				add_filter( 'body_class', array( $this, 'add_bs5_body_class' ) );
-			}
-
-			/**
-			 * Maybe load CSS
-			 *
-			 * We load super early in case there is a theme version that might change the colors
-			 */
-			if ( $this->settings['css'] ) {
-				$priority = $this->is_bs3_compat() ? 100 : 1;
+            $aui_bs5 = $this->settings['bs_ver'] === '5';
+
+            if ( $aui_bs5 ) {
+                include_once( dirname( __FILE__ ) . '/inc/bs-conversion.php' );
+                add_filter( 'admin_body_class', array( $this, 'add_bs5_admin_body_class' ), 99, 1 );
+                add_filter( 'body_class', array( $this, 'add_bs5_body_class' ) );
+            }
+
+            /**
+             * Maybe load CSS
+             *
+             * We load super early in case there is a theme version that might change the colors
+             */
+            if ( $this->settings['css'] ) {
+                $priority = $this->is_bs3_compat() ? 100 : 1;
                 $priority = $aui_bs5 ? 10 : $priority;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), $priority );
-			}
-			if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
-			}
-
-			// maybe load JS
-			if ( $this->settings['js'] ) {
-				$priority = $this->is_bs3_compat() ? 100 : 1;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
-			}
-			if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
-			}
-
-			// Maybe set the HTML font size
-			if ( $this->settings['html_font_size'] ) {
-				add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
-			}
-
-			// Maybe show backend style error
-			if( $this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper' ){
-				add_action( 'admin_notices', array( $this, 'show_admin_style_notice' ) );
-			}
-
-		}
-
-		/**
-		 * Show admin notice if backend scripts not loaded.
-		 */
-		public function show_admin_style_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=".wp_create_nonce('aui-fix-admin'));
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">Fix Now</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI is disable or set wrong.')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'.$message.'</p></div>';
-		}
-
-		/**
-		 * Check if we should load the admin scripts or not.
-		 *
-		 * @return bool
-		 */
-		public function load_admin_scripts(){
-			$result = true;
-
-			// check if specifically disabled
-			if(!empty($this->settings['disable_admin'])){
-				$url_parts = explode("\n",$this->settings['disable_admin']);
-				foreach($url_parts as $part){
-					if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
-						return false; // return early, no point checking further
-					}
-				}
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Add a html font size to the footer.
-		 */
-		public function html_font_size(){
-			$this->settings = $this->get_settings();
-			echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
-		}
-
-		/**
-		 * Check if the current admin screen should load scripts.
-		 *
-		 * @return bool
-		 */
-		public function is_aui_screen(){
+                add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), $priority );
+            }
+            if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
+                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
+            }
+
+            // maybe load JS
+            if ( $this->settings['js'] ) {
+                $priority = $this->is_bs3_compat() ? 100 : 1;
+                add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
+            }
+            if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
+                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
+            }
+
+            // Maybe set the HTML font size
+            if ( $this->settings['html_font_size'] ) {
+                add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
+            }
+
+            // Maybe show backend style error
+            if( $this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper' ){
+                add_action( 'admin_notices', array( $this, 'show_admin_style_notice' ) );
+            }
+
+        }
+
+        /**
+         * Show admin notice if backend scripts not loaded.
+         */
+        public function show_admin_style_notice(){
+            $fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=".wp_create_nonce('aui-fix-admin'));
+            $button = '<a href="'.esc_url($fix_url).'" class="button-primary">Fix Now</a>';
+            $message = __( '<b>Style Issue:</b> AyeCode UI is disable or set wrong.')." " .$button;
+            echo '<div class="notice notice-error aui-settings-error-notice"><p>'.$message.'</p></div>';
+        }
+
+        /**
+         * Check if we should load the admin scripts or not.
+         *
+         * @return bool
+         */
+        public function load_admin_scripts(){
+            $result = true;
+
+            // check if specifically disabled
+            if(!empty($this->settings['disable_admin'])){
+                $url_parts = explode("\n",$this->settings['disable_admin']);
+                foreach($url_parts as $part){
+                    if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
+                        return false; // return early, no point checking further
+                    }
+                }
+            }
+
+            return $result;
+        }
+
+        /**
+         * Add a html font size to the footer.
+         */
+        public function html_font_size(){
+            $this->settings = $this->get_settings();
+            echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
+        }
+
+        /**
+         * Check if the current admin screen should load scripts.
+         *
+         * @return bool
+         */
+        public function is_aui_screen(){
 //			echo '###';exit;
-			$load = false;
-			// check if we should load or not
-			if ( is_admin() ) {
-				// Only enable on set pages
-				$aui_screens = array(
-					'page',
+            $load = false;
+            // check if we should load or not
+            if ( is_admin() ) {
+                // Only enable on set pages
+                $aui_screens = array(
+                    'page',
                     //'docs',
-					'post',
-					'settings_page_ayecode-ui-settings',
-					'appearance_page_gutenberg-widgets',
-					'widgets',
-					'ayecode-ui-settings',
-					'site-editor'
-				);
-				$screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
+                    'post',
+                    'settings_page_ayecode-ui-settings',
+                    'appearance_page_gutenberg-widgets',
+                    'widgets',
+                    'ayecode-ui-settings',
+                    'site-editor'
+                );
+                $screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
 
-				$screen = get_current_screen();
+                $screen = get_current_screen();
 
 //				echo '###'.$screen->id;
 
-				// check if we are on a AUI screen
-				if ( $screen && in_array( $screen->id, $screen_ids ) ) {
-					$load = true;
-				}
+                // check if we are on a AUI screen
+                if ( $screen && in_array( $screen->id, $screen_ids ) ) {
+                    $load = true;
+                }
 
-				//load for widget previews in WP 5.8
-				if( !empty($_REQUEST['legacy-widget-preview'])){
-					$load = true;
-				}
-			}
+                //load for widget previews in WP 5.8
+                if( !empty($_REQUEST['legacy-widget-preview'])){
+                    $load = true;
+                }
+            }
 
 
 
-			return apply_filters( 'aui_load_on_admin' , $load );
-		}
+            return apply_filters( 'aui_load_on_admin' , $load );
+        }
 
-		/**
-		 * Check if the current theme is a block theme.
-		 *
-		 * @return bool
-		 */
-		public static function is_block_theme() {
-			if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
-				return true;
-			}
+        /**
+         * Check if the current theme is a block theme.
+         *
+         * @return bool
+         */
+        public static function is_block_theme() {
+            if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
+                return true;
+            }
 
-			return false;
-		}
+            return false;
+        }
 
-		/**
-		 * Adds the styles.
-		 */
-		public function enqueue_style() {
+        /**
+         * Adds the styles.
+         */
+        public function enqueue_style() {
             global $aui_bs5;
 
             $load_fse = false;
 
-			if( is_admin() && !$this->is_aui_screen()){
-				// don't add wp-admin scripts if not requested to
-			}else{
-				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
+            if( is_admin() && !$this->is_aui_screen()){
+                // don't add wp-admin scripts if not requested to
+            }else{
+                $css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
 
-				$rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
+                $rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
 
                 $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				if($this->settings[$css_setting]){
-					$compatibility = $this->settings[$css_setting]=='core' ? false : true;
-					$url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
+                if($this->settings[$css_setting]){
+                    $compatibility = $this->settings[$css_setting]=='core' ? false : true;
+                    $url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
 
 
 
-					wp_register_style( 'ayecode-ui', $url, array(), $this->version );
-					wp_enqueue_style( 'ayecode-ui' );
+                    wp_register_style( 'ayecode-ui', $url, array(), $this->version );
+                    wp_enqueue_style( 'ayecode-ui' );
 
-					$current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
+                    $current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
 
 //					if ( is_admin() && !empty($_REQUEST['postType']) ) {
-					if ( is_admin() && ( !empty($_REQUEST['postType']) || $current_screen->is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
-						$url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
-						wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
-						wp_enqueue_style( 'ayecode-ui-fse' );
-						$load_fse = true;
-					}
+                    if ( is_admin() && ( !empty($_REQUEST['postType']) || $current_screen->is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+                        $url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
+                        wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
+                        wp_enqueue_style( 'ayecode-ui-fse' );
+                        $load_fse = true;
+                    }
 
 
-					// flatpickr
-					wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
+                    // flatpickr
+                    wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
 
-					// fix some wp-admin issues
-					if(is_admin()){
-						$custom_css = "
+                    // fix some wp-admin issues
+                    if(is_admin()){
+                        $custom_css = "
                 body{
                     background-color: #f1f1f1;
                     font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif;
@@ -535,67 +535,67 @@ 
 				}
                 ";
 
-						// @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
-						$custom_css .= "
+                        // @todo, remove once fixed :: fix for this bug https://github.com/WordPress/gutenberg/issues/14377
+                        $custom_css .= "
 						.edit-post-sidebar input[type=color].components-text-control__input{
 						    padding: 0;
 						}
 					";
-						wp_add_inline_style( 'ayecode-ui', $custom_css );
-					}
+                        wp_add_inline_style( 'ayecode-ui', $custom_css );
+                    }
 
-					// custom changes
-					if ( $load_fse ) {
-						wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility) );
-					}else{
-						wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
+                    // custom changes
+                    if ( $load_fse ) {
+                        wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility) );
+                    }else{
+                        wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
 
-					}
+                    }
 
-				}
-			}
+                }
+            }
 
 
-		}
+        }
 
-		/**
-		 * Get inline script used if bootstrap enqueued
-		 *
-		 * If this remains small then its best to use this than to add another JS file.
-		 */
-		public function inline_script() {
+        /**
+         * Get inline script used if bootstrap enqueued
+         *
+         * If this remains small then its best to use this than to add another JS file.
+         */
+        public function inline_script() {
             global $aui_bs5;
-			// Flatpickr calendar locale
-			$flatpickr_locale = self::flatpickr_locale();
-
-			ob_start();
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
-			}else{
-				include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
+            // Flatpickr calendar locale
+            $flatpickr_locale = self::flatpickr_locale();
+
+            ob_start();
+            if ( $aui_bs5 ) {
+                include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
+            }else{
+                include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
             }
 
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', self::minify_js($output) );
-		}
-
-
-		/**
-		 * JS to help with conflict issues with other plugins and themes using bootstrap v3.
-		 *
-		 * @TODO we may need this when other conflicts arrise.
-		 * @return mixed
-		 */
-		public static function bs3_compat_js() {
-			ob_start();
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', self::minify_js($output) );
+        }
+
+
+        /**
+         * JS to help with conflict issues with other plugins and themes using bootstrap v3.
+         *
+         * @TODO we may need this when other conflicts arrise.
+         * @return mixed
+         */
+        public static function bs3_compat_js() {
+            ob_start();
+            ?>
             <script>
 				<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
                 /* With Avada builder */
@@ -603,20 +603,20 @@ 
 				<?php } ?>
             </script>
 			<?php
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', ob_get_clean());
-		}
-
-		/**
-		 * Get inline script used if bootstrap file browser enqueued.
-		 *
-		 * If this remains small then its best to use this than to add another JS file.
-		 */
-		public function inline_script_file_browser(){
-			ob_start();
-			?>
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', ob_get_clean());
+        }
+
+        /**
+         * Get inline script used if bootstrap file browser enqueued.
+         *
+         * If this remains small then its best to use this than to add another JS file.
+         */
+        public function inline_script_file_browser(){
+            ob_start();
+            ?>
             <script>
                 // run on doc ready
                 jQuery(document).ready(function () {
@@ -624,282 +624,282 @@ 
                 });
             </script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<script>',
-				'</script>'
-			), '', $output );
-		}
+            return str_replace( array(
+                '<script>',
+                '</script>'
+            ), '', $output );
+        }
 
-		/**
-		 * Adds the Font Awesome JS.
-		 */
-		public function enqueue_scripts() {
+        /**
+         * Adds the Font Awesome JS.
+         */
+        public function enqueue_scripts() {
 
-			if( is_admin() && !$this->is_aui_screen()){
-				// don't add wp-admin scripts if not requested to
-			}else {
+            if( is_admin() && !$this->is_aui_screen()){
+                // don't add wp-admin scripts if not requested to
+            }else {
 
-				$js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
+                $js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
 
-				$bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
+                $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				// select2
-				wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
+                // select2
+                wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
 
-				// flatpickr
-				wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
+                // flatpickr
+                wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
 
-				// iconpicker
-				if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
-					wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
-				}else{
-					wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
-				}
+                // iconpicker
+                if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
+                    wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
+                }else{
+                    wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
+                }
 
-				// Bootstrap file browser
-				wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
-				wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
-
-				$load_inline = false;
-
-				if ( $this->settings[ $js_setting ] == 'core-popper' ) {
-					// Bootstrap bundle
-					$url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
-					wp_register_script( 'bootstrap-js-bundle', $url, array(
-						'select2',
-						'jquery'
-					), $this->version, $this->is_bs3_compat() );
-					// if in admin then add to footer for compatibility.
-					is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-js-bundle', $script );
-				} elseif ( $this->settings[ $js_setting ] == 'popper' ) {
-					$url = $this->url . 'assets/js/popper.min.js'; //@todo we need to update this to bs5
-					wp_register_script( 'bootstrap-js-popper', $url, array( 'select2', 'jquery' ), $this->version );
-					wp_enqueue_script( 'bootstrap-js-popper' );
-					$load_inline = true;
-				} else {
-					$load_inline = true;
-				}
+                // Bootstrap file browser
+                wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
+                wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
+
+                $load_inline = false;
+
+                if ( $this->settings[ $js_setting ] == 'core-popper' ) {
+                    // Bootstrap bundle
+                    $url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
+                    wp_register_script( 'bootstrap-js-bundle', $url, array(
+                        'select2',
+                        'jquery'
+                    ), $this->version, $this->is_bs3_compat() );
+                    // if in admin then add to footer for compatibility.
+                    is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-js-bundle', $script );
+                } elseif ( $this->settings[ $js_setting ] == 'popper' ) {
+                    $url = $this->url . 'assets/js/popper.min.js'; //@todo we need to update this to bs5
+                    wp_register_script( 'bootstrap-js-popper', $url, array( 'select2', 'jquery' ), $this->version );
+                    wp_enqueue_script( 'bootstrap-js-popper' );
+                    $load_inline = true;
+                } else {
+                    $load_inline = true;
+                }
 
-				// Load needed inline scripts by faking the loading of a script if the main script is not being loaded
-				if ( $load_inline ) {
-					wp_register_script( 'bootstrap-dummy', '', array( 'select2', 'jquery' ) );
-					wp_enqueue_script( 'bootstrap-dummy' );
-					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-dummy', $script );
-				}
-			}
-
-		}
-
-		/**
-		 * Enqueue flatpickr if called.
-		 */
-		public function enqueue_flatpickr(){
-			wp_enqueue_style( 'flatpickr' );
-			wp_enqueue_script( 'flatpickr' );
-		}
-
-		/**
-		 * Enqueue iconpicker if called.
-		 */
-		public function enqueue_iconpicker(){
-			wp_enqueue_style( 'iconpicker' );
-			wp_enqueue_script( 'iconpicker' );
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
-
-			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
-			}
-
-			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
-
-			return trailingslashit( $url );
-		}
-
-		/**
-		 * Get the url path to the current folder.
-		 *
-		 * @return string
-		 */
-		public function get_url_old() {
-
-			$url = '';
-			// check if we are inside a plugin
-			$file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
-
-			// add check in-case user has changed wp-content dir name.
-			$wp_content_folder_name = basename(WP_CONTENT_DIR);
-			$dir_parts = explode("/$wp_content_folder_name/",$file_dir);
-			$url_parts = explode("/$wp_content_folder_name/",plugins_url());
-
-			if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-				$url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
-			}
-
-			return $url;
-		}
-
-		/**
-		 * Register the database settings with WordPress.
-		 */
-		public function register_settings() {
-			register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
-		}
-
-		/**
-		 * Add the WordPress settings menu item.
-		 * @since 1.0.10 Calling function name direct will fail theme check so we don't.
-		 */
-		public function menu_item() {
-			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
-				$this,
-				'settings_page'
-			) );
-		}
-
-		/**
-		 * Get a list of themes and their default JS settings.
-		 *
-		 * @return array
-		 */
-		public function theme_js_settings(){
-			return array(
-				'ayetheme' => 'popper',
-				'listimia' => 'required',
-				'listimia_backend' => 'core-popper',
-				//'avada'    => 'required', // removed as we now add compatibility
-			);
-		}
-
-		/**
+                // Load needed inline scripts by faking the loading of a script if the main script is not being loaded
+                if ( $load_inline ) {
+                    wp_register_script( 'bootstrap-dummy', '', array( 'select2', 'jquery' ) );
+                    wp_enqueue_script( 'bootstrap-dummy' );
+                    $script = $this->inline_script();
+                    wp_add_inline_script( 'bootstrap-dummy', $script );
+                }
+            }
+
+        }
+
+        /**
+         * Enqueue flatpickr if called.
+         */
+        public function enqueue_flatpickr(){
+            wp_enqueue_style( 'flatpickr' );
+            wp_enqueue_script( 'flatpickr' );
+        }
+
+        /**
+         * Enqueue iconpicker if called.
+         */
+        public function enqueue_iconpicker(){
+            wp_enqueue_style( 'iconpicker' );
+            wp_enqueue_script( 'iconpicker' );
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url() {
+            $content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
+            $content_url = untrailingslashit( WP_CONTENT_URL );
+
+            // Replace http:// to https://.
+            if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
+                $content_url = str_replace( 'http://', 'https://', $content_url );
+            }
+
+            // Check if we are inside a plugin
+            $file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
+            $url = str_replace( $content_dir, $content_url, $file_dir );
+
+            return trailingslashit( $url );
+        }
+
+        /**
+         * Get the url path to the current folder.
+         *
+         * @return string
+         */
+        public function get_url_old() {
+
+            $url = '';
+            // check if we are inside a plugin
+            $file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
+
+            // add check in-case user has changed wp-content dir name.
+            $wp_content_folder_name = basename(WP_CONTENT_DIR);
+            $dir_parts = explode("/$wp_content_folder_name/",$file_dir);
+            $url_parts = explode("/$wp_content_folder_name/",plugins_url());
+
+            if(!empty($url_parts[0]) && !empty($dir_parts[1])){
+                $url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
+            }
+
+            return $url;
+        }
+
+        /**
+         * Register the database settings with WordPress.
+         */
+        public function register_settings() {
+            register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
+        }
+
+        /**
+         * Add the WordPress settings menu item.
+         * @since 1.0.10 Calling function name direct will fail theme check so we don't.
+         */
+        public function menu_item() {
+            $menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
+            call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
+                $this,
+                'settings_page'
+            ) );
+        }
+
+        /**
+         * Get a list of themes and their default JS settings.
+         *
+         * @return array
+         */
+        public function theme_js_settings(){
+            return array(
+                'ayetheme' => 'popper',
+                'listimia' => 'required',
+                'listimia_backend' => 'core-popper',
+                //'avada'    => 'required', // removed as we now add compatibility
+            );
+        }
+
+        /**
          * Get the date the site was installed.
          *
-		 * @return false|string
-		 */
+         * @return false|string
+         */
         public function get_site_install_date() {
-	        global $wpdb; // This gives you access to the WordPress database object
+            global $wpdb; // This gives you access to the WordPress database object
+
+            // Prepare the SQL query to get the oldest registration date
+            $query = "SELECT MIN(user_registered) AS oldest_registration_date FROM {$wpdb->users}";
 
-	        // Prepare the SQL query to get the oldest registration date
-	        $query = "SELECT MIN(user_registered) AS oldest_registration_date FROM {$wpdb->users}";
+            // Execute the query
+            $date = $wpdb->get_var($query);
 
-	        // Execute the query
-	        $date = $wpdb->get_var($query);
+            return $date ? $date : false;
+        }
 
-	        return $date ? $date : false;
+        /**
+         * Show admin notice if backend scripts not loaded.
+         */
+        public function show_admin_version_notice(){
+            $fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
+            $button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
+            $message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
+            echo '<div class="notice notice-error aui-settings-error-notice"><p>'.$message.'</p></div>';
         }
 
-		/**
-		 * Show admin notice if backend scripts not loaded.
-		 */
-		public function show_admin_version_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'.$message.'</p></div>';
-		}
-
-		/**
-		 * Get the current Font Awesome output settings.
-		 *
-		 * @return array The array of settings.
-		 */
-		public function get_settings() {
-
-			$db_settings = get_option( 'ayecode-ui-settings' );
+        /**
+         * Get the current Font Awesome output settings.
+         *
+         * @return array The array of settings.
+         */
+        public function get_settings() {
+
+            $db_settings = get_option( 'ayecode-ui-settings' );
 
             // Maybe show default version notice
-			$site_install_date = new DateTime( self::get_site_install_date() );
-			$switch_over_date = new DateTime("2024-02-01");
-			if ( empty( $db_settings ) && $site_install_date < $switch_over_date ) {
-				add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
-			}
-
-			$js_default = 'core-popper';
-			$js_default_backend = $js_default;
-
-			// maybe set defaults (if no settings set)
-			if(empty($db_settings)){
-				$active_theme = strtolower( get_template() ); // active parent theme.
-				$theme_js_settings = self::theme_js_settings();
-				if(isset($theme_js_settings[$active_theme])){
-					$js_default = $theme_js_settings[$active_theme];
-					$js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
-				}
-			}
+            $site_install_date = new DateTime( self::get_site_install_date() );
+            $switch_over_date = new DateTime("2024-02-01");
+            if ( empty( $db_settings ) && $site_install_date < $switch_over_date ) {
+                add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
+            }
 
-			/**
-			 * Filter the default settings.
-			 */
-			$defaults = apply_filters( 'ayecode-ui-default-settings', array(
-				'css'            => 'compatibility', // core, compatibility
-				'js'             => $js_default, // js to load, core-popper, popper
-				'html_font_size' => '16', // js to load, core-popper, popper
-				'css_backend'    => 'compatibility', // core, compatibility
-				'js_backend'     => $js_default_backend, // js to load, core-popper, popper
-				'disable_admin'  => '', // URL snippets to disable loading on admin
+            $js_default = 'core-popper';
+            $js_default_backend = $js_default;
+
+            // maybe set defaults (if no settings set)
+            if(empty($db_settings)){
+                $active_theme = strtolower( get_template() ); // active parent theme.
+                $theme_js_settings = self::theme_js_settings();
+                if(isset($theme_js_settings[$active_theme])){
+                    $js_default = $theme_js_settings[$active_theme];
+                    $js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
+                }
+            }
+
+            /**
+             * Filter the default settings.
+             */
+            $defaults = apply_filters( 'ayecode-ui-default-settings', array(
+                'css'            => 'compatibility', // core, compatibility
+                'js'             => $js_default, // js to load, core-popper, popper
+                'html_font_size' => '16', // js to load, core-popper, popper
+                'css_backend'    => 'compatibility', // core, compatibility
+                'js_backend'     => $js_default_backend, // js to load, core-popper, popper
+                'disable_admin'  => '', // URL snippets to disable loading on admin
                 'bs_ver'         => '5', // The default bootstrap version to sue by default
-			), $db_settings );
+            ), $db_settings );
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+            $settings = wp_parse_args( $db_settings, $defaults );
 
-			/**
-			 * Filter the Bootstrap settings.
-			 *
-			 * @todo if we add this filer people might use it and then it defeats the purpose of this class :/
-			 */
-			return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
-		}
+            /**
+             * Filter the Bootstrap settings.
+             *
+             * @todo if we add this filer people might use it and then it defeats the purpose of this class :/
+             */
+            return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
+        }
 
 
-		/**
-		 * The settings page html output.
-		 */
-		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
-			}
+        /**
+         * The settings page html output.
+         */
+        public function settings_page() {
+            if ( ! current_user_can( 'manage_options' ) ) {
+                wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+            }
             $overrides = apply_filters( 'ayecode-ui-settings', array(), array(), array() );
 
-			?>
+            ?>
             <div class="wrap">
                 <h1><?php echo $this->name; ?></h1>
                 <p><?php echo apply_filters( 'ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'ayecode-connect' ) );?></p>
                 <form method="post" action="options.php">
 					<?php
-					settings_fields( 'ayecode-ui-settings' );
-					do_settings_sections( 'ayecode-ui-settings' );
-					?>
+                    settings_fields( 'ayecode-ui-settings' );
+                    do_settings_sections( 'ayecode-ui-settings' );
+                    ?>
 
                     <h2><?php _e( 'BootStrap Version', 'ayecode-connect' ); ?></h2>
                     <p><?php echo apply_filters( 'ayecode-ui-version-settings-message', __("V5 is recommended, however if you have another plugin installed using v4, you may need to use v4 also.", 'ayecode-connect' ) );?></p>
 	                <div class="bsui"><?php
-	                if ( ! empty( $overrides ) ) {
-		                echo aui()->alert(array(
-			                'type'=> 'info',
-			                'content'=> __("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
-		                ));
-	                }
-	                ?>
+                    if ( ! empty( $overrides ) ) {
+                        echo aui()->alert(array(
+                            'type'=> 'info',
+                            'content'=> __("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
+                        ));
+                    }
+                    ?>
                     </div>
                     <table class="form-table wpbs-table-version-settings">
                         <tr valign="top">
@@ -983,77 +983,77 @@ 
                     </table>
 
 					<?php
-					submit_button();
-					?>
+                    submit_button();
+                    ?>
                 </form>
                 <div id="wpbs-version" data-aui-source="<?php echo esc_attr( $this->get_load_source() ); ?>"><?php echo $this->version; ?></div>
             </div>
 			<?php
-		}
+        }
 
         public function get_load_source(){
-	        $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-	        $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
-
-	        // Find source plugin/theme of SD
-	        $source = array();
-	        if ( strpos( $file, $plugins_dir ) !== false ) {
-		        $source = explode( "/", plugin_basename( $file ) );
-	        } else if ( function_exists( 'get_theme_root' ) ) {
-		        $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
-
-		        if ( strpos( $file, $themes_dir ) !== false ) {
-			        $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
-		        }
-	        }
+            $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
+            $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+
+            // Find source plugin/theme of SD
+            $source = array();
+            if ( strpos( $file, $plugins_dir ) !== false ) {
+                $source = explode( "/", plugin_basename( $file ) );
+            } else if ( function_exists( 'get_theme_root' ) ) {
+                $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+
+                if ( strpos( $file, $themes_dir ) !== false ) {
+                    $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+                }
+            }
 
             return isset($source[0]) ? esc_attr($source[0]) : '';
         }
 
-		public function customizer_settings($wp_customize){
-			$wp_customize->add_section('aui_settings', array(
-				'title'    => __('AyeCode UI', 'ayecode-connect' ),
-				'priority' => 120,
-			));
-
-			//  =============================
-			//  = Color Picker              =
-			//  =============================
-			$wp_customize->add_setting('aui_options[color_primary]', array(
-				'default'           => AUI_PRIMARY_COLOR,
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
-				'label'    => __('Primary Color', 'ayecode-connect' ),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_primary]',
-			)));
-
-			$wp_customize->add_setting('aui_options[color_secondary]', array(
-				'default'           => '#6c757d',
-				'sanitize_callback' => 'sanitize_hex_color',
-				'capability'        => 'edit_theme_options',
-				'type'              => 'option',
-				'transport'         => 'refresh',
-			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
-				'label'    => __('Secondary Color', 'ayecode-connect' ),
-				'section'  => 'aui_settings',
-				'settings' => 'aui_options[color_secondary]',
-			)));
-		}
-
-		/**
-		 * CSS to help with conflict issues with other plugins and themes using bootstrap v3.
-		 *
-		 * @return mixed
-		 */
-		public static function bs3_compat_css() {
-			ob_start();
-			?>
+        public function customizer_settings($wp_customize){
+            $wp_customize->add_section('aui_settings', array(
+                'title'    => __('AyeCode UI', 'ayecode-connect' ),
+                'priority' => 120,
+            ));
+
+            //  =============================
+            //  = Color Picker              =
+            //  =============================
+            $wp_customize->add_setting('aui_options[color_primary]', array(
+                'default'           => AUI_PRIMARY_COLOR,
+                'sanitize_callback' => 'sanitize_hex_color',
+                'capability'        => 'edit_theme_options',
+                'type'              => 'option',
+                'transport'         => 'refresh',
+            ));
+            $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
+                'label'    => __('Primary Color', 'ayecode-connect' ),
+                'section'  => 'aui_settings',
+                'settings' => 'aui_options[color_primary]',
+            )));
+
+            $wp_customize->add_setting('aui_options[color_secondary]', array(
+                'default'           => '#6c757d',
+                'sanitize_callback' => 'sanitize_hex_color',
+                'capability'        => 'edit_theme_options',
+                'type'              => 'option',
+                'transport'         => 'refresh',
+            ));
+            $wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
+                'label'    => __('Secondary Color', 'ayecode-connect' ),
+                'section'  => 'aui_settings',
+                'settings' => 'aui_options[color_secondary]',
+            )));
+        }
+
+        /**
+         * CSS to help with conflict issues with other plugins and themes using bootstrap v3.
+         *
+         * @return mixed
+         */
+        public static function bs3_compat_css() {
+            ob_start();
+            ?>
             <style>
                 /* Bootstrap 3 compatibility */
                 body.modal-open .modal-backdrop.show:not(.in) {opacity:0.5;}
@@ -1082,55 +1082,55 @@ 
                 <?php } ?>
             </style>
 			<?php
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
-		}
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', self::minify_css( ob_get_clean() ) );
+        }
 
 
-		public static function custom_css($compatibility = true) {
+        public static function custom_css($compatibility = true) {
             global $aui_bs5;
 
-			$colors = array();
-			if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+            $colors = array();
+            if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
 
 
-				$setting = wp_get_global_settings();
+                $setting = wp_get_global_settings();
 
 //                print_r(wp_get_global_styles());//exit;
 //                print_r(get_default_block_editor_settings());exit;
 
 //                print_r($setting);echo  '###';exit;
-				if(!empty($setting['color']['palette']['theme'])){
-					foreach($setting['color']['palette']['theme'] as $color){
-						$colors[$color['slug']] = esc_attr($color['color']);
-					}
-				}
+                if(!empty($setting['color']['palette']['theme'])){
+                    foreach($setting['color']['palette']['theme'] as $color){
+                        $colors[$color['slug']] = esc_attr($color['color']);
+                    }
+                }
 
-				if(!empty($setting['color']['palette']['custom'])){
-					foreach($setting['color']['palette']['custom'] as $color){
-						$colors[$color['slug']] = esc_attr($color['color']);
-					}
-				}
-			}else{
-				$settings = get_option('aui_options');
-				$colors = array(
-					'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
-					'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
-				);
-			}
+                if(!empty($setting['color']['palette']['custom'])){
+                    foreach($setting['color']['palette']['custom'] as $color){
+                        $colors[$color['slug']] = esc_attr($color['color']);
+                    }
+                }
+            }else{
+                $settings = get_option('aui_options');
+                $colors = array(
+                    'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
+                    'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
+                );
+            }
 
-			ob_start();
+            ob_start();
 
-			?>
+            ?>
             <style>
                 <?php
 
-					// BS v3 compat
-					if( self::is_bs3_compat() ){
-						echo self::bs3_compat_css();
-					}
+                    // BS v3 compat
+                    if( self::is_bs3_compat() ){
+                        echo self::bs3_compat_css();
+                    }
 
                     $current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
                     $is_fse = false;
@@ -1138,26 +1138,26 @@ 
                         $is_fse = true;
                     }
 
-					if(!empty($colors)){
-						$d_colors = self::get_colors(true);
+                    if(!empty($colors)){
+                        $d_colors = self::get_colors(true);
 
 //						$is_fse = !empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template';
-						foreach($colors as $key => $color ){
-							if((empty( $d_colors[$key]) ||  $d_colors[$key] != $color) || $is_fse ) {
-								$var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
-								$compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
-								echo $aui_bs5 ? self::css_overwrite_bs5($key,$var,$compat,$color) : self::css_overwrite($key,$var,$compat,$color);
-							}
-						}
-					   // exit;
-					}
+                        foreach($colors as $key => $color ){
+                            if((empty( $d_colors[$key]) ||  $d_colors[$key] != $color) || $is_fse ) {
+                                $var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
+                                $compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
+                                echo $aui_bs5 ? self::css_overwrite_bs5($key,$var,$compat,$color) : self::css_overwrite($key,$var,$compat,$color);
+                            }
+                        }
+                        // exit;
+                    }
 
-					// Set admin bar z-index lower when modal is open.
-					echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
+                    // Set admin bar z-index lower when modal is open.
+                    echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
 
-					if(is_admin()){
-						echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
-					}
+                    if(is_admin()){
+                        echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
+                    }
 
                     if( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' )  ){
                         $css = '';
@@ -1177,28 +1177,28 @@ 
                         }
 
                         // line height
-                         if( !empty( $theme_settings['typography']['lineHeight'] ) ){
+                            if( !empty( $theme_settings['typography']['lineHeight'] ) ){
                             $css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
                         }
 
 
-                           // font weight
-                         if( !empty( $theme_settings['typography']['fontWeight'] ) ){
+                            // font weight
+                            if( !empty( $theme_settings['typography']['fontWeight'] ) ){
                             $css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
                         }
 
                         // Background
-                         if( !empty( $theme_settings['color']['background'] ) ){
+                            if( !empty( $theme_settings['color']['background'] ) ){
                             $css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
                         }
 
-                         // Background Gradient
-                         if( !empty( $theme_settings['color']['gradient'] ) ){
+                            // Background Gradient
+                            if( !empty( $theme_settings['color']['gradient'] ) ){
                             $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
                         }
 
-                           // Background Gradient
-                         if( !empty( $theme_settings['color']['gradient'] ) ){
+                            // Background Gradient
+                            if( !empty( $theme_settings['color']['gradient'] ) ){
                             $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
                         }
 
@@ -1236,7 +1236,7 @@ 
                             $headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
                         }
 
-                         // heading font family
+                            // heading font family
                         if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
                             $headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
                         }
@@ -1249,21 +1249,21 @@ 
 
                         foreach($hs as $hn){
                             $h_css = '';
-                             if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
+                                if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
                                 $h_css .= 'color: ' . esc_attr( $theme_settings['elements'][$hn]['color']['text'] ) . ';';
-                             }
+                                }
 
-                              if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
+                                if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
                                 $h_css .= 'font-size: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontSize']  ) . ';';
-                             }
+                                }
 
-                              if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
+                                if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
                                 $h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
-                             }
+                                }
 
-                             if($h_css){
+                                if($h_css){
                                 echo $bep . $hn . '{'.$h_css.'}';
-                             }
+                                }
                         }
 
 //                        wp_mail('x@x.com','ss',print_r($_SERVER,true).'@@@');
@@ -1273,171 +1273,171 @@ 
 
 
                     }
-				?>
+                ?>
             </style>
 			<?php
 
 
-			/*
+            /*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
-				'<style>',
-				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
-		}
-
-
-
-		/**
-		 * Check if we should add booststrap 3 compatibility changes.
-		 *
-		 * @return bool
-		 */
-		public static function is_bs3_compat(){
-			return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
-		}
-
-		public static function hex_to_rgb($hex) {
-			// Remove '#' if present
-			$hex = str_replace('#', '', $hex);
-
-			// Convert 3-digit hex to 6-digit hex
-			if(strlen($hex) == 3) {
-				$hex = str_repeat(substr($hex, 0, 1), 2) . str_repeat(substr($hex, 1, 1), 2) . str_repeat(substr($hex, 2, 1), 2);
-			}
-
-			// Convert hex to RGB
-			$r = hexdec(substr($hex, 0, 2));
-			$g = hexdec(substr($hex, 2, 2));
-			$b = hexdec(substr($hex, 4, 2));
-
-			// Return RGB values as an array
-			return $r . ',' . $g . ',' . $b;
-		}
-
-		/**
-		 * Build the CSS to overwrite a bootstrap color variable.
-		 *
-		 * @param $type
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
-			global $aui_bs5;
-
-			$is_var = false;
-			$is_custom = strpos($type, 'custom-') !== false ? true : false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
-				//if(!sanitize_hex_color($color_code)){
-				$color_code = esc_attr($color_code);
-				$is_var = true;
+            return str_replace( array(
+                '<style>',
+                '</style>'
+            ), '', self::minify_css( ob_get_clean() ) );
+        }
+
+
+
+        /**
+         * Check if we should add booststrap 3 compatibility changes.
+         *
+         * @return bool
+         */
+        public static function is_bs3_compat(){
+            return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
+        }
+
+        public static function hex_to_rgb($hex) {
+            // Remove '#' if present
+            $hex = str_replace('#', '', $hex);
+
+            // Convert 3-digit hex to 6-digit hex
+            if(strlen($hex) == 3) {
+                $hex = str_repeat(substr($hex, 0, 1), 2) . str_repeat(substr($hex, 1, 1), 2) . str_repeat(substr($hex, 2, 1), 2);
+            }
+
+            // Convert hex to RGB
+            $r = hexdec(substr($hex, 0, 2));
+            $g = hexdec(substr($hex, 2, 2));
+            $b = hexdec(substr($hex, 4, 2));
+
+            // Return RGB values as an array
+            return $r . ',' . $g . ',' . $b;
+        }
+
+        /**
+         * Build the CSS to overwrite a bootstrap color variable.
+         *
+         * @param $type
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
+            global $aui_bs5;
+
+            $is_var = false;
+            $is_custom = strpos($type, 'custom-') !== false ? true : false;
+            if(!$color_code){return '';}
+            if(strpos($color_code, 'var') !== false){
+                //if(!sanitize_hex_color($color_code)){
+                $color_code = esc_attr($color_code);
+                $is_var = true;
 //				$color_code = "rgba($color_code, 0.5)";
 //                echo '###1'.$color_code.'###';//exit;
-			}
+            }
 
 //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+            if(!$color_code){return '';}
 
-			$rgb = self::hex_to_rgb($hex);
+            $rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
-				$compatibility = '.bsui';
-			}elseif(!$compatibility){
-				$compatibility = '';
-			}else{
-				$compatibility = esc_attr($compatibility);
-			}
+            if($compatibility===true || $compatibility===1){
+                $compatibility = '.bsui';
+            }elseif(!$compatibility){
+                $compatibility = '';
+            }else{
+                $compatibility = esc_attr($compatibility);
+            }
 
-			$prefix = $compatibility ? $compatibility . " " : "";
+            $prefix = $compatibility ? $compatibility . " " : "";
 
 
             $output = '';
 
 //            echo '####'.$color_code;exit;
 
-			$type = sanitize_html_class($type);
+            $type = sanitize_html_class($type);
+
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                ".btn-{$type}"                                              => array( 'b', 'o' ),
+                ".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
+                ".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
+                ".btn-outline-{$type}"                                      => array( 'c', 'o' ),
+                ".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
+                ".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
+                ".badge-{$type}"                                            => array( 'b' ),
+                ".alert-{$type}"                                            => array( 'b', 'o' ),
+                ".bg-{$type}"                                               => array( 'b', 'f' ),
+                ".btn-link.btn-{$type}"                                     => array( 'c' ),
+                ".text-{$type}"                                     => array( 'c' ),
+            );
+
+            if ( $aui_bs5 ) {
+                unset($selectors[".alert-{$type}" ]);
+            }
 
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-				".text-{$type}"                                     => array( 'c' ),
-			);
-
-			if ( $aui_bs5 ) {
-				unset($selectors[".alert-{$type}" ]);
-			}
-
-			if ( $type == 'primary' ) {
-				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
-						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
-							'b',
-							'o'
-						),
-						'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
-							'b',
-							'o'
-						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
-						'.page-item.active .page-link'                                                                         => array(
-							'b',
-							'o'
-						),
-						'.progress-bar'                                                                                        => array( 'b' ),
-						'.list-group-item.active'                                                                              => array(
-							'b',
-							'o'
-						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
-					);
-			}
+            if ( $type == 'primary' ) {
+                $selectors = $selectors + array(
+                        'a'                                                                                                    => array( 'c' ),
+                        '.btn-link'                                                                                            => array( 'c' ),
+                        '.dropdown-item.active'                                                                                => array( 'b' ),
+                        '.custom-control-input:checked~.custom-control-label::before'                                          => array(
+                            'b',
+                            'o'
+                        ),
+                        '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
+                            'b',
+                            'o'
+                        ),
+                        '.nav-pills .nav-link.active'                                                                          => array( 'b' ),
+                        '.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
+                        '.page-link'                                                                                           => array( 'c' ),
+                        '.page-item.active .page-link'                                                                         => array(
+                            'b',
+                            'o'
+                        ),
+                        '.progress-bar'                                                                                        => array( 'b' ),
+                        '.list-group-item.active'                                                                              => array(
+                            'b',
+                            'o'
+                        ),
+                        '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+                    );
+            }
 
 
 
             // link
-			if ( $type === 'primary' ) {
-				$output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
-				$output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
-				$output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
+            if ( $type === 'primary' ) {
+                $output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
+                $output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
+                $output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
 
-				$output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
-				$output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
+                $output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
 
                 // dropdown
-				$output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
 
                 // pagination
-				$output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
+                $output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
 
-			}
+            }
 
-			$output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
+            $output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
 
-			//  buttons
-			$output .= $prefix . ' .btn-'.esc_attr($type).'{';
-			$output .= ' 
+            //  buttons
+            $output .= $prefix . ' .btn-'.esc_attr($type).'{';
+            $output .= ' 
             --bs-btn-bg: '.esc_attr($color_code).';
             --bs-btn-border-color: '.esc_attr($color_code).';
             --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
@@ -1455,11 +1455,11 @@ 
 //			--bs-btn-active-color: #fff;
 //			--bs-btn-disabled-color: #fff;
 //            ';
-			$output .= '}';
+            $output .= '}';
 
-			//  buttons outline
-			$output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
-			$output .= ' 
+            //  buttons outline
+            $output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
+            $output .= ' 
             --bs-btn-border-color: '.esc_attr($color_code).';
             --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
             --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
@@ -1476,37 +1476,37 @@ 
 //			--bs-btn-active-color: #fff;
 //			--bs-btn-disabled-color: #fff;
 //            ';
-			$output .= '}';
+            $output .= '}';
 
 
             // button hover
-			$output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
-			$output .= ' 
+            $output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
+            $output .= ' 
             box-shadow: 0 0.25rem 0.25rem 0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb), .1), 0 0.375rem 0.75rem -0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb) , .4);
             }
             ';
 
 
-			if ( $aui_bs5 ) {
+            if ( $aui_bs5 ) {
 //				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
-			}
+                $output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
+                $output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+            }
 
 
-			if ( $is_custom ) {
+            if ( $is_custom ) {
 
 //				echo '###'.$type;exit;
 
-				// build rules into each type
-				foreach($selectors as $selector => $types){
-					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-					$types = array_combine($types,$types);
-					if(isset($types['c'])){$color[] = $selector;}
-					if(isset($types['b'])){$background[] = $selector;}
-					if(isset($types['o'])){$border[] = $selector;}
-					if(isset($types['f'])){$fill[] = $selector;}
-				}
+                // build rules into each type
+                foreach($selectors as $selector => $types){
+                    $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+                    $types = array_combine($types,$types);
+                    if(isset($types['c'])){$color[] = $selector;}
+                    if(isset($types['b'])){$background[] = $selector;}
+                    if(isset($types['o'])){$border[] = $selector;}
+                    if(isset($types['f'])){$fill[] = $selector;}
+                }
 
 //				// build rules into each type
 //				foreach($important_selectors as $selector => $types){
@@ -1518,67 +1518,67 @@ 
 //					if(isset($types['f'])){$fill_i[] = $selector;}
 //				}
 
-				// add any color rules
-				if(!empty($color)){
-					$output .= implode(",",$color) . "{color: $color_code;} ";
-				}
-				if(!empty($color_i)){
-					$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-				}
+                // add any color rules
+                if(!empty($color)){
+                    $output .= implode(",",$color) . "{color: $color_code;} ";
+                }
+                if(!empty($color_i)){
+                    $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+                }
 
-				// add any background color rules
-				if(!empty($background)){
-					$output .= implode(",",$background) . "{background-color: $color_code;} ";
-				}
-				if(!empty($background_i)){
-					$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+                // add any background color rules
+                if(!empty($background)){
+                    $output .= implode(",",$background) . "{background-color: $color_code;} ";
+                }
+                if(!empty($background_i)){
+                    $output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
 //				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
-				}
+                }
 
-				// add any border color rules
-				if(!empty($border)){
-					$output .= implode(",",$border) . "{border-color: $color_code;} ";
-				}
-				if(!empty($border_i)){
-					$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-				}
+                // add any border color rules
+                if(!empty($border)){
+                    $output .= implode(",",$border) . "{border-color: $color_code;} ";
+                }
+                if(!empty($border_i)){
+                    $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+                }
 
-				// add any fill color rules
-				if(!empty($fill)){
-					$output .= implode(",",$fill) . "{fill: $color_code;} ";
-				}
-				if(!empty($fill_i)){
-					$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-				}
+                // add any fill color rules
+                if(!empty($fill)){
+                    $output .= implode(",",$fill) . "{fill: $color_code;} ";
+                }
+                if(!empty($fill_i)){
+                    $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+                }
 
-			}
+            }
 
 
 
 
-			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
-			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+            $transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
+            // darken
+            $darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
+            $darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
 
-			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+            // lighten
+            $lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
 
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
 
 
-			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            // button states
+            $output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
+            $output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
 //			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			// text
+            // text
 //			$output .= $prefix .".xxx, .text-{$type} {color: var(--bs-".esc_attr($type).");} ";
 
 
@@ -1593,773 +1593,773 @@ 
 //				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
 //			}
 
-			// alerts
-			if ( $aui_bs5 ) {
+            // alerts
+            if ( $aui_bs5 ) {
 //				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
-			}
-
-			return $output;
-		}
-
-		/**
-		 * Build the CSS to overwrite a bootstrap color variable.
-		 *
-		 * @param $type
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
+                $output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+            }
+
+            return $output;
+        }
+
+        /**
+         * Build the CSS to overwrite a bootstrap color variable.
+         *
+         * @param $type
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
             global $aui_bs5;
 
-			$is_var = false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
-				//if(!sanitize_hex_color($color_code)){
-				$color_code = esc_attr($color_code);
-				$is_var = true;
+            $is_var = false;
+            if(!$color_code){return '';}
+            if(strpos($color_code, 'var') !== false){
+                //if(!sanitize_hex_color($color_code)){
+                $color_code = esc_attr($color_code);
+                $is_var = true;
 //				$color_code = "rgba($color_code, 0.5)";
 //                echo '###1'.$color_code.'###';//exit;
-			}
+            }
 
 //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+            if(!$color_code){return '';}
 
             $rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
-				$compatibility = '.bsui';
-			}elseif(!$compatibility){
-				$compatibility = '';
-			}else{
-				$compatibility = esc_attr($compatibility);
-			}
+            if($compatibility===true || $compatibility===1){
+                $compatibility = '.bsui';
+            }elseif(!$compatibility){
+                $compatibility = '';
+            }else{
+                $compatibility = esc_attr($compatibility);
+            }
 
 
 
 //            echo '####'.$color_code;exit;
 
-			$type = sanitize_html_class($type);
-
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-			);
-
-			if ( $aui_bs5 ) {
+            $type = sanitize_html_class($type);
+
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                ".btn-{$type}"                                              => array( 'b', 'o' ),
+                ".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
+                ".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
+                ".btn-outline-{$type}"                                      => array( 'c', 'o' ),
+                ".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
+                ".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
+                ".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
+                ".badge-{$type}"                                            => array( 'b' ),
+                ".alert-{$type}"                                            => array( 'b', 'o' ),
+                ".bg-{$type}"                                               => array( 'b', 'f' ),
+                ".btn-link.btn-{$type}"                                     => array( 'c' ),
+            );
+
+            if ( $aui_bs5 ) {
                 unset($selectors[".alert-{$type}" ]);
-			}
-
-			if ( $type == 'primary' ) {
-				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
-						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
-							'b',
-							'o'
-						),
-						'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
-							'b',
-							'o'
-						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
-						'.page-item.active .page-link'                                                                         => array(
-							'b',
-							'o'
-						),
-						'.progress-bar'                                                                                        => array( 'b' ),
-						'.list-group-item.active'                                                                              => array(
-							'b',
-							'o'
-						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+            }
+
+            if ( $type == 'primary' ) {
+                $selectors = $selectors + array(
+                        'a'                                                                                                    => array( 'c' ),
+                        '.btn-link'                                                                                            => array( 'c' ),
+                        '.dropdown-item.active'                                                                                => array( 'b' ),
+                        '.custom-control-input:checked~.custom-control-label::before'                                          => array(
+                            'b',
+                            'o'
+                        ),
+                        '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before'                   => array(
+                            'b',
+                            'o'
+                        ),
+                        '.nav-pills .nav-link.active'                                                                          => array( 'b' ),
+                        '.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
+                        '.page-link'                                                                                           => array( 'c' ),
+                        '.page-item.active .page-link'                                                                         => array(
+                            'b',
+                            'o'
+                        ),
+                        '.progress-bar'                                                                                        => array( 'b' ),
+                        '.list-group-item.active'                                                                              => array(
+                            'b',
+                            'o'
+                        ),
+                        '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
 //				    '.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
 //				    '.custom-range::-moz-range-thumb' => array('b'),
 //				    '.custom-range::-ms-thumb' => array('b'),
-					);
-			}
-
-			$important_selectors = array(
-				".bg-{$type}" => array('b','f'),
-				".border-{$type}" => array('o'),
-				".text-{$type}" => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			if ( $aui_bs5 ) {
+                    );
+            }
+
+            $important_selectors = array(
+                ".bg-{$type}" => array('b','f'),
+                ".border-{$type}" => array('o'),
+                ".text-{$type}" => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
+
+            $output = '';
+
+            if ( $aui_bs5 ) {
 //				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
-			}
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+                $output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+            }
+
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
+
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? $compatibility . " ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
+
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
+
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
 //				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
-			}
+            }
 
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
 
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
 
 
-			$prefix = $compatibility ? $compatibility . " " : "";
+            $prefix = $compatibility ? $compatibility . " " : "";
 
-			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
-			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+            $transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
+            // darken
+            $darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
+            $darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
 
-			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+            // lighten
+            $lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
 
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
 
 
-			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            // button states
+            $output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
+            $output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
 //			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			if ( $type == 'primary' ) {
-				// dropdown's
-				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+            if ( $type == 'primary' ) {
+                // dropdown's
+                $output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
-				// input states
-				$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
+                // input states
+                $output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-				// page link
-				$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			}
+                // page link
+                $output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            }
 
             // alerts
-			if ( $aui_bs5 ) {
+            if ( $aui_bs5 ) {
 //				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
-			}
-
-			return $output;
-		}
-
-		/**
-		 *
-		 * @deprecated 0.1.76 Use css_overwrite()
-		 *
-		 * @param $color_code
-		 * @param $compatibility
-		 * @param $use_variable
-		 *
-		 * @return string
-		 */
-		public static function css_primary($color_code,$compatibility, $use_variable = false){
-
-			if(!$use_variable){
-				$color_code = sanitize_hex_color($color_code);
-				if(!$color_code){return '';}
-			}
-
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				'a' => array('c'),
-				'.btn-primary' => array('b','o'),
-				'.btn-primary.disabled' => array('b','o'),
-				'.btn-primary:disabled' => array('b','o'),
-				'.btn-outline-primary' => array('c','o'),
-				'.btn-outline-primary:hover' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
-				'.btn-link' => array('c'),
-				'.dropdown-item.active' => array('b'),
-				'.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
-				'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
+                $output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+            }
+
+            return $output;
+        }
+
+        /**
+         *
+         * @deprecated 0.1.76 Use css_overwrite()
+         *
+         * @param $color_code
+         * @param $compatibility
+         * @param $use_variable
+         *
+         * @return string
+         */
+        public static function css_primary($color_code,$compatibility, $use_variable = false){
+
+            if(!$use_variable){
+                $color_code = sanitize_hex_color($color_code);
+                if(!$color_code){return '';}
+            }
+
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                'a' => array('c'),
+                '.btn-primary' => array('b','o'),
+                '.btn-primary.disabled' => array('b','o'),
+                '.btn-primary:disabled' => array('b','o'),
+                '.btn-outline-primary' => array('c','o'),
+                '.btn-outline-primary:hover' => array('b','o'),
+                '.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
+                '.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
+                '.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
+                '.btn-link' => array('c'),
+                '.dropdown-item.active' => array('b'),
+                '.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
+                '.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
 //				'.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
 //				'.custom-range::-moz-range-thumb' => array('b'),
 //				'.custom-range::-ms-thumb' => array('b'),
-				'.nav-pills .nav-link.active' => array('b'),
-				'.nav-pills .show>.nav-link' => array('b'),
-				'.page-link' => array('c'),
-				'.page-item.active .page-link' => array('b','o'),
-				'.badge-primary' => array('b'),
-				'.alert-primary' => array('b','o'),
-				'.progress-bar' => array('b'),
-				'.list-group-item.active' => array('b','o'),
-				'.bg-primary' => array('b','f'),
-				'.btn-link.btn-primary' => array('c'),
-				'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
-			);
-
-			$important_selectors = array(
-				'.bg-primary' => array('b','f'),
-				'.border-primary' => array('o'),
-				'.text-primary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			// dropdown's
-			$output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
-
-
-			// input states
-			$output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			// page link
-			$output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-			return $output;
-		}
-
-		/**
-		 *
-		 * @deprecated 0.1.76 Use css_overwrite()
-		 *
-		 * @param $color_code
-		 * @param $compatibility
-		 *
-		 * @return string
-		 */
-		public static function css_secondary($color_code,$compatibility){;
-			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
-			/**
-			 * c = color, b = background color, o = border-color, f = fill
-			 */
-			$selectors = array(
-				'.btn-secondary' => array('b','o'),
-				'.btn-secondary.disabled' => array('b','o'),
-				'.btn-secondary:disabled' => array('b','o'),
-				'.btn-outline-secondary' => array('c','o'),
-				'.btn-outline-secondary:hover' => array('b','o'),
-				'.btn-outline-secondary.disabled' => array('c'),
-				'.btn-outline-secondary:disabled' => array('c'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-secondary.dropdown-toggle' => array('b','o'),
-				'.badge-secondary' => array('b'),
-				'.alert-secondary' => array('b','o'),
-				'.btn-link.btn-secondary' => array('c'),
-			);
-
-			$important_selectors = array(
-				'.bg-secondary' => array('b','f'),
-				'.border-secondary' => array('o'),
-				'.text-secondary' => array('c'),
-			);
-
-			$color = array();
-			$color_i = array();
-			$background = array();
-			$background_i = array();
-			$border = array();
-			$border_i = array();
-			$fill = array();
-			$fill_i = array();
-
-			$output = '';
-
-			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
-			}
-
-			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
-			}
-
-			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
-			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
-			}
-
-			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
-			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
-			}
-
-			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
-			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
-			}
-
-			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
-			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
-			}
-
-
-			$prefix = $compatibility ? ".bsui " : "";
-
-			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
-
-			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
-
-			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
-
-
-			// button states
-			$output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
-
-
-			return $output;
-		}
-
-		/**
-		 * Increases or decreases the brightness of a color by a percentage of the current brightness.
-		 *
-		 * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
-		 * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
-		 *
-		 * @return  string
-		 */
-		public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
-			$hexCode = ltrim($hexCode, '#');
-
-			if (strlen($hexCode) == 3) {
-				$hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
-			}
-
-			$hexCode = array_map('hexdec', str_split($hexCode, 2));
-
-			foreach ($hexCode as & $color) {
-				$adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
-				$adjustAmount = ceil($adjustableLimit * $adjustPercent);
-
-				$color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
-			}
-
-			return '#' . implode($hexCode);
-		}
-
-		/**
-		 * Check if we should display examples.
-		 */
-		public function maybe_show_examples(){
-			if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
-				echo "<head>";
-				wp_head();
-				echo "</head>";
-				echo "<body>";
-				echo $this->get_examples();
-				echo "</body>";
-				exit;
-			}
-		}
-
-		/**
-		 * Get developer examples.
-		 *
-		 * @return string
-		 */
-		public function get_examples(){
-			$output = '';
-
-
-			// open form
-			$output .= "<form class='p-5 m-5 border rounded'>";
-
-			// input example
-			$output .= aui()->input(array(
-				'type'  =>  'text',
-				'id'    =>  'text-example',
-				'name'    =>  'text-example',
-				'placeholder'   => 'text placeholder',
-				'title'   => 'Text input example',
-				'value' =>  '',
-				'required'  => false,
-				'help_text' => 'help text',
-				'label' => 'Text input example label'
-			));
-
-			// 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;
-		}
-
-		/**
-		 * Calendar params.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return array Calendar params.
-		 */
-		public static function calendar_params() {
-			$params = array(
-				'month_long_1' => __( 'January', 'ayecode-connect' ),
-				'month_long_2' => __( 'February', 'ayecode-connect' ),
-				'month_long_3' => __( 'March', 'ayecode-connect' ),
-				'month_long_4' => __( 'April', 'ayecode-connect' ),
-				'month_long_5' => __( 'May', 'ayecode-connect' ),
-				'month_long_6' => __( 'June', 'ayecode-connect' ),
-				'month_long_7' => __( 'July', 'ayecode-connect' ),
-				'month_long_8' => __( 'August', 'ayecode-connect' ),
-				'month_long_9' => __( 'September', 'ayecode-connect' ),
-				'month_long_10' => __( 'October', 'ayecode-connect' ),
-				'month_long_11' => __( 'November', 'ayecode-connect' ),
-				'month_long_12' => __( 'December', 'ayecode-connect' ),
-				'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
-				'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
-				'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
-				'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
-				'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
-				'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
-				'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
-				'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
-				'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
-				'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
-				'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
-				'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
-				'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
-				'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
-				'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
-				'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
-				'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
-				'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
-				'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
-				'day_s2_1' => __( 'Su', 'ayecode-connect' ),
-				'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
-				'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
-				'day_s2_4' => __( 'We', 'ayecode-connect' ),
-				'day_s2_5' => __( 'Th', 'ayecode-connect' ),
-				'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
-				'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
-				'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
-				'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
-				'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
-				'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
-				'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
-				'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
-				'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
-				'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
-				'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
-				'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
-				'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
-				'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
-				'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
-				'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
-				'am_lower' => __( 'am', 'ayecode-connect' ),
-				'pm_lower' => __( 'pm', 'ayecode-connect' ),
-				'am_upper' => __( 'AM', 'ayecode-connect' ),
-				'pm_upper' => __( 'PM', 'ayecode-connect' ),
-				'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
-				'time_24hr' => false,
-				'year' => __( 'Year', 'ayecode-connect' ),
-				'hour' => __( 'Hour', 'ayecode-connect' ),
-				'minute' => __( 'Minute', 'ayecode-connect' ),
-				'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
-				'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
-				'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
-				'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
-			);
-
-			return apply_filters( 'ayecode_ui_calendar_params', $params );
-		}
-
-		/**
-		 * Flatpickr calendar localize.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return string Calendar locale.
-		 */
-		public static function flatpickr_locale() {
-			$params = self::calendar_params();
-
-			if ( is_string( $params ) ) {
-				$params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
-			} else {
-				foreach ( (array) $params as $key => $value ) {
-					if ( ! is_scalar( $value ) ) {
-						continue;
-					}
-
-					$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-				}
-			}
+                '.nav-pills .nav-link.active' => array('b'),
+                '.nav-pills .show>.nav-link' => array('b'),
+                '.page-link' => array('c'),
+                '.page-item.active .page-link' => array('b','o'),
+                '.badge-primary' => array('b'),
+                '.alert-primary' => array('b','o'),
+                '.progress-bar' => array('b'),
+                '.list-group-item.active' => array('b','o'),
+                '.bg-primary' => array('b','f'),
+                '.btn-link.btn-primary' => array('c'),
+                '.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
+            );
+
+            $important_selectors = array(
+                '.bg-primary' => array('b','f'),
+                '.border-primary' => array('o'),
+                '.text-primary' => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
+
+            $output = '';
+
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
+
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
+
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
+
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+            }
+
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
+
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
+
+
+            $prefix = $compatibility ? ".bsui " : "";
+
+            // darken
+            $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+
+            // lighten
+            $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
+
 
-			$day_s3 = array();
-			$day_s5 = array();
+            // button states
+            $output .= $prefix ." .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            $output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			for ( $i = 1; $i <= 7; $i ++ ) {
-				$day_s3[] = addslashes( $params[ 'day_s3_' . $i ] );
-				$day_s5[] = addslashes( $params[ 'day_s3_' . $i ] );
-			}
 
-			$month_s = array();
-			$month_long = array();
+            // dropdown's
+            $output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] );
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] );
-			}
 
-			ob_start();
-		if ( 0 ) { ?><script><?php } ?>
+            // input states
+            $output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+            // page link
+            $output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+            return $output;
+        }
+
+        /**
+         *
+         * @deprecated 0.1.76 Use css_overwrite()
+         *
+         * @param $color_code
+         * @param $compatibility
+         *
+         * @return string
+         */
+        public static function css_secondary($color_code,$compatibility){;
+            $color_code = sanitize_hex_color($color_code);
+            if(!$color_code){return '';}
+            /**
+             * c = color, b = background color, o = border-color, f = fill
+             */
+            $selectors = array(
+                '.btn-secondary' => array('b','o'),
+                '.btn-secondary.disabled' => array('b','o'),
+                '.btn-secondary:disabled' => array('b','o'),
+                '.btn-outline-secondary' => array('c','o'),
+                '.btn-outline-secondary:hover' => array('b','o'),
+                '.btn-outline-secondary.disabled' => array('c'),
+                '.btn-outline-secondary:disabled' => array('c'),
+                '.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
+                '.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
+                '.btn-outline-secondary.dropdown-toggle' => array('b','o'),
+                '.badge-secondary' => array('b'),
+                '.alert-secondary' => array('b','o'),
+                '.btn-link.btn-secondary' => array('c'),
+            );
+
+            $important_selectors = array(
+                '.bg-secondary' => array('b','f'),
+                '.border-secondary' => array('o'),
+                '.text-secondary' => array('c'),
+            );
+
+            $color = array();
+            $color_i = array();
+            $background = array();
+            $background_i = array();
+            $border = array();
+            $border_i = array();
+            $fill = array();
+            $fill_i = array();
+
+            $output = '';
+
+            // build rules into each type
+            foreach($selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color[] = $selector;}
+                if(isset($types['b'])){$background[] = $selector;}
+                if(isset($types['o'])){$border[] = $selector;}
+                if(isset($types['f'])){$fill[] = $selector;}
+            }
+
+            // build rules into each type
+            foreach($important_selectors as $selector => $types){
+                $selector = $compatibility ? ".bsui ".$selector : $selector;
+                $types = array_combine($types,$types);
+                if(isset($types['c'])){$color_i[] = $selector;}
+                if(isset($types['b'])){$background_i[] = $selector;}
+                if(isset($types['o'])){$border_i[] = $selector;}
+                if(isset($types['f'])){$fill_i[] = $selector;}
+            }
+
+            // add any color rules
+            if(!empty($color)){
+                $output .= implode(",",$color) . "{color: $color_code;} ";
+            }
+            if(!empty($color_i)){
+                $output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+            }
+
+            // add any background color rules
+            if(!empty($background)){
+                $output .= implode(",",$background) . "{background-color: $color_code;} ";
+            }
+            if(!empty($background_i)){
+                $output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+            }
+
+            // add any border color rules
+            if(!empty($border)){
+                $output .= implode(",",$border) . "{border-color: $color_code;} ";
+            }
+            if(!empty($border_i)){
+                $output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+            }
+
+            // add any fill color rules
+            if(!empty($fill)){
+                $output .= implode(",",$fill) . "{fill: $color_code;} ";
+            }
+            if(!empty($fill_i)){
+                $output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+            }
+
+
+            $prefix = $compatibility ? ".bsui " : "";
+
+            // darken
+            $darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
+            $darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
+            $darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+
+            // lighten
+            $lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+
+            // opacity see https://css-tricks.com/8-digit-hex-codes/
+            $op_25 = $color_code."40"; // 25% opacity
+
+
+            // button states
+            $output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+            $output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+            $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
+            $output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+
+
+            return $output;
+        }
+
+        /**
+         * Increases or decreases the brightness of a color by a percentage of the current brightness.
+         *
+         * @param   string  $hexCode        Supported formats: `#FFF`, `#FFFFFF`, `FFF`, `FFFFFF`
+         * @param   float   $adjustPercent  A number between -1 and 1. E.g. 0.3 = 30% lighter; -0.4 = 40% darker.
+         *
+         * @return  string
+         */
+        public static function css_hex_lighten_darken($hexCode, $adjustPercent) {
+            $hexCode = ltrim($hexCode, '#');
+
+            if (strlen($hexCode) == 3) {
+                $hexCode = $hexCode[0] . $hexCode[0] . $hexCode[1] . $hexCode[1] . $hexCode[2] . $hexCode[2];
+            }
+
+            $hexCode = array_map('hexdec', str_split($hexCode, 2));
+
+            foreach ($hexCode as & $color) {
+                $adjustableLimit = $adjustPercent < 0 ? $color : 255 - $color;
+                $adjustAmount = ceil($adjustableLimit * $adjustPercent);
+
+                $color = str_pad(dechex($color + $adjustAmount), 2, '0', STR_PAD_LEFT);
+            }
+
+            return '#' . implode($hexCode);
+        }
+
+        /**
+         * Check if we should display examples.
+         */
+        public function maybe_show_examples(){
+            if(current_user_can('manage_options') && isset($_REQUEST['preview-aui'])){
+                echo "<head>";
+                wp_head();
+                echo "</head>";
+                echo "<body>";
+                echo $this->get_examples();
+                echo "</body>";
+                exit;
+            }
+        }
+
+        /**
+         * Get developer examples.
+         *
+         * @return string
+         */
+        public function get_examples(){
+            $output = '';
+
+
+            // open form
+            $output .= "<form class='p-5 m-5 border rounded'>";
+
+            // input example
+            $output .= aui()->input(array(
+                'type'  =>  'text',
+                'id'    =>  'text-example',
+                'name'    =>  'text-example',
+                'placeholder'   => 'text placeholder',
+                'title'   => 'Text input example',
+                'value' =>  '',
+                'required'  => false,
+                'help_text' => 'help text',
+                'label' => 'Text input example label'
+            ));
+
+            // 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;
+        }
+
+        /**
+         * Calendar params.
+         *
+         * @since 0.1.44
+         *
+         * @return array Calendar params.
+         */
+        public static function calendar_params() {
+            $params = array(
+                'month_long_1' => __( 'January', 'ayecode-connect' ),
+                'month_long_2' => __( 'February', 'ayecode-connect' ),
+                'month_long_3' => __( 'March', 'ayecode-connect' ),
+                'month_long_4' => __( 'April', 'ayecode-connect' ),
+                'month_long_5' => __( 'May', 'ayecode-connect' ),
+                'month_long_6' => __( 'June', 'ayecode-connect' ),
+                'month_long_7' => __( 'July', 'ayecode-connect' ),
+                'month_long_8' => __( 'August', 'ayecode-connect' ),
+                'month_long_9' => __( 'September', 'ayecode-connect' ),
+                'month_long_10' => __( 'October', 'ayecode-connect' ),
+                'month_long_11' => __( 'November', 'ayecode-connect' ),
+                'month_long_12' => __( 'December', 'ayecode-connect' ),
+                'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
+                'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
+                'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
+                'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
+                'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
+                'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
+                'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
+                'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
+                'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
+                'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
+                'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
+                'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
+                'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
+                'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
+                'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
+                'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
+                'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
+                'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
+                'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
+                'day_s2_1' => __( 'Su', 'ayecode-connect' ),
+                'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
+                'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
+                'day_s2_4' => __( 'We', 'ayecode-connect' ),
+                'day_s2_5' => __( 'Th', 'ayecode-connect' ),
+                'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
+                'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
+                'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
+                'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
+                'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
+                'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
+                'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
+                'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
+                'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
+                'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
+                'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
+                'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
+                'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
+                'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
+                'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
+                'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
+                'am_lower' => __( 'am', 'ayecode-connect' ),
+                'pm_lower' => __( 'pm', 'ayecode-connect' ),
+                'am_upper' => __( 'AM', 'ayecode-connect' ),
+                'pm_upper' => __( 'PM', 'ayecode-connect' ),
+                'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
+                'time_24hr' => false,
+                'year' => __( 'Year', 'ayecode-connect' ),
+                'hour' => __( 'Hour', 'ayecode-connect' ),
+                'minute' => __( 'Minute', 'ayecode-connect' ),
+                'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
+                'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
+                'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
+                'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
+            );
+
+            return apply_filters( 'ayecode_ui_calendar_params', $params );
+        }
+
+        /**
+         * Flatpickr calendar localize.
+         *
+         * @since 0.1.44
+         *
+         * @return string Calendar locale.
+         */
+        public static function flatpickr_locale() {
+            $params = self::calendar_params();
+
+            if ( is_string( $params ) ) {
+                $params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
+            } else {
+                foreach ( (array) $params as $key => $value ) {
+                    if ( ! is_scalar( $value ) ) {
+                        continue;
+                    }
+
+                    $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+                }
+            }
+
+            $day_s3 = array();
+            $day_s5 = array();
+
+            for ( $i = 1; $i <= 7; $i ++ ) {
+                $day_s3[] = addslashes( $params[ 'day_s3_' . $i ] );
+                $day_s5[] = addslashes( $params[ 'day_s3_' . $i ] );
+            }
+
+            $month_s = array();
+            $month_long = array();
+
+            for ( $i = 1; $i <= 12; $i ++ ) {
+                $month_s[] = addslashes( $params[ 'month_s_' . $i ] );
+                $month_long[] = addslashes( $params[ 'month_long_' . $i ] );
+            }
+
+            ob_start();
+        if ( 0 ) { ?><script><?php } ?>
                 {
                     weekdays: {
                         shorthand: ['<?php echo implode( "','", $day_s3 ); ?>'],
@@ -2398,189 +2398,189 @@ 
                 }
 				<?php if ( 0 ) { ?></script><?php } ?>
 			<?php
-			$locale = ob_get_clean();
-
-			return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
-		}
-
-		/**
-		 * Select2 JS params.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return array Select2 JS params.
-		 */
-		public static function select2_params() {
-			$params = array(
-				'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
-				'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
-				'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
-				'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
-				'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
-			);
-
-			return apply_filters( 'ayecode_ui_select2_params', $params );
-		}
-
-		/**
-		 * Select2 JS localize.
-		 *
-		 * @since 0.1.44
-		 *
-		 * @return string Select2 JS locale.
-		 */
-		public static function select2_locale() {
-			$params = self::select2_params();
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
+            $locale = ob_get_clean();
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
-		}
-
-		/**
-		 * Time ago JS localize.
-		 *
-		 * @since 0.1.47
-		 *
-		 * @return string Time ago JS locale.
-		 */
-		public static function timeago_locale() {
-			$params = array(
-				'prefix_ago' => '',
-				'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
-				'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
-				'suffix_after' => '',
-				'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
-				'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
-				'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
-				'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
-				'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
-				'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
-				'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
-				'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
-				'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
-				'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
-				'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
-			);
-
-			$params = apply_filters( 'ayecode_ui_timeago_params', $params );
-
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
-					continue;
-				}
+            return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
+        }
+
+        /**
+         * Select2 JS params.
+         *
+         * @since 0.1.44
+         *
+         * @return array Select2 JS params.
+         */
+        public static function select2_params() {
+            $params = array(
+                'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
+                'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
+                'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
+                'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
+                'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
+                'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
+                'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
+                'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
+            );
+
+            return apply_filters( 'ayecode_ui_select2_params', $params );
+        }
+
+        /**
+         * Select2 JS localize.
+         *
+         * @since 0.1.44
+         *
+         * @return string Select2 JS locale.
+         */
+        public static function select2_locale() {
+            $params = self::select2_params();
+
+            foreach ( (array) $params as $key => $value ) {
+                if ( ! is_scalar( $value ) ) {
+                    continue;
+                }
+
+                $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+            }
+
+            $locale = json_encode( $params );
+
+            return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
+        }
+
+        /**
+         * Time ago JS localize.
+         *
+         * @since 0.1.47
+         *
+         * @return string Time ago JS locale.
+         */
+        public static function timeago_locale() {
+            $params = array(
+                'prefix_ago' => '',
+                'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
+                'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
+                'suffix_after' => '',
+                'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
+                'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
+                'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
+                'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
+                'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
+                'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
+                'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
+                'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
+                'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
+                'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
+                'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
+            );
+
+            $params = apply_filters( 'ayecode_ui_timeago_params', $params );
+
+            foreach ( (array) $params as $key => $value ) {
+                if ( ! is_scalar( $value ) ) {
+                    continue;
+                }
+
+                $params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+            }
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
-			}
-
-			$locale = json_encode( $params );
-
-			return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
-		}
-
-		/**
-		 * JavaScript Minifier
-		 *
-		 * @param $input
-		 *
-		 * @return mixed
-		 */
-		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
-					// Remove white-space(s) outside the string and regex
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
-					// Remove the last semicolon
-					'#;+\}#',
-					// Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
-					'#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
-					// --ibid. From `foo['bar']` to `foo.bar`
-					'#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
-				),
-				array(
-					'$1',
-					'$1$2',
-					'}',
-					'$1$3',
-					'$1.$3'
-				),
-				$input);
-		}
-
-		/**
-		 * Minify CSS
-		 *
-		 * @param $input
-		 *
-		 * @return mixed
-		 */
-		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
-			return preg_replace(
-				array(
-					// Remove comment(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
-					// Remove unused white-space(s)
-					'#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
-					// Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
-					'#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
-					// Replace `:0 0 0 0` with `:0`
-					'#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
-					// Replace `background-position:0` with `background-position:0 0`
-					'#(background-position):0(?=[;\}])#si',
-					// Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
-					'#(?<=[\s:,\-])0+\.(\d+)#s',
-					// Minify string value
-					'#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
-					'#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
-					// Minify HEX color code
-					'#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
-					// Replace `(border|outline):none` with `(border|outline):0`
-					'#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
-					// Remove empty selector(s)
-					'#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
-				),
-				array(
-					'$1',
-					'$1$2$3$4$5$6$7',
-					'$1',
-					':0',
-					'$1:0 0',
-					'.$1',
-					'$1$3',
-					'$1$2$4$5',
-					'$1$2$3',
-					'$1:0',
-					'$1$2'
-				),
-				$input);
-		}
-
-		/**
-		 * Get the conditional fields JavaScript.
-		 *
-		 * @return mixed
-		 */
-		public function conditional_fields_js() {
-			ob_start();
-			?>
+            $locale = json_encode( $params );
+
+            return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
+        }
+
+        /**
+         * JavaScript Minifier
+         *
+         * @param $input
+         *
+         * @return mixed
+         */
+        public static function minify_js($input) {
+            if(trim($input) === "") return $input;
+            return preg_replace(
+                array(
+                    // Remove comment(s)
+                    '#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
+                    // Remove white-space(s) outside the string and regex
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/)|\/(?!\/)[^\n\r]*?\/(?=[\s.,;]|[gimuy]|$))|\s*([!%&*\(\)\-=+\[\]\{\}|;:,.<>?\/])\s*#s',
+                    // Remove the last semicolon
+                    '#;+\}#',
+                    // Minify object attribute(s) except JSON attribute(s). From `{'foo':'bar'}` to `{foo:'bar'}`
+                    '#([\{,])([\'])(\d+|[a-z_][a-z0-9_]*)\2(?=\:)#i',
+                    // --ibid. From `foo['bar']` to `foo.bar`
+                    '#([a-z0-9_\)\]])\[([\'"])([a-z_][a-z0-9_]*)\2\]#i'
+                ),
+                array(
+                    '$1',
+                    '$1$2',
+                    '}',
+                    '$1$3',
+                    '$1.$3'
+                ),
+                $input);
+        }
+
+        /**
+         * Minify CSS
+         *
+         * @param $input
+         *
+         * @return mixed
+         */
+        public static function minify_css($input) {
+            if(trim($input) === "") return $input;
+            return preg_replace(
+                array(
+                    // Remove comment(s)
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')|\/\*(?!\!)(?>.*?\*\/)|^\s*|\s*$#s',
+                    // Remove unused white-space(s)
+                    '#("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\'|\/\*(?>.*?\*\/))|\s*+;\s*+(})\s*+|\s*+([*$~^|]?+=|[{};,>~]|\s(?![0-9\.])|!important\b)\s*+|([[(:])\s++|\s++([])])|\s++(:)\s*+(?!(?>[^{}"\']++|"(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')*+{)|^\s++|\s++\z|(\s)\s+#si',
+                    // Replace `0(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)` with `0`
+                    '#(?<=[\s:])(0)(cm|em|ex|in|mm|pc|pt|px|vh|vw|%)#si',
+                    // Replace `:0 0 0 0` with `:0`
+                    '#:(0\s+0|0\s+0\s+0\s+0)(?=[;\}]|\!important)#i',
+                    // Replace `background-position:0` with `background-position:0 0`
+                    '#(background-position):0(?=[;\}])#si',
+                    // Replace `0.6` with `.6`, but only when preceded by `:`, `,`, `-` or a white-space
+                    '#(?<=[\s:,\-])0+\.(\d+)#s',
+                    // Minify string value
+                    '#(\/\*(?>.*?\*\/))|(?<!content\:)([\'"])([a-z_][a-z0-9\-_]*?)\2(?=[\s\{\}\];,])#si',
+                    '#(\/\*(?>.*?\*\/))|(\burl\()([\'"])([^\s]+?)\3(\))#si',
+                    // Minify HEX color code
+                    '#(?<=[\s:,\-]\#)([a-f0-6]+)\1([a-f0-6]+)\2([a-f0-6]+)\3#i',
+                    // Replace `(border|outline):none` with `(border|outline):0`
+                    '#(?<=[\{;])(border|outline):none(?=[;\}\!])#',
+                    // Remove empty selector(s)
+                    '#(\/\*(?>.*?\*\/))|(^|[\{\}])(?:[^\s\{\}]+)\{\}#s'
+                ),
+                array(
+                    '$1',
+                    '$1$2$3$4$5$6$7',
+                    '$1',
+                    ':0',
+                    '$1:0 0',
+                    '.$1',
+                    '$1$3',
+                    '$1$2$4$5',
+                    '$1$2$3',
+                    '$1:0',
+                    '$1$2'
+                ),
+                $input);
+        }
+
+        /**
+         * Get the conditional fields JavaScript.
+         *
+         * @return mixed
+         */
+        public function conditional_fields_js() {
+            ob_start();
+            ?>
             <script>
                 /**
                  * Conditional Fields
@@ -3101,14 +3101,14 @@ 
 				<?php do_action( 'aui_conditional_fields_js', $this ); ?>
             </script>
 			<?php
-			$output = ob_get_clean();
+            $output = ob_get_clean();
 
-			return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
-		}
-	}
+            return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
+        }
+    }
 
-	/**
-	 * Run the class if found.
-	 */
-	AyeCode_UI_Settings::instance();
+    /**
+     * Run the class if found.
+     */
+    AyeCode_UI_Settings::instance();
 }
\ No newline at end of file

Spacing +743 added lines, -743 removed lines

@@ -12,14 +12,14 @@ 
 /**
  * Bail if we are not in WP.
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
 /**
  * Only add if the class does not already exist.
  */
-if ( ! class_exists( 'AyeCode_UI_Settings' ) ) {
+if (!class_exists('AyeCode_UI_Settings')) {
 
 	/**
 	 * A Class to be able to change settings for Font Awesome.
@@ -99,27 +99,27 @@ 
 		 * @return AyeCode_UI_Settings - Main instance.
 		 */
 		public static function instance() {
-			if ( ! isset( self::$instance ) && ! ( self::$instance instanceof AyeCode_UI_Settings ) ) {
+			if (!isset(self::$instance) && !(self::$instance instanceof AyeCode_UI_Settings)) {
 
 				self::$instance = new AyeCode_UI_Settings;
 
-				add_action( 'init', array( self::$instance, 'init' ) ); // set settings
+				add_action('init', array(self::$instance, 'init')); // set settings
 
-				if ( is_admin() ) {
-					add_action( 'admin_menu', array( self::$instance, 'menu_item' ) );
-					add_action( 'admin_init', array( self::$instance, 'register_settings' ) );
+				if (is_admin()) {
+					add_action('admin_menu', array(self::$instance, 'menu_item'));
+					add_action('admin_init', array(self::$instance, 'register_settings'));
 
 					// Maybe show example page
-					add_action( 'template_redirect', array( self::$instance,'maybe_show_examples' ) );
+					add_action('template_redirect', array(self::$instance, 'maybe_show_examples'));
 
-					if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
-						add_filter( 'sd_aui_colors', array( self::$instance,'sd_aui_colors' ), 10, 3 );
+					if (defined('BLOCKSTRAP_VERSION')) {
+						add_filter('sd_aui_colors', array(self::$instance, 'sd_aui_colors'), 10, 3);
 					}
 				}
 
-				add_action( 'customize_register', array( self::$instance, 'customizer_settings' ));
+				add_action('customize_register', array(self::$instance, 'customizer_settings'));
 
-				do_action( 'ayecode_ui_settings_loaded' );
+				do_action('ayecode_ui_settings_loaded');
 			}
 
 			return self::$instance;
@@ -134,13 +134,13 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function sd_aui_colors( $theme_colors, $include_outlines, $include_branding ){
+		public function sd_aui_colors($theme_colors, $include_outlines, $include_branding) {
 
 
 			$setting = wp_get_global_settings();
 
-			if(!empty($setting['color']['palette']['custom'])){
-				foreach($setting['color']['palette']['custom'] as $color){
+			if (!empty($setting['color']['palette']['custom'])) {
+				foreach ($setting['color']['palette']['custom'] as $color) {
 					$theme_colors[$color['slug']] = esc_attr($color['name']);
 				}
 			}
@@ -151,81 +151,81 @@ 
 		/**
 		 * Setup some constants.
 		 */
-		public function constants(){
-			define( 'AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be" );
-			define( 'AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d' );
-			define( 'AUI_INFO_COLOR_ORIGINAL', '#17a2b8' );
-			define( 'AUI_WARNING_COLOR_ORIGINAL', '#ffc107' );
-			define( 'AUI_DANGER_COLOR_ORIGINAL', '#dc3545' );
-			define( 'AUI_SUCCESS_COLOR_ORIGINAL', '#44c553' );
-			define( 'AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa' );
-			define( 'AUI_DARK_COLOR_ORIGINAL', '#343a40' );
-			define( 'AUI_WHITE_COLOR_ORIGINAL', '#fff' );
-			define( 'AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd' );
-			define( 'AUI_SALMON_COLOR_ORIGINAL', '#ff977a' );
-			define( 'AUI_CYAN_COLOR_ORIGINAL', '#35bdff' );
-			define( 'AUI_GRAY_COLOR_ORIGINAL', '#ced4da' );
-			define( 'AUI_INDIGO_COLOR_ORIGINAL', '#502c6c' );
-			define( 'AUI_ORANGE_COLOR_ORIGINAL', '#orange' );
-			define( 'AUI_BLACK_COLOR_ORIGINAL', '#000' );
+		public function constants() {
+			define('AUI_PRIMARY_COLOR_ORIGINAL', "#1e73be");
+			define('AUI_SECONDARY_COLOR_ORIGINAL', '#6c757d');
+			define('AUI_INFO_COLOR_ORIGINAL', '#17a2b8');
+			define('AUI_WARNING_COLOR_ORIGINAL', '#ffc107');
+			define('AUI_DANGER_COLOR_ORIGINAL', '#dc3545');
+			define('AUI_SUCCESS_COLOR_ORIGINAL', '#44c553');
+			define('AUI_LIGHT_COLOR_ORIGINAL', '#f8f9fa');
+			define('AUI_DARK_COLOR_ORIGINAL', '#343a40');
+			define('AUI_WHITE_COLOR_ORIGINAL', '#fff');
+			define('AUI_PURPLE_COLOR_ORIGINAL', '#ad6edd');
+			define('AUI_SALMON_COLOR_ORIGINAL', '#ff977a');
+			define('AUI_CYAN_COLOR_ORIGINAL', '#35bdff');
+			define('AUI_GRAY_COLOR_ORIGINAL', '#ced4da');
+			define('AUI_INDIGO_COLOR_ORIGINAL', '#502c6c');
+			define('AUI_ORANGE_COLOR_ORIGINAL', '#orange');
+			define('AUI_BLACK_COLOR_ORIGINAL', '#000');
 
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
-				define( 'AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL );
+			if (!defined('AUI_PRIMARY_COLOR')) {
+				define('AUI_PRIMARY_COLOR', AUI_PRIMARY_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_SECONDARY_COLOR' ) ) {
-				define( 'AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL );
+			if (!defined('AUI_SECONDARY_COLOR')) {
+				define('AUI_SECONDARY_COLOR', AUI_SECONDARY_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_INFO_COLOR' ) ) {
-				define( 'AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL );
+			if (!defined('AUI_INFO_COLOR')) {
+				define('AUI_INFO_COLOR', AUI_INFO_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_WARNING_COLOR' ) ) {
-				define( 'AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL );
+			if (!defined('AUI_WARNING_COLOR')) {
+				define('AUI_WARNING_COLOR', AUI_WARNING_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_DANGER_COLOR' ) ) {
-				define( 'AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL );
+			if (!defined('AUI_DANGER_COLOR')) {
+				define('AUI_DANGER_COLOR', AUI_DANGER_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_SUCCESS_COLOR' ) ) {
-				define( 'AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL );
+			if (!defined('AUI_SUCCESS_COLOR')) {
+				define('AUI_SUCCESS_COLOR', AUI_SUCCESS_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_LIGHT_COLOR' ) ) {
-				define( 'AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL );
+			if (!defined('AUI_LIGHT_COLOR')) {
+				define('AUI_LIGHT_COLOR', AUI_LIGHT_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_DARK_COLOR' ) ) {
-				define( 'AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL );
+			if (!defined('AUI_DARK_COLOR')) {
+				define('AUI_DARK_COLOR', AUI_DARK_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_WHITE_COLOR' ) ) {
-				define( 'AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL );
+			if (!defined('AUI_WHITE_COLOR')) {
+				define('AUI_WHITE_COLOR', AUI_WHITE_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_PURPLE_COLOR' ) ) {
-				define( 'AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL );
+			if (!defined('AUI_PURPLE_COLOR')) {
+				define('AUI_PURPLE_COLOR', AUI_PURPLE_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_SALMON_COLOR' ) ) {
-				define( 'AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL );
+			if (!defined('AUI_SALMON_COLOR')) {
+				define('AUI_SALMON_COLOR', AUI_SALMON_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_CYAN_COLOR' ) ) {
-				define( 'AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL );
+			if (!defined('AUI_CYAN_COLOR')) {
+				define('AUI_CYAN_COLOR', AUI_CYAN_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_GRAY_COLOR' ) ) {
-				define( 'AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL );
+			if (!defined('AUI_GRAY_COLOR')) {
+				define('AUI_GRAY_COLOR', AUI_GRAY_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_INDIGO_COLOR' ) ) {
-				define( 'AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL );
+			if (!defined('AUI_INDIGO_COLOR')) {
+				define('AUI_INDIGO_COLOR', AUI_INDIGO_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_ORANGE_COLOR' ) ) {
-				define( 'AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL );
+			if (!defined('AUI_ORANGE_COLOR')) {
+				define('AUI_ORANGE_COLOR', AUI_ORANGE_COLOR_ORIGINAL);
 			}
-			if ( ! defined( 'AUI_BLACK_COLOR' ) ) {
-				define( 'AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL );
+			if (!defined('AUI_BLACK_COLOR')) {
+				define('AUI_BLACK_COLOR', AUI_BLACK_COLOR_ORIGINAL);
 			}
 
 		}
 
-		public static function get_colors( $original = false){
+		public static function get_colors($original = false) {
 
-			if ( ! defined( 'AUI_PRIMARY_COLOR' ) ) {
+			if (!defined('AUI_PRIMARY_COLOR')) {
 				return array();
 			}
-			if ( $original ) {
+			if ($original) {
 				return array(
 					'primary'   => AUI_PRIMARY_COLOR_ORIGINAL,
 					'secondary' => AUI_SECONDARY_COLOR_ORIGINAL,
@@ -273,7 +273,7 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function add_bs5_admin_body_class( $classes = '' ) {
+		public function add_bs5_admin_body_class($classes = '') {
 			$classes .= ' aui_bs5';
 
 			return $classes;
@@ -286,7 +286,7 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function add_bs5_body_class( $classes ) {
+		public function add_bs5_body_class($classes) {
 			$classes[] = 'aui_bs5';
 
 			return $classes;
@@ -299,12 +299,12 @@ 
             global $aui_bs5;
 
 			// Maybe fix settings
-			if ( ! empty( $_REQUEST['aui-fix-admin'] ) && !empty($_REQUEST['nonce']) && wp_verify_nonce( $_REQUEST['nonce'], "aui-fix-admin" ) ) {
-				$db_settings = get_option( 'ayecode-ui-settings' );
-				if ( ! empty( $db_settings ) ) {
+			if (!empty($_REQUEST['aui-fix-admin']) && !empty($_REQUEST['nonce']) && wp_verify_nonce($_REQUEST['nonce'], "aui-fix-admin")) {
+				$db_settings = get_option('ayecode-ui-settings');
+				if (!empty($db_settings)) {
 					$db_settings['css_backend'] = 'compatibility';
 					$db_settings['js_backend'] = 'core-popper';
-					update_option( 'ayecode-ui-settings', $db_settings );
+					update_option('ayecode-ui-settings', $db_settings);
 					wp_safe_redirect(admin_url("options-general.php?page=ayecode-ui-settings&updated=true"));
 				}
 			}
@@ -316,10 +316,10 @@ 
             // define the version
 			$aui_bs5 = $this->settings['bs_ver'] === '5';
 
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs-conversion.php' );
-				add_filter( 'admin_body_class', array( $this, 'add_bs5_admin_body_class' ), 99, 1 );
-				add_filter( 'body_class', array( $this, 'add_bs5_body_class' ) );
+			if ($aui_bs5) {
+				include_once(dirname(__FILE__) . '/inc/bs-conversion.php');
+				add_filter('admin_body_class', array($this, 'add_bs5_admin_body_class'), 99, 1);
+				add_filter('body_class', array($this, 'add_bs5_body_class'));
 			}
 
 			/**
@@ -327,32 +327,32 @@ 
 			 *
 			 * We load super early in case there is a theme version that might change the colors
 			 */
-			if ( $this->settings['css'] ) {
+			if ($this->settings['css']) {
 				$priority = $this->is_bs3_compat() ? 100 : 1;
                 $priority = $aui_bs5 ? 10 : $priority;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_style' ), $priority );
+				add_action('wp_enqueue_scripts', array($this, 'enqueue_style'), $priority);
 			}
-			if ( $this->settings['css_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_style' ), 1 );
+			if ($this->settings['css_backend'] && $this->load_admin_scripts()) {
+				add_action('admin_enqueue_scripts', array($this, 'enqueue_style'), 1);
 			}
 
 			// maybe load JS
-			if ( $this->settings['js'] ) {
+			if ($this->settings['js']) {
 				$priority = $this->is_bs3_compat() ? 100 : 1;
-				add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ), $priority );
+				add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'), $priority);
 			}
-			if ( $this->settings['js_backend'] && $this->load_admin_scripts() ) {
-				add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ), 1 );
+			if ($this->settings['js_backend'] && $this->load_admin_scripts()) {
+				add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'), 1);
 			}
 
 			// Maybe set the HTML font size
-			if ( $this->settings['html_font_size'] ) {
-				add_action( 'wp_footer', array( $this, 'html_font_size' ), 10 );
+			if ($this->settings['html_font_size']) {
+				add_action('wp_footer', array($this, 'html_font_size'), 10);
 			}
 
 			// Maybe show backend style error
-			if( $this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper' ){
-				add_action( 'admin_notices', array( $this, 'show_admin_style_notice' ) );
+			if ($this->settings['css_backend'] != 'compatibility' || $this->settings['js_backend'] != 'core-popper') {
+				add_action('admin_notices', array($this, 'show_admin_style_notice'));
 			}
 
 		}
@@ -360,11 +360,11 @@ 
 		/**
 		 * Show admin notice if backend scripts not loaded.
 		 */
-		public function show_admin_style_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=".wp_create_nonce('aui-fix-admin'));
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">Fix Now</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI is disable or set wrong.')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'.$message.'</p></div>';
+		public function show_admin_style_notice() {
+			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings&aui-fix-admin=true&nonce=" . wp_create_nonce('aui-fix-admin'));
+			$button = '<a href="' . esc_url($fix_url) . '" class="button-primary">Fix Now</a>';
+			$message = __('<b>Style Issue:</b> AyeCode UI is disable or set wrong.') . " " . $button;
+			echo '<div class="notice notice-error aui-settings-error-notice"><p>' . $message . '</p></div>';
 		}
 
 		/**
@@ -372,14 +372,14 @@ 
 		 *
 		 * @return bool
 		 */
-		public function load_admin_scripts(){
+		public function load_admin_scripts() {
 			$result = true;
 
 			// check if specifically disabled
-			if(!empty($this->settings['disable_admin'])){
-				$url_parts = explode("\n",$this->settings['disable_admin']);
-				foreach($url_parts as $part){
-					if( strpos($_SERVER['REQUEST_URI'], trim($part)) !== false ){
+			if (!empty($this->settings['disable_admin'])) {
+				$url_parts = explode("\n", $this->settings['disable_admin']);
+				foreach ($url_parts as $part) {
+					if (strpos($_SERVER['REQUEST_URI'], trim($part)) !== false) {
 						return false; // return early, no point checking further
 					}
 				}
@@ -391,9 +391,9 @@ 
 		/**
 		 * Add a html font size to the footer.
 		 */
-		public function html_font_size(){
+		public function html_font_size() {
 			$this->settings = $this->get_settings();
-			echo "<style>html{font-size:".absint($this->settings['html_font_size'])."px;}</style>";
+			echo "<style>html{font-size:" . absint($this->settings['html_font_size']) . "px;}</style>";
 		}
 
 		/**
@@ -401,11 +401,11 @@ 
 		 *
 		 * @return bool
 		 */
-		public function is_aui_screen(){
+		public function is_aui_screen() {
 //			echo '###';exit;
 			$load = false;
 			// check if we should load or not
-			if ( is_admin() ) {
+			if (is_admin()) {
 				// Only enable on set pages
 				$aui_screens = array(
 					'page',
@@ -417,26 +417,26 @@ 
 					'ayecode-ui-settings',
 					'site-editor'
 				);
-				$screen_ids = apply_filters( 'aui_screen_ids', $aui_screens );
+				$screen_ids = apply_filters('aui_screen_ids', $aui_screens);
 
 				$screen = get_current_screen();
 
 //				echo '###'.$screen->id;
 
 				// check if we are on a AUI screen
-				if ( $screen && in_array( $screen->id, $screen_ids ) ) {
+				if ($screen && in_array($screen->id, $screen_ids)) {
 					$load = true;
 				}
 
 				//load for widget previews in WP 5.8
-				if( !empty($_REQUEST['legacy-widget-preview'])){
+				if (!empty($_REQUEST['legacy-widget-preview'])) {
 					$load = true;
 				}
 			}
 
 
 
-			return apply_filters( 'aui_load_on_admin' , $load );
+			return apply_filters('aui_load_on_admin', $load);
 		}
 
 		/**
@@ -445,7 +445,7 @@ 
 		 * @return bool
 		 */
 		public static function is_block_theme() {
-			if ( function_exists( 'wp_is_block_theme' && wp_is_block_theme() ) ) {
+			if (function_exists('wp_is_block_theme' && wp_is_block_theme())) {
 				return true;
 			}
 
@@ -460,40 +460,40 @@ 
 
             $load_fse = false;
 
-			if( is_admin() && !$this->is_aui_screen()){
+			if (is_admin() && !$this->is_aui_screen()) {
 				// don't add wp-admin scripts if not requested to
-			}else{
+			} else {
 				$css_setting = current_action() == 'wp_enqueue_scripts' ? 'css' : 'css_backend';
 
-				$rtl = is_rtl() && ! $aui_bs5 ? '-rtl' : '';
+				$rtl = is_rtl() && !$aui_bs5 ? '-rtl' : '';
 
                 $bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
-				if($this->settings[$css_setting]){
-					$compatibility = $this->settings[$css_setting]=='core' ? false : true;
-					$url = $this->settings[$css_setting]=='core' ? $this->url.'assets'.$bs_ver.'/css/ayecode-ui'.$rtl.'.css' : $this->url.'assets'.$bs_ver.'/css/ayecode-ui-compatibility'.$rtl.'.css';
+				if ($this->settings[$css_setting]) {
+					$compatibility = $this->settings[$css_setting] == 'core' ? false : true;
+					$url = $this->settings[$css_setting] == 'core' ? $this->url . 'assets' . $bs_ver . '/css/ayecode-ui' . $rtl . '.css' : $this->url . 'assets' . $bs_ver . '/css/ayecode-ui-compatibility' . $rtl . '.css';
 
 
 
-					wp_register_style( 'ayecode-ui', $url, array(), $this->version );
-					wp_enqueue_style( 'ayecode-ui' );
+					wp_register_style('ayecode-ui', $url, array(), $this->version);
+					wp_enqueue_style('ayecode-ui');
 
-					$current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
+					$current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
 
 //					if ( is_admin() && !empty($_REQUEST['postType']) ) {
-					if ( is_admin() && ( !empty($_REQUEST['postType']) || $current_screen->is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
-						$url = $this->url.'assets'.$bs_ver.'/css/ayecode-ui-fse.css';
-						wp_register_style( 'ayecode-ui-fse', $url, array(), $this->version );
-						wp_enqueue_style( 'ayecode-ui-fse' );
+					if (is_admin() && (!empty($_REQUEST['postType']) || $current_screen->is_block_editor()) && (defined('BLOCKSTRAP_VERSION') || defined('AUI_FSE'))) {
+						$url = $this->url . 'assets' . $bs_ver . '/css/ayecode-ui-fse.css';
+						wp_register_style('ayecode-ui-fse', $url, array(), $this->version);
+						wp_enqueue_style('ayecode-ui-fse');
 						$load_fse = true;
 					}
 
 
 					// flatpickr
-					wp_register_style( 'flatpickr', $this->url.'assets'.$bs_ver.'/css/flatpickr.min.css', array(), $this->version );
+					wp_register_style('flatpickr', $this->url . 'assets' . $bs_ver . '/css/flatpickr.min.css', array(), $this->version);
 
 					// fix some wp-admin issues
-					if(is_admin()){
+					if (is_admin()) {
 						$custom_css = "
                 body{
                     background-color: #f1f1f1;
@@ -541,14 +541,14 @@ 
 						    padding: 0;
 						}
 					";
-						wp_add_inline_style( 'ayecode-ui', $custom_css );
+						wp_add_inline_style('ayecode-ui', $custom_css);
 					}
 
 					// custom changes
-					if ( $load_fse ) {
-						wp_add_inline_style( 'ayecode-ui-fse', self::custom_css($compatibility) );
-					}else{
-						wp_add_inline_style( 'ayecode-ui', self::custom_css($compatibility) );
+					if ($load_fse) {
+						wp_add_inline_style('ayecode-ui-fse', self::custom_css($compatibility));
+					} else {
+						wp_add_inline_style('ayecode-ui', self::custom_css($compatibility));
 
 					}
 
@@ -569,10 +569,10 @@ 
 			$flatpickr_locale = self::flatpickr_locale();
 
 			ob_start();
-			if ( $aui_bs5 ) {
-				include_once( dirname( __FILE__ ) . '/inc/bs5-js.php' );
-			}else{
-				include_once( dirname( __FILE__ ) . '/inc/bs4-js.php' );
+			if ($aui_bs5) {
+				include_once(dirname(__FILE__) . '/inc/bs5-js.php');
+			} else {
+				include_once(dirname(__FILE__) . '/inc/bs4-js.php');
             }
 
 			$output = ob_get_clean();
@@ -580,10 +580,10 @@ 
 			/*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', self::minify_js($output) );
+			), '', self::minify_js($output));
 		}
 
 
@@ -597,13 +597,13 @@ 
 			ob_start();
 			?>
             <script>
-				<?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
+				<?php if (defined('FUSION_BUILDER_VERSION')) { ?>
                 /* With Avada builder */
 
 				<?php } ?>
             </script>
 			<?php
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
 			), '', ob_get_clean());
@@ -614,7 +614,7 @@ 
 		 *
 		 * If this remains small then its best to use this than to add another JS file.
 		 */
-		public function inline_script_file_browser(){
+		public function inline_script_file_browser() {
 			ob_start();
 			?>
             <script>
@@ -629,10 +629,10 @@ 
 			/*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
+			return str_replace(array(
 				'<script>',
 				'</script>'
-			), '', $output );
+			), '', $output);
 		}
 
 		/**
@@ -640,59 +640,59 @@ 
 		 */
 		public function enqueue_scripts() {
 
-			if( is_admin() && !$this->is_aui_screen()){
+			if (is_admin() && !$this->is_aui_screen()) {
 				// don't add wp-admin scripts if not requested to
-			}else {
+			} else {
 
 				$js_setting = current_action() == 'wp_enqueue_scripts' ? 'js' : 'js_backend';
 
 				$bs_ver = $this->settings['bs_ver'] == '5' ? '-v5' : '';
 
 				// select2
-				wp_register_script( 'select2', $this->url . 'assets/js/select2.min.js', array( 'jquery' ), $this->select2_version );
+				wp_register_script('select2', $this->url . 'assets/js/select2.min.js', array('jquery'), $this->select2_version);
 
 				// flatpickr
-				wp_register_script( 'flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version );
+				wp_register_script('flatpickr', $this->url . 'assets/js/flatpickr.min.js', array(), $this->version);
 
 				// iconpicker
-				if ( defined( 'FAS_ICONPICKER_JS_URL' ) ) {
-					wp_register_script( 'iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version );
-				}else{
-					wp_register_script( 'iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version );
+				if (defined('FAS_ICONPICKER_JS_URL')) {
+					wp_register_script('iconpicker', FAS_ICONPICKER_JS_URL, array(), $this->version);
+				} else {
+					wp_register_script('iconpicker', $this->url . 'assets/js/fa-iconpicker.min.js', array(), $this->version);
 				}
 
 				// Bootstrap file browser
-				wp_register_script( 'aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array( 'jquery' ), $this->select2_version );
-				wp_add_inline_script( 'aui-custom-file-input', $this->inline_script_file_browser() );
+				wp_register_script('aui-custom-file-input', $url = $this->url . 'assets/js/bs-custom-file-input.min.js', array('jquery'), $this->select2_version);
+				wp_add_inline_script('aui-custom-file-input', $this->inline_script_file_browser());
 
 				$load_inline = false;
 
-				if ( $this->settings[ $js_setting ] == 'core-popper' ) {
+				if ($this->settings[$js_setting] == 'core-popper') {
 					// Bootstrap bundle
 					$url = $this->url . 'assets' . $bs_ver . '/js/bootstrap.bundle.min.js';
-					wp_register_script( 'bootstrap-js-bundle', $url, array(
+					wp_register_script('bootstrap-js-bundle', $url, array(
 						'select2',
 						'jquery'
-					), $this->version, $this->is_bs3_compat() );
+					), $this->version, $this->is_bs3_compat());
 					// if in admin then add to footer for compatibility.
-					is_admin() ? wp_enqueue_script( 'bootstrap-js-bundle', '', null, null, true ) : wp_enqueue_script( 'bootstrap-js-bundle' );
+					is_admin() ? wp_enqueue_script('bootstrap-js-bundle', '', null, null, true) : wp_enqueue_script('bootstrap-js-bundle');
 					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-js-bundle', $script );
-				} elseif ( $this->settings[ $js_setting ] == 'popper' ) {
+					wp_add_inline_script('bootstrap-js-bundle', $script);
+				} elseif ($this->settings[$js_setting] == 'popper') {
 					$url = $this->url . 'assets/js/popper.min.js'; //@todo we need to update this to bs5
-					wp_register_script( 'bootstrap-js-popper', $url, array( 'select2', 'jquery' ), $this->version );
-					wp_enqueue_script( 'bootstrap-js-popper' );
+					wp_register_script('bootstrap-js-popper', $url, array('select2', 'jquery'), $this->version);
+					wp_enqueue_script('bootstrap-js-popper');
 					$load_inline = true;
 				} else {
 					$load_inline = true;
 				}
 
 				// Load needed inline scripts by faking the loading of a script if the main script is not being loaded
-				if ( $load_inline ) {
-					wp_register_script( 'bootstrap-dummy', '', array( 'select2', 'jquery' ) );
-					wp_enqueue_script( 'bootstrap-dummy' );
+				if ($load_inline) {
+					wp_register_script('bootstrap-dummy', '', array('select2', 'jquery'));
+					wp_enqueue_script('bootstrap-dummy');
 					$script = $this->inline_script();
-					wp_add_inline_script( 'bootstrap-dummy', $script );
+					wp_add_inline_script('bootstrap-dummy', $script);
 				}
 			}
 
@@ -701,17 +701,17 @@ 
 		/**
 		 * Enqueue flatpickr if called.
 		 */
-		public function enqueue_flatpickr(){
-			wp_enqueue_style( 'flatpickr' );
-			wp_enqueue_script( 'flatpickr' );
+		public function enqueue_flatpickr() {
+			wp_enqueue_style('flatpickr');
+			wp_enqueue_script('flatpickr');
 		}
 
 		/**
 		 * Enqueue iconpicker if called.
 		 */
-		public function enqueue_iconpicker(){
-			wp_enqueue_style( 'iconpicker' );
-			wp_enqueue_script( 'iconpicker' );
+		public function enqueue_iconpicker() {
+			wp_enqueue_style('iconpicker');
+			wp_enqueue_script('iconpicker');
 		}
 
 		/**
@@ -720,19 +720,19 @@ 
 		 * @return string
 		 */
 		public function get_url() {
-			$content_dir = wp_normalize_path( untrailingslashit( WP_CONTENT_DIR ) );
-			$content_url = untrailingslashit( WP_CONTENT_URL );
+			$content_dir = wp_normalize_path(untrailingslashit(WP_CONTENT_DIR));
+			$content_url = untrailingslashit(WP_CONTENT_URL);
 
 			// Replace http:// to https://.
-			if ( strpos( $content_url, 'http://' ) === 0 && strpos( plugins_url(), 'https://' ) === 0 ) {
-				$content_url = str_replace( 'http://', 'https://', $content_url );
+			if (strpos($content_url, 'http://') === 0 && strpos(plugins_url(), 'https://') === 0) {
+				$content_url = str_replace('http://', 'https://', $content_url);
 			}
 
 			// Check if we are inside a plugin
-			$file_dir = str_replace( "/includes", "", wp_normalize_path( dirname( __FILE__ ) ) );
-			$url = str_replace( $content_dir, $content_url, $file_dir );
+			$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
+			$url = str_replace($content_dir, $content_url, $file_dir);
 
-			return trailingslashit( $url );
+			return trailingslashit($url);
 		}
 
 		/**
@@ -744,15 +744,15 @@ 
 
 			$url = '';
 			// check if we are inside a plugin
-			$file_dir = str_replace( "/includes","", wp_normalize_path( dirname( __FILE__ ) ) );
+			$file_dir = str_replace("/includes", "", wp_normalize_path(dirname(__FILE__)));
 
 			// add check in-case user has changed wp-content dir name.
 			$wp_content_folder_name = basename(WP_CONTENT_DIR);
-			$dir_parts = explode("/$wp_content_folder_name/",$file_dir);
-			$url_parts = explode("/$wp_content_folder_name/",plugins_url());
+			$dir_parts = explode("/$wp_content_folder_name/", $file_dir);
+			$url_parts = explode("/$wp_content_folder_name/", plugins_url());
 
-			if(!empty($url_parts[0]) && !empty($dir_parts[1])){
-				$url = trailingslashit( $url_parts[0]."/$wp_content_folder_name/".$dir_parts[1] );
+			if (!empty($url_parts[0]) && !empty($dir_parts[1])) {
+				$url = trailingslashit($url_parts[0] . "/$wp_content_folder_name/" . $dir_parts[1]);
 			}
 
 			return $url;
@@ -762,7 +762,7 @@ 
 		 * Register the database settings with WordPress.
 		 */
 		public function register_settings() {
-			register_setting( 'ayecode-ui-settings', 'ayecode-ui-settings' );
+			register_setting('ayecode-ui-settings', 'ayecode-ui-settings');
 		}
 
 		/**
@@ -771,10 +771,10 @@ 
 		 */
 		public function menu_item() {
 			$menu_function = 'add' . '_' . 'options' . '_' . 'page'; // won't pass theme check if function name present in theme
-			call_user_func( $menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
+			call_user_func($menu_function, $this->name, $this->name, 'manage_options', 'ayecode-ui-settings', array(
 				$this,
 				'settings_page'
-			) );
+			));
 		}
 
 		/**
@@ -782,7 +782,7 @@ 
 		 *
 		 * @return array
 		 */
-		public function theme_js_settings(){
+		public function theme_js_settings() {
 			return array(
 				'ayetheme' => 'popper',
 				'listimia' => 'required',
@@ -811,11 +811,11 @@ 
 		/**
 		 * Show admin notice if backend scripts not loaded.
 		 */
-		public function show_admin_version_notice(){
-			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings" );
-			$button = '<a href="'.esc_url($fix_url).'" class="button-primary">View Settings</a>';
-			$message = __( '<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)')." " .$button;
-			echo '<div class="notice notice-error aui-settings-error-notice"><p>'.$message.'</p></div>';
+		public function show_admin_version_notice() {
+			$fix_url = admin_url("options-general.php?page=ayecode-ui-settings");
+			$button = '<a href="' . esc_url($fix_url) . '" class="button-primary">View Settings</a>';
+			$message = __('<b>Style Issue:</b> AyeCode UI has changed its default version from v4 to v5, if you notice unwanted style changes, please revert to v4 (saving the settings page will remove this notice)') . " " . $button;
+			echo '<div class="notice notice-error aui-settings-error-notice"><p>' . $message . '</p></div>';
 		}
 
 		/**
@@ -825,32 +825,32 @@ 
 		 */
 		public function get_settings() {
 
-			$db_settings = get_option( 'ayecode-ui-settings' );
+			$db_settings = get_option('ayecode-ui-settings');
 
             // Maybe show default version notice
-			$site_install_date = new DateTime( self::get_site_install_date() );
+			$site_install_date = new DateTime(self::get_site_install_date());
 			$switch_over_date = new DateTime("2024-02-01");
-			if ( empty( $db_settings ) && $site_install_date < $switch_over_date ) {
-				add_action( 'admin_notices', array( $this, 'show_admin_version_notice' ) );
+			if (empty($db_settings) && $site_install_date < $switch_over_date) {
+				add_action('admin_notices', array($this, 'show_admin_version_notice'));
 			}
 
 			$js_default = 'core-popper';
 			$js_default_backend = $js_default;
 
 			// maybe set defaults (if no settings set)
-			if(empty($db_settings)){
-				$active_theme = strtolower( get_template() ); // active parent theme.
+			if (empty($db_settings)) {
+				$active_theme = strtolower(get_template()); // active parent theme.
 				$theme_js_settings = self::theme_js_settings();
-				if(isset($theme_js_settings[$active_theme])){
+				if (isset($theme_js_settings[$active_theme])) {
 					$js_default = $theme_js_settings[$active_theme];
-					$js_default_backend = isset($theme_js_settings[$active_theme."_backend"]) ? $theme_js_settings[$active_theme."_backend"] : $js_default;
+					$js_default_backend = isset($theme_js_settings[$active_theme . "_backend"]) ? $theme_js_settings[$active_theme . "_backend"] : $js_default;
 				}
 			}
 
 			/**
 			 * Filter the default settings.
 			 */
-			$defaults = apply_filters( 'ayecode-ui-default-settings', array(
+			$defaults = apply_filters('ayecode-ui-default-settings', array(
 				'css'            => 'compatibility', // core, compatibility
 				'js'             => $js_default, // js to load, core-popper, popper
 				'html_font_size' => '16', // js to load, core-popper, popper
@@ -858,16 +858,16 @@ 
 				'js_backend'     => $js_default_backend, // js to load, core-popper, popper
 				'disable_admin'  => '', // URL snippets to disable loading on admin
                 'bs_ver'         => '5', // The default bootstrap version to sue by default
-			), $db_settings );
+			), $db_settings);
 
-			$settings = wp_parse_args( $db_settings, $defaults );
+			$settings = wp_parse_args($db_settings, $defaults);
 
 			/**
 			 * Filter the Bootstrap settings.
 			 *
 			 * @todo if we add this filer people might use it and then it defeats the purpose of this class :/
 			 */
-			return $this->settings = apply_filters( 'ayecode-ui-settings', $settings, $db_settings, $defaults );
+			return $this->settings = apply_filters('ayecode-ui-settings', $settings, $db_settings, $defaults);
 		}
 
 
@@ -875,109 +875,109 @@ 
 		 * The settings page html output.
 		 */
 		public function settings_page() {
-			if ( ! current_user_can( 'manage_options' ) ) {
-				wp_die( __( 'You do not have sufficient permissions to access this page.', 'ayecode-connect' ) );
+			if (!current_user_can('manage_options')) {
+				wp_die(__('You do not have sufficient permissions to access this page.', 'ayecode-connect'));
 			}
-            $overrides = apply_filters( 'ayecode-ui-settings', array(), array(), array() );
+            $overrides = apply_filters('ayecode-ui-settings', array(), array(), array());
 
 			?>
             <div class="wrap">
                 <h1><?php echo $this->name; ?></h1>
-                <p><?php echo apply_filters( 'ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'ayecode-connect' ) );?></p>
+                <p><?php echo apply_filters('ayecode-ui-settings-message', __("Here you can adjust settings if you are having compatibility issues.", 'ayecode-connect')); ?></p>
                 <form method="post" action="options.php">
 					<?php
-					settings_fields( 'ayecode-ui-settings' );
-					do_settings_sections( 'ayecode-ui-settings' );
+					settings_fields('ayecode-ui-settings');
+					do_settings_sections('ayecode-ui-settings');
 					?>
 
-                    <h2><?php _e( 'BootStrap Version', 'ayecode-connect' ); ?></h2>
-                    <p><?php echo apply_filters( 'ayecode-ui-version-settings-message', __("V5 is recommended, however if you have another plugin installed using v4, you may need to use v4 also.", 'ayecode-connect' ) );?></p>
+                    <h2><?php _e('BootStrap Version', 'ayecode-connect'); ?></h2>
+                    <p><?php echo apply_filters('ayecode-ui-version-settings-message', __("V5 is recommended, however if you have another plugin installed using v4, you may need to use v4 also.", 'ayecode-connect')); ?></p>
 	                <div class="bsui"><?php
-	                if ( ! empty( $overrides ) ) {
+	                if (!empty($overrides)) {
 		                echo aui()->alert(array(
 			                'type'=> 'info',
-			                'content'=> __("Some options are disabled as your current theme is overriding them.", 'ayecode-connect' )
+			                'content'=> __("Some options are disabled as your current theme is overriding them.", 'ayecode-connect')
 		                ));
 	                }
 	                ?>
                     </div>
                     <table class="form-table wpbs-table-version-settings">
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-css"><?php _e( 'Version', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-css"><?php _e('Version', 'ayecode-connect'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[bs_ver]" id="wpbs-css" <?php echo !empty($overrides['bs_ver']) ? 'disabled' : ''; ?>>
-                                    <option	value="5" <?php selected( $this->settings['bs_ver'], '5' ); ?>><?php _e( 'v5 (recommended)', 'ayecode-connect' ); ?></option>
-                                    <option value="4" <?php selected( $this->settings['bs_ver'], '4' ); ?>><?php _e( 'v4 (legacy)', 'ayecode-connect' ); ?></option>
+                                    <option	value="5" <?php selected($this->settings['bs_ver'], '5'); ?>><?php _e('v5 (recommended)', 'ayecode-connect'); ?></option>
+                                    <option value="4" <?php selected($this->settings['bs_ver'], '4'); ?>><?php _e('v4 (legacy)', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
                     </table>
 
-                    <h2><?php _e( 'Frontend', 'ayecode-connect' ); ?></h2>
+                    <h2><?php _e('Frontend', 'ayecode-connect'); ?></h2>
                     <table class="form-table wpbs-table-settings">
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-css"><?php _e( 'Load CSS', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-css"><?php _e('Load CSS', 'ayecode-connect'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[css]" id="wpbs-css" <?php echo !empty($overrides['css']) ? 'disabled' : ''; ?>>
-                                    <option	value="compatibility" <?php selected( $this->settings['css'], 'compatibility' ); ?>><?php _e( 'Compatibility Mode (default)', 'ayecode-connect' ); ?></option>
-                                    <option value="core" <?php selected( $this->settings['css'], 'core' ); ?>><?php _e( 'Full Mode', 'ayecode-connect' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['css'], '' ); ?>><?php _e( 'Disabled', 'ayecode-connect' ); ?></option>
+                                    <option	value="compatibility" <?php selected($this->settings['css'], 'compatibility'); ?>><?php _e('Compatibility Mode (default)', 'ayecode-connect'); ?></option>
+                                    <option value="core" <?php selected($this->settings['css'], 'core'); ?>><?php _e('Full Mode', 'ayecode-connect'); ?></option>
+                                    <option	value="" <?php selected($this->settings['css'], ''); ?>><?php _e('Disabled', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-js"><?php _e( 'Load JS', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-js"><?php _e('Load JS', 'ayecode-connect'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[js]" id="wpbs-js" <?php echo !empty($overrides['js']) ? 'disabled' : ''; ?>>
-                                    <option	value="core-popper" <?php selected( $this->settings['js'], 'core-popper' ); ?>><?php _e( 'Core + Popper (default)', 'ayecode-connect' ); ?></option>
-                                    <option value="popper" <?php selected( $this->settings['js'], 'popper' ); ?>><?php _e( 'Popper', 'ayecode-connect' ); ?></option>
-                                    <option value="required" <?php selected( $this->settings['js'], 'required' ); ?>><?php _e( 'Required functions only', 'ayecode-connect' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['js'], '' ); ?>><?php _e( 'Disabled (not recommended)', 'ayecode-connect' ); ?></option>
+                                    <option	value="core-popper" <?php selected($this->settings['js'], 'core-popper'); ?>><?php _e('Core + Popper (default)', 'ayecode-connect'); ?></option>
+                                    <option value="popper" <?php selected($this->settings['js'], 'popper'); ?>><?php _e('Popper', 'ayecode-connect'); ?></option>
+                                    <option value="required" <?php selected($this->settings['js'], 'required'); ?>><?php _e('Required functions only', 'ayecode-connect'); ?></option>
+                                    <option	value="" <?php selected($this->settings['js'], ''); ?>><?php _e('Disabled (not recommended)', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-font_size"><?php _e( 'HTML Font Size (px)', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-font_size"><?php _e('HTML Font Size (px)', 'ayecode-connect'); ?></label></th>
                             <td>
-                                <input type="number" name="ayecode-ui-settings[html_font_size]" id="wpbs-font_size" value="<?php echo absint( $this->settings['html_font_size']); ?>" placeholder="16" <?php echo !empty($overrides['html_font_size']) ? 'disabled' : ''; ?> />
-                                <p class="description" ><?php _e("Our font sizing is rem (responsive based) here you can set the html font size in-case your theme is setting it too low.", 'ayecode-connect' );?></p>
+                                <input type="number" name="ayecode-ui-settings[html_font_size]" id="wpbs-font_size" value="<?php echo absint($this->settings['html_font_size']); ?>" placeholder="16" <?php echo !empty($overrides['html_font_size']) ? 'disabled' : ''; ?> />
+                                <p class="description" ><?php _e("Our font sizing is rem (responsive based) here you can set the html font size in-case your theme is setting it too low.", 'ayecode-connect'); ?></p>
                             </td>
                         </tr>
 
                     </table>
 
-                    <h2><?php _e( 'Backend', 'ayecode-connect' ); ?> (wp-admin)</h2>
+                    <h2><?php _e('Backend', 'ayecode-connect'); ?> (wp-admin)</h2>
                     <table class="form-table wpbs-table-settings">
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-css-admin"><?php _e( 'Load CSS', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-css-admin"><?php _e('Load CSS', 'ayecode-connect'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[css_backend]" id="wpbs-css-admin" <?php echo !empty($overrides['css_backend']) ? 'disabled' : ''; ?>>
-                                    <option	value="compatibility" <?php selected( $this->settings['css_backend'], 'compatibility' ); ?>><?php _e( 'Compatibility Mode (default)', 'ayecode-connect' ); ?></option>
-                                    <option value="core" <?php selected( $this->settings['css_backend'], 'core' ); ?>><?php _e( 'Full Mode (will cause style issues)', 'ayecode-connect' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['css_backend'], '' ); ?>><?php _e( 'Disabled', 'ayecode-connect' ); ?></option>
+                                    <option	value="compatibility" <?php selected($this->settings['css_backend'], 'compatibility'); ?>><?php _e('Compatibility Mode (default)', 'ayecode-connect'); ?></option>
+                                    <option value="core" <?php selected($this->settings['css_backend'], 'core'); ?>><?php _e('Full Mode (will cause style issues)', 'ayecode-connect'); ?></option>
+                                    <option	value="" <?php selected($this->settings['css_backend'], ''); ?>><?php _e('Disabled', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-js-admin"><?php _e( 'Load JS', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-js-admin"><?php _e('Load JS', 'ayecode-connect'); ?></label></th>
                             <td>
                                 <select name="ayecode-ui-settings[js_backend]" id="wpbs-js-admin" <?php echo !empty($overrides['js_backend']) ? 'disabled' : ''; ?>>
-                                    <option	value="core-popper" <?php selected( $this->settings['js_backend'], 'core-popper' ); ?>><?php _e( 'Core + Popper (default)', 'ayecode-connect' ); ?></option>
-                                    <option value="popper" <?php selected( $this->settings['js_backend'], 'popper' ); ?>><?php _e( 'Popper', 'ayecode-connect' ); ?></option>
-                                    <option value="required" <?php selected( $this->settings['js_backend'], 'required' ); ?>><?php _e( 'Required functions only', 'ayecode-connect' ); ?></option>
-                                    <option	value="" <?php selected( $this->settings['js_backend'], '' ); ?>><?php _e( 'Disabled (not recommended)', 'ayecode-connect' ); ?></option>
+                                    <option	value="core-popper" <?php selected($this->settings['js_backend'], 'core-popper'); ?>><?php _e('Core + Popper (default)', 'ayecode-connect'); ?></option>
+                                    <option value="popper" <?php selected($this->settings['js_backend'], 'popper'); ?>><?php _e('Popper', 'ayecode-connect'); ?></option>
+                                    <option value="required" <?php selected($this->settings['js_backend'], 'required'); ?>><?php _e('Required functions only', 'ayecode-connect'); ?></option>
+                                    <option	value="" <?php selected($this->settings['js_backend'], ''); ?>><?php _e('Disabled (not recommended)', 'ayecode-connect'); ?></option>
                                 </select>
                             </td>
                         </tr>
 
                         <tr valign="top">
-                            <th scope="row"><label for="wpbs-disable-admin"><?php _e( 'Disable load on URL', 'ayecode-connect' ); ?></label></th>
+                            <th scope="row"><label for="wpbs-disable-admin"><?php _e('Disable load on URL', 'ayecode-connect'); ?></label></th>
                             <td>
-                                <p><?php _e( 'If you have backend conflict you can enter a partial URL argument that will disable the loading of AUI on those pages. Add each argument on a new line.', 'ayecode-connect' ); ?></p>
-                                <textarea name="ayecode-ui-settings[disable_admin]" rows="10" cols="50" id="wpbs-disable-admin" class="large-text code" spellcheck="false" placeholder="myplugin.php &#10;action=go"><?php echo $this->settings['disable_admin'];?></textarea>
+                                <p><?php _e('If you have backend conflict you can enter a partial URL argument that will disable the loading of AUI on those pages. Add each argument on a new line.', 'ayecode-connect'); ?></p>
+                                <textarea name="ayecode-ui-settings[disable_admin]" rows="10" cols="50" id="wpbs-disable-admin" class="large-text code" spellcheck="false" placeholder="myplugin.php &#10;action=go"><?php echo $this->settings['disable_admin']; ?></textarea>
                             </td>
                         </tr>
                     </table>
@@ -986,33 +986,33 @@ 
 					submit_button();
 					?>
                 </form>
-                <div id="wpbs-version" data-aui-source="<?php echo esc_attr( $this->get_load_source() ); ?>"><?php echo $this->version; ?></div>
+                <div id="wpbs-version" data-aui-source="<?php echo esc_attr($this->get_load_source()); ?>"><?php echo $this->version; ?></div>
             </div>
 			<?php
 		}
 
-        public function get_load_source(){
-	        $file = str_replace( array( "/", "\\" ), "/", realpath( __FILE__ ) );
-	        $plugins_dir = str_replace( array( "/", "\\" ), "/", realpath( WP_PLUGIN_DIR ) );
+        public function get_load_source() {
+	        $file = str_replace(array("/", "\\"), "/", realpath(__FILE__));
+	        $plugins_dir = str_replace(array("/", "\\"), "/", realpath(WP_PLUGIN_DIR));
 
 	        // Find source plugin/theme of SD
 	        $source = array();
-	        if ( strpos( $file, $plugins_dir ) !== false ) {
-		        $source = explode( "/", plugin_basename( $file ) );
-	        } else if ( function_exists( 'get_theme_root' ) ) {
-		        $themes_dir = str_replace( array( "/", "\\" ), "/", realpath( get_theme_root() ) );
+	        if (strpos($file, $plugins_dir) !== false) {
+		        $source = explode("/", plugin_basename($file));
+	        } else if (function_exists('get_theme_root')) {
+		        $themes_dir = str_replace(array("/", "\\"), "/", realpath(get_theme_root()));
 
-		        if ( strpos( $file, $themes_dir ) !== false ) {
-			        $source = explode( "/", ltrim( str_replace( $themes_dir, "", $file ), "/" ) );
+		        if (strpos($file, $themes_dir) !== false) {
+			        $source = explode("/", ltrim(str_replace($themes_dir, "", $file), "/"));
 		        }
 	        }
 
             return isset($source[0]) ? esc_attr($source[0]) : '';
         }
 
-		public function customizer_settings($wp_customize){
+		public function customizer_settings($wp_customize) {
 			$wp_customize->add_section('aui_settings', array(
-				'title'    => __('AyeCode UI', 'ayecode-connect' ),
+				'title'    => __('AyeCode UI', 'ayecode-connect'),
 				'priority' => 120,
 			));
 
@@ -1026,8 +1026,8 @@ 
 				'type'              => 'option',
 				'transport'         => 'refresh',
 			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
-				'label'    => __('Primary Color', 'ayecode-connect' ),
+			$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'color_primary', array(
+				'label'    => __('Primary Color', 'ayecode-connect'),
 				'section'  => 'aui_settings',
 				'settings' => 'aui_options[color_primary]',
 			)));
@@ -1039,8 +1039,8 @@ 
 				'type'              => 'option',
 				'transport'         => 'refresh',
 			));
-			$wp_customize->add_control( new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
-				'label'    => __('Secondary Color', 'ayecode-connect' ),
+			$wp_customize->add_control(new WP_Customize_Color_Control($wp_customize, 'color_secondary', array(
+				'label'    => __('Secondary Color', 'ayecode-connect'),
 				'section'  => 'aui_settings',
 				'settings' => 'aui_options[color_secondary]',
 			)));
@@ -1066,12 +1066,12 @@ 
                 .collapse.show:not(.in){display: inherit;}
                 .fade.show{opacity: 1;}
 
-                <?php if( defined( 'SVQ_THEME_VERSION' ) ){ ?>
+                <?php if (defined('SVQ_THEME_VERSION')) { ?>
                 /* KLEO theme specific */
                 .kleo-main-header .navbar-collapse.collapse.show:not(.in){display: block !important;}
                 <?php } ?>
 
-                <?php if( defined( 'FUSION_BUILDER_VERSION' ) ){ ?>
+                <?php if (defined('FUSION_BUILDER_VERSION')) { ?>
                 /* With Avada builder */
                 body.modal-open .modal.in  {opacity:1;z-index: 99999}
                 body.modal-open .modal.bsui.in .modal-content  {box-shadow: none;}
@@ -1082,10 +1082,10 @@ 
                 <?php } ?>
             </style>
 			<?php
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
+			), '', self::minify_css(ob_get_clean()));
 		}
 
 
@@ -1093,7 +1093,7 @@ 
             global $aui_bs5;
 
 			$colors = array();
-			if ( defined( 'BLOCKSTRAP_VERSION' ) ) {
+			if (defined('BLOCKSTRAP_VERSION')) {
 
 
 				$setting = wp_get_global_settings();
@@ -1102,22 +1102,22 @@ 
 //                print_r(get_default_block_editor_settings());exit;
 
 //                print_r($setting);echo  '###';exit;
-				if(!empty($setting['color']['palette']['theme'])){
-					foreach($setting['color']['palette']['theme'] as $color){
+				if (!empty($setting['color']['palette']['theme'])) {
+					foreach ($setting['color']['palette']['theme'] as $color) {
 						$colors[$color['slug']] = esc_attr($color['color']);
 					}
 				}
 
-				if(!empty($setting['color']['palette']['custom'])){
-					foreach($setting['color']['palette']['custom'] as $color){
+				if (!empty($setting['color']['palette']['custom'])) {
+					foreach ($setting['color']['palette']['custom'] as $color) {
 						$colors[$color['slug']] = esc_attr($color['color']);
 					}
 				}
-			}else{
+			} else {
 				$settings = get_option('aui_options');
 				$colors = array(
-					'primary'   => ! empty( $settings['color_primary'] ) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
-					'secondary' => ! empty( $settings['color_secondary'] ) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
+					'primary'   => !empty($settings['color_primary']) ? $settings['color_primary'] : AUI_PRIMARY_COLOR,
+					'secondary' => !empty($settings['color_secondary']) ? $settings['color_secondary'] : AUI_SECONDARY_COLOR
 				);
 			}
 
@@ -1128,25 +1128,25 @@ 
                 <?php
 
 					// BS v3 compat
-					if( self::is_bs3_compat() ){
+					if (self::is_bs3_compat()) {
 						echo self::bs3_compat_css();
 					}
 
-                    $current_screen = function_exists('get_current_screen' ) ? get_current_screen() : '';
+                    $current_screen = function_exists('get_current_screen') ? get_current_screen() : '';
                     $is_fse = false;
-                    if ( is_admin() && ( !empty($_REQUEST['postType']) || $current_screen->is_block_editor() ) && ( defined( 'BLOCKSTRAP_VERSION' ) || defined( 'AUI_FSE' ) )  ) {
+                    if (is_admin() && (!empty($_REQUEST['postType']) || $current_screen->is_block_editor()) && (defined('BLOCKSTRAP_VERSION') || defined('AUI_FSE'))) {
                         $is_fse = true;
                     }
 
-					if(!empty($colors)){
+					if (!empty($colors)) {
 						$d_colors = self::get_colors(true);
 
 //						$is_fse = !empty($_REQUEST['postType']) && $_REQUEST['postType']=='wp_template';
-						foreach($colors as $key => $color ){
-							if((empty( $d_colors[$key]) ||  $d_colors[$key] != $color) || $is_fse ) {
+						foreach ($colors as $key => $color) {
+							if ((empty($d_colors[$key]) || $d_colors[$key] != $color) || $is_fse) {
 								$var = $is_fse ? "var(--wp--preset--color--$key)" : $color;
 								$compat = $is_fse ? '.editor-styles-wrapper' : $compatibility;
-								echo $aui_bs5 ? self::css_overwrite_bs5($key,$var,$compat,$color) : self::css_overwrite($key,$var,$compat,$color);
+								echo $aui_bs5 ? self::css_overwrite_bs5($key, $var, $compat, $color) : self::css_overwrite($key, $var, $compat, $color);
 							}
 						}
 					   // exit;
@@ -1155,70 +1155,70 @@ 
 					// Set admin bar z-index lower when modal is open.
 					echo ' body.modal-open #wpadminbar{z-index:999}.embed-responsive-16by9 .fluid-width-video-wrapper{padding:0 !important;position:initial}';
 
-					if(is_admin()){
+					if (is_admin()) {
 						echo ' body.modal-open #adminmenuwrap{z-index:999} body.modal-open #wpadminbar{z-index:1025}';
 					}
 
-                    if( $aui_bs5 && defined( 'BLOCKSTRAP_VERSION' )  ){
+                    if ($aui_bs5 && defined('BLOCKSTRAP_VERSION')) {
                         $css = '';
                         $theme_settings = wp_get_global_styles();
 
 //                        print_r( $theme_settings);exit;
 
                         // font face
-                        if( !empty( $theme_settings['typography']['fontFamily'] ) ){
-                            $t_fontface = str_replace( array('var:preset|','font-family|'), array('--wp--preset--','font-family--'), $theme_settings['typography']['fontFamily']  ); //var(--wp--preset--font-family--poppins)
+                        if (!empty($theme_settings['typography']['fontFamily'])) {
+                            $t_fontface = str_replace(array('var:preset|', 'font-family|'), array('--wp--preset--', 'font-family--'), $theme_settings['typography']['fontFamily']); //var(--wp--preset--font-family--poppins)
                             $css .= '--bs-body-font-family: ' . esc_attr($t_fontface) . ';';
                         }
 
                         // font size
-                        if( !empty( $theme_settings['typography']['fontSize'] ) ){
-                            $css .= '--bs-body-font-size: ' . esc_attr( $theme_settings['typography']['fontSize'] ) . ' ;';
+                        if (!empty($theme_settings['typography']['fontSize'])) {
+                            $css .= '--bs-body-font-size: ' . esc_attr($theme_settings['typography']['fontSize']) . ' ;';
                         }
 
                         // line height
-                         if( !empty( $theme_settings['typography']['lineHeight'] ) ){
-                            $css .= '--bs-body-line-height: ' . esc_attr( $theme_settings['typography']['lineHeight'] ) . ';';
+                         if (!empty($theme_settings['typography']['lineHeight'])) {
+                            $css .= '--bs-body-line-height: ' . esc_attr($theme_settings['typography']['lineHeight']) . ';';
                         }
 
 
                            // font weight
-                         if( !empty( $theme_settings['typography']['fontWeight'] ) ){
-                            $css .= '--bs-body-font-weight: ' . esc_attr( $theme_settings['typography']['fontWeight'] ) . ';';
+                         if (!empty($theme_settings['typography']['fontWeight'])) {
+                            $css .= '--bs-body-font-weight: ' . esc_attr($theme_settings['typography']['fontWeight']) . ';';
                         }
 
                         // Background
-                         if( !empty( $theme_settings['color']['background'] ) ){
-                            $css .= '--bs-body-bg: ' . esc_attr( $theme_settings['color']['background'] ) . ';';
+                         if (!empty($theme_settings['color']['background'])) {
+                            $css .= '--bs-body-bg: ' . esc_attr($theme_settings['color']['background']) . ';';
                         }
 
                          // Background Gradient
-                         if( !empty( $theme_settings['color']['gradient'] ) ){
-                            $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
+                         if (!empty($theme_settings['color']['gradient'])) {
+                            $css .= 'background: ' . esc_attr($theme_settings['color']['gradient']) . ';';
                         }
 
                            // Background Gradient
-                         if( !empty( $theme_settings['color']['gradient'] ) ){
-                            $css .= 'background: ' . esc_attr( $theme_settings['color']['gradient'] ) . ';';
+                         if (!empty($theme_settings['color']['gradient'])) {
+                            $css .= 'background: ' . esc_attr($theme_settings['color']['gradient']) . ';';
                         }
 
                         // text color
-                        if( !empty( $theme_settings['color']['text'] ) ){
-                            $css .= '--bs-body-color: ' . esc_attr( $theme_settings['color']['text'] ) . ';';
+                        if (!empty($theme_settings['color']['text'])) {
+                            $css .= '--bs-body-color: ' . esc_attr($theme_settings['color']['text']) . ';';
                         }
 
 
                         // link colors
-                        if( !empty( $theme_settings['elements']['link']['color']['text'] ) ){
-                            $css .= '--bs-link-color: ' . esc_attr( $theme_settings['elements']['link']['color']['text'] ) . ';';
+                        if (!empty($theme_settings['elements']['link']['color']['text'])) {
+                            $css .= '--bs-link-color: ' . esc_attr($theme_settings['elements']['link']['color']['text']) . ';';
                         }
-                        if( !empty( $theme_settings['elements']['link'][':hover']['color']['text'] ) ){
-                            $css .= '--bs-link-hover-color: ' . esc_attr( $theme_settings['elements']['link'][':hover']['color']['text'] ) . ';';
+                        if (!empty($theme_settings['elements']['link'][':hover']['color']['text'])) {
+                            $css .= '--bs-link-hover-color: ' . esc_attr($theme_settings['elements']['link'][':hover']['color']['text']) . ';';
                         }
 
 
 
-                        if($css){
+                        if ($css) {
                             echo  $is_fse ? 'body.editor-styles-wrapper{' . $css . '}' : 'body{' . $css . '}';
                         }
 
@@ -1227,42 +1227,42 @@ 
 
                         // Headings
                         $headings_css = '';
-                        if( !empty( $theme_settings['elements']['heading']['color']['text'] ) ){
-                            $headings_css .= "color: " . esc_attr( $theme_settings['elements']['heading']['color']['text'] ) . ";";
+                        if (!empty($theme_settings['elements']['heading']['color']['text'])) {
+                            $headings_css .= "color: " . esc_attr($theme_settings['elements']['heading']['color']['text']) . ";";
                         }
 
                         // heading background
-                        if( !empty( $theme_settings['elements']['heading']['color']['background'] ) ){
-                            $headings_css .= 'background: ' . esc_attr( $theme_settings['elements']['heading']['color']['background'] ) . ';';
+                        if (!empty($theme_settings['elements']['heading']['color']['background'])) {
+                            $headings_css .= 'background: ' . esc_attr($theme_settings['elements']['heading']['color']['background']) . ';';
                         }
 
                          // heading font family
-                        if( !empty( $theme_settings['elements']['heading']['typography']['fontFamily'] ) ){
-                            $headings_css .= 'font-family: ' . esc_attr( $theme_settings['elements']['heading']['typography']['fontFamily']  ) . ';';
+                        if (!empty($theme_settings['elements']['heading']['typography']['fontFamily'])) {
+                            $headings_css .= 'font-family: ' . esc_attr($theme_settings['elements']['heading']['typography']['fontFamily']) . ';';
                         }
 
-                        if( $headings_css ){
+                        if ($headings_css) {
                             echo "$bep h1,$bep h2,$bep h3, $bep h4,$bep h5,$bep h6{ " . $headings_css . "}";
                         }
 
-                        $hs = array('h1','h2','h3','h4','h5','h6');
+                        $hs = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6');
 
-                        foreach($hs as $hn){
+                        foreach ($hs as $hn) {
                             $h_css = '';
-                             if( !empty( $theme_settings['elements'][$hn]['color']['text'] ) ){
-                                $h_css .= 'color: ' . esc_attr( $theme_settings['elements'][$hn]['color']['text'] ) . ';';
+                             if (!empty($theme_settings['elements'][$hn]['color']['text'])) {
+                                $h_css .= 'color: ' . esc_attr($theme_settings['elements'][$hn]['color']['text']) . ';';
                              }
 
-                              if( !empty( $theme_settings['elements'][$hn]['typography']['fontSize'] ) ){
-                                $h_css .= 'font-size: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontSize']  ) . ';';
+                              if (!empty($theme_settings['elements'][$hn]['typography']['fontSize'])) {
+                                $h_css .= 'font-size: ' . esc_attr($theme_settings['elements'][$hn]['typography']['fontSize']) . ';';
                              }
 
-                              if( !empty( $theme_settings['elements'][$hn]['typography']['fontFamily'] ) ){
-                                $h_css .= 'font-family: ' . esc_attr( $theme_settings['elements'][$hn]['typography']['fontFamily']  ) . ';';
+                              if (!empty($theme_settings['elements'][$hn]['typography']['fontFamily'])) {
+                                $h_css .= 'font-family: ' . esc_attr($theme_settings['elements'][$hn]['typography']['fontFamily']) . ';';
                              }
 
-                             if($h_css){
-                                echo $bep . $hn . '{'.$h_css.'}';
+                             if ($h_css) {
+                                echo $bep . $hn . '{' . $h_css . '}';
                              }
                         }
 
@@ -1281,10 +1281,10 @@ 
 			/*
 			 * We only add the <script> tags for code highlighting, so we strip them from the output.
 			 */
-			return str_replace( array(
+			return str_replace(array(
 				'<style>',
 				'</style>'
-			), '', self::minify_css( ob_get_clean() ) );
+			), '', self::minify_css(ob_get_clean()));
 		}
 
 
@@ -1294,7 +1294,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public static function is_bs3_compat(){
+		public static function is_bs3_compat() {
 			return defined('AYECODE_UI_BS3_COMPAT') || defined('SVQ_THEME_VERSION') || defined('FUSION_BUILDER_VERSION');
 		}
 
@@ -1303,7 +1303,7 @@ 
 			$hex = str_replace('#', '', $hex);
 
 			// Convert 3-digit hex to 6-digit hex
-			if(strlen($hex) == 3) {
+			if (strlen($hex) == 3) {
 				$hex = str_repeat(substr($hex, 0, 1), 2) . str_repeat(substr($hex, 1, 1), 2) . str_repeat(substr($hex, 2, 1), 2);
 			}
 
@@ -1325,13 +1325,13 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_overwrite_bs5($type,$color_code,$compatibility, $hex = '' ){
+		public static function css_overwrite_bs5($type, $color_code, $compatibility, $hex = '') {
 			global $aui_bs5;
 
 			$is_var = false;
 			$is_custom = strpos($type, 'custom-') !== false ? true : false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
+			if (!$color_code) {return ''; }
+			if (strpos($color_code, 'var') !== false) {
 				//if(!sanitize_hex_color($color_code)){
 				$color_code = esc_attr($color_code);
 				$is_var = true;
@@ -1341,15 +1341,15 @@ 
 
 //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+			if (!$color_code) {return ''; }
 
 			$rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
+			if ($compatibility === true || $compatibility === 1) {
 				$compatibility = '.bsui';
-			}elseif(!$compatibility){
+			}elseif (!$compatibility) {
 				$compatibility = '';
-			}else{
+			} else {
 				$compatibility = esc_attr($compatibility);
 			}
 
@@ -1366,30 +1366,30 @@ 
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
 			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
-				".text-{$type}"                                     => array( 'c' ),
+				".btn-{$type}"                                              => array('b', 'o'),
+				".btn-{$type}.disabled"                                     => array('b', 'o'),
+				".btn-{$type}:disabled"                                     => array('b', 'o'),
+				".btn-outline-{$type}"                                      => array('c', 'o'),
+				".btn-outline-{$type}:hover"                                => array('b', 'o'),
+				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array('b', 'o'),
+				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array('b', 'o'),
+				".show>.btn-outline-{$type}.dropdown-toggle"                => array('b', 'o'),
+				".badge-{$type}"                                            => array('b'),
+				".alert-{$type}"                                            => array('b', 'o'),
+				".bg-{$type}"                                               => array('b', 'f'),
+				".btn-link.btn-{$type}"                                     => array('c'),
+				".text-{$type}"                                     => array('c'),
 			);
 
-			if ( $aui_bs5 ) {
-				unset($selectors[".alert-{$type}" ]);
+			if ($aui_bs5) {
+				unset($selectors[".alert-{$type}"]);
 			}
 
-			if ( $type == 'primary' ) {
+			if ($type == 'primary') {
 				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
+						'a'                                                                                                    => array('c'),
+						'.btn-link'                                                                                            => array('c'),
+						'.dropdown-item.active'                                                                                => array('b'),
 						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
 							'b',
 							'o'
@@ -1398,56 +1398,56 @@ 
 							'b',
 							'o'
 						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
+						'.nav-pills .nav-link.active'                                                                          => array('b'),
+						'.nav-pills .show>.nav-link'                                                                           => array('b'),
+						'.page-link'                                                                                           => array('c'),
 						'.page-item.active .page-link'                                                                         => array(
 							'b',
 							'o'
 						),
-						'.progress-bar'                                                                                        => array( 'b' ),
+						'.progress-bar'                                                                                        => array('b'),
 						'.list-group-item.active'                                                                              => array(
 							'b',
 							'o'
 						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
 					);
 			}
 
 
 
             // link
-			if ( $type === 'primary' ) {
-				$output .= 'html body {--bs-link-hover-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .75); --bs-link-color: var(--bs-'.esc_attr($type).'); }';
-				$output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: '.esc_attr($color_code).';  }';
-				$output .= $prefix . ' .navbar { --bs-nav-link-hover-color: '.esc_attr($color_code).'; --bs-navbar-hover-color: '.esc_attr($color_code).'; --bs-navbar-active-color: '.esc_attr($color_code).'; }';
+			if ($type === 'primary') {
+				$output .= 'html body {--bs-link-hover-color: rgba(var(--bs-' . esc_attr($type) . '-rgb), .75); --bs-link-color: var(--bs-' . esc_attr($type) . '); }';
+				$output .= $prefix . ' .breadcrumb{--bs-breadcrumb-item-active-color: ' . esc_attr($color_code) . ';  }';
+				$output .= $prefix . ' .navbar { --bs-nav-link-hover-color: ' . esc_attr($color_code) . '; --bs-navbar-hover-color: ' . esc_attr($color_code) . '; --bs-navbar-active-color: ' . esc_attr($color_code) . '; }';
 
-				$output .= $prefix . ' a{color: var(--bs-'.esc_attr($type).');}';
-				$output .= $prefix . ' .text-primary{color: var(--bs-'.esc_attr($type).') !important;}';
+				$output .= $prefix . ' a{color: var(--bs-' . esc_attr($type) . ');}';
+				$output .= $prefix . ' .text-primary{color: var(--bs-' . esc_attr($type) . ') !important;}';
 
                 // dropdown
-				$output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-'.esc_attr($type).'); --bs-dropdown-link-active-color: var(--bs-'.esc_attr($type).');}';
+				$output .= $prefix . ' .dropdown-menu{--bs-dropdown-link-hover-color: var(--bs-' . esc_attr($type) . '); --bs-dropdown-link-active-color: var(--bs-' . esc_attr($type) . ');}';
 
                 // pagination
-				$output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-'.esc_attr($type).'); --bs-pagination-active-bg: var(--bs-'.esc_attr($type).');}';
+				$output .= $prefix . ' .pagination{--bs-pagination-hover-color: var(--bs-' . esc_attr($type) . '); --bs-pagination-active-bg: var(--bs-' . esc_attr($type) . ');}';
 
 			}
 
-			$output .= $prefix . ' .link-'.esc_attr($type).':hover {color: rgba(var(--bs-'.esc_attr($type).'-rgb), .8) !important;}';
+			$output .= $prefix . ' .link-' . esc_attr($type) . ':hover {color: rgba(var(--bs-' . esc_attr($type) . '-rgb), .8) !important;}';
 
 			//  buttons
-			$output .= $prefix . ' .btn-'.esc_attr($type).'{';
+			$output .= $prefix . ' .btn-' . esc_attr($type) . '{';
 			$output .= ' 
-            --bs-btn-bg: '.esc_attr($color_code).';
-            --bs-btn-border-color: '.esc_attr($color_code).';
-            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type).'-rgb;
-            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
+            --bs-btn-bg: '.esc_attr($color_code) . ';
+            --bs-btn-border-color: '.esc_attr($color_code) . ';
+            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type) . '-rgb;
+            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
             --bs-btn-active-shadow: unset;
-            --bs-btn-disabled-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .5);
-            --bs-btn-disabled-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .1);
+            --bs-btn-disabled-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .5);
+            --bs-btn-disabled-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .1);
             ';
 //			$output .= '
 //		    --bs-btn-color: #fff;
@@ -1458,17 +1458,17 @@ 
 			$output .= '}';
 
 			//  buttons outline
-			$output .= $prefix . ' .btn-outline-'.esc_attr($type).'{';
+			$output .= $prefix . ' .btn-outline-' . esc_attr($type) . '{';
 			$output .= ' 
-            --bs-btn-border-color: '.esc_attr($color_code).';
-            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type).'-rgb;
-            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
-            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .9);
+            --bs-btn-border-color: '.esc_attr($color_code) . ';
+            --bs-btn-hover-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-hover-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-focus-shadow-rgb: --bs-'.esc_attr($type) . '-rgb;
+            --bs-btn-active-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
+            --bs-btn-active-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .9);
             --bs-btn-active-shadow: unset;
-            --bs-btn-disabled-bg: rgba(var(--bs-'.esc_attr($type).'-rgb), .5);
-            --bs-btn-disabled-border-color: rgba(var(--bs-'.esc_attr($type).'-rgb), .1);
+            --bs-btn-disabled-bg: rgba(var(--bs-'.esc_attr($type) . '-rgb), .5);
+            --bs-btn-disabled-border-color: rgba(var(--bs-'.esc_attr($type) . '-rgb), .1);
             ';
 //			$output .= '
 //		    --bs-btn-color: #fff;
@@ -1480,32 +1480,32 @@ 
 
 
             // button hover
-			$output .= $prefix . ' .btn-'.esc_attr($type).':hover{';
+			$output .= $prefix . ' .btn-' . esc_attr($type) . ':hover{';
 			$output .= ' 
-            box-shadow: 0 0.25rem 0.25rem 0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb), .1), 0 0.375rem 0.75rem -0.125rem rgb(var(--bs-'.esc_attr($type).'-rgb) , .4);
+            box-shadow: 0 0.25rem 0.25rem 0.125rem rgb(var(--bs-'.esc_attr($type) . '-rgb), .1), 0 0.375rem 0.75rem -0.125rem rgb(var(--bs-' . esc_attr($type) . '-rgb) , .4);
             }
             ';
 
 
-			if ( $aui_bs5 ) {
+			if ($aui_bs5) {
 //				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).': '.esc_attr($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+				$output .= 'html body {--bs-' . esc_attr($type) . ': ' . esc_attr($color_code) . '; }';
+				$output .= 'html body {--bs-' . esc_attr($type) . '-rgb: ' . $rgb . '; }';
 			}
 
 
-			if ( $is_custom ) {
+			if ($is_custom) {
 
 //				echo '###'.$type;exit;
 
 				// build rules into each type
-				foreach($selectors as $selector => $types){
-					$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-					$types = array_combine($types,$types);
-					if(isset($types['c'])){$color[] = $selector;}
-					if(isset($types['b'])){$background[] = $selector;}
-					if(isset($types['o'])){$border[] = $selector;}
-					if(isset($types['f'])){$fill[] = $selector;}
+				foreach ($selectors as $selector => $types) {
+					$selector = $compatibility ? $compatibility . " " . $selector : $selector;
+					$types = array_combine($types, $types);
+					if (isset($types['c'])) {$color[] = $selector; }
+					if (isset($types['b'])) {$background[] = $selector; }
+					if (isset($types['o'])) {$border[] = $selector; }
+					if (isset($types['f'])) {$fill[] = $selector; }
 				}
 
 //				// build rules into each type
@@ -1519,36 +1519,36 @@ 
 //				}
 
 				// add any color rules
-				if(!empty($color)){
-					$output .= implode(",",$color) . "{color: $color_code;} ";
+				if (!empty($color)) {
+					$output .= implode(",", $color) . "{color: $color_code;} ";
 				}
-				if(!empty($color_i)){
-					$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+				if (!empty($color_i)) {
+					$output .= implode(",", $color_i) . "{color: $color_code !important;} ";
 				}
 
 				// add any background color rules
-				if(!empty($background)){
-					$output .= implode(",",$background) . "{background-color: $color_code;} ";
+				if (!empty($background)) {
+					$output .= implode(",", $background) . "{background-color: $color_code;} ";
 				}
-				if(!empty($background_i)){
-					$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+				if (!empty($background_i)) {
+					$output .= $aui_bs5 ? '' : implode(",", $background_i) . "{background-color: $color_code !important;} ";
 //				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
 				}
 
 				// add any border color rules
-				if(!empty($border)){
-					$output .= implode(",",$border) . "{border-color: $color_code;} ";
+				if (!empty($border)) {
+					$output .= implode(",", $border) . "{border-color: $color_code;} ";
 				}
-				if(!empty($border_i)){
-					$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+				if (!empty($border_i)) {
+					$output .= implode(",", $border_i) . "{border-color: $color_code !important;} ";
 				}
 
 				// add any fill color rules
-				if(!empty($fill)){
-					$output .= implode(",",$fill) . "{fill: $color_code;} ";
+				if (!empty($fill)) {
+					$output .= implode(",", $fill) . "{fill: $color_code;} ";
 				}
-				if(!empty($fill_i)){
-					$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+				if (!empty($fill_i)) {
+					$output .= implode(",", $fill_i) . "{fill: $color_code !important;} ";
 				}
 
 			}
@@ -1558,25 +1558,25 @@ 
 
 			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
 			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+			$darker_075 = $is_var ? $color_code . ';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code, "-0.075");
+			$darker_10 = $is_var ? $color_code . ';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code, "-0.10");
+			$darker_125 = $is_var ? $color_code . ';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code, "-0.125");
+			$darker_40 = $is_var ? $color_code . ';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code, "-0.4");
 
 			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+			$lighten_25 = $is_var ? $color_code . ';filter:brightness(1.25)' : self::css_hex_lighten_darken($color_code, "0.25");
 
 			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+			$op_25 = $color_code . "40"; // 25% opacity
 
 
 			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+			$output .= $is_var ? $prefix . " .btn-{$type}{{$transition }} " : '';
+			$output .= $prefix . " .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: " . $darker_075 . ";    border-color: " . $darker_10 . ";} ";
 //			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: " . $darker_10 . ";    border-color: " . $darker_125 . ";} ";
+			$output .= $prefix . " .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 			// text
 //			$output .= $prefix .".xxx, .text-{$type} {color: var(--bs-".esc_attr($type).");} ";
@@ -1594,9 +1594,9 @@ 
 //			}
 
 			// alerts
-			if ( $aui_bs5 ) {
+			if ($aui_bs5) {
 //				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+				$output .= $prefix . " .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
 			}
 
 			return $output;
@@ -1611,12 +1611,12 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_overwrite($type,$color_code,$compatibility, $hex = '' ){
+		public static function css_overwrite($type, $color_code, $compatibility, $hex = '') {
             global $aui_bs5;
 
 			$is_var = false;
-			if(!$color_code){return '';}
-			if(strpos($color_code, 'var') !== false){
+			if (!$color_code) {return ''; }
+			if (strpos($color_code, 'var') !== false) {
 				//if(!sanitize_hex_color($color_code)){
 				$color_code = esc_attr($color_code);
 				$is_var = true;
@@ -1626,15 +1626,15 @@ 
 
 //            echo '@@@'.$color_code.'==='.self::hex_to_rgb($color_code);exit;
 
-			if(!$color_code){return '';}
+			if (!$color_code) {return ''; }
 
             $rgb = self::hex_to_rgb($hex);
 
-			if($compatibility===true || $compatibility===1){
+			if ($compatibility === true || $compatibility === 1) {
 				$compatibility = '.bsui';
-			}elseif(!$compatibility){
+			}elseif (!$compatibility) {
 				$compatibility = '';
-			}else{
+			} else {
 				$compatibility = esc_attr($compatibility);
 			}
 
@@ -1648,29 +1648,29 @@ 
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
 			$selectors = array(
-				".btn-{$type}"                                              => array( 'b', 'o' ),
-				".btn-{$type}.disabled"                                     => array( 'b', 'o' ),
-				".btn-{$type}:disabled"                                     => array( 'b', 'o' ),
-				".btn-outline-{$type}"                                      => array( 'c', 'o' ),
-				".btn-outline-{$type}:hover"                                => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array( 'b', 'o' ),
-				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array( 'b', 'o' ),
-				".show>.btn-outline-{$type}.dropdown-toggle"                => array( 'b', 'o' ),
-				".badge-{$type}"                                            => array( 'b' ),
-				".alert-{$type}"                                            => array( 'b', 'o' ),
-				".bg-{$type}"                                               => array( 'b', 'f' ),
-				".btn-link.btn-{$type}"                                     => array( 'c' ),
+				".btn-{$type}"                                              => array('b', 'o'),
+				".btn-{$type}.disabled"                                     => array('b', 'o'),
+				".btn-{$type}:disabled"                                     => array('b', 'o'),
+				".btn-outline-{$type}"                                      => array('c', 'o'),
+				".btn-outline-{$type}:hover"                                => array('b', 'o'),
+				".btn-outline-{$type}:not(:disabled):not(.disabled).active" => array('b', 'o'),
+				".btn-outline-{$type}:not(:disabled):not(.disabled):active" => array('b', 'o'),
+				".show>.btn-outline-{$type}.dropdown-toggle"                => array('b', 'o'),
+				".badge-{$type}"                                            => array('b'),
+				".alert-{$type}"                                            => array('b', 'o'),
+				".bg-{$type}"                                               => array('b', 'f'),
+				".btn-link.btn-{$type}"                                     => array('c'),
 			);
 
-			if ( $aui_bs5 ) {
-                unset($selectors[".alert-{$type}" ]);
+			if ($aui_bs5) {
+                unset($selectors[".alert-{$type}"]);
 			}
 
-			if ( $type == 'primary' ) {
+			if ($type == 'primary') {
 				$selectors = $selectors + array(
-						'a'                                                                                                    => array( 'c' ),
-						'.btn-link'                                                                                            => array( 'c' ),
-						'.dropdown-item.active'                                                                                => array( 'b' ),
+						'a'                                                                                                    => array('c'),
+						'.btn-link'                                                                                            => array('c'),
+						'.dropdown-item.active'                                                                                => array('b'),
 						'.custom-control-input:checked~.custom-control-label::before'                                          => array(
 							'b',
 							'o'
@@ -1679,19 +1679,19 @@ 
 							'b',
 							'o'
 						),
-						'.nav-pills .nav-link.active'                                                                          => array( 'b' ),
-						'.nav-pills .show>.nav-link'                                                                           => array( 'b' ),
-						'.page-link'                                                                                           => array( 'c' ),
+						'.nav-pills .nav-link.active'                                                                          => array('b'),
+						'.nav-pills .show>.nav-link'                                                                           => array('b'),
+						'.page-link'                                                                                           => array('c'),
 						'.page-item.active .page-link'                                                                         => array(
 							'b',
 							'o'
 						),
-						'.progress-bar'                                                                                        => array( 'b' ),
+						'.progress-bar'                                                                                        => array('b'),
 						'.list-group-item.active'                                                                              => array(
 							'b',
 							'o'
 						),
-						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array( 'b' ),
+						'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
 //				    '.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
 //				    '.custom-range::-moz-range-thumb' => array('b'),
 //				    '.custom-range::-ms-thumb' => array('b'),
@@ -1699,7 +1699,7 @@ 
 			}
 
 			$important_selectors = array(
-				".bg-{$type}" => array('b','f'),
+				".bg-{$type}" => array('b', 'f'),
 				".border-{$type}" => array('o'),
 				".text-{$type}" => array('c'),
 			);
@@ -1715,62 +1715,62 @@ 
 
 			$output = '';
 
-			if ( $aui_bs5 ) {
+			if ($aui_bs5) {
 //				$output .= $is_var ? 'html body {--bs-'.esc_attr($type).'-rgb: '.$color_code.'; }' : 'html body {--bs-'.esc_attr($type).'-rgb: '.self::hex_to_rgb($color_code).'; }';
-				$output .= 'html body {--bs-'.esc_attr($type).'-rgb: '.$rgb.'; }';
+				$output .= 'html body {--bs-' . esc_attr($type) . '-rgb: ' . $rgb . '; }';
 			}
 
 			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
+			foreach ($selectors as $selector => $types) {
+				$selector = $compatibility ? $compatibility . " " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color[] = $selector; }
+				if (isset($types['b'])) {$background[] = $selector; }
+				if (isset($types['o'])) {$border[] = $selector; }
+				if (isset($types['f'])) {$fill[] = $selector; }
 			}
 
 			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? $compatibility . " ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
+			foreach ($important_selectors as $selector => $types) {
+				$selector = $compatibility ? $compatibility . " " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color_i[] = $selector; }
+				if (isset($types['b'])) {$background_i[] = $selector; }
+				if (isset($types['o'])) {$border_i[] = $selector; }
+				if (isset($types['f'])) {$fill_i[] = $selector; }
 			}
 
 			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
+			if (!empty($color)) {
+				$output .= implode(",", $color) . "{color: $color_code;} ";
 			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			if (!empty($color_i)) {
+				$output .= implode(",", $color_i) . "{color: $color_code !important;} ";
 			}
 
 			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
+			if (!empty($background)) {
+				$output .= implode(",", $background) . "{background-color: $color_code;} ";
 			}
-			if(!empty($background_i)){
-				$output .= $aui_bs5 ? '' : implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			if (!empty($background_i)) {
+				$output .= $aui_bs5 ? '' : implode(",", $background_i) . "{background-color: $color_code !important;} ";
 //				$output .= implode(",",$background_i) . "{background-color: rgba(var(--bs-primary-rgb), var(--bs-bg-opacity)) !important;} ";
 			}
 
 			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
+			if (!empty($border)) {
+				$output .= implode(",", $border) . "{border-color: $color_code;} ";
 			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			if (!empty($border_i)) {
+				$output .= implode(",", $border_i) . "{border-color: $color_code !important;} ";
 			}
 
 			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
+			if (!empty($fill)) {
+				$output .= implode(",", $fill) . "{fill: $color_code;} ";
 			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			if (!empty($fill_i)) {
+				$output .= implode(",", $fill_i) . "{fill: $color_code !important;} ";
 			}
 
 
@@ -1778,27 +1778,27 @@ 
 
 			$transition = $is_var ? 'transition: color 0.15s ease-in-out,background-color 0.15s ease-in-out,border-color 0.15s ease-in-out,box-shadow 0.15s ease-in-out,filter 0.15s ease-in-out;' : '';
 			// darken
-			$darker_075 = $is_var ? $color_code.';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = $is_var ? $color_code.';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = $is_var ? $color_code.';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code,"-0.125");
-			$darker_40 = $is_var ? $color_code.';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code,"-0.4");
+			$darker_075 = $is_var ? $color_code . ';filter:brightness(0.925)' : self::css_hex_lighten_darken($color_code, "-0.075");
+			$darker_10 = $is_var ? $color_code . ';filter:brightness(0.9)' : self::css_hex_lighten_darken($color_code, "-0.10");
+			$darker_125 = $is_var ? $color_code . ';filter:brightness(0.875)' : self::css_hex_lighten_darken($color_code, "-0.125");
+			$darker_40 = $is_var ? $color_code . ';filter:brightness(0.6)' : self::css_hex_lighten_darken($color_code, "-0.4");
 
 			// lighten
-			$lighten_25 = $is_var ? $color_code.';filter:brightness(1.25)' :self::css_hex_lighten_darken($color_code,"0.25");
+			$lighten_25 = $is_var ? $color_code . ';filter:brightness(1.25)' : self::css_hex_lighten_darken($color_code, "0.25");
 
 			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+			$op_25 = $color_code . "40"; // 25% opacity
 
 
 			// button states
-			$output .= $is_var ? $prefix ." .btn-{$type}{{$transition }} " : '';
-			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
+			$output .= $is_var ? $prefix . " .btn-{$type}{{$transition }} " : '';
+			$output .= $prefix . " .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: " . $darker_075 . ";    border-color: " . $darker_10 . ";} ";
 //			$output .= $prefix ." .btn-{$type}:hover, $prefix .btn-{$type}:focus, $prefix .btn-{$type}.focus{background-color: #000;    border-color: #000;} ";
-			$output .= $prefix ." .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-outline-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-{$type}.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-{$type}:not(:disabled):not(.disabled):active, $prefix .btn-{$type}:not(:disabled):not(.disabled).active, .show>$prefix .btn-{$type}.dropdown-toggle{background-color: " . $darker_10 . ";    border-color: " . $darker_125 . ";} ";
+			$output .= $prefix . " .btn-{$type}:not(:disabled):not(.disabled):active:focus, $prefix .btn-{$type}:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-{$type}.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
-			if ( $type == 'primary' ) {
+			if ($type == 'primary') {
 				// dropdown's
 				$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
@@ -1810,9 +1810,9 @@ 
 			}
 
             // alerts
-			if ( $aui_bs5 ) {
+			if ($aui_bs5) {
 //				$output .= $is_var ? '' : $prefix ." .alert-{$type} {background-color: ".$color_code."20;    border-color: ".$color_code."30;color:$darker_40} ";
-				$output .= $prefix ." .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
+				$output .= $prefix . " .alert-{$type} {--bs-alert-bg: rgba(var(--bs-{$type}-rgb), .1 ) !important;--bs-alert-border-color: rgba(var(--bs-{$type}-rgb), .25 ) !important;--bs-alert-color: rgba(var(--bs-{$type}-rgb), 1 ) !important;} ";
 			}
 
 			return $output;
@@ -1828,11 +1828,11 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_primary($color_code,$compatibility, $use_variable = false){
+		public static function css_primary($color_code, $compatibility, $use_variable = false) {
 
-			if(!$use_variable){
+			if (!$use_variable) {
 				$color_code = sanitize_hex_color($color_code);
-				if(!$color_code){return '';}
+				if (!$color_code) {return ''; }
 			}
 
 			/**
@@ -1840,36 +1840,36 @@ 
 			 */
 			$selectors = array(
 				'a' => array('c'),
-				'.btn-primary' => array('b','o'),
-				'.btn-primary.disabled' => array('b','o'),
-				'.btn-primary:disabled' => array('b','o'),
-				'.btn-outline-primary' => array('c','o'),
-				'.btn-outline-primary:hover' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.show>.btn-outline-primary.dropdown-toggle' => array('b','o'),
+				'.btn-primary' => array('b', 'o'),
+				'.btn-primary.disabled' => array('b', 'o'),
+				'.btn-primary:disabled' => array('b', 'o'),
+				'.btn-outline-primary' => array('c', 'o'),
+				'.btn-outline-primary:hover' => array('b', 'o'),
+				'.btn-outline-primary:not(:disabled):not(.disabled).active' => array('b', 'o'),
+				'.btn-outline-primary:not(:disabled):not(.disabled):active' => array('b', 'o'),
+				'.show>.btn-outline-primary.dropdown-toggle' => array('b', 'o'),
 				'.btn-link' => array('c'),
 				'.dropdown-item.active' => array('b'),
-				'.custom-control-input:checked~.custom-control-label::before' => array('b','o'),
-				'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b','o'),
+				'.custom-control-input:checked~.custom-control-label::before' => array('b', 'o'),
+				'.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before' => array('b', 'o'),
 //				'.custom-range::-webkit-slider-thumb' => array('b'), // these break the inline rules...
 //				'.custom-range::-moz-range-thumb' => array('b'),
 //				'.custom-range::-ms-thumb' => array('b'),
 				'.nav-pills .nav-link.active' => array('b'),
 				'.nav-pills .show>.nav-link' => array('b'),
 				'.page-link' => array('c'),
-				'.page-item.active .page-link' => array('b','o'),
+				'.page-item.active .page-link' => array('b', 'o'),
 				'.badge-primary' => array('b'),
-				'.alert-primary' => array('b','o'),
+				'.alert-primary' => array('b', 'o'),
 				'.progress-bar' => array('b'),
-				'.list-group-item.active' => array('b','o'),
-				'.bg-primary' => array('b','f'),
+				'.list-group-item.active' => array('b', 'o'),
+				'.bg-primary' => array('b', 'f'),
 				'.btn-link.btn-primary' => array('c'),
 				'.select2-container .select2-results__option--highlighted.select2-results__option[aria-selected=true]' => array('b'),
 			);
 
 			$important_selectors = array(
-				'.bg-primary' => array('b','f'),
+				'.bg-primary' => array('b', 'f'),
 				'.border-primary' => array('o'),
 				'.text-primary' => array('c'),
 			);
@@ -1886,88 +1886,88 @@ 
 			$output = '';
 
 			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
+			foreach ($selectors as $selector => $types) {
+				$selector = $compatibility ? ".bsui " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color[] = $selector; }
+				if (isset($types['b'])) {$background[] = $selector; }
+				if (isset($types['o'])) {$border[] = $selector; }
+				if (isset($types['f'])) {$fill[] = $selector; }
 			}
 
 			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
+			foreach ($important_selectors as $selector => $types) {
+				$selector = $compatibility ? ".bsui " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color_i[] = $selector; }
+				if (isset($types['b'])) {$background_i[] = $selector; }
+				if (isset($types['o'])) {$border_i[] = $selector; }
+				if (isset($types['f'])) {$fill_i[] = $selector; }
 			}
 
 			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
+			if (!empty($color)) {
+				$output .= implode(",", $color) . "{color: $color_code;} ";
 			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			if (!empty($color_i)) {
+				$output .= implode(",", $color_i) . "{color: $color_code !important;} ";
 			}
 
 			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
+			if (!empty($background)) {
+				$output .= implode(",", $background) . "{background-color: $color_code;} ";
 			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			if (!empty($background_i)) {
+				$output .= implode(",", $background_i) . "{background-color: $color_code !important;} ";
 			}
 
 			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
+			if (!empty($border)) {
+				$output .= implode(",", $border) . "{border-color: $color_code;} ";
 			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			if (!empty($border_i)) {
+				$output .= implode(",", $border_i) . "{border-color: $color_code !important;} ";
 			}
 
 			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
+			if (!empty($fill)) {
+				$output .= implode(",", $fill) . "{fill: $color_code;} ";
 			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			if (!empty($fill_i)) {
+				$output .= implode(",", $fill_i) . "{fill: $color_code !important;} ";
 			}
 
 
 			$prefix = $compatibility ? ".bsui " : "";
 
 			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+			$darker_075 = self::css_hex_lighten_darken($color_code, "-0.075");
+			$darker_10 = self::css_hex_lighten_darken($color_code, "-0.10");
+			$darker_125 = self::css_hex_lighten_darken($color_code, "-0.125");
 
 			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+			$lighten_25 = self::css_hex_lighten_darken($color_code, "0.25");
 
 			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+			$op_25 = $color_code . "40"; // 25% opacity
 
 
 			// button states
-			$output .= $prefix ." .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-primary:hover, $prefix .btn-primary:focus, $prefix .btn-primary.focus{background-color: " . $darker_075 . ";    border-color: " . $darker_10 . ";} ";
+			$output .= $prefix . " .btn-outline-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-primary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-primary:not(:disabled):not(.disabled):active, $prefix .btn-primary:not(:disabled):not(.disabled).active, .show>$prefix .btn-primary.dropdown-toggle{background-color: " . $darker_10 . ";    border-color: " . $darker_125 . ";} ";
+			$output .= $prefix . " .btn-primary:not(:disabled):not(.disabled):active:focus, $prefix .btn-primary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-primary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 
 			// dropdown's
-			$output .= $prefix ." .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
+			$output .= $prefix . " .dropdown-item.active, $prefix .dropdown-item:active{background-color: $color_code;} ";
 
 
 			// input states
-			$output .= $prefix ." .form-control:focus{border-color: ".$lighten_25.";box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .form-control:focus{border-color: " . $lighten_25 . ";box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 			// page link
-			$output .= $prefix ." .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .page-link:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 			return $output;
 		}
@@ -1981,30 +1981,30 @@ 
 		 *
 		 * @return string
 		 */
-		public static function css_secondary($color_code,$compatibility){;
+		public static function css_secondary($color_code, $compatibility) {;
 			$color_code = sanitize_hex_color($color_code);
-			if(!$color_code){return '';}
+			if (!$color_code) {return ''; }
 			/**
 			 * c = color, b = background color, o = border-color, f = fill
 			 */
 			$selectors = array(
-				'.btn-secondary' => array('b','o'),
-				'.btn-secondary.disabled' => array('b','o'),
-				'.btn-secondary:disabled' => array('b','o'),
-				'.btn-outline-secondary' => array('c','o'),
-				'.btn-outline-secondary:hover' => array('b','o'),
+				'.btn-secondary' => array('b', 'o'),
+				'.btn-secondary.disabled' => array('b', 'o'),
+				'.btn-secondary:disabled' => array('b', 'o'),
+				'.btn-outline-secondary' => array('c', 'o'),
+				'.btn-outline-secondary:hover' => array('b', 'o'),
 				'.btn-outline-secondary.disabled' => array('c'),
 				'.btn-outline-secondary:disabled' => array('c'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b','o'),
-				'.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b','o'),
-				'.btn-outline-secondary.dropdown-toggle' => array('b','o'),
+				'.btn-outline-secondary:not(:disabled):not(.disabled):active' => array('b', 'o'),
+				'.btn-outline-secondary:not(:disabled):not(.disabled).active' => array('b', 'o'),
+				'.btn-outline-secondary.dropdown-toggle' => array('b', 'o'),
 				'.badge-secondary' => array('b'),
-				'.alert-secondary' => array('b','o'),
+				'.alert-secondary' => array('b', 'o'),
 				'.btn-link.btn-secondary' => array('c'),
 			);
 
 			$important_selectors = array(
-				'.bg-secondary' => array('b','f'),
+				'.bg-secondary' => array('b', 'f'),
 				'.border-secondary' => array('o'),
 				'.text-secondary' => array('c'),
 			);
@@ -2021,77 +2021,77 @@ 
 			$output = '';
 
 			// build rules into each type
-			foreach($selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color[] = $selector;}
-				if(isset($types['b'])){$background[] = $selector;}
-				if(isset($types['o'])){$border[] = $selector;}
-				if(isset($types['f'])){$fill[] = $selector;}
+			foreach ($selectors as $selector => $types) {
+				$selector = $compatibility ? ".bsui " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color[] = $selector; }
+				if (isset($types['b'])) {$background[] = $selector; }
+				if (isset($types['o'])) {$border[] = $selector; }
+				if (isset($types['f'])) {$fill[] = $selector; }
 			}
 
 			// build rules into each type
-			foreach($important_selectors as $selector => $types){
-				$selector = $compatibility ? ".bsui ".$selector : $selector;
-				$types = array_combine($types,$types);
-				if(isset($types['c'])){$color_i[] = $selector;}
-				if(isset($types['b'])){$background_i[] = $selector;}
-				if(isset($types['o'])){$border_i[] = $selector;}
-				if(isset($types['f'])){$fill_i[] = $selector;}
+			foreach ($important_selectors as $selector => $types) {
+				$selector = $compatibility ? ".bsui " . $selector : $selector;
+				$types = array_combine($types, $types);
+				if (isset($types['c'])) {$color_i[] = $selector; }
+				if (isset($types['b'])) {$background_i[] = $selector; }
+				if (isset($types['o'])) {$border_i[] = $selector; }
+				if (isset($types['f'])) {$fill_i[] = $selector; }
 			}
 
 			// add any color rules
-			if(!empty($color)){
-				$output .= implode(",",$color) . "{color: $color_code;} ";
+			if (!empty($color)) {
+				$output .= implode(",", $color) . "{color: $color_code;} ";
 			}
-			if(!empty($color_i)){
-				$output .= implode(",",$color_i) . "{color: $color_code !important;} ";
+			if (!empty($color_i)) {
+				$output .= implode(",", $color_i) . "{color: $color_code !important;} ";
 			}
 
 			// add any background color rules
-			if(!empty($background)){
-				$output .= implode(",",$background) . "{background-color: $color_code;} ";
+			if (!empty($background)) {
+				$output .= implode(",", $background) . "{background-color: $color_code;} ";
 			}
-			if(!empty($background_i)){
-				$output .= implode(",",$background_i) . "{background-color: $color_code !important;} ";
+			if (!empty($background_i)) {
+				$output .= implode(",", $background_i) . "{background-color: $color_code !important;} ";
 			}
 
 			// add any border color rules
-			if(!empty($border)){
-				$output .= implode(",",$border) . "{border-color: $color_code;} ";
+			if (!empty($border)) {
+				$output .= implode(",", $border) . "{border-color: $color_code;} ";
 			}
-			if(!empty($border_i)){
-				$output .= implode(",",$border_i) . "{border-color: $color_code !important;} ";
+			if (!empty($border_i)) {
+				$output .= implode(",", $border_i) . "{border-color: $color_code !important;} ";
 			}
 
 			// add any fill color rules
-			if(!empty($fill)){
-				$output .= implode(",",$fill) . "{fill: $color_code;} ";
+			if (!empty($fill)) {
+				$output .= implode(",", $fill) . "{fill: $color_code;} ";
 			}
-			if(!empty($fill_i)){
-				$output .= implode(",",$fill_i) . "{fill: $color_code !important;} ";
+			if (!empty($fill_i)) {
+				$output .= implode(",", $fill_i) . "{fill: $color_code !important;} ";
 			}
 
 
 			$prefix = $compatibility ? ".bsui " : "";
 
 			// darken
-			$darker_075 = self::css_hex_lighten_darken($color_code,"-0.075");
-			$darker_10 = self::css_hex_lighten_darken($color_code,"-0.10");
-			$darker_125 = self::css_hex_lighten_darken($color_code,"-0.125");
+			$darker_075 = self::css_hex_lighten_darken($color_code, "-0.075");
+			$darker_10 = self::css_hex_lighten_darken($color_code, "-0.10");
+			$darker_125 = self::css_hex_lighten_darken($color_code, "-0.125");
 
 			// lighten
-			$lighten_25 = self::css_hex_lighten_darken($color_code,"0.25");
+			$lighten_25 = self::css_hex_lighten_darken($color_code, "0.25");
 
 			// opacity see https://css-tricks.com/8-digit-hex-codes/
-			$op_25 = $color_code."40"; // 25% opacity
+			$op_25 = $color_code . "40"; // 25% opacity
 
 
 			// button states
-			$output .= $prefix ." .btn-secondary:hover{background-color: ".$darker_075.";    border-color: ".$darker_10.";} ";
-			$output .= $prefix ." .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: ".$darker_10.";    border-color: ".$darker_125.";} ";
-			$output .= $prefix ." .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-secondary:hover{background-color: " . $darker_075 . ";    border-color: " . $darker_10 . ";} ";
+			$output .= $prefix . " .btn-outline-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-outline-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-outline-secondary.dropdown-toggle:focus{box-shadow: 0 0 0 0.2rem $op_25;} ";
+			$output .= $prefix . " .btn-secondary:not(:disabled):not(.disabled):active, $prefix .btn-secondary:not(:disabled):not(.disabled).active, .show>$prefix .btn-secondary.dropdown-toggle{background-color: " . $darker_10 . ";    border-color: " . $darker_125 . ";} ";
+			$output .= $prefix . " .btn-secondary:not(:disabled):not(.disabled):active:focus, $prefix .btn-secondary:not(:disabled):not(.disabled).active:focus, .show>$prefix .btn-secondary.dropdown-toggle:focus {box-shadow: 0 0 0 0.2rem $op_25;} ";
 
 
 			return $output;
@@ -2127,8 +2127,8 @@ 
 		/**
 		 * Check if we should display 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>";
@@ -2144,7 +2144,7 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_examples(){
+		public function get_examples() {
 			$output = '';
 
 
@@ -2250,74 +2250,74 @@ 
 		 */
 		public static function calendar_params() {
 			$params = array(
-				'month_long_1' => __( 'January', 'ayecode-connect' ),
-				'month_long_2' => __( 'February', 'ayecode-connect' ),
-				'month_long_3' => __( 'March', 'ayecode-connect' ),
-				'month_long_4' => __( 'April', 'ayecode-connect' ),
-				'month_long_5' => __( 'May', 'ayecode-connect' ),
-				'month_long_6' => __( 'June', 'ayecode-connect' ),
-				'month_long_7' => __( 'July', 'ayecode-connect' ),
-				'month_long_8' => __( 'August', 'ayecode-connect' ),
-				'month_long_9' => __( 'September', 'ayecode-connect' ),
-				'month_long_10' => __( 'October', 'ayecode-connect' ),
-				'month_long_11' => __( 'November', 'ayecode-connect' ),
-				'month_long_12' => __( 'December', 'ayecode-connect' ),
-				'month_s_1' => _x( 'Jan', 'January abbreviation', 'ayecode-connect' ),
-				'month_s_2' => _x( 'Feb', 'February abbreviation', 'ayecode-connect' ),
-				'month_s_3' => _x( 'Mar', 'March abbreviation', 'ayecode-connect' ),
-				'month_s_4' => _x( 'Apr', 'April abbreviation', 'ayecode-connect' ),
-				'month_s_5' => _x( 'May', 'May abbreviation', 'ayecode-connect' ),
-				'month_s_6' => _x( 'Jun', 'June abbreviation', 'ayecode-connect' ),
-				'month_s_7' => _x( 'Jul', 'July abbreviation', 'ayecode-connect' ),
-				'month_s_8' => _x( 'Aug', 'August abbreviation', 'ayecode-connect' ),
-				'month_s_9' => _x( 'Sep', 'September abbreviation', 'ayecode-connect' ),
-				'month_s_10' => _x( 'Oct', 'October abbreviation', 'ayecode-connect' ),
-				'month_s_11' => _x( 'Nov', 'November abbreviation', 'ayecode-connect' ),
-				'month_s_12' => _x( 'Dec', 'December abbreviation', 'ayecode-connect' ),
-				'day_s1_1' => _x( 'S', 'Sunday initial', 'ayecode-connect' ),
-				'day_s1_2' => _x( 'M', 'Monday initial', 'ayecode-connect' ),
-				'day_s1_3' => _x( 'T', 'Tuesday initial', 'ayecode-connect' ),
-				'day_s1_4' => _x( 'W', 'Wednesday initial', 'ayecode-connect' ),
-				'day_s1_5' => _x( 'T', 'Friday initial', 'ayecode-connect' ),
-				'day_s1_6' => _x( 'F', 'Thursday initial', 'ayecode-connect' ),
-				'day_s1_7' => _x( 'S', 'Saturday initial', 'ayecode-connect' ),
-				'day_s2_1' => __( 'Su', 'ayecode-connect' ),
-				'day_s2_2' => __( 'Mo', 'ayecode-connect' ),
-				'day_s2_3' => __( 'Tu', 'ayecode-connect' ),
-				'day_s2_4' => __( 'We', 'ayecode-connect' ),
-				'day_s2_5' => __( 'Th', 'ayecode-connect' ),
-				'day_s2_6' => __( 'Fr', 'ayecode-connect' ),
-				'day_s2_7' => __( 'Sa', 'ayecode-connect' ),
-				'day_s3_1' => __( 'Sun', 'ayecode-connect' ),
-				'day_s3_2' => __( 'Mon', 'ayecode-connect' ),
-				'day_s3_3' => __( 'Tue', 'ayecode-connect' ),
-				'day_s3_4' => __( 'Wed', 'ayecode-connect' ),
-				'day_s3_5' => __( 'Thu', 'ayecode-connect' ),
-				'day_s3_6' => __( 'Fri', 'ayecode-connect' ),
-				'day_s3_7' => __( 'Sat', 'ayecode-connect' ),
-				'day_s5_1' => __( 'Sunday', 'ayecode-connect' ),
-				'day_s5_2' => __( 'Monday', 'ayecode-connect' ),
-				'day_s5_3' => __( 'Tuesday', 'ayecode-connect' ),
-				'day_s5_4' => __( 'Wednesday', 'ayecode-connect' ),
-				'day_s5_5' => __( 'Thursday', 'ayecode-connect' ),
-				'day_s5_6' => __( 'Friday', 'ayecode-connect' ),
-				'day_s5_7' => __( 'Saturday', 'ayecode-connect' ),
-				'am_lower' => __( 'am', 'ayecode-connect' ),
-				'pm_lower' => __( 'pm', 'ayecode-connect' ),
-				'am_upper' => __( 'AM', 'ayecode-connect' ),
-				'pm_upper' => __( 'PM', 'ayecode-connect' ),
-				'firstDayOfWeek' => (int) get_option( 'start_of_week' ),
+				'month_long_1' => __('January', 'ayecode-connect'),
+				'month_long_2' => __('February', 'ayecode-connect'),
+				'month_long_3' => __('March', 'ayecode-connect'),
+				'month_long_4' => __('April', 'ayecode-connect'),
+				'month_long_5' => __('May', 'ayecode-connect'),
+				'month_long_6' => __('June', 'ayecode-connect'),
+				'month_long_7' => __('July', 'ayecode-connect'),
+				'month_long_8' => __('August', 'ayecode-connect'),
+				'month_long_9' => __('September', 'ayecode-connect'),
+				'month_long_10' => __('October', 'ayecode-connect'),
+				'month_long_11' => __('November', 'ayecode-connect'),
+				'month_long_12' => __('December', 'ayecode-connect'),
+				'month_s_1' => _x('Jan', 'January abbreviation', 'ayecode-connect'),
+				'month_s_2' => _x('Feb', 'February abbreviation', 'ayecode-connect'),
+				'month_s_3' => _x('Mar', 'March abbreviation', 'ayecode-connect'),
+				'month_s_4' => _x('Apr', 'April abbreviation', 'ayecode-connect'),
+				'month_s_5' => _x('May', 'May abbreviation', 'ayecode-connect'),
+				'month_s_6' => _x('Jun', 'June abbreviation', 'ayecode-connect'),
+				'month_s_7' => _x('Jul', 'July abbreviation', 'ayecode-connect'),
+				'month_s_8' => _x('Aug', 'August abbreviation', 'ayecode-connect'),
+				'month_s_9' => _x('Sep', 'September abbreviation', 'ayecode-connect'),
+				'month_s_10' => _x('Oct', 'October abbreviation', 'ayecode-connect'),
+				'month_s_11' => _x('Nov', 'November abbreviation', 'ayecode-connect'),
+				'month_s_12' => _x('Dec', 'December abbreviation', 'ayecode-connect'),
+				'day_s1_1' => _x('S', 'Sunday initial', 'ayecode-connect'),
+				'day_s1_2' => _x('M', 'Monday initial', 'ayecode-connect'),
+				'day_s1_3' => _x('T', 'Tuesday initial', 'ayecode-connect'),
+				'day_s1_4' => _x('W', 'Wednesday initial', 'ayecode-connect'),
+				'day_s1_5' => _x('T', 'Friday initial', 'ayecode-connect'),
+				'day_s1_6' => _x('F', 'Thursday initial', 'ayecode-connect'),
+				'day_s1_7' => _x('S', 'Saturday initial', 'ayecode-connect'),
+				'day_s2_1' => __('Su', 'ayecode-connect'),
+				'day_s2_2' => __('Mo', 'ayecode-connect'),
+				'day_s2_3' => __('Tu', 'ayecode-connect'),
+				'day_s2_4' => __('We', 'ayecode-connect'),
+				'day_s2_5' => __('Th', 'ayecode-connect'),
+				'day_s2_6' => __('Fr', 'ayecode-connect'),
+				'day_s2_7' => __('Sa', 'ayecode-connect'),
+				'day_s3_1' => __('Sun', 'ayecode-connect'),
+				'day_s3_2' => __('Mon', 'ayecode-connect'),
+				'day_s3_3' => __('Tue', 'ayecode-connect'),
+				'day_s3_4' => __('Wed', 'ayecode-connect'),
+				'day_s3_5' => __('Thu', 'ayecode-connect'),
+				'day_s3_6' => __('Fri', 'ayecode-connect'),
+				'day_s3_7' => __('Sat', 'ayecode-connect'),
+				'day_s5_1' => __('Sunday', 'ayecode-connect'),
+				'day_s5_2' => __('Monday', 'ayecode-connect'),
+				'day_s5_3' => __('Tuesday', 'ayecode-connect'),
+				'day_s5_4' => __('Wednesday', 'ayecode-connect'),
+				'day_s5_5' => __('Thursday', 'ayecode-connect'),
+				'day_s5_6' => __('Friday', 'ayecode-connect'),
+				'day_s5_7' => __('Saturday', 'ayecode-connect'),
+				'am_lower' => __('am', 'ayecode-connect'),
+				'pm_lower' => __('pm', 'ayecode-connect'),
+				'am_upper' => __('AM', 'ayecode-connect'),
+				'pm_upper' => __('PM', 'ayecode-connect'),
+				'firstDayOfWeek' => (int) get_option('start_of_week'),
 				'time_24hr' => false,
-				'year' => __( 'Year', 'ayecode-connect' ),
-				'hour' => __( 'Hour', 'ayecode-connect' ),
-				'minute' => __( 'Minute', 'ayecode-connect' ),
-				'weekAbbreviation' => __( 'Wk', 'ayecode-connect' ),
-				'rangeSeparator' => __( ' to ', 'ayecode-connect' ),
-				'scrollTitle' => __( 'Scroll to increment', 'ayecode-connect' ),
-				'toggleTitle' => __( 'Click to toggle', 'ayecode-connect' )
+				'year' => __('Year', 'ayecode-connect'),
+				'hour' => __('Hour', 'ayecode-connect'),
+				'minute' => __('Minute', 'ayecode-connect'),
+				'weekAbbreviation' => __('Wk', 'ayecode-connect'),
+				'rangeSeparator' => __(' to ', 'ayecode-connect'),
+				'scrollTitle' => __('Scroll to increment', 'ayecode-connect'),
+				'toggleTitle' => __('Click to toggle', 'ayecode-connect')
 			);
 
-			return apply_filters( 'ayecode_ui_calendar_params', $params );
+			return apply_filters('ayecode_ui_calendar_params', $params);
 		}
 
 		/**
@@ -2330,47 +2330,47 @@ 
 		public static function flatpickr_locale() {
 			$params = self::calendar_params();
 
-			if ( is_string( $params ) ) {
-				$params = html_entity_decode( $params, ENT_QUOTES, 'UTF-8' );
+			if (is_string($params)) {
+				$params = html_entity_decode($params, ENT_QUOTES, 'UTF-8');
 			} else {
-				foreach ( (array) $params as $key => $value ) {
-					if ( ! is_scalar( $value ) ) {
+				foreach ((array) $params as $key => $value) {
+					if (!is_scalar($value)) {
 						continue;
 					}
 
-					$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+					$params[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 				}
 			}
 
 			$day_s3 = array();
 			$day_s5 = array();
 
-			for ( $i = 1; $i <= 7; $i ++ ) {
-				$day_s3[] = addslashes( $params[ 'day_s3_' . $i ] );
-				$day_s5[] = addslashes( $params[ 'day_s3_' . $i ] );
+			for ($i = 1; $i <= 7; $i++) {
+				$day_s3[] = addslashes($params['day_s3_' . $i]);
+				$day_s5[] = addslashes($params['day_s3_' . $i]);
 			}
 
 			$month_s = array();
 			$month_long = array();
 
-			for ( $i = 1; $i <= 12; $i ++ ) {
-				$month_s[] = addslashes( $params[ 'month_s_' . $i ] );
-				$month_long[] = addslashes( $params[ 'month_long_' . $i ] );
+			for ($i = 1; $i <= 12; $i++) {
+				$month_s[] = addslashes($params['month_s_' . $i]);
+				$month_long[] = addslashes($params['month_long_' . $i]);
 			}
 
 			ob_start();
-		if ( 0 ) { ?><script><?php } ?>
+		if (0) { ?><script><?php } ?>
                 {
                     weekdays: {
-                        shorthand: ['<?php echo implode( "','", $day_s3 ); ?>'],
-                            longhand: ['<?php echo implode( "','", $day_s5 ); ?>'],
+                        shorthand: ['<?php echo implode("','", $day_s3); ?>'],
+                            longhand: ['<?php echo implode("','", $day_s5); ?>'],
                     },
                     months: {
-                        shorthand: ['<?php echo implode( "','", $month_s ); ?>'],
-                            longhand: ['<?php echo implode( "','", $month_long ); ?>'],
+                        shorthand: ['<?php echo implode("','", $month_s); ?>'],
+                            longhand: ['<?php echo implode("','", $month_long); ?>'],
                     },
                     daysInMonth: [31,28,31,30,31,30,31,31,30,31,30,31],
-                        firstDayOfWeek: <?php echo (int) $params[ 'firstDayOfWeek' ]; ?>,
+                        firstDayOfWeek: <?php echo (int) $params['firstDayOfWeek']; ?>,
                     ordinal: function (nth) {
                         var s = nth % 100;
                         if (s > 3 && s < 21)
@@ -2386,21 +2386,21 @@ 
                                 return "th";
                         }
                     },
-                    rangeSeparator: '<?php echo addslashes( $params[ 'rangeSeparator' ] ); ?>',
-                        weekAbbreviation: '<?php echo addslashes( $params[ 'weekAbbreviation' ] ); ?>',
-                    scrollTitle: '<?php echo addslashes( $params[ 'scrollTitle' ] ); ?>',
-                    toggleTitle: '<?php echo addslashes( $params[ 'toggleTitle' ] ); ?>',
-                    amPM: ['<?php echo addslashes( $params[ 'am_upper' ] ); ?>','<?php echo addslashes( $params[ 'pm_upper' ] ); ?>'],
-                    yearAriaLabel: '<?php echo addslashes( $params[ 'year' ] ); ?>',
-                    hourAriaLabel: '<?php echo addslashes( $params[ 'hour' ] ); ?>',
-                    minuteAriaLabel: '<?php echo addslashes( $params[ 'minute' ] ); ?>',
-                    time_24hr: <?php echo ( $params[ 'time_24hr' ] ? 'true' : 'false' ) ; ?>
+                    rangeSeparator: '<?php echo addslashes($params['rangeSeparator']); ?>',
+                        weekAbbreviation: '<?php echo addslashes($params['weekAbbreviation']); ?>',
+                    scrollTitle: '<?php echo addslashes($params['scrollTitle']); ?>',
+                    toggleTitle: '<?php echo addslashes($params['toggleTitle']); ?>',
+                    amPM: ['<?php echo addslashes($params['am_upper']); ?>','<?php echo addslashes($params['pm_upper']); ?>'],
+                    yearAriaLabel: '<?php echo addslashes($params['year']); ?>',
+                    hourAriaLabel: '<?php echo addslashes($params['hour']); ?>',
+                    minuteAriaLabel: '<?php echo addslashes($params['minute']); ?>',
+                    time_24hr: <?php echo ($params['time_24hr'] ? 'true' : 'false'); ?>
                 }
-				<?php if ( 0 ) { ?></script><?php } ?>
+				<?php if (0) { ?></script><?php } ?>
 			<?php
 			$locale = ob_get_clean();
 
-			return apply_filters( 'ayecode_ui_flatpickr_locale', trim( $locale ) );
+			return apply_filters('ayecode_ui_flatpickr_locale', trim($locale));
 		}
 
 		/**
@@ -2412,20 +2412,20 @@ 
 		 */
 		public static function select2_params() {
 			$params = array(
-				'i18n_select_state_text'    => esc_attr__( 'Select an option&hellip;', 'ayecode-connect' ),
-				'i18n_no_matches'           => _x( 'No matches found', 'enhanced select', 'ayecode-connect' ),
-				'i18n_ajax_error'           => _x( 'Loading failed', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_1'    => _x( 'Please enter 1 or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_short_n'    => _x( 'Please enter %item% or more characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_1'     => _x( 'Please delete 1 character', 'enhanced select', 'ayecode-connect' ),
-				'i18n_input_too_long_n'     => _x( 'Please delete %item% characters', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_1' => _x( 'You can only select 1 item', 'enhanced select', 'ayecode-connect' ),
-				'i18n_selection_too_long_n' => _x( 'You can only select %item% items', 'enhanced select', 'ayecode-connect' ),
-				'i18n_load_more'            => _x( 'Loading more results&hellip;', 'enhanced select', 'ayecode-connect' ),
-				'i18n_searching'            => _x( 'Searching&hellip;', 'enhanced select', 'ayecode-connect' )
+				'i18n_select_state_text'    => esc_attr__('Select an option&hellip;', 'ayecode-connect'),
+				'i18n_no_matches'           => _x('No matches found', 'enhanced select', 'ayecode-connect'),
+				'i18n_ajax_error'           => _x('Loading failed', 'enhanced select', 'ayecode-connect'),
+				'i18n_input_too_short_1'    => _x('Please enter 1 or more characters', 'enhanced select', 'ayecode-connect'),
+				'i18n_input_too_short_n'    => _x('Please enter %item% or more characters', 'enhanced select', 'ayecode-connect'),
+				'i18n_input_too_long_1'     => _x('Please delete 1 character', 'enhanced select', 'ayecode-connect'),
+				'i18n_input_too_long_n'     => _x('Please delete %item% characters', 'enhanced select', 'ayecode-connect'),
+				'i18n_selection_too_long_1' => _x('You can only select 1 item', 'enhanced select', 'ayecode-connect'),
+				'i18n_selection_too_long_n' => _x('You can only select %item% items', 'enhanced select', 'ayecode-connect'),
+				'i18n_load_more'            => _x('Loading more results&hellip;', 'enhanced select', 'ayecode-connect'),
+				'i18n_searching'            => _x('Searching&hellip;', 'enhanced select', 'ayecode-connect')
 			);
 
-			return apply_filters( 'ayecode_ui_select2_params', $params );
+			return apply_filters('ayecode_ui_select2_params', $params);
 		}
 
 		/**
@@ -2438,17 +2438,17 @@ 
 		public static function select2_locale() {
 			$params = self::select2_params();
 
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
+			foreach ((array) $params as $key => $value) {
+				if (!is_scalar($value)) {
 					continue;
 				}
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+				$params[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 
-			$locale = json_encode( $params );
+			$locale = json_encode($params);
 
-			return apply_filters( 'ayecode_ui_select2_locale', trim( $locale ) );
+			return apply_filters('ayecode_ui_select2_locale', trim($locale));
 		}
 
 		/**
@@ -2461,35 +2461,35 @@ 
 		public static function timeago_locale() {
 			$params = array(
 				'prefix_ago' => '',
-				'suffix_ago' => ' ' . _x( 'ago', 'time ago', 'ayecode-connect' ),
-				'prefix_after' => _x( 'after', 'time ago', 'ayecode-connect' ) . ' ',
+				'suffix_ago' => ' ' . _x('ago', 'time ago', 'ayecode-connect'),
+				'prefix_after' => _x('after', 'time ago', 'ayecode-connect') . ' ',
 				'suffix_after' => '',
-				'seconds' => _x( 'less than a minute', 'time ago', 'ayecode-connect' ),
-				'minute' => _x( 'about a minute', 'time ago', 'ayecode-connect' ),
-				'minutes' => _x( '%d minutes', 'time ago', 'ayecode-connect' ),
-				'hour' => _x( 'about an hour', 'time ago', 'ayecode-connect' ),
-				'hours' => _x( 'about %d hours', 'time ago', 'ayecode-connect' ),
-				'day' => _x( 'a day', 'time ago', 'ayecode-connect' ),
-				'days' => _x( '%d days', 'time ago', 'ayecode-connect' ),
-				'month' => _x( 'about a month', 'time ago', 'ayecode-connect' ),
-				'months' => _x( '%d months', 'time ago', 'ayecode-connect' ),
-				'year' => _x( 'about a year', 'time ago', 'ayecode-connect' ),
-				'years' => _x( '%d years', 'time ago', 'ayecode-connect' ),
+				'seconds' => _x('less than a minute', 'time ago', 'ayecode-connect'),
+				'minute' => _x('about a minute', 'time ago', 'ayecode-connect'),
+				'minutes' => _x('%d minutes', 'time ago', 'ayecode-connect'),
+				'hour' => _x('about an hour', 'time ago', 'ayecode-connect'),
+				'hours' => _x('about %d hours', 'time ago', 'ayecode-connect'),
+				'day' => _x('a day', 'time ago', 'ayecode-connect'),
+				'days' => _x('%d days', 'time ago', 'ayecode-connect'),
+				'month' => _x('about a month', 'time ago', 'ayecode-connect'),
+				'months' => _x('%d months', 'time ago', 'ayecode-connect'),
+				'year' => _x('about a year', 'time ago', 'ayecode-connect'),
+				'years' => _x('%d years', 'time ago', 'ayecode-connect'),
 			);
 
-			$params = apply_filters( 'ayecode_ui_timeago_params', $params );
+			$params = apply_filters('ayecode_ui_timeago_params', $params);
 
-			foreach ( (array) $params as $key => $value ) {
-				if ( ! is_scalar( $value ) ) {
+			foreach ((array) $params as $key => $value) {
+				if (!is_scalar($value)) {
 					continue;
 				}
 
-				$params[ $key ] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8' );
+				$params[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');
 			}
 
-			$locale = json_encode( $params );
+			$locale = json_encode($params);
 
-			return apply_filters( 'ayecode_ui_timeago_locale', trim( $locale ) );
+			return apply_filters('ayecode_ui_timeago_locale', trim($locale));
 		}
 
 		/**
@@ -2500,7 +2500,7 @@ 
 		 * @return mixed
 		 */
 		public static function minify_js($input) {
-			if(trim($input) === "") return $input;
+			if (trim($input) === "") return $input;
 			return preg_replace(
 				array(
 					// Remove comment(s)
@@ -2532,7 +2532,7 @@ 
 		 * @return mixed
 		 */
 		public static function minify_css($input) {
-			if(trim($input) === "") return $input;
+			if (trim($input) === "") return $input;
 			return preg_replace(
 				array(
 					// Remove comment(s)
@@ -3098,12 +3098,12 @@ 
                         });
                     }
                 }
-				<?php do_action( 'aui_conditional_fields_js', $this ); ?>
+				<?php do_action('aui_conditional_fields_js', $this); ?>
             </script>
 			<?php
 			$output = ob_get_clean();
 
-			return str_replace( array( '<script>', '</script>' ), '', self::minify_js( $output ) );
+			return str_replace(array('<script>', '</script>'), '', self::minify_js($output));
 		}
 	}