AyeCode / invoicing

includes/class-getpaid-subscriptions-query.php

Indentation +490 added lines, -490 removed lines

@@ -16,495 +16,495 @@
  */
 class GetPaid_Subscriptions_Query {
 
-	/**
-	 * Query vars, after parsing
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	public $query_vars = array();
-
-	/**
-	 * List of found subscriptions.
-	 *
-	 * @since 1.0.19
-	 * @var array
-	 */
-	private $results;
-
-	/**
-	 * Total number of found subscriptions for the current query
-	 *
-	 * @since 1.0.19
-	 * @var int
-	 */
-	private $total_subscriptions = 0;
-
-	/**
-	 * The SQL query used to fetch matching subscriptions.
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $request;
-
-	// SQL clauses
-
-	/**
-	 * Contains the 'FIELDS' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_fields;
-
-	/**
-	 * Contains the 'FROM' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_from;
-
-	/**
-	 * Contains the 'WHERE' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_where;
-
-	/**
-	 * Contains the 'ORDER BY' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_orderby;
-
-	/**
-	 * Contains the 'LIMIT' sql clause
-	 *
-	 * @since 1.0.19
-	 * @var string
-	 */
-	public $query_limit;
-
-	/**
-	 * Class constructor.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param null|string|array $query Optional. The query variables.
-	 */
-	public function __construct( $query = null ) {
-		if ( ! is_null( $query ) ) {
-			$this->prepare_query( $query );
-			$this->query();
-		}
-	}
-
-	/**
-	 * Fills in missing query variables with default values.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
-	 * @return array Complete query variables with undefined ones filled in with defaults.
-	 */
-	public static function fill_query_vars( $args ) {
-		$defaults = array(
-			'status'            => 'all',
-			'customer_in'       => array(),
-			'customer_not_in'   => array(),
-			'product_in'        => array(),
-			'product_not_in'    => array(),
-			'include'           => array(),
-			'exclude'           => array(),
-			'orderby'           => 'id',
-			'order'             => 'DESC',
-			'offset'            => '',
-			'number'            => 10,
-			'paged'             => 1,
-			'count_total'       => true,
-			'fields'            => 'all',
-		);
-
-		return wp_parse_args( $args, $defaults );
-	}
-
-	/**
-	 * Prepare the query variables.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 *
-	 * @param string|array $query {
-	 *     Optional. Array or string of Query parameters.
-	 *
-	 *     @type string|array $status              The subscription status to filter by. Can either be a single status or an array of statuses.
-	 *                                             Default is all.
-	 *     @type int[]        $customer_in         An array of customer ids to filter by.
-	 *     @type int[]        $customer_not_in     An array of customer ids whose subscriptions should be excluded.
-	 *     @type int[]        $invoice_in          An array of invoice ids to filter by.
-	 *     @type int[]        $invoice_not_in      An array of invoice ids whose subscriptions should be excluded.
-	 *     @type int[]        $product_in          An array of product ids to filter by.
-	 *     @type int[]        $product_not_in      An array of product ids whose subscriptions should be excluded.
-	 *     @type array        $date_created_query  A WP_Date_Query compatible array use to filter subscriptions by their date of creation.
-	 *     @type array        $date_expires_query  A WP_Date_Query compatible array use to filter subscriptions by their expiration date.
-	 *     @type array        $include             An array of subscription IDs to include. Default empty array.
-	 *     @type array        $exclude             An array of subscription IDs to exclude. Default empty array.
-	 *     @type string|array $orderby             Field(s) to sort the retrieved subscription by. May be a single value,
-	 *                                             an array of values, or a multi-dimensional array with fields as
-	 *                                             keys and orders ('ASC' or 'DESC') as values. Accepted values are
-	 *                                             'id', 'customer_id', 'frequency', 'period', 'initial_amount,
-	 *                                             'recurring_amount', 'bill_times', 'parent_payment_id', 'created', 'expiration'
-	 *                                             'transaction_id', 'product_id', 'trial_period', 'include', 'status', 'profile_id'. Default array( 'id' ).
-	 *     @type string       $order               Designates ascending or descending order of subscriptions. Order values
-	 *                                             passed as part of an `$orderby` array take precedence over this
-	 *                                             parameter. Accepts 'ASC', 'DESC'. Default 'DESC'.
-	 *     @type int          $offset              Number of subscriptions to offset in retrieved results. Can be used in
-	 *                                             conjunction with pagination. Default 0.
-	 *     @type int          $number              Number of subscriptions to limit the query for. Can be used in
-	 *                                             conjunction with pagination. Value -1 (all) is supported, but
-	 *                                             should be used with caution on larger sites.
-	 *                                             Default 10.
-	 *     @type int          $paged               When used with number, defines the page of results to return.
-	 *                                             Default 1.
-	 *     @type bool         $count_total         Whether to count the total number of subscriptions found. If pagination
-	 *                                             is not needed, setting this to false can improve performance.
-	 *                                             Default true.
-	 *     @type string|array $fields              Which fields to return. Single or all fields (string), or array
-	 *                                             of fields. Accepts 'id', 'customer_id', 'frequency', 'period', 'initial_amount,
-	 *                                             'recurring_amount', 'bill_times', 'parent_payment_id', 'created', 'expiration'
-	 *                                             'transaction_id', 'product_id', 'trial_period', 'status', 'profile_id'.
-	 *                                             Use 'all' for all fields. Default 'all'.
-	 * }
-	 */
-	public function prepare_query( $query = array() ) {
-		global $wpdb;
-
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
-			$this->query_limit = null;
-			$this->query_vars  = $this->fill_query_vars( $query );
-		}
-
-		if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
-			$this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
-		}
-
-		do_action( 'getpaid_pre_get_subscriptions', array( &$this ) );
-
-		// Ensure that query vars are filled after 'getpaid_pre_get_subscriptions'.
-		$qv                =& $this->query_vars;
-		$qv                = $this->fill_query_vars( $qv );
-		$table             = $wpdb->prefix . 'wpinv_subscriptions';
-		$this->query_from  = "FROM $table";
-
-		// Prepare query fields.
-		$this->prepare_query_fields( $qv, $table );
-
-		// Prepare query where.
-		$this->prepare_query_where( $qv, $table );
-
-		// Prepare query order.
-		$this->prepare_query_order( $qv, $table );
-
-		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
-			} else {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
-			}
-		}
-
-		do_action_ref_array( 'getpaid_after_subscriptions_query', array( &$this ) );
-	}
-
-	/**
-	 * Prepares the query fields.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_fields( &$qv, $table ) {
-
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields'] = array_unique( $qv['fields'] );
-
-			$query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				$field          = sanitize_key( $field );
-				$query_fields[] = "$table.`$field`";
-			}
-			$this->query_fields = implode( ',', $query_fields );
-		} else {
-			$this->query_fields = "$table.*";
-		}
-
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
-		}
-
-	}
-
-	/**
-	 * Prepares the query where.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_where( &$qv, $table ) {
-		global $wpdb;
-		$this->query_where = 'WHERE 1=1';
-
-		// Status.
-		if ( 'all' !== $qv['status'] ) {
-			$statuses           = wpinv_clean( wpinv_parse_list( $qv['status'] ) );
-			$prepared_statuses  = join( ',', array_fill( 0, count( $statuses ), '%s' ) );
-			$this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $prepared_statuses )", $statuses );
-		}
-
-		if ( ! empty( $qv['customer_in'] ) ) {
-			$customer_in        = implode( ',', wp_parse_id_list( $qv['customer_in'] ) );
-			$this->query_where .= " AND $table.`customer_id` IN ($customer_in)";
-		} elseif ( ! empty( $qv['customer_not_in'] ) ) {
-			$customer_not_in    = implode( ',', wp_parse_id_list( $qv['customer_not_in'] ) );
-			$this->query_where .= " AND $table.`customer_id` NOT IN ($customer_not_in)";
-		}
-
-		if ( ! empty( $qv['product_in'] ) ) {
-			$product_in         = implode( ',', wp_parse_id_list( $qv['product_in'] ) );
-			$this->query_where .= " AND $table.`product_id` IN ($product_in)";
-		} elseif ( ! empty( $qv['product_not_in'] ) ) {
-			$product_not_in     = implode( ',', wp_parse_id_list( $qv['product_not_in'] ) );
-			$this->query_where .= " AND $table.`product_id` NOT IN ($product_not_in)";
-		}
-
-		if ( ! empty( $qv['invoice_in'] ) ) {
-			$invoice_in         = implode( ',', wp_parse_id_list( $qv['invoice_in'] ) );
-			$this->query_where .= " AND $table.`parent_payment_id` IN ($invoice_in)";
-		} elseif ( ! empty( $qv['invoice_not_in'] ) ) {
-			$invoice_not_in     = implode( ',', wp_parse_id_list( $qv['invoice_not_in'] ) );
-			$this->query_where .= " AND $table.`parent_payment_id` NOT IN ($invoice_not_in)";
-		}
-
-		if ( ! empty( $qv['include'] ) ) {
-			$include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
-			$this->query_where .= " AND $table.`id` IN ($include)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
-			$this->query_where .= " AND $table.`id` NOT IN ($exclude)";
-		}
-
-		// Date queries are allowed for the subscription creation date.
-		if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
-			$date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.created" );
-			$this->query_where .= $date_created_query->get_sql();
-		}
-
-		// Date queries are also allowed for the subscription expiration date.
-		if ( ! empty( $qv['date_expires_query'] ) && is_array( $qv['date_expires_query'] ) ) {
-			$date_expires_query = new WP_Date_Query( $qv['date_expires_query'], "$table.expiration" );
-			$this->query_where .= $date_expires_query->get_sql();
-		}
-
-	}
-
-	/**
-	 * Prepares the query order.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param array $qv Query vars.
-	 * @param string $table Table name.
-	 */
-	protected function prepare_query_order( &$qv, $table ) {
-
-		// sorting.
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order       = $this->parse_order( $qv['order'] );
-
-		// Default order is by 'id' (latest subscriptions).
-		if ( empty( $qv['orderby'] ) ) {
-			$qv['orderby'] = array( 'id' );
-		}
-
-		// 'orderby' values may be an array, comma- or space-separated list.
-		$ordersby      = array_filter( wpinv_parse_list(  $qv['orderby'] ) );
-
-		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
-
-			if ( is_int( $_key ) ) {
-				// Integer key means this is a flat array of 'orderby' fields.
-				$_orderby = $_value;
-				$_order   = $order;
-			} else {
-				// Non-integer key means that the key is the field and the value is ASC/DESC.
-				$_orderby = $_key;
-				$_order   = $_value;
-			}
-
-			$parsed = $this->parse_orderby( $_orderby, $table );
-
-			if ( $parsed ) {
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
-			}
-
-		}
-
-		// If no valid clauses were found, order by id.
-		if ( empty( $orderby_array ) ) {
-			$orderby_array[] = "id $order";
-		}
-
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
-
-	}
-
-	/**
-	 * Execute the query, with the current variables.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @global wpdb $wpdb WordPress database abstraction object.
-	 */
-	public function query() {
-		global $wpdb;
-
-		$qv =& $this->query_vars;
-
-		// Return a non-null value to bypass the default GetPaid subscriptions query and remember to set the
-		// total_subscriptions property.
-		$this->results = apply_filters_ref_array( 'getpaid_subscriptions_pre_query', array( null, &$this ) );
-
-		if ( null === $this->results ) {
-			$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
-
-			if ( ( is_array( $qv['fields'] ) && 1 != count( $qv['fields'] ) ) || 'all' == $qv['fields'] ) {
-				$this->results = $wpdb->get_results( $this->request );
-			} else {
-				$this->results = $wpdb->get_col( $this->request );
-			}
-
-			if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-				$found_subscriptions_query = apply_filters( 'getpaid_found_subscriptions_query', 'SELECT FOUND_ROWS()', $this );
-				$this->total_subscriptions   = (int) $wpdb->get_var( $found_subscriptions_query );
-			}
-		}
-
-		if ( 'all' == $qv['fields'] ) {
-			foreach ( $this->results as $key => $subscription ) {
-				wp_cache_set( $subscription->id, $subscription, 'getpaid_subscriptions' );
-				wp_cache_set( $subscription->profile_id, $subscription->id, 'getpaid_subscription_profile_ids_to_subscription_ids' );
-				wp_cache_set( $subscription->transaction_id, $subscription->id, 'getpaid_subscription_transaction_ids_to_subscription_ids' );
-				wp_cache_set( $subscription->transaction_id, $subscription->id, 'getpaid_subscription_transaction_ids_to_subscription_ids' );
-				$this->results[ $key ] = new WPInv_Subscription( $subscription );
-			}
-		}
-
-	}
-
-	/**
-	 * Retrieve query variable.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $query_var Query variable key.
-	 * @return mixed
-	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Set query variable.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $query_var Query variable key.
-	 * @param mixed $value Query variable value.
-	 */
-	public function set( $query_var, $value ) {
-		$this->query_vars[ $query_var ] = $value;
-	}
-
-	/**
-	 * Return the list of subscriptions.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @return WPInv_Subscription[]|array Found subscriptions.
-	 */
-	public function get_results() {
-		return $this->results;
-	}
-
-	/**
-	 * Return the total number of subscriptions for the current query.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @return int Number of total subscriptions.
-	 */
-	public function get_total() {
-		return $this->total_subscriptions;
-	}
-
-	/**
-	 * Parse and sanitize 'orderby' keys passed to the subscriptions query.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $orderby Alias for the field to order by.
-	 *  @param string $table The current table.
-	 * @return string Value to use in the ORDER clause, if `$orderby` is valid.
-	 */
-	protected function parse_orderby( $orderby, $table ) {
-
-		$_orderby = '';
-		if ( in_array( $orderby, array( 'customer_id', 'frequency', 'period', 'initial_amount', 'recurring_amount', 'bill_times', 'transaction_id', 'parent_payment_id', 'product_id', 'created', 'expiration', 'trial_period', 'status', 'profile_id' ) ) ) {
-			$_orderby = "$table.`$orderby`";
-		} elseif ( 'id' === strtolower( $orderby ) ) {
-			$_orderby = "$table.id";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include     = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
-			$_orderby    = "FIELD( $table.id, $include_sql )";
-		}
-
-		return $_orderby;
-	}
-
-	/**
-	 * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
-	 *
-	 * @since 1.0.19
-	 *
-	 * @param string $order The 'order' query variable.
-	 * @return string The sanitized 'order' query variable.
-	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
-			return 'DESC';
-		}
-
-		if ( 'ASC' === strtoupper( $order ) ) {
-			return 'ASC';
-		} else {
-			return 'DESC';
-		}
-	}
+    /**
+     * Query vars, after parsing
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    public $query_vars = array();
+
+    /**
+     * List of found subscriptions.
+     *
+     * @since 1.0.19
+     * @var array
+     */
+    private $results;
+
+    /**
+     * Total number of found subscriptions for the current query
+     *
+     * @since 1.0.19
+     * @var int
+     */
+    private $total_subscriptions = 0;
+
+    /**
+     * The SQL query used to fetch matching subscriptions.
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $request;
+
+    // SQL clauses
+
+    /**
+     * Contains the 'FIELDS' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_fields;
+
+    /**
+     * Contains the 'FROM' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_from;
+
+    /**
+     * Contains the 'WHERE' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_where;
+
+    /**
+     * Contains the 'ORDER BY' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_orderby;
+
+    /**
+     * Contains the 'LIMIT' sql clause
+     *
+     * @since 1.0.19
+     * @var string
+     */
+    public $query_limit;
+
+    /**
+     * Class constructor.
+     *
+     * @since 1.0.19
+     *
+     * @param null|string|array $query Optional. The query variables.
+     */
+    public function __construct( $query = null ) {
+        if ( ! is_null( $query ) ) {
+            $this->prepare_query( $query );
+            $this->query();
+        }
+    }
+
+    /**
+     * Fills in missing query variables with default values.
+     *
+     * @since 1.0.19
+     *
+     * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
+     * @return array Complete query variables with undefined ones filled in with defaults.
+     */
+    public static function fill_query_vars( $args ) {
+        $defaults = array(
+            'status'            => 'all',
+            'customer_in'       => array(),
+            'customer_not_in'   => array(),
+            'product_in'        => array(),
+            'product_not_in'    => array(),
+            'include'           => array(),
+            'exclude'           => array(),
+            'orderby'           => 'id',
+            'order'             => 'DESC',
+            'offset'            => '',
+            'number'            => 10,
+            'paged'             => 1,
+            'count_total'       => true,
+            'fields'            => 'all',
+        );
+
+        return wp_parse_args( $args, $defaults );
+    }
+
+    /**
+     * Prepare the query variables.
+     *
+     * @since 1.0.19
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     *
+     * @param string|array $query {
+     *     Optional. Array or string of Query parameters.
+     *
+     *     @type string|array $status              The subscription status to filter by. Can either be a single status or an array of statuses.
+     *                                             Default is all.
+     *     @type int[]        $customer_in         An array of customer ids to filter by.
+     *     @type int[]        $customer_not_in     An array of customer ids whose subscriptions should be excluded.
+     *     @type int[]        $invoice_in          An array of invoice ids to filter by.
+     *     @type int[]        $invoice_not_in      An array of invoice ids whose subscriptions should be excluded.
+     *     @type int[]        $product_in          An array of product ids to filter by.
+     *     @type int[]        $product_not_in      An array of product ids whose subscriptions should be excluded.
+     *     @type array        $date_created_query  A WP_Date_Query compatible array use to filter subscriptions by their date of creation.
+     *     @type array        $date_expires_query  A WP_Date_Query compatible array use to filter subscriptions by their expiration date.
+     *     @type array        $include             An array of subscription IDs to include. Default empty array.
+     *     @type array        $exclude             An array of subscription IDs to exclude. Default empty array.
+     *     @type string|array $orderby             Field(s) to sort the retrieved subscription by. May be a single value,
+     *                                             an array of values, or a multi-dimensional array with fields as
+     *                                             keys and orders ('ASC' or 'DESC') as values. Accepted values are
+     *                                             'id', 'customer_id', 'frequency', 'period', 'initial_amount,
+     *                                             'recurring_amount', 'bill_times', 'parent_payment_id', 'created', 'expiration'
+     *                                             'transaction_id', 'product_id', 'trial_period', 'include', 'status', 'profile_id'. Default array( 'id' ).
+     *     @type string       $order               Designates ascending or descending order of subscriptions. Order values
+     *                                             passed as part of an `$orderby` array take precedence over this
+     *                                             parameter. Accepts 'ASC', 'DESC'. Default 'DESC'.
+     *     @type int          $offset              Number of subscriptions to offset in retrieved results. Can be used in
+     *                                             conjunction with pagination. Default 0.
+     *     @type int          $number              Number of subscriptions to limit the query for. Can be used in
+     *                                             conjunction with pagination. Value -1 (all) is supported, but
+     *                                             should be used with caution on larger sites.
+     *                                             Default 10.
+     *     @type int          $paged               When used with number, defines the page of results to return.
+     *                                             Default 1.
+     *     @type bool         $count_total         Whether to count the total number of subscriptions found. If pagination
+     *                                             is not needed, setting this to false can improve performance.
+     *                                             Default true.
+     *     @type string|array $fields              Which fields to return. Single or all fields (string), or array
+     *                                             of fields. Accepts 'id', 'customer_id', 'frequency', 'period', 'initial_amount,
+     *                                             'recurring_amount', 'bill_times', 'parent_payment_id', 'created', 'expiration'
+     *                                             'transaction_id', 'product_id', 'trial_period', 'status', 'profile_id'.
+     *                                             Use 'all' for all fields. Default 'all'.
+     * }
+     */
+    public function prepare_query( $query = array() ) {
+        global $wpdb;
+
+        if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+            $this->query_limit = null;
+            $this->query_vars  = $this->fill_query_vars( $query );
+        }
+
+        if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
+            $this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
+        }
+
+        do_action( 'getpaid_pre_get_subscriptions', array( &$this ) );
+
+        // Ensure that query vars are filled after 'getpaid_pre_get_subscriptions'.
+        $qv                =& $this->query_vars;
+        $qv                = $this->fill_query_vars( $qv );
+        $table             = $wpdb->prefix . 'wpinv_subscriptions';
+        $this->query_from  = "FROM $table";
+
+        // Prepare query fields.
+        $this->prepare_query_fields( $qv, $table );
+
+        // Prepare query where.
+        $this->prepare_query_where( $qv, $table );
+
+        // Prepare query order.
+        $this->prepare_query_order( $qv, $table );
+
+        // limit
+        if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
+            if ( $qv['offset'] ) {
+                $this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
+            } else {
+                $this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+            }
+        }
+
+        do_action_ref_array( 'getpaid_after_subscriptions_query', array( &$this ) );
+    }
+
+    /**
+     * Prepares the query fields.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_fields( &$qv, $table ) {
+
+        if ( is_array( $qv['fields'] ) ) {
+            $qv['fields'] = array_unique( $qv['fields'] );
+
+            $query_fields = array();
+            foreach ( $qv['fields'] as $field ) {
+                $field          = sanitize_key( $field );
+                $query_fields[] = "$table.`$field`";
+            }
+            $this->query_fields = implode( ',', $query_fields );
+        } else {
+            $this->query_fields = "$table.*";
+        }
+
+        if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+            $this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+        }
+
+    }
+
+    /**
+     * Prepares the query where.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_where( &$qv, $table ) {
+        global $wpdb;
+        $this->query_where = 'WHERE 1=1';
+
+        // Status.
+        if ( 'all' !== $qv['status'] ) {
+            $statuses           = wpinv_clean( wpinv_parse_list( $qv['status'] ) );
+            $prepared_statuses  = join( ',', array_fill( 0, count( $statuses ), '%s' ) );
+            $this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $prepared_statuses )", $statuses );
+        }
+
+        if ( ! empty( $qv['customer_in'] ) ) {
+            $customer_in        = implode( ',', wp_parse_id_list( $qv['customer_in'] ) );
+            $this->query_where .= " AND $table.`customer_id` IN ($customer_in)";
+        } elseif ( ! empty( $qv['customer_not_in'] ) ) {
+            $customer_not_in    = implode( ',', wp_parse_id_list( $qv['customer_not_in'] ) );
+            $this->query_where .= " AND $table.`customer_id` NOT IN ($customer_not_in)";
+        }
+
+        if ( ! empty( $qv['product_in'] ) ) {
+            $product_in         = implode( ',', wp_parse_id_list( $qv['product_in'] ) );
+            $this->query_where .= " AND $table.`product_id` IN ($product_in)";
+        } elseif ( ! empty( $qv['product_not_in'] ) ) {
+            $product_not_in     = implode( ',', wp_parse_id_list( $qv['product_not_in'] ) );
+            $this->query_where .= " AND $table.`product_id` NOT IN ($product_not_in)";
+        }
+
+        if ( ! empty( $qv['invoice_in'] ) ) {
+            $invoice_in         = implode( ',', wp_parse_id_list( $qv['invoice_in'] ) );
+            $this->query_where .= " AND $table.`parent_payment_id` IN ($invoice_in)";
+        } elseif ( ! empty( $qv['invoice_not_in'] ) ) {
+            $invoice_not_in     = implode( ',', wp_parse_id_list( $qv['invoice_not_in'] ) );
+            $this->query_where .= " AND $table.`parent_payment_id` NOT IN ($invoice_not_in)";
+        }
+
+        if ( ! empty( $qv['include'] ) ) {
+            $include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
+            $this->query_where .= " AND $table.`id` IN ($include)";
+        } elseif ( ! empty( $qv['exclude'] ) ) {
+            $exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+            $this->query_where .= " AND $table.`id` NOT IN ($exclude)";
+        }
+
+        // Date queries are allowed for the subscription creation date.
+        if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
+            $date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.created" );
+            $this->query_where .= $date_created_query->get_sql();
+        }
+
+        // Date queries are also allowed for the subscription expiration date.
+        if ( ! empty( $qv['date_expires_query'] ) && is_array( $qv['date_expires_query'] ) ) {
+            $date_expires_query = new WP_Date_Query( $qv['date_expires_query'], "$table.expiration" );
+            $this->query_where .= $date_expires_query->get_sql();
+        }
+
+    }
+
+    /**
+     * Prepares the query order.
+     *
+     * @since 1.0.19
+     *
+     * @param array $qv Query vars.
+     * @param string $table Table name.
+     */
+    protected function prepare_query_order( &$qv, $table ) {
+
+        // sorting.
+        $qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
+        $order       = $this->parse_order( $qv['order'] );
+
+        // Default order is by 'id' (latest subscriptions).
+        if ( empty( $qv['orderby'] ) ) {
+            $qv['orderby'] = array( 'id' );
+        }
+
+        // 'orderby' values may be an array, comma- or space-separated list.
+        $ordersby      = array_filter( wpinv_parse_list(  $qv['orderby'] ) );
+
+        $orderby_array = array();
+        foreach ( $ordersby as $_key => $_value ) {
+
+            if ( is_int( $_key ) ) {
+                // Integer key means this is a flat array of 'orderby' fields.
+                $_orderby = $_value;
+                $_order   = $order;
+            } else {
+                // Non-integer key means that the key is the field and the value is ASC/DESC.
+                $_orderby = $_key;
+                $_order   = $_value;
+            }
+
+            $parsed = $this->parse_orderby( $_orderby, $table );
+
+            if ( $parsed ) {
+                $orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+            }
+
+        }
+
+        // If no valid clauses were found, order by id.
+        if ( empty( $orderby_array ) ) {
+            $orderby_array[] = "id $order";
+        }
+
+        $this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+
+    }
+
+    /**
+     * Execute the query, with the current variables.
+     *
+     * @since 1.0.19
+     *
+     * @global wpdb $wpdb WordPress database abstraction object.
+     */
+    public function query() {
+        global $wpdb;
+
+        $qv =& $this->query_vars;
+
+        // Return a non-null value to bypass the default GetPaid subscriptions query and remember to set the
+        // total_subscriptions property.
+        $this->results = apply_filters_ref_array( 'getpaid_subscriptions_pre_query', array( null, &$this ) );
+
+        if ( null === $this->results ) {
+            $this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
+
+            if ( ( is_array( $qv['fields'] ) && 1 != count( $qv['fields'] ) ) || 'all' == $qv['fields'] ) {
+                $this->results = $wpdb->get_results( $this->request );
+            } else {
+                $this->results = $wpdb->get_col( $this->request );
+            }
+
+            if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+                $found_subscriptions_query = apply_filters( 'getpaid_found_subscriptions_query', 'SELECT FOUND_ROWS()', $this );
+                $this->total_subscriptions   = (int) $wpdb->get_var( $found_subscriptions_query );
+            }
+        }
+
+        if ( 'all' == $qv['fields'] ) {
+            foreach ( $this->results as $key => $subscription ) {
+                wp_cache_set( $subscription->id, $subscription, 'getpaid_subscriptions' );
+                wp_cache_set( $subscription->profile_id, $subscription->id, 'getpaid_subscription_profile_ids_to_subscription_ids' );
+                wp_cache_set( $subscription->transaction_id, $subscription->id, 'getpaid_subscription_transaction_ids_to_subscription_ids' );
+                wp_cache_set( $subscription->transaction_id, $subscription->id, 'getpaid_subscription_transaction_ids_to_subscription_ids' );
+                $this->results[ $key ] = new WPInv_Subscription( $subscription );
+            }
+        }
+
+    }
+
+    /**
+     * Retrieve query variable.
+     *
+     * @since 1.0.19
+     *
+     * @param string $query_var Query variable key.
+     * @return mixed
+     */
+    public function get( $query_var ) {
+        if ( isset( $this->query_vars[ $query_var ] ) ) {
+            return $this->query_vars[ $query_var ];
+        }
+
+        return null;
+    }
+
+    /**
+     * Set query variable.
+     *
+     * @since 1.0.19
+     *
+     * @param string $query_var Query variable key.
+     * @param mixed $value Query variable value.
+     */
+    public function set( $query_var, $value ) {
+        $this->query_vars[ $query_var ] = $value;
+    }
+
+    /**
+     * Return the list of subscriptions.
+     *
+     * @since 1.0.19
+     *
+     * @return WPInv_Subscription[]|array Found subscriptions.
+     */
+    public function get_results() {
+        return $this->results;
+    }
+
+    /**
+     * Return the total number of subscriptions for the current query.
+     *
+     * @since 1.0.19
+     *
+     * @return int Number of total subscriptions.
+     */
+    public function get_total() {
+        return $this->total_subscriptions;
+    }
+
+    /**
+     * Parse and sanitize 'orderby' keys passed to the subscriptions query.
+     *
+     * @since 1.0.19
+     *
+     * @param string $orderby Alias for the field to order by.
+     *  @param string $table The current table.
+     * @return string Value to use in the ORDER clause, if `$orderby` is valid.
+     */
+    protected function parse_orderby( $orderby, $table ) {
+
+        $_orderby = '';
+        if ( in_array( $orderby, array( 'customer_id', 'frequency', 'period', 'initial_amount', 'recurring_amount', 'bill_times', 'transaction_id', 'parent_payment_id', 'product_id', 'created', 'expiration', 'trial_period', 'status', 'profile_id' ) ) ) {
+            $_orderby = "$table.`$orderby`";
+        } elseif ( 'id' === strtolower( $orderby ) ) {
+            $_orderby = "$table.id";
+        } elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
+            $include     = wp_parse_id_list( $this->query_vars['include'] );
+            $include_sql = implode( ',', $include );
+            $_orderby    = "FIELD( $table.id, $include_sql )";
+        }
+
+        return $_orderby;
+    }
+
+    /**
+     * Parse an 'order' query variable and cast it to ASC or DESC as necessary.
+     *
+     * @since 1.0.19
+     *
+     * @param string $order The 'order' query variable.
+     * @return string The sanitized 'order' query variable.
+     */
+    protected function parse_order( $order ) {
+        if ( ! is_string( $order ) || empty( $order ) ) {
+            return 'DESC';
+        }
+
+        if ( 'ASC' === strtoupper( $order ) ) {
+            return 'ASC';
+        } else {
+            return 'DESC';
+        }
+    }
 
 }

Spacing +96 added lines, -96 removed lines

@@ -97,9 +97,9 @@ 
 	 *
 	 * @param null|string|array $query Optional. The query variables.
 	 */
-	public function __construct( $query = null ) {
-		if ( ! is_null( $query ) ) {
-			$this->prepare_query( $query );
+	public function __construct($query = null) {
+		if (!is_null($query)) {
+			$this->prepare_query($query);
 			$this->query();
 		}
 	}
@@ -112,7 +112,7 @@ 
 	 * @param  string|array $args Query vars, as passed to `GetPaid_Subscriptions_Query`.
 	 * @return array Complete query variables with undefined ones filled in with defaults.
 	 */
-	public static function fill_query_vars( $args ) {
+	public static function fill_query_vars($args) {
 		$defaults = array(
 			'status'            => 'all',
 			'customer_in'       => array(),
@@ -130,7 +130,7 @@ 
 			'fields'            => 'all',
 		);
 
-		return wp_parse_args( $args, $defaults );
+		return wp_parse_args($args, $defaults);
 	}
 
 	/**
@@ -182,45 +182,45 @@ 
 	 *                                             Use 'all' for all fields. Default 'all'.
 	 * }
 	 */
-	public function prepare_query( $query = array() ) {
+	public function prepare_query($query = array()) {
 		global $wpdb;
 
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+		if (empty($this->query_vars) || !empty($query)) {
 			$this->query_limit = null;
-			$this->query_vars  = $this->fill_query_vars( $query );
+			$this->query_vars  = $this->fill_query_vars($query);
 		}
 
-		if ( ! empty( $this->query_vars['fields'] ) && 'all' !== $this->query_vars['fields'] ) {
-			$this->query_vars['fields'] = wpinv_parse_list( $this->query_vars['fields'] );
+		if (!empty($this->query_vars['fields']) && 'all' !== $this->query_vars['fields']) {
+			$this->query_vars['fields'] = wpinv_parse_list($this->query_vars['fields']);
 		}
 
-		do_action( 'getpaid_pre_get_subscriptions', array( &$this ) );
+		do_action('getpaid_pre_get_subscriptions', array(&$this));
 
 		// Ensure that query vars are filled after 'getpaid_pre_get_subscriptions'.
-		$qv                =& $this->query_vars;
-		$qv                = $this->fill_query_vars( $qv );
+		$qv                = & $this->query_vars;
+		$qv                = $this->fill_query_vars($qv);
 		$table             = $wpdb->prefix . 'wpinv_subscriptions';
 		$this->query_from  = "FROM $table";
 
 		// Prepare query fields.
-		$this->prepare_query_fields( $qv, $table );
+		$this->prepare_query_fields($qv, $table);
 
 		// Prepare query where.
-		$this->prepare_query_where( $qv, $table );
+		$this->prepare_query_where($qv, $table);
 
 		// Prepare query order.
-		$this->prepare_query_order( $qv, $table );
+		$this->prepare_query_order($qv, $table);
 
 		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['offset'], $qv['number'] );
+		if (isset($qv['number']) && $qv['number'] > 0) {
+			if ($qv['offset']) {
+				$this->query_limit = $wpdb->prepare('LIMIT %d, %d', $qv['offset'], $qv['number']);
 			} else {
-				$this->query_limit = $wpdb->prepare( 'LIMIT %d, %d', $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+				$this->query_limit = $wpdb->prepare('LIMIT %d, %d', $qv['number'] * ($qv['paged'] - 1), $qv['number']);
 			}
 		}
 
-		do_action_ref_array( 'getpaid_after_subscriptions_query', array( &$this ) );
+		do_action_ref_array('getpaid_after_subscriptions_query', array(&$this));
 	}
 
 	/**
@@ -231,22 +231,22 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_fields( &$qv, $table ) {
+	protected function prepare_query_fields(&$qv, $table) {
 
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields'] = array_unique( $qv['fields'] );
+		if (is_array($qv['fields'])) {
+			$qv['fields'] = array_unique($qv['fields']);
 
 			$query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				$field          = sanitize_key( $field );
+			foreach ($qv['fields'] as $field) {
+				$field          = sanitize_key($field);
 				$query_fields[] = "$table.`$field`";
 			}
-			$this->query_fields = implode( ',', $query_fields );
+			$this->query_fields = implode(',', $query_fields);
 		} else {
 			$this->query_fields = "$table.*";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+		if (isset($qv['count_total']) && $qv['count_total']) {
 			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
 		}
 
@@ -260,58 +260,58 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_where( &$qv, $table ) {
+	protected function prepare_query_where(&$qv, $table) {
 		global $wpdb;
 		$this->query_where = 'WHERE 1=1';
 
 		// Status.
-		if ( 'all' !== $qv['status'] ) {
-			$statuses           = wpinv_clean( wpinv_parse_list( $qv['status'] ) );
-			$prepared_statuses  = join( ',', array_fill( 0, count( $statuses ), '%s' ) );
-			$this->query_where .= $wpdb->prepare( " AND $table.`status` IN ( $prepared_statuses )", $statuses );
+		if ('all' !== $qv['status']) {
+			$statuses           = wpinv_clean(wpinv_parse_list($qv['status']));
+			$prepared_statuses  = join(',', array_fill(0, count($statuses), '%s'));
+			$this->query_where .= $wpdb->prepare(" AND $table.`status` IN ( $prepared_statuses )", $statuses);
 		}
 
-		if ( ! empty( $qv['customer_in'] ) ) {
-			$customer_in        = implode( ',', wp_parse_id_list( $qv['customer_in'] ) );
+		if (!empty($qv['customer_in'])) {
+			$customer_in        = implode(',', wp_parse_id_list($qv['customer_in']));
 			$this->query_where .= " AND $table.`customer_id` IN ($customer_in)";
-		} elseif ( ! empty( $qv['customer_not_in'] ) ) {
-			$customer_not_in    = implode( ',', wp_parse_id_list( $qv['customer_not_in'] ) );
+		} elseif (!empty($qv['customer_not_in'])) {
+			$customer_not_in    = implode(',', wp_parse_id_list($qv['customer_not_in']));
 			$this->query_where .= " AND $table.`customer_id` NOT IN ($customer_not_in)";
 		}
 
-		if ( ! empty( $qv['product_in'] ) ) {
-			$product_in         = implode( ',', wp_parse_id_list( $qv['product_in'] ) );
+		if (!empty($qv['product_in'])) {
+			$product_in         = implode(',', wp_parse_id_list($qv['product_in']));
 			$this->query_where .= " AND $table.`product_id` IN ($product_in)";
-		} elseif ( ! empty( $qv['product_not_in'] ) ) {
-			$product_not_in     = implode( ',', wp_parse_id_list( $qv['product_not_in'] ) );
+		} elseif (!empty($qv['product_not_in'])) {
+			$product_not_in     = implode(',', wp_parse_id_list($qv['product_not_in']));
 			$this->query_where .= " AND $table.`product_id` NOT IN ($product_not_in)";
 		}
 
-		if ( ! empty( $qv['invoice_in'] ) ) {
-			$invoice_in         = implode( ',', wp_parse_id_list( $qv['invoice_in'] ) );
+		if (!empty($qv['invoice_in'])) {
+			$invoice_in         = implode(',', wp_parse_id_list($qv['invoice_in']));
 			$this->query_where .= " AND $table.`parent_payment_id` IN ($invoice_in)";
-		} elseif ( ! empty( $qv['invoice_not_in'] ) ) {
-			$invoice_not_in     = implode( ',', wp_parse_id_list( $qv['invoice_not_in'] ) );
+		} elseif (!empty($qv['invoice_not_in'])) {
+			$invoice_not_in     = implode(',', wp_parse_id_list($qv['invoice_not_in']));
 			$this->query_where .= " AND $table.`parent_payment_id` NOT IN ($invoice_not_in)";
 		}
 
-		if ( ! empty( $qv['include'] ) ) {
-			$include            = implode( ',', wp_parse_id_list( $qv['include'] ) );
+		if (!empty($qv['include'])) {
+			$include            = implode(',', wp_parse_id_list($qv['include']));
 			$this->query_where .= " AND $table.`id` IN ($include)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$exclude            = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+		} elseif (!empty($qv['exclude'])) {
+			$exclude            = implode(',', wp_parse_id_list($qv['exclude']));
 			$this->query_where .= " AND $table.`id` NOT IN ($exclude)";
 		}
 
 		// Date queries are allowed for the subscription creation date.
-		if ( ! empty( $qv['date_created_query'] ) && is_array( $qv['date_created_query'] ) ) {
-			$date_created_query = new WP_Date_Query( $qv['date_created_query'], "$table.created" );
+		if (!empty($qv['date_created_query']) && is_array($qv['date_created_query'])) {
+			$date_created_query = new WP_Date_Query($qv['date_created_query'], "$table.created");
 			$this->query_where .= $date_created_query->get_sql();
 		}
 
 		// Date queries are also allowed for the subscription expiration date.
-		if ( ! empty( $qv['date_expires_query'] ) && is_array( $qv['date_expires_query'] ) ) {
-			$date_expires_query = new WP_Date_Query( $qv['date_expires_query'], "$table.expiration" );
+		if (!empty($qv['date_expires_query']) && is_array($qv['date_expires_query'])) {
+			$date_expires_query = new WP_Date_Query($qv['date_expires_query'], "$table.expiration");
 			$this->query_where .= $date_expires_query->get_sql();
 		}
 
@@ -325,24 +325,24 @@ 
 	 * @param array $qv Query vars.
 	 * @param string $table Table name.
 	 */
-	protected function prepare_query_order( &$qv, $table ) {
+	protected function prepare_query_order(&$qv, $table) {
 
 		// sorting.
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order       = $this->parse_order( $qv['order'] );
+		$qv['order'] = isset($qv['order']) ? strtoupper($qv['order']) : '';
+		$order       = $this->parse_order($qv['order']);
 
 		// Default order is by 'id' (latest subscriptions).
-		if ( empty( $qv['orderby'] ) ) {
-			$qv['orderby'] = array( 'id' );
+		if (empty($qv['orderby'])) {
+			$qv['orderby'] = array('id');
 		}
 
 		// 'orderby' values may be an array, comma- or space-separated list.
-		$ordersby      = array_filter( wpinv_parse_list(  $qv['orderby'] ) );
+		$ordersby      = array_filter(wpinv_parse_list($qv['orderby']));
 
 		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
+		foreach ($ordersby as $_key => $_value) {
 
-			if ( is_int( $_key ) ) {
+			if (is_int($_key)) {
 				// Integer key means this is a flat array of 'orderby' fields.
 				$_orderby = $_value;
 				$_order   = $order;
@@ -352,20 +352,20 @@ 
 				$_order   = $_value;
 			}
 
-			$parsed = $this->parse_orderby( $_orderby, $table );
+			$parsed = $this->parse_orderby($_orderby, $table);
 
-			if ( $parsed ) {
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+			if ($parsed) {
+				$orderby_array[] = $parsed . ' ' . $this->parse_order($_order);
 			}
 
 		}
 
 		// If no valid clauses were found, order by id.
-		if ( empty( $orderby_array ) ) {
+		if (empty($orderby_array)) {
 			$orderby_array[] = "id $order";
 		}
 
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+		$this->query_orderby = 'ORDER BY ' . implode(', ', $orderby_array);
 
 	}
 
@@ -379,34 +379,34 @@ 
 	public function query() {
 		global $wpdb;
 
-		$qv =& $this->query_vars;
+		$qv = & $this->query_vars;
 
 		// Return a non-null value to bypass the default GetPaid subscriptions query and remember to set the
 		// total_subscriptions property.
-		$this->results = apply_filters_ref_array( 'getpaid_subscriptions_pre_query', array( null, &$this ) );
+		$this->results = apply_filters_ref_array('getpaid_subscriptions_pre_query', array(null, &$this));
 
-		if ( null === $this->results ) {
+		if (null === $this->results) {
 			$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
 
-			if ( ( is_array( $qv['fields'] ) && 1 != count( $qv['fields'] ) ) || 'all' == $qv['fields'] ) {
-				$this->results = $wpdb->get_results( $this->request );
+			if ((is_array($qv['fields']) && 1 != count($qv['fields'])) || 'all' == $qv['fields']) {
+				$this->results = $wpdb->get_results($this->request);
 			} else {
-				$this->results = $wpdb->get_col( $this->request );
+				$this->results = $wpdb->get_col($this->request);
 			}
 
-			if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
-				$found_subscriptions_query = apply_filters( 'getpaid_found_subscriptions_query', 'SELECT FOUND_ROWS()', $this );
-				$this->total_subscriptions   = (int) $wpdb->get_var( $found_subscriptions_query );
+			if (isset($qv['count_total']) && $qv['count_total']) {
+				$found_subscriptions_query = apply_filters('getpaid_found_subscriptions_query', 'SELECT FOUND_ROWS()', $this);
+				$this->total_subscriptions = (int) $wpdb->get_var($found_subscriptions_query);
 			}
 		}
 
-		if ( 'all' == $qv['fields'] ) {
-			foreach ( $this->results as $key => $subscription ) {
-				wp_cache_set( $subscription->id, $subscription, 'getpaid_subscriptions' );
-				wp_cache_set( $subscription->profile_id, $subscription->id, 'getpaid_subscription_profile_ids_to_subscription_ids' );
-				wp_cache_set( $subscription->transaction_id, $subscription->id, 'getpaid_subscription_transaction_ids_to_subscription_ids' );
-				wp_cache_set( $subscription->transaction_id, $subscription->id, 'getpaid_subscription_transaction_ids_to_subscription_ids' );
-				$this->results[ $key ] = new WPInv_Subscription( $subscription );
+		if ('all' == $qv['fields']) {
+			foreach ($this->results as $key => $subscription) {
+				wp_cache_set($subscription->id, $subscription, 'getpaid_subscriptions');
+				wp_cache_set($subscription->profile_id, $subscription->id, 'getpaid_subscription_profile_ids_to_subscription_ids');
+				wp_cache_set($subscription->transaction_id, $subscription->id, 'getpaid_subscription_transaction_ids_to_subscription_ids');
+				wp_cache_set($subscription->transaction_id, $subscription->id, 'getpaid_subscription_transaction_ids_to_subscription_ids');
+				$this->results[$key] = new WPInv_Subscription($subscription);
 			}
 		}
 
@@ -420,9 +420,9 @@ 
 	 * @param string $query_var Query variable key.
 	 * @return mixed
 	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
+	public function get($query_var) {
+		if (isset($this->query_vars[$query_var])) {
+			return $this->query_vars[$query_var];
 		}
 
 		return null;
@@ -436,8 +436,8 @@ 
 	 * @param string $query_var Query variable key.
 	 * @param mixed $value Query variable value.
 	 */
-	public function set( $query_var, $value ) {
-		$this->query_vars[ $query_var ] = $value;
+	public function set($query_var, $value) {
+		$this->query_vars[$query_var] = $value;
 	}
 
 	/**
@@ -471,16 +471,16 @@ 
 	 *  @param string $table The current table.
 	 * @return string Value to use in the ORDER clause, if `$orderby` is valid.
 	 */
-	protected function parse_orderby( $orderby, $table ) {
+	protected function parse_orderby($orderby, $table) {
 
 		$_orderby = '';
-		if ( in_array( $orderby, array( 'customer_id', 'frequency', 'period', 'initial_amount', 'recurring_amount', 'bill_times', 'transaction_id', 'parent_payment_id', 'product_id', 'created', 'expiration', 'trial_period', 'status', 'profile_id' ) ) ) {
+		if (in_array($orderby, array('customer_id', 'frequency', 'period', 'initial_amount', 'recurring_amount', 'bill_times', 'transaction_id', 'parent_payment_id', 'product_id', 'created', 'expiration', 'trial_period', 'status', 'profile_id'))) {
 			$_orderby = "$table.`$orderby`";
-		} elseif ( 'id' === strtolower( $orderby ) ) {
+		} elseif ('id' === strtolower($orderby)) {
 			$_orderby = "$table.id";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include     = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
+		} elseif ('include' === $orderby && !empty($this->query_vars['include'])) {
+			$include     = wp_parse_id_list($this->query_vars['include']);
+			$include_sql = implode(',', $include);
 			$_orderby    = "FIELD( $table.id, $include_sql )";
 		}
 
@@ -495,12 +495,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if (!is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';

widgets/subscriptions.php

Indentation +331 added lines, -331 removed lines

@@ -14,144 +14,144 @@ 
  */
 class WPInv_Subscriptions_Widget extends WP_Super_Duper {
 
-	/**
-	 * Register the widget with WordPress.
-	 *
-	 */
-	public function __construct() {
-
-		$options = array(
-			'textdomain'    => 'invoicing',
-			'block-icon'    => 'controls-repeat',
-			'block-category'=> 'widgets',
-			'block-keywords'=> "['invoicing','subscriptions', 'getpaid']",
-			'class_name'     => __CLASS__,
-			'base_id'       => 'wpinv_subscriptions',
-			'name'          => __( 'GetPaid > Subscriptions', 'invoicing' ),
-			'widget_ops'    => array(
-				'classname'   => 'getpaid-subscriptions bsui',
-				'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
-			),
-			'arguments'     => array(
-				'title'  => array(
-					'title'       => __( 'Widget title', 'invoicing' ),
-					'desc'        => __( 'Enter widget title.', 'invoicing' ),
-					'type'        => 'text',
-					'desc_tip'    => true,
-					'default'     => '',
-					'advanced'    => false
-				),
-			)
-
-		);
-
-
-		parent::__construct( $options );
-	}
-
-	/**
-	 * Retrieves current user's subscriptions.
-	 *
-	 * @return GetPaid_Subscriptions_Query
-	 */
-	public function get_subscriptions() {
-
-		// Prepare license args.
-		$args  = array(
-			'customer_in' => get_current_user_id(),
-			'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
-		);
-
-		return new GetPaid_Subscriptions_Query( $args );
-
-	}
-
-	/**
-	 * The Super block output function.
-	 *
-	 * @param array $args
-	 * @param array $widget_args
-	 * @param string $content
-	 *
-	 * @return mixed|string|bool
-	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
-
-		// Ensure that the user is logged in.
-		if ( ! is_user_logged_in() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		// Are we displaying a single subscription?
-		if ( isset( $_GET['subscription'] ) ) {
-			return $this->display_single_subscription( trim( $_GET['subscription'] ) );
-		}
-
-		// Retrieve the user's subscriptions.
-		$subscriptions = $this->get_subscriptions();
-
-		// Start the output buffer.
-		ob_start();
-
-		// Backwards compatibility.
-		do_action( 'wpinv_before_user_subscriptions' );
-
-		// Display errors and notices.
-		wpinv_print_errors();
-
-		do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
-
-		// Print the table header.
-		$this->print_table_header();
-
-		// Print table body.
-		$this->print_table_body( $subscriptions->get_results() );
-
-		// Print table footer.
-		$this->print_table_footer();
-
-		// Print the navigation.
-		$this->print_navigation( $subscriptions->get_total() );
-
-		// Backwards compatibility.
-		do_action( 'wpinv_after_user_subscriptions' );
-
-		// Return the output.
-		return ob_get_clean();
-
-	}
-
-	/**
-	 * Retrieves the subscription columns.
-	 *
-	 * @return array
-	 */
-	public function get_subscriptions_table_columns() {
+    /**
+     * Register the widget with WordPress.
+     *
+     */
+    public function __construct() {
+
+        $options = array(
+            'textdomain'    => 'invoicing',
+            'block-icon'    => 'controls-repeat',
+            'block-category'=> 'widgets',
+            'block-keywords'=> "['invoicing','subscriptions', 'getpaid']",
+            'class_name'     => __CLASS__,
+            'base_id'       => 'wpinv_subscriptions',
+            'name'          => __( 'GetPaid > Subscriptions', 'invoicing' ),
+            'widget_ops'    => array(
+                'classname'   => 'getpaid-subscriptions bsui',
+                'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
+            ),
+            'arguments'     => array(
+                'title'  => array(
+                    'title'       => __( 'Widget title', 'invoicing' ),
+                    'desc'        => __( 'Enter widget title.', 'invoicing' ),
+                    'type'        => 'text',
+                    'desc_tip'    => true,
+                    'default'     => '',
+                    'advanced'    => false
+                ),
+            )
+
+        );
+
+
+        parent::__construct( $options );
+    }
+
+    /**
+     * Retrieves current user's subscriptions.
+     *
+     * @return GetPaid_Subscriptions_Query
+     */
+    public function get_subscriptions() {
+
+        // Prepare license args.
+        $args  = array(
+            'customer_in' => get_current_user_id(),
+            'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+        );
+
+        return new GetPaid_Subscriptions_Query( $args );
+
+    }
+
+    /**
+     * The Super block output function.
+     *
+     * @param array $args
+     * @param array $widget_args
+     * @param string $content
+     *
+     * @return mixed|string|bool
+     */
+    public function output( $args = array(), $widget_args = array(), $content = '' ) {
+
+        // Ensure that the user is logged in.
+        if ( ! is_user_logged_in() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        // Are we displaying a single subscription?
+        if ( isset( $_GET['subscription'] ) ) {
+            return $this->display_single_subscription( trim( $_GET['subscription'] ) );
+        }
+
+        // Retrieve the user's subscriptions.
+        $subscriptions = $this->get_subscriptions();
+
+        // Start the output buffer.
+        ob_start();
+
+        // Backwards compatibility.
+        do_action( 'wpinv_before_user_subscriptions' );
+
+        // Display errors and notices.
+        wpinv_print_errors();
+
+        do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
+
+        // Print the table header.
+        $this->print_table_header();
+
+        // Print table body.
+        $this->print_table_body( $subscriptions->get_results() );
+
+        // Print table footer.
+        $this->print_table_footer();
+
+        // Print the navigation.
+        $this->print_navigation( $subscriptions->get_total() );
+
+        // Backwards compatibility.
+        do_action( 'wpinv_after_user_subscriptions' );
+
+        // Return the output.
+        return ob_get_clean();
+
+    }
+
+    /**
+     * Retrieves the subscription columns.
+     *
+     * @return array
+     */
+    public function get_subscriptions_table_columns() {
 
-		$columns = array(
-			'subscription'   => __( 'Subscription', 'invoicing' ),
-			'amount'         => __( 'Amount', 'invoicing' ),
-			'renewal-date'   => __( 'Next payment', 'invoicing' ),
-			'status'         => __( 'Status', 'invoicing' ),
-		);
+        $columns = array(
+            'subscription'   => __( 'Subscription', 'invoicing' ),
+            'amount'         => __( 'Amount', 'invoicing' ),
+            'renewal-date'   => __( 'Next payment', 'invoicing' ),
+            'status'         => __( 'Status', 'invoicing' ),
+        );
 
-		return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
-	}
+        return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
+    }
 
-	/**
-	 * Displays the table header.
-	 *
-	 */
-	public function print_table_header() {
+    /**
+     * Displays the table header.
+     *
+     */
+    public function print_table_header() {
 
-		?>
+        ?>
 
 			<table class="table table-bordered table-striped">
 
@@ -167,120 +167,120 @@ 
 
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the table body.
-	 *
-	 * @param WPInv_Subscription[] $subscriptions
-	 */
-	public function print_table_body( $subscriptions ) {
+    /**
+     * Displays the table body.
+     *
+     * @param WPInv_Subscription[] $subscriptions
+     */
+    public function print_table_body( $subscriptions ) {
 
-		if ( empty( $subscriptions ) ) {
-			$this->print_table_body_no_subscriptions();
-		} else {
-			$this->print_table_body_subscriptions( $subscriptions );
-		}
+        if ( empty( $subscriptions ) ) {
+            $this->print_table_body_no_subscriptions();
+        } else {
+            $this->print_table_body_subscriptions( $subscriptions );
+        }
 
-	}
+    }
 
-	/**
-	 * Displays the table body if no subscriptions were found.
-	 *
-	 */
-	public function print_table_body_no_subscriptions() {
+    /**
+     * Displays the table body if no subscriptions were found.
+     *
+     */
+    public function print_table_body_no_subscriptions() {
 
-		?>
+        ?>
 		<tbody>
 
 			<tr>
 				<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
 
 					<?php
-						echo aui()->alert(
-							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
-								'type'    => 'warning',
-							)
-						);
-					?>
+                        echo aui()->alert(
+                            array(
+                                'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+                                'type'    => 'warning',
+                            )
+                        );
+                    ?>
 
 				</td>
 			</tr>
 
 		</tbody>
 		<?php
-	}
+    }
 
-	/**
-	 * Displays the table body if subscriptions were found.
-	 *
-	 * @param WPInv_Subscription[] $subscriptions
-	 */
-	public function print_table_body_subscriptions( $subscriptions ) {
+    /**
+     * Displays the table body if subscriptions were found.
+     *
+     * @param WPInv_Subscription[] $subscriptions
+     */
+    public function print_table_body_subscriptions( $subscriptions ) {
 
-		?>
+        ?>
 		<tbody>
 
 			<?php foreach ( $subscriptions as $subscription ) : ?>
 				<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
 					<?php
-						wpinv_get_template(
-							'subscriptions/subscriptions-table-row.php',
-							array(
-								'subscription' => $subscription,
-								'widget'       => $this
-							)
-						);
-					?>
+                        wpinv_get_template(
+                            'subscriptions/subscriptions-table-row.php',
+                            array(
+                                'subscription' => $subscription,
+                                'widget'       => $this
+                            )
+                        );
+                    ?>
 				</tr>
 			<?php endforeach; ?>
 
 		</tbody>
 		<?php
-	}
-
-	/**
-	 * Adds row actions to a column
-	 *
-	 * @param string $content column content
-	 * @param WPInv_Subscription $subscription
-	 * @since       1.0.0
-	 * @return      string
-	 */
-	public function add_row_actions( $content, $subscription ) {
-
-		// Prepare row actions.
-		$actions = array();
-
-		// View subscription action.
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) );
-		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
-
-		// Filter the actions.
-		$actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
-
-		$sanitized  = array();
-		foreach ( $actions as $key => $action ) {
-			$key         = sanitize_html_class( $key );
-			$action      = wp_kses_post( $action );
-			$sanitized[] = "<span class='$key'>$action</span>";
-		}
-
-		$row_actions  = "<small class='form-text getpaid-subscription-item-actions'>";
-		$row_actions .= implode( ' | ', $sanitized );
-		$row_actions .= '</small>';
-
-		return $content . $row_actions;
-	}
-
-	/**
-	 * Displays the table footer.
-	 *
-	 */
-	public function print_table_footer() {
-
-		?>
+    }
+
+    /**
+     * Adds row actions to a column
+     *
+     * @param string $content column content
+     * @param WPInv_Subscription $subscription
+     * @since       1.0.0
+     * @return      string
+     */
+    public function add_row_actions( $content, $subscription ) {
+
+        // Prepare row actions.
+        $actions = array();
+
+        // View subscription action.
+        $view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) );
+        $actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
+
+        // Filter the actions.
+        $actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
+
+        $sanitized  = array();
+        foreach ( $actions as $key => $action ) {
+            $key         = sanitize_html_class( $key );
+            $action      = wp_kses_post( $action );
+            $sanitized[] = "<span class='$key'>$action</span>";
+        }
+
+        $row_actions  = "<small class='form-text getpaid-subscription-item-actions'>";
+        $row_actions .= implode( ' | ', $sanitized );
+        $row_actions .= '</small>';
+
+        return $content . $row_actions;
+    }
+
+    /**
+     * Displays the table footer.
+     *
+     */
+    public function print_table_footer() {
+
+        ?>
 
 				<tfoot>
 					<tr>
@@ -295,129 +295,129 @@ 
 			</table>
 		<?php
 
-	}
+    }
 
-	/**
-	 * Displays the navigation.
-	 *
-	 * @param int $total
-	 */
-	public function print_navigation( $total ) {
+    /**
+     * Displays the navigation.
+     *
+     * @param int $total
+     */
+    public function print_navigation( $total ) {
 
-		if ( $total < 1 ) {
+        if ( $total < 1 ) {
 
-			// Out-of-bounds, run the query again without LIMIT for total count.
-			$args  = array(
-				'customer_in' => get_current_user_id(),
-				'fields'      => 'id',
-			);
+            // Out-of-bounds, run the query again without LIMIT for total count.
+            $args  = array(
+                'customer_in' => get_current_user_id(),
+                'fields'      => 'id',
+            );
 
-			$count_query = new GetPaid_Subscriptions_Query( $args );
-			$total       = $count_query->get_total();
-		}
+            $count_query = new GetPaid_Subscriptions_Query( $args );
+            $total       = $count_query->get_total();
+        }
 
-		// Abort if we do not have pages.
-		if ( 2 > $total ) {
-			return;
-		}
+        // Abort if we do not have pages.
+        if ( 2 > $total ) {
+            return;
+        }
 
-		?>
+        ?>
 
 		<div class="getpaid-subscriptions-pagination">
 			<?php
-				$big = 999999;
-
-				echo getpaid_paginate_links(
-					array(
-						'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-						'format'  => '?paged=%#%',
-						'total'   => (int) ceil( $total / 10 ),
-					)
-				);
-			?>
+                $big = 999999;
+
+                echo getpaid_paginate_links(
+                    array(
+                        'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                        'format'  => '?paged=%#%',
+                        'total'   => (int) ceil( $total / 10 ),
+                    )
+                );
+            ?>
 		</div>
 
 		<?php
-	}
-
-	/**
-	 * Returns a single subscription's columns.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 *
-	 * @return array
-	 */
-	public function get_single_subscription_columns( $subscription ) {
-
-		// Prepare subscription detail columns.
-		$fields = apply_filters(
-			'getpaid_single_subscription_details_fields',
-			array(
-				'status'           => __( 'Status', 'invoicing' ),
-				'initial_amount'   => __( 'Initial amount', 'invoicing' ),
-				'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
-				'start_date'       => __( 'Start date', 'invoicing' ),
-				'expiry_date'      => __( 'Next payment', 'invoicing' ),
-				'payments'         => __( 'Payments', 'invoicing' ),
-				'item'             => __( 'Item', 'invoicing' ),
-			),
-			$subscription
-		);
-
-		if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
-			$fields['expiry_date'] = __( 'End date', 'invoicing' );
-		}
-
-		if ( $subscription->get_initial_amount() == $subscription->get_recurring_amount() ) {
-			unset( $fields['initial_amount'] );
-		}
-
-		return $fields;
-	}
-
-	/**
-	 * Displays a single subscription.
-	 *
-	 * @param string $subscription
-	 *
-	 * @return string
-	 */
-	public function display_single_subscription( $subscription ) {
-
-		// Fetch the subscription.
-		$subscription = new WPInv_Subscription( (int) $subscription );
-
-		if ( ! $subscription->get_id() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		// Ensure that the user owns this subscription key.
-		if ( get_current_user_id() != $subscription->get_customer_id() ) {
-
-			return aui()->alert(
-				array(
-					'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
-					'type'    => 'error',
-				)
-			);
-
-		}
-
-		return wpinv_get_template_html(
-			'subscriptions/subscription-details.php',
-			array(
-				'subscription' => $subscription,
-				'widget'       => $this
-			)
-		);
-
-	}
+    }
+
+    /**
+     * Returns a single subscription's columns.
+     *
+     * @param WPInv_Subscription $subscription
+     *
+     * @return array
+     */
+    public function get_single_subscription_columns( $subscription ) {
+
+        // Prepare subscription detail columns.
+        $fields = apply_filters(
+            'getpaid_single_subscription_details_fields',
+            array(
+                'status'           => __( 'Status', 'invoicing' ),
+                'initial_amount'   => __( 'Initial amount', 'invoicing' ),
+                'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
+                'start_date'       => __( 'Start date', 'invoicing' ),
+                'expiry_date'      => __( 'Next payment', 'invoicing' ),
+                'payments'         => __( 'Payments', 'invoicing' ),
+                'item'             => __( 'Item', 'invoicing' ),
+            ),
+            $subscription
+        );
+
+        if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
+            $fields['expiry_date'] = __( 'End date', 'invoicing' );
+        }
+
+        if ( $subscription->get_initial_amount() == $subscription->get_recurring_amount() ) {
+            unset( $fields['initial_amount'] );
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Displays a single subscription.
+     *
+     * @param string $subscription
+     *
+     * @return string
+     */
+    public function display_single_subscription( $subscription ) {
+
+        // Fetch the subscription.
+        $subscription = new WPInv_Subscription( (int) $subscription );
+
+        if ( ! $subscription->get_id() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        // Ensure that the user owns this subscription key.
+        if ( get_current_user_id() != $subscription->get_customer_id() ) {
+
+            return aui()->alert(
+                array(
+                    'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
+                    'type'    => 'error',
+                )
+            );
+
+        }
+
+        return wpinv_get_template_html(
+            'subscriptions/subscription-details.php',
+            array(
+                'subscription' => $subscription,
+                'widget'       => $this
+            )
+        );
+
+    }
 
 }

Spacing +71 added lines, -71 removed lines

@@ -5,7 +5,7 @@ 
  * @version 1.0.0
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Contains the subscriptions widget.
@@ -27,15 +27,15 @@ 
 			'block-keywords'=> "['invoicing','subscriptions', 'getpaid']",
 			'class_name'     => __CLASS__,
 			'base_id'       => 'wpinv_subscriptions',
-			'name'          => __( 'GetPaid > Subscriptions', 'invoicing' ),
+			'name'          => __('GetPaid > Subscriptions', 'invoicing'),
 			'widget_ops'    => array(
 				'classname'   => 'getpaid-subscriptions bsui',
-				'description' => esc_html__( "Displays the current user's subscriptions.", 'invoicing' ),
+				'description' => esc_html__("Displays the current user's subscriptions.", 'invoicing'),
 			),
 			'arguments'     => array(
 				'title'  => array(
-					'title'       => __( 'Widget title', 'invoicing' ),
-					'desc'        => __( 'Enter widget title.', 'invoicing' ),
+					'title'       => __('Widget title', 'invoicing'),
+					'desc'        => __('Enter widget title.', 'invoicing'),
 					'type'        => 'text',
 					'desc_tip'    => true,
 					'default'     => '',
@@ -46,7 +46,7 @@ 
 		);
 
 
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 	/**
@@ -57,12 +57,12 @@ 
 	public function get_subscriptions() {
 
 		// Prepare license args.
-		$args  = array(
+		$args = array(
 			'customer_in' => get_current_user_id(),
-			'paged'       => ( get_query_var( 'paged' ) ) ? absint( get_query_var( 'paged' ) ) : 1,
+			'paged'       => (get_query_var('paged')) ? absint(get_query_var('paged')) : 1,
 		);
 
-		return new GetPaid_Subscriptions_Query( $args );
+		return new GetPaid_Subscriptions_Query($args);
 
 	}
 
@@ -75,14 +75,14 @@ 
 	 *
 	 * @return mixed|string|bool
 	 */
-	public function output( $args = array(), $widget_args = array(), $content = '' ) {
+	public function output($args = array(), $widget_args = array(), $content = '') {
 
 		// Ensure that the user is logged in.
-		if ( ! is_user_logged_in() ) {
+		if (!is_user_logged_in()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'You need to log-in or create an account to view this section.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('You need to log-in or create an account to view this section.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);
@@ -90,8 +90,8 @@ 
 		}
 
 		// Are we displaying a single subscription?
-		if ( isset( $_GET['subscription'] ) ) {
-			return $this->display_single_subscription( trim( $_GET['subscription'] ) );
+		if (isset($_GET['subscription'])) {
+			return $this->display_single_subscription(trim($_GET['subscription']));
 		}
 
 		// Retrieve the user's subscriptions.
@@ -101,27 +101,27 @@ 
 		ob_start();
 
 		// Backwards compatibility.
-		do_action( 'wpinv_before_user_subscriptions' );
+		do_action('wpinv_before_user_subscriptions');
 
 		// Display errors and notices.
 		wpinv_print_errors();
 
-		do_action( 'getpaid_license_manager_before_subscriptions', $subscriptions );
+		do_action('getpaid_license_manager_before_subscriptions', $subscriptions);
 
 		// Print the table header.
 		$this->print_table_header();
 
 		// Print table body.
-		$this->print_table_body( $subscriptions->get_results() );
+		$this->print_table_body($subscriptions->get_results());
 
 		// Print table footer.
 		$this->print_table_footer();
 
 		// Print the navigation.
-		$this->print_navigation( $subscriptions->get_total() );
+		$this->print_navigation($subscriptions->get_total());
 
 		// Backwards compatibility.
-		do_action( 'wpinv_after_user_subscriptions' );
+		do_action('wpinv_after_user_subscriptions');
 
 		// Return the output.
 		return ob_get_clean();
@@ -136,13 +136,13 @@ 
 	public function get_subscriptions_table_columns() {
 
 		$columns = array(
-			'subscription'   => __( 'Subscription', 'invoicing' ),
-			'amount'         => __( 'Amount', 'invoicing' ),
-			'renewal-date'   => __( 'Next payment', 'invoicing' ),
-			'status'         => __( 'Status', 'invoicing' ),
+			'subscription'   => __('Subscription', 'invoicing'),
+			'amount'         => __('Amount', 'invoicing'),
+			'renewal-date'   => __('Next payment', 'invoicing'),
+			'status'         => __('Status', 'invoicing'),
 		);
 
-		return apply_filters( 'getpaid_frontend_subscriptions_table_columns', $columns );
+		return apply_filters('getpaid_frontend_subscriptions_table_columns', $columns);
 	}
 
 	/**
@@ -157,9 +157,9 @@ 
 
 				<thead>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th scope="col" class="getpaid-subscriptions-table-<?php echo sanitize_html_class( $key ); ?>">
-								<?php echo sanitize_text_field( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th scope="col" class="getpaid-subscriptions-table-<?php echo sanitize_html_class($key); ?>">
+								<?php echo sanitize_text_field($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -174,12 +174,12 @@ 
 	 *
 	 * @param WPInv_Subscription[] $subscriptions
 	 */
-	public function print_table_body( $subscriptions ) {
+	public function print_table_body($subscriptions) {
 
-		if ( empty( $subscriptions ) ) {
+		if (empty($subscriptions)) {
 			$this->print_table_body_no_subscriptions();
 		} else {
-			$this->print_table_body_subscriptions( $subscriptions );
+			$this->print_table_body_subscriptions($subscriptions);
 		}
 
 	}
@@ -194,12 +194,12 @@ 
 		<tbody>
 
 			<tr>
-				<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
+				<td colspan="<?php echo count($this->get_subscriptions_table_columns()); ?>">
 
 					<?php
 						echo aui()->alert(
 							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+								'content' => wp_kses_post(__('No subscriptions found.', 'invoicing')),
 								'type'    => 'warning',
 							)
 						);
@@ -217,12 +217,12 @@ 
 	 *
 	 * @param WPInv_Subscription[] $subscriptions
 	 */
-	public function print_table_body_subscriptions( $subscriptions ) {
+	public function print_table_body_subscriptions($subscriptions) {
 
 		?>
 		<tbody>
 
-			<?php foreach ( $subscriptions as $subscription ) : ?>
+			<?php foreach ($subscriptions as $subscription) : ?>
 				<tr class="getpaid-subscriptions-table-row subscription-<?php echo (int) $subscription->get_id(); ?>">
 					<?php
 						wpinv_get_template(
@@ -248,27 +248,27 @@ 
 	 * @since       1.0.0
 	 * @return      string
 	 */
-	public function add_row_actions( $content, $subscription ) {
+	public function add_row_actions($content, $subscription) {
 
 		// Prepare row actions.
 		$actions = array();
 
 		// View subscription action.
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) ) );
-		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
+		$view_url        = esc_url(add_query_arg('subscription', (int) $subscription->get_id(), get_permalink((int) wpinv_get_option('invoice_subscription_page'))));
+		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __('Manage Subscription', 'invoicing') . '</a>';
 
 		// Filter the actions.
-		$actions = apply_filters( 'getpaid_subscriptions_table_subscription_actions', $actions, $subscription );
+		$actions = apply_filters('getpaid_subscriptions_table_subscription_actions', $actions, $subscription);
 
-		$sanitized  = array();
-		foreach ( $actions as $key => $action ) {
-			$key         = sanitize_html_class( $key );
-			$action      = wp_kses_post( $action );
+		$sanitized = array();
+		foreach ($actions as $key => $action) {
+			$key         = sanitize_html_class($key);
+			$action      = wp_kses_post($action);
 			$sanitized[] = "<span class='$key'>$action</span>";
 		}
 
 		$row_actions  = "<small class='form-text getpaid-subscription-item-actions'>";
-		$row_actions .= implode( ' | ', $sanitized );
+		$row_actions .= implode(' | ', $sanitized);
 		$row_actions .= '</small>';
 
 		return $content . $row_actions;
@@ -284,9 +284,9 @@ 
 
 				<tfoot>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th class="getpaid-subscriptions-<?php echo sanitize_html_class( $key ); ?>">
-								<?php echo sanitize_text_field( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th class="getpaid-subscriptions-<?php echo sanitize_html_class($key); ?>">
+								<?php echo sanitize_text_field($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -302,22 +302,22 @@ 
 	 *
 	 * @param int $total
 	 */
-	public function print_navigation( $total ) {
+	public function print_navigation($total) {
 
-		if ( $total < 1 ) {
+		if ($total < 1) {
 
 			// Out-of-bounds, run the query again without LIMIT for total count.
-			$args  = array(
+			$args = array(
 				'customer_in' => get_current_user_id(),
 				'fields'      => 'id',
 			);
 
-			$count_query = new GetPaid_Subscriptions_Query( $args );
+			$count_query = new GetPaid_Subscriptions_Query($args);
 			$total       = $count_query->get_total();
 		}
 
 		// Abort if we do not have pages.
-		if ( 2 > $total ) {
+		if (2 > $total) {
 			return;
 		}
 
@@ -329,9 +329,9 @@ 
 
 				echo getpaid_paginate_links(
 					array(
-						'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+						'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 						'format'  => '?paged=%#%',
-						'total'   => (int) ceil( $total / 10 ),
+						'total'   => (int) ceil($total / 10),
 					)
 				);
 			?>
@@ -347,29 +347,29 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_single_subscription_columns( $subscription ) {
+	public function get_single_subscription_columns($subscription) {
 
 		// Prepare subscription detail columns.
 		$fields = apply_filters(
 			'getpaid_single_subscription_details_fields',
 			array(
-				'status'           => __( 'Status', 'invoicing' ),
-				'initial_amount'   => __( 'Initial amount', 'invoicing' ),
-				'recurring_amount' => __( 'Recurring amount', 'invoicing' ),
-				'start_date'       => __( 'Start date', 'invoicing' ),
-				'expiry_date'      => __( 'Next payment', 'invoicing' ),
-				'payments'         => __( 'Payments', 'invoicing' ),
-				'item'             => __( 'Item', 'invoicing' ),
+				'status'           => __('Status', 'invoicing'),
+				'initial_amount'   => __('Initial amount', 'invoicing'),
+				'recurring_amount' => __('Recurring amount', 'invoicing'),
+				'start_date'       => __('Start date', 'invoicing'),
+				'expiry_date'      => __('Next payment', 'invoicing'),
+				'payments'         => __('Payments', 'invoicing'),
+				'item'             => __('Item', 'invoicing'),
 			),
 			$subscription
 		);
 
-		if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
-			$fields['expiry_date'] = __( 'End date', 'invoicing' );
+		if (!$subscription->is_active() || $subscription->is_last_renewal()) {
+			$fields['expiry_date'] = __('End date', 'invoicing');
 		}
 
-		if ( $subscription->get_initial_amount() == $subscription->get_recurring_amount() ) {
-			unset( $fields['initial_amount'] );
+		if ($subscription->get_initial_amount() == $subscription->get_recurring_amount()) {
+			unset($fields['initial_amount']);
 		}
 
 		return $fields;
@@ -382,16 +382,16 @@ 
 	 *
 	 * @return string
 	 */
-	public function display_single_subscription( $subscription ) {
+	public function display_single_subscription($subscription) {
 
 		// Fetch the subscription.
-		$subscription = new WPInv_Subscription( (int) $subscription );
+		$subscription = new WPInv_Subscription((int) $subscription);
 
-		if ( ! $subscription->get_id() ) {
+		if (!$subscription->get_id()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('Subscription not found.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);
@@ -399,11 +399,11 @@ 
 		}
 
 		// Ensure that the user owns this subscription key.
-		if ( get_current_user_id() != $subscription->get_customer_id() ) {
+		if (get_current_user_id() != $subscription->get_customer_id()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('You do not have permission to view this subscription. Ensure that you are logged in to the account that owns the subscription.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);

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

Indentation +9 added lines, -9 removed lines

@@ -6,7 +6,7 @@ 
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -15,10 +15,10 @@ 
 class GetPaid_Meta_Box_Invoice_Subscription {
 
     /**
-	 * Output the subscription metabox.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the subscription metabox.
+     *
+     * @param WP_Post $post
+     */
     public static function output( $post ) {
 
         // Fetch the invoice.
@@ -34,10 +34,10 @@ 
     }
 
     /**
-	 * Output the subscription invoices.
-	 *
-	 * @param WP_Post $post
-	 */
+     * Output the subscription invoices.
+     *
+     * @param WP_Post $post
+     */
     public static function output_invoices( $post ) {
 
         // Fetch the invoice.

Spacing +9 added lines, -9 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -19,16 +19,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output( $post ) {
+    public static function output($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_details_metabox( /** @scrutinizer ignore-type */$subscription );
+        getpaid_admin_subscription_details_metabox(/** @scrutinizer ignore-type */$subscription);
         echo '</div>';
 
     }
@@ -38,16 +38,16 @@ 
 	 *
 	 * @param WP_Post $post
 	 */
-    public static function output_invoices( $post ) {
+    public static function output_invoices($post) {
 
         // Fetch the invoice.
-        $invoice = new WPInv_Invoice( $post );
+        $invoice = new WPInv_Invoice($post);
 
         // Fetch the subscription.
-        $subscription = getpaid_get_invoice_subscription( $invoice );
+        $subscription = getpaid_get_invoice_subscription($invoice);
 
         echo '<div class="bsui">';
-        getpaid_admin_subscription_invoice_details_metabox( /** @scrutinizer ignore-type */$subscription );
+        getpaid_admin_subscription_invoice_details_metabox(/** @scrutinizer ignore-type */$subscription);
         echo '</div>';
 
     }

templates/invoice-history.php

Indentation +59 added lines, -59 removed lines

@@ -40,86 +40,86 @@ 
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
 					<?php
 
-						foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) :
+                        foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) :
 
-							$column_id = sanitize_html_class( $column_id );
-							$class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
+                            $column_id = sanitize_html_class( $column_id );
+                            $class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
 
-							echo "<td class='$column_id $class'>";
-							switch ( $column_id ) {
+                            echo "<td class='$column_id $class'>";
+                            switch ( $column_id ) {
 
-								case 'invoice-number':
-									echo wpinv_invoice_link( $invoice );
-									break;
+                                case 'invoice-number':
+                                    echo wpinv_invoice_link( $invoice );
+                                    break;
 
-								case 'created-date':
-									echo getpaid_format_date_value( $invoice->get_date_created() );
-									break;
+                                case 'created-date':
+                                    echo getpaid_format_date_value( $invoice->get_date_created() );
+                                    break;
 
-								case 'payment-date':
+                                case 'payment-date':
 
-									if ( $invoice->needs_payment() ) {
-										echo "&mdash;";
-									} else {
-										echo getpaid_format_date_value( $invoice->get_date_completed() );
-									}
+                                    if ( $invoice->needs_payment() ) {
+                                        echo "&mdash;";
+                                    } else {
+                                        echo getpaid_format_date_value( $invoice->get_date_completed() );
+                                    }
 									
-									break;
+                                    break;
 
-								case 'invoice-status':
-									echo $invoice->get_status_label_html();
+                                case 'invoice-status':
+                                    echo $invoice->get_status_label_html();
 									
-									break;
+                                    break;
 
-								case 'invoice-total':
-									echo wpinv_price( wpinv_format_amount( $invoice->get_total() ) );
+                                case 'invoice-total':
+                                    echo wpinv_price( wpinv_format_amount( $invoice->get_total() ) );
 									
-									break;
+                                    break;
 
-								case 'invoice-actions':
+                                case 'invoice-actions':
 
-									$actions = array(
+                                    $actions = array(
 
-										'pay'       => array(
-											'url'   => $invoice->get_checkout_payment_url(),
-											'name'  => __( 'Pay Now', 'invoicing' ),
+                                        'pay'       => array(
+                                            'url'   => $invoice->get_checkout_payment_url(),
+                                            'name'  => __( 'Pay Now', 'invoicing' ),
                                             'class' => 'btn-success'
-										),
+                                        ),
 
                                         'print'     => array(
-											'url'   => $invoice->get_view_url(),
-											'name'  => __( 'View Invoice', 'invoicing' ),
+                                            'url'   => $invoice->get_view_url(),
+                                            'name'  => __( 'View Invoice', 'invoicing' ),
                                             'class' => 'btn-secondary',
                                             'attrs' => 'target="_blank"'
-										)
-									);
+                                        )
+                                    );
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
-									}
+                                    if ( ! $invoice->needs_payment() ) {
+                                        unset( $actions['pay'] );
+                                    }
 
-									$actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice );
+                                    $actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice );
 
-									foreach ( $actions as $key => $action ) {
-										$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-										echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
-									}
+                                    foreach ( $actions as $key => $action ) {
+                                        $class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
+                                        echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+                                    }
 									
-									break;
+                                    break;
 
-								default:
-									do_action( "wpinv_user_invoices_column_$column_id", $invoice );
-									break;
+                                default:
+                                    do_action( "wpinv_user_invoices_column_$column_id", $invoice );
+                                    break;
 
 								
-							}
+                            }
 
-							do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
+                            do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
 						
-							echo '</td>';
+                            echo '</td>';
 
-						endforeach;
-					?>
+                        endforeach;
+                    ?>
 				</tr>
 
 			<?php endforeach; ?>
@@ -132,14 +132,14 @@ 
 	<?php if ( 1 < $invoices->max_num_pages ) : ?>
 		<div class="invoicing-Pagination">
 			<?php
-			$big = 999999;
-
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-				'format'  => '?paged=%#%',
-				'total'   => $invoices->max_num_pages,
-			) );
-			?>
+            $big = 999999;
+
+            echo paginate_links( array(
+                'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+                'format'  => '?paged=%#%',
+                'total'   => $invoices->max_num_pages,
+            ) );
+            ?>
 		</div>
 	<?php endif; ?>
 

Spacing +31 added lines, -31 removed lines

@@ -7,13 +7,13 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Current page.
-$current_page   = empty( $_GET[ 'page' ] ) ? 1 : absint( $_GET[ 'page' ] );
+$current_page = empty($_GET['page']) ? 1 : absint($_GET['page']);
 
 // Fires before displaying user invoices.
-do_action( 'wpinv_before_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages );
+do_action('wpinv_before_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages);
 
 ?>
 
@@ -23,9 +23,9 @@ 
 		<thead>
 			<tr>
 
-				<?php foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) : ?>
-					<th class="<?php echo sanitize_html_class( $column_id ); ?> <?php echo ( ! empty( $column_name['class'] ) ? sanitize_html_class( $column_name['class'] ) : '');?> border-bottom-0">
-						<span class="nobr"><?php echo esc_html( $column_name['title'] ); ?></span>
+				<?php foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) : ?>
+					<th class="<?php echo sanitize_html_class($column_id); ?> <?php echo (!empty($column_name['class']) ? sanitize_html_class($column_name['class']) : ''); ?> border-bottom-0">
+						<span class="nobr"><?php echo esc_html($column_name['title']); ?></span>
 					</th>
 				<?php endforeach; ?>
 
@@ -35,33 +35,33 @@ 
 
 		
 		<tbody>
-			<?php foreach ( $invoices->invoices as $invoice ) : ?>
+			<?php foreach ($invoices->invoices as $invoice) : ?>
 
 				<tr class="wpinv-item wpinv-item-<?php echo $invoice_status = $invoice->get_status(); ?>">
 					<?php
 
-						foreach ( wpinv_get_user_invoices_columns() as $column_id => $column_name ) :
+						foreach (wpinv_get_user_invoices_columns() as $column_id => $column_name) :
 
-							$column_id = sanitize_html_class( $column_id );
-							$class     = empty( $column_name['class'] ) ? '' : sanitize_html_class( $column_name['class'] );
+							$column_id = sanitize_html_class($column_id);
+							$class     = empty($column_name['class']) ? '' : sanitize_html_class($column_name['class']);
 
 							echo "<td class='$column_id $class'>";
-							switch ( $column_id ) {
+							switch ($column_id) {
 
 								case 'invoice-number':
-									echo wpinv_invoice_link( $invoice );
+									echo wpinv_invoice_link($invoice);
 									break;
 
 								case 'created-date':
-									echo getpaid_format_date_value( $invoice->get_date_created() );
+									echo getpaid_format_date_value($invoice->get_date_created());
 									break;
 
 								case 'payment-date':
 
-									if ( $invoice->needs_payment() ) {
+									if ($invoice->needs_payment()) {
 										echo "&mdash;";
 									} else {
-										echo getpaid_format_date_value( $invoice->get_date_completed() );
+										echo getpaid_format_date_value($invoice->get_date_completed());
 									}
 									
 									break;
@@ -72,7 +72,7 @@ 
 									break;
 
 								case 'invoice-total':
-									echo wpinv_price( wpinv_format_amount( $invoice->get_total() ) );
+									echo wpinv_price(wpinv_format_amount($invoice->get_total()));
 									
 									break;
 
@@ -82,39 +82,39 @@ 
 
 										'pay'       => array(
 											'url'   => $invoice->get_checkout_payment_url(),
-											'name'  => __( 'Pay Now', 'invoicing' ),
+											'name'  => __('Pay Now', 'invoicing'),
                                             'class' => 'btn-success'
 										),
 
                                         'print'     => array(
 											'url'   => $invoice->get_view_url(),
-											'name'  => __( 'View Invoice', 'invoicing' ),
+											'name'  => __('View Invoice', 'invoicing'),
                                             'class' => 'btn-secondary',
                                             'attrs' => 'target="_blank"'
 										)
 									);
 
-									if ( ! $invoice->needs_payment() ) {
-										unset( $actions['pay'] );
+									if (!$invoice->needs_payment()) {
+										unset($actions['pay']);
 									}
 
-									$actions = apply_filters( 'wpinv_user_invoices_actions', $actions, $invoice );
+									$actions = apply_filters('wpinv_user_invoices_actions', $actions, $invoice);
 
-									foreach ( $actions as $key => $action ) {
+									foreach ($actions as $key => $action) {
 										$class = !empty($action['class']) ? sanitize_html_class($action['class']) : '';
-										echo '<a href="' . esc_url( $action['url'] ) . '" class="btn btn-sm btn-block ' . $class . ' ' . sanitize_html_class( $key ) . '" ' . ( !empty($action['attrs']) ? $action['attrs'] : '' ) . '>' . $action['name'] . '</a>';
+										echo '<a href="' . esc_url($action['url']) . '" class="btn btn-sm btn-block ' . $class . ' ' . sanitize_html_class($key) . '" ' . (!empty($action['attrs']) ? $action['attrs'] : '') . '>' . $action['name'] . '</a>';
 									}
 									
 									break;
 
 								default:
-									do_action( "wpinv_user_invoices_column_$column_id", $invoice );
+									do_action("wpinv_user_invoices_column_$column_id", $invoice);
 									break;
 
 								
 							}
 
-							do_action( "wpinv_user_invoices_column_after_$column_id", $invoice );
+							do_action("wpinv_user_invoices_column_after_$column_id", $invoice);
 						
 							echo '</td>';
 
@@ -127,20 +127,20 @@ 
 		</tbody>
 	</table>
 
-	<?php do_action( 'wpinv_before_user_invoices_pagination' ); ?>
+	<?php do_action('wpinv_before_user_invoices_pagination'); ?>
 
-	<?php if ( 1 < $invoices->max_num_pages ) : ?>
+	<?php if (1 < $invoices->max_num_pages) : ?>
 		<div class="invoicing-Pagination">
 			<?php
 			$big = 999999;
 
-			echo paginate_links( array(
-				'base'    => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
+			echo paginate_links(array(
+				'base'    => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
 				'format'  => '?paged=%#%',
 				'total'   => $invoices->max_num_pages,
-			) );
+			));
 			?>
 		</div>
 	<?php endif; ?>
 
-<?php do_action( 'wpinv_after_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages  ); ?>
+<?php do_action('wpinv_after_user_invoices', $invoices->invoices, $invoices->total, $invoices->max_num_pages); ?>

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

Braces +15 added lines, -16 removed lines

@@ -79,10 +79,10 @@ 
 			if($type=='file' ){
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-file-input ';
-			}elseif($type=='checkbox'){
+			} elseif($type=='checkbox'){
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-control-input ';
-			}elseif($type=='datepicker' || $type=='timepicker'){
+			} elseif($type=='datepicker' || $type=='timepicker'){
 				$type = 'text';
 				//$args['class'] .= ' aui-flatpickr bg-initial ';
 				$args['class'] .= ' bg-initial ';
@@ -166,8 +166,7 @@ 
 
 			// label
 			if(!empty($args['label'])){
-				if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
-				elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
+				if($type == 'file'){$label_args['class'] .= 'custom-file-label';} elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
 				$label = self::label( $label_args, $type );
 			}
 
@@ -188,7 +187,7 @@ 
 					'content' => $output,
 					'class'   => 'form-group custom-file'
 				) );
-			}elseif($type == 'checkbox'){
+			} elseif($type == 'checkbox'){
 				$wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
 				$output = self::wrap( array(
 					'content' => $output,
@@ -198,7 +197,7 @@ 
 				if($args['label_type']=='horizontal'){
 					$output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $output . '</div>';
 				}
-			}elseif($type == 'password' && $args['password_toggle'] && !$args['input_group_right']){
+			} elseif($type == 'password' && $args['password_toggle'] && !$args['input_group_right']){
 
 
 				// allow password field to toggle view
@@ -322,7 +321,7 @@ 
 
 		// label
 		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		} elseif(!empty($args['label']) && !$label_after){
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
@@ -357,7 +356,7 @@ 
 
 			wp_editor( $content, $editor_id, $settings );
 			$output .= ob_get_clean();
-		}else{
+		} else{
 
 			// open
 			$output .= '<textarea ';
@@ -479,7 +478,7 @@ 
 			// maybe hide labels //@todo set a global option for visibility class
 			if($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type']) ){
 				$class = $args['class'];
-			}else{
+			} else{
 				$class = 'sr-only '.$args['class'];
 			}
 
@@ -582,7 +581,7 @@ 
 			$output .= '</'.sanitize_html_class($args['type']).'>';
 
 
-		}else{
+		} else{
 			$output = $args['content'];
 		}
 
@@ -644,7 +643,7 @@ 
 		if(!empty($args['select2'])){
 			$args['class'] .= ' aui-select2';
 			$is_select2 = true;
-		}elseif( strpos($args['class'], 'aui-select2') !== false){
+		} elseif( strpos($args['class'], 'aui-select2') !== false){
 			$is_select2 = true;
 		}
 
@@ -663,7 +662,7 @@ 
 
 		// label
 		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		} elseif(!empty($args['label']) && !$label_after){
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
@@ -738,7 +737,7 @@ 
 		// placeholder
 		if(!empty($args['placeholder']) && !$is_select2){
 			$output .= '<option value="" disabled selected hidden>'.esc_attr($args['placeholder']).'</option>';
-		}elseif($is_select2 && !empty($args['placeholder'])){
+		} elseif($is_select2 && !empty($args['placeholder'])){
 			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
 		}
 
@@ -747,7 +746,7 @@ 
 
 			if(!is_array($args['options'])){
 				$output .= $args['options']; // not the preferred way but an option
-			}else{
+			} else{
 				foreach($args['options'] as $val => $name){
 					$selected = '';
 					if(is_array($name)){
@@ -766,7 +765,7 @@ 
 
 							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
 						}
-					}else{
+					} else{
 						if(!empty($args['value'])){
 							if(is_array($args['value'])){
 								$selected = in_array($val,$args['value']) ? 'selected="selected"' : '';
@@ -986,7 +985,7 @@ 
 
 		// label
 		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label'])){
+		} elseif(!empty($args['label'])){
 			$output .= self::label(array('title'=>$args['label'],'for'=>$args['id'].$count,'class'=>'form-check-label'),'radio');
 		}
 

Indentation +1002 added lines, -1002 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,1012 +11,1012 @@ 
  */
 class AUI_Component_Input {
 
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function input($args = array()){
-		$defaults = array(
-			'type'       => 'text',
-			'name'       => '',
-			'class'      => '',
-			'wrap_class' => '',
-			'id'         => '',
-			'placeholder'=> '',
-			'title'      => '',
-			'value'      => '',
-			'required'   => false,
-			'label'      => '',
-			'label_after'=> false,
-			'label_class'=> '',
-			'label_type' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'  => '',
-			'validation_text'   => '',
-			'validation_pattern' => '',
-			'no_wrap'    => false,
-			'input_group_right' => '',
-			'input_group_left' => '',
-			'input_group_right_inside' => false, // forces the input group inside the input
-			'input_group_left_inside' => false, // forces the input group inside the input
-			'step'       => '',
-			'switch'     => false, // to show checkbox as a switch
-			'checked'   => false, // set a checkbox or radio as selected
-			'password_toggle' => true, // toggle view/hide password
-			'element_require'   => '', // [%element_id%] == "1"
-			'extra_attributes'  => array() // an array of extra attributes
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if ( ! empty( $args['type'] ) ) {
-			// hidden label option needs to be empty
-			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-			$type = sanitize_html_class( $args['type'] );
-
-			$help_text = '';
-			$label = '';
-			$label_after = $args['label_after'];
-			$label_args = array(
-				'title'=> $args['label'],
-				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
-				'label_type' => $args['label_type']
-			);
-
-			// floating labels need label after
-			if( $args['label_type'] == 'floating' && $type != 'checkbox' ){
-				$label_after = true;
-				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-			}
-
-			// Some special sauce for files
-			if($type=='file' ){
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= ' custom-file-input ';
-			}elseif($type=='checkbox'){
-				$label_after = true; // if type file we need the label after
-				$args['class'] .= ' custom-control-input ';
-			}elseif($type=='datepicker' || $type=='timepicker'){
-				$type = 'text';
-				//$args['class'] .= ' aui-flatpickr bg-initial ';
-				$args['class'] .= ' bg-initial ';
-
-				$args['extra_attributes']['data-aui-init'] = 'flatpickr';
-				// enqueue the script
-				$aui_settings = AyeCode_UI_Settings::instance();
-				$aui_settings->enqueue_flatpickr();
-			}
-
-
-			// open/type
-			$output .= '<input type="' . $type . '" ';
-
-			// name
-			if(!empty($args['name'])){
-				$output .= ' name="'.esc_attr($args['name']).'" ';
-			}
-
-			// id
-			if(!empty($args['id'])){
-				$output .= ' id="'.sanitize_html_class($args['id']).'" ';
-			}
-
-			// placeholder
-			if(!empty($args['placeholder'])){
-				$output .= ' placeholder="'.esc_attr($args['placeholder']).'" ';
-			}
-
-			// title
-			if(!empty($args['title'])){
-				$output .= ' title="'.esc_attr($args['title']).'" ';
-			}
-
-			// value
-			if(!empty($args['value'])){
-				$output .= ' value="'.sanitize_text_field($args['value']).'" ';
-			}
-
-			// checked, for radio and checkboxes
-			if( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ){
-				$output .= ' checked ';
-			}
-
-			// validation text
-			if(!empty($args['validation_text'])){
-				$output .= ' oninvalid="setCustomValidity(\''.esc_attr($args['validation_text']).'\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if(!empty($args['validation_pattern'])){
-				$output .= ' pattern="'.$args['validation_pattern'].'" ';
-			}
-
-			// step (for numbers)
-			if(!empty($args['step'])){
-				$output .= ' step="'.$args['step'].'" ';
-			}
-
-			// required
-			if(!empty($args['required'])){
-				$output .= ' required ';
-			}
-
-			// class
-			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="form-control '.$class.'" ';
-
-			// data-attributes
-			$output .= AUI_Component_Helper::data_attributes($args);
-
-			// extra attributes
-			if(!empty($args['extra_attributes'])){
-				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
-			}
-
-			// close
-			$output .= ' >';
-
-
-			// label
-			if(!empty($args['label'])){
-				if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
-				elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
-				$label = self::label( $label_args, $type );
-			}
-
-			// help text
-			if(!empty($args['help_text'])){
-				$help_text = AUI_Component_Helper::help_text($args['help_text']);
-			}
-
-
-			// set help text in the correct possition
-			if($label_after){
-				$output .= $label . $help_text;
-			}
-
-			// some input types need a separate wrap
-			if($type == 'file') {
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => 'form-group custom-file'
-				) );
-			}elseif($type == 'checkbox'){
-				$wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => 'custom-control '.$wrap_class
-				) );
-
-				if($args['label_type']=='horizontal'){
-					$output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $output . '</div>';
-				}
-			}elseif($type == 'password' && $args['password_toggle'] && !$args['input_group_right']){
-
-
-				// allow password field to toggle view
-				$args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function input($args = array()){
+        $defaults = array(
+            'type'       => 'text',
+            'name'       => '',
+            'class'      => '',
+            'wrap_class' => '',
+            'id'         => '',
+            'placeholder'=> '',
+            'title'      => '',
+            'value'      => '',
+            'required'   => false,
+            'label'      => '',
+            'label_after'=> false,
+            'label_class'=> '',
+            'label_type' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'help_text'  => '',
+            'validation_text'   => '',
+            'validation_pattern' => '',
+            'no_wrap'    => false,
+            'input_group_right' => '',
+            'input_group_left' => '',
+            'input_group_right_inside' => false, // forces the input group inside the input
+            'input_group_left_inside' => false, // forces the input group inside the input
+            'step'       => '',
+            'switch'     => false, // to show checkbox as a switch
+            'checked'   => false, // set a checkbox or radio as selected
+            'password_toggle' => true, // toggle view/hide password
+            'element_require'   => '', // [%element_id%] == "1"
+            'extra_attributes'  => array() // an array of extra attributes
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        if ( ! empty( $args['type'] ) ) {
+            // hidden label option needs to be empty
+            $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+            $type = sanitize_html_class( $args['type'] );
+
+            $help_text = '';
+            $label = '';
+            $label_after = $args['label_after'];
+            $label_args = array(
+                'title'=> $args['label'],
+                'for'=> $args['id'],
+                'class' => $args['label_class']." ",
+                'label_type' => $args['label_type']
+            );
+
+            // floating labels need label after
+            if( $args['label_type'] == 'floating' && $type != 'checkbox' ){
+                $label_after = true;
+                $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+            }
+
+            // Some special sauce for files
+            if($type=='file' ){
+                $label_after = true; // if type file we need the label after
+                $args['class'] .= ' custom-file-input ';
+            }elseif($type=='checkbox'){
+                $label_after = true; // if type file we need the label after
+                $args['class'] .= ' custom-control-input ';
+            }elseif($type=='datepicker' || $type=='timepicker'){
+                $type = 'text';
+                //$args['class'] .= ' aui-flatpickr bg-initial ';
+                $args['class'] .= ' bg-initial ';
+
+                $args['extra_attributes']['data-aui-init'] = 'flatpickr';
+                // enqueue the script
+                $aui_settings = AyeCode_UI_Settings::instance();
+                $aui_settings->enqueue_flatpickr();
+            }
+
+
+            // open/type
+            $output .= '<input type="' . $type . '" ';
+
+            // name
+            if(!empty($args['name'])){
+                $output .= ' name="'.esc_attr($args['name']).'" ';
+            }
+
+            // id
+            if(!empty($args['id'])){
+                $output .= ' id="'.sanitize_html_class($args['id']).'" ';
+            }
+
+            // placeholder
+            if(!empty($args['placeholder'])){
+                $output .= ' placeholder="'.esc_attr($args['placeholder']).'" ';
+            }
+
+            // title
+            if(!empty($args['title'])){
+                $output .= ' title="'.esc_attr($args['title']).'" ';
+            }
+
+            // value
+            if(!empty($args['value'])){
+                $output .= ' value="'.sanitize_text_field($args['value']).'" ';
+            }
+
+            // checked, for radio and checkboxes
+            if( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ){
+                $output .= ' checked ';
+            }
+
+            // validation text
+            if(!empty($args['validation_text'])){
+                $output .= ' oninvalid="setCustomValidity(\''.esc_attr($args['validation_text']).'\')" ';
+                $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+            }
+
+            // validation_pattern
+            if(!empty($args['validation_pattern'])){
+                $output .= ' pattern="'.$args['validation_pattern'].'" ';
+            }
+
+            // step (for numbers)
+            if(!empty($args['step'])){
+                $output .= ' step="'.$args['step'].'" ';
+            }
+
+            // required
+            if(!empty($args['required'])){
+                $output .= ' required ';
+            }
+
+            // class
+            $class = !empty($args['class']) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+            $output .= ' class="form-control '.$class.'" ';
+
+            // data-attributes
+            $output .= AUI_Component_Helper::data_attributes($args);
+
+            // extra attributes
+            if(!empty($args['extra_attributes'])){
+                $output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
+            }
+
+            // close
+            $output .= ' >';
+
+
+            // label
+            if(!empty($args['label'])){
+                if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
+                elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
+                $label = self::label( $label_args, $type );
+            }
+
+            // help text
+            if(!empty($args['help_text'])){
+                $help_text = AUI_Component_Helper::help_text($args['help_text']);
+            }
+
+
+            // set help text in the correct possition
+            if($label_after){
+                $output .= $label . $help_text;
+            }
+
+            // some input types need a separate wrap
+            if($type == 'file') {
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => 'form-group custom-file'
+                ) );
+            }elseif($type == 'checkbox'){
+                $wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => 'custom-control '.$wrap_class
+                ) );
+
+                if($args['label_type']=='horizontal'){
+                    $output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $output . '</div>';
+                }
+            }elseif($type == 'password' && $args['password_toggle'] && !$args['input_group_right']){
+
+
+                // allow password field to toggle view
+                $args['input_group_right'] = '<span class="input-group-text c-pointer px-3" 
 onclick="var $el = jQuery(this).find(\'i\');$el.toggleClass(\'fa-eye fa-eye-slash\');
 var $eli = jQuery(this).parent().parent().find(\'input\');
 if($el.hasClass(\'fa-eye\'))
 {$eli.attr(\'type\',\'text\');}
 else{$eli.attr(\'type\',\'password\');}"
 ><i class="far fa-fw fa-eye-slash"></i></span>';
-			}
-
-			// input group wraps
-			if($args['input_group_left'] || $args['input_group_right']){
-				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
-				if($args['input_group_left']){
-					$output = self::wrap( array(
-						'content' => $output,
-						'class'   => $args['input_group_left_inside'] ? 'input-group-inside position-relative'.$w100  : 'input-group',
-						'input_group_left' => $args['input_group_left'],
-						'input_group_left_inside'    => $args['input_group_left_inside']
-					) );
-				}
-				if($args['input_group_right']){
-					$output = self::wrap( array(
-						'content' => $output,
-						'class'   => $args['input_group_right_inside'] ? 'input-group-inside position-relative'.$w100 : 'input-group',
-						'input_group_right' => $args['input_group_right'],
-						'input_group_right_inside'    => $args['input_group_right_inside']
-					) );
-				}
-
-			}
-
-			if(!$label_after){
-				$output .= $help_text;
-			}
-
-
-			if($args['label_type']=='horizontal' && $type != 'checkbox'){
-				$output = self::wrap( array(
-					'content' => $output,
-					'class'   => 'col-sm-10',
-				) );
-			}
-
-			if(!$label_after){
-				$output = $label . $output;
-			}
-
-			// wrap
-			if(!$args['no_wrap']){
-
-				$form_group_class = $args['label_type']=='floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
-				$wrap_class = $args['label_type']=='horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
-				$output = self::wrap(array(
-					'content' => $output,
-					'class'   => $wrap_class,
-					'element_require'   => $args['element_require'],
-					'argument_id'  => $args['id']
-				));
-			}
-
-
-
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function textarea($args = array()){
-		$defaults = array(
-			'name'       => '',
-			'class'      => '',
-			'wrap_class' => '',
-			'id'         => '',
-			'placeholder'=> '',
-			'title'      => '',
-			'value'      => '',
-			'required'   => false,
-			'label'      => '',
-			'label_after'=> false,
-			'label_class'      => '',
-			'label_type' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'help_text'  => '',
-			'validation_text'   => '',
-			'validation_pattern' => '',
-			'no_wrap'    => false,
-			'rows'      => '',
-			'wysiwyg'   => false,
-			'element_require'   => '', // [%element_id%] == "1"
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-		// floating labels don't work with wysiwyg so set it as top
-		if($args['label_type'] == 'floating' && !empty($args['wysiwyg'])){
-			$args['label_type'] = 'top';
-		}
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if( $args['label_type'] == 'floating' && empty($args['wysiwyg']) ){
-			$label_after = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// label
-		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
-			$label_args = array(
-				'title'=> $args['label'],
-				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
-				'label_type' => $args['label_type']
-			);
-			$output .= self::label( $label_args );
-		}
-
-		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
-			$output .= '<div class="col-sm-10">';
-		}
-
-		if(!empty($args['wysiwyg'])){
-			ob_start();
-			$content = $args['value'];
-			$editor_id = !empty($args['id']) ? sanitize_html_class($args['id']) : 'wp_editor';
-			$settings = array(
-				'textarea_rows' => !empty(absint($args['rows'])) ? absint($args['rows']) : 4,
-				'quicktags'     => false,
-				'media_buttons' => false,
-				'editor_class'  => 'form-control',
-				'textarea_name' => !empty($args['name']) ? sanitize_html_class($args['name']) : sanitize_html_class($args['id']),
-				'teeny'         => true,
-			);
-
-			// maybe set settings if array
-			if(is_array($args['wysiwyg'])){
-				$settings  = wp_parse_args( $args['wysiwyg'], $settings );
-			}
-
-			wp_editor( $content, $editor_id, $settings );
-			$output .= ob_get_clean();
-		}else{
-
-			// open
-			$output .= '<textarea ';
-
-			// name
-			if(!empty($args['name'])){
-				$output .= ' name="'.sanitize_html_class($args['name']).'" ';
-			}
-
-			// id
-			if(!empty($args['id'])){
-				$output .= ' id="'.sanitize_html_class($args['id']).'" ';
-			}
-
-			// placeholder
-			if(!empty($args['placeholder'])){
-				$output .= ' placeholder="'.esc_attr($args['placeholder']).'" ';
-			}
-
-			// title
-			if(!empty($args['title'])){
-				$output .= ' title="'.esc_attr($args['title']).'" ';
-			}
-
-			// validation text
-			if(!empty($args['validation_text'])){
-				$output .= ' oninvalid="setCustomValidity(\''.esc_attr($args['validation_text']).'\')" ';
-				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
-			}
-
-			// validation_pattern
-			if(!empty($args['validation_pattern'])){
-				$output .= ' pattern="'.$args['validation_pattern'].'" ';
-			}
-
-			// required
-			if(!empty($args['required'])){
-				$output .= ' required ';
-			}
-
-			// rows
-			if(!empty($args['rows'])){
-				$output .= ' rows="'.absint($args['rows']).'" ';
-			}
-
-
-			// class
-			$class = !empty($args['class']) ? $args['class'] : '';
-			$output .= ' class="form-control '.$class.'" ';
-
-
-			// close tag
-			$output .= ' >';
-
-			// value
-			if(!empty($args['value'])){
-				$output .= sanitize_textarea_field($args['value']);
-			}
-
-			// closing tag
-			$output .= '</textarea>';
-
-		}
-
-		if(!empty($args['label']) && $label_after){
-			$label_args = array(
-				'title'=> $args['label'],
-				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
-				'label_type' => $args['label_type']
-			);
-			$output .= self::label( $label_args );
-		}
-
-		// help text
-		if(!empty($args['help_text'])){
-			$output .= AUI_Component_Helper::help_text($args['help_text']);
-		}
-
-		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
-			$output .= '</div>';
-		}
-
-
-		// wrap
-		if(!$args['no_wrap']){
-			$form_group_class = $args['label_type']=='floating' ? 'form-label-group' : 'form-group';
-			$wrap_class = $args['label_type']=='horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
-			$output = self::wrap(array(
-				'content' => $output,
-				'class'   => $wrap_class,
-				'element_require'   => $args['element_require'],
-				'argument_id'  => $args['id']
-			));
-		}
-
-
-		return $output;
-	}
-
-	public static function label($args = array(), $type = ''){
-		//<label for="exampleInputEmail1">Email address</label>
-		$defaults = array(
-			'title'       => 'div',
-			'for'      => '',
-			'class'      => '',
-			'label_type'    => '', // empty = hidden, top, horizontal
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		if($args['title']){
-
-			// maybe hide labels //@todo set a global option for visibility class
-			if($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type']) ){
-				$class = $args['class'];
-			}else{
-				$class = 'sr-only '.$args['class'];
-			}
-
-			// maybe horizontal
-			if($args['label_type']=='horizontal' && $type != 'checkbox'){
-				$class .= ' col-sm-2 col-form-label';
-			}
-
-			// open
-			$output .= '<label ';
-
-			// for
-			if(!empty($args['for'])){
-				$output .= ' for="'.sanitize_text_field($args['for']).'" ';
-			}
-
-			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
-			$output .= ' class="'.$class.'" ';
-
-			// close
-			$output .= '>';
-
-
-			// title, don't escape fully as can contain html
-			if(!empty($args['title'])){
-				$output .= wp_kses_post($args['title']);
-			}
-
-			// close wrap
-			$output .= '</label>';
-
-
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Wrap some content in a HTML wrapper.
-	 *
-	 * @param array $args
-	 *
-	 * @return string
-	 */
-	public static function wrap($args = array()){
-		$defaults = array(
-			'type'       => 'div',
-			'class'      => 'form-group',
-			'content'   => '',
-			'input_group_left' => '',
-			'input_group_right' => '',
-			'input_group_left_inside' => false,
-			'input_group_right_inside' => false,
-			'element_require'   => '',
-			'argument_id'   => '',
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-		if($args['type']){
-
-			// open
-			$output .= '<'.sanitize_html_class($args['type']);
-
-			// element require
-			if(!empty($args['element_require'])){
-				$output .= AUI_Component_Helper::element_require($args['element_require']);
-				$args['class'] .= " aui-conditional-field";
-			}
-
-			// argument_id
-			if( !empty($args['argument_id']) ){
-				$output .= ' data-argument="'.esc_attr($args['argument_id']).'"';
-			}
-
-			// class
-			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="'.$class.'" ';
-
-			// close wrap
-			$output .= ' >';
-
-
-			// Input group left
-			if(!empty($args['input_group_left'])){
-				$position_class = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">'.$args['input_group_left'].'</span>';
-				$output .= '<div class="input-group-prepend '.$position_class.'">'.$input_group_left.'</div>';
-			}
-
-			// content
-			$output .= $args['content'];
-
-			// Input group right
-			if(!empty($args['input_group_right'])){
-				$position_class = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">'.$args['input_group_right'].'</span>';
-				$output .= '<div class="input-group-append '.$position_class.'">'.$input_group_right.'</div>';
-			}
-
-
-			// close wrap
-			$output .= '</'.sanitize_html_class($args['type']).'>';
-
-
-		}else{
-			$output = $args['content'];
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function select($args = array()){
-		$defaults = array(
-			'class'      => '',
-			'wrap_class' => '',
-			'id'         => '',
-			'title'      => '',
-			'value'      => '', // can be an array or a string
-			'required'   => false,
-			'label'      => '',
-			'label_after'=> false,
-			'label_type' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'label_class'      => '',
-			'help_text'  => '',
-			'placeholder'=> '',
-			'options'    => array(), // array or string
-			'icon'       => '',
-			'multiple'   => false,
-			'select2'    => false,
-			'no_wrap'    => false,
-			'element_require'   => '', // [%element_id%] == "1"
-			'extra_attributes'  => array(), // an array of extra attributes
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-		$output = '';
-
-		// for now lets hide floating labels
-		if( $args['label_type'] == 'floating' ){$args['label_type'] = 'hidden';}
-
-		// hidden label option needs to be empty
-		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
-
-
-		$label_after = $args['label_after'];
-
-		// floating labels need label after
-		if( $args['label_type'] == 'floating' ){
-			$label_after = true;
-			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
-		}
-
-		// Maybe setup select2
-		$is_select2 = false;
-		if(!empty($args['select2'])){
-			$args['class'] .= ' aui-select2';
-			$is_select2 = true;
-		}elseif( strpos($args['class'], 'aui-select2') !== false){
-			$is_select2 = true;
-		}
-
-		// select2 tags
-		if( !empty($args['select2']) && $args['select2'] === 'tags'){ // triple equals needed here for some reason
-			$args['data-tags'] = 'true';
-			$args['data-token-separators'] = "[',']";
-			$args['multiple'] = true;
-		}
-
-		// select2 placeholder
-		if($is_select2 && !empty($args['placeholder']) && empty($args['data-placeholder'])){
-			$args['data-placeholder'] = esc_attr($args['placeholder']);
-			$args['data-allow-clear'] = empty($args['data-allow-clear']) ? true : esc_attr($args['data-allow-clear']);
-		}
-
-		// label
-		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
-			$label_args = array(
-				'title'=> $args['label'],
-				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
-				'label_type' => $args['label_type']
-			);
-			$output .= self::label($label_args);
-		}
-
-		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
-			$output .= '<div class="col-sm-10">';
-		}
-
-		// open/type
-		$output .= '<select ';
-
-		// style
-		if($is_select2){
-			$output .= " style='width:100%;' ";
-		}
-
-		// element require
-		if(!empty($args['element_require'])){
-			$output .= AUI_Component_Helper::element_require($args['element_require']);
-			$args['class'] .= " aui-conditional-field";
-		}
-
-		// class
-		$class = !empty($args['class']) ? $args['class'] : '';
-		$output .= AUI_Component_Helper::class_attr('custom-select '.$class);
-
-		// name
-		if(!empty($args['name'])){
-			$output .= AUI_Component_Helper::name($args['name'],$args['multiple']);
-		}
-
-		// id
-		if(!empty($args['id'])){
-			$output .= AUI_Component_Helper::id($args['id']);
-		}
-
-		// title
-		if(!empty($args['title'])){
-			$output .= AUI_Component_Helper::title($args['title']);
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes($args);
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes($args);
-
-		// extra attributes
-		if(!empty($args['extra_attributes'])){
-			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
-		}
-
-		// required
-		if(!empty($args['required'])){
-			$output .= ' required ';
-		}
-
-		// multiple
-		if(!empty($args['multiple'])){
-			$output .= ' multiple ';
-		}
-
-		// close opening tag
-		$output .= ' >';
-
-		// placeholder
-		if(!empty($args['placeholder']) && !$is_select2){
-			$output .= '<option value="" disabled selected hidden>'.esc_attr($args['placeholder']).'</option>';
-		}elseif($is_select2 && !empty($args['placeholder'])){
-			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
-		}
-
-		// Options
-		if(!empty($args['options'])){
-
-			if(!is_array($args['options'])){
-				$output .= $args['options']; // not the preferred way but an option
-			}else{
-				foreach($args['options'] as $val => $name){
-					$selected = '';
-					if(is_array($name)){
-						if (isset($name['optgroup']) && ($name['optgroup'] == 'start' || $name['optgroup'] == 'end')) {
-							$option_label = isset($name['label']) ? $name['label'] : '';
-
-							$output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
-						} else {
-							$option_label = isset($name['label']) ? $name['label'] : '';
-							$option_value = isset($name['value']) ? $name['value'] : '';
-							if(!empty($args['multiple']) && !empty($args['value']) && is_array($args['value']) ){
-								$selected = in_array($option_value, stripslashes_deep($args['value'])) ? "selected" : "";
-							} elseif(!empty($args['value'])) {
-								$selected = selected($option_value,stripslashes_deep($args['value']), false);
-							}
-
-							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
-						}
-					}else{
-						if(!empty($args['value'])){
-							if(is_array($args['value'])){
-								$selected = in_array($val,$args['value']) ? 'selected="selected"' : '';
-							} elseif(!empty($args['value'])) {
-								$selected = selected( $args['value'], $val, false);
-							}
-						}
-						$output .= '<option value="'.esc_attr($val).'" '.$selected.'>'.esc_attr($name).'</option>';
-					}
-				}
-			}
-
-		}
-
-		// closing tag
-		$output .= '</select>';
-
-		if(!empty($args['label']) && $label_after){
-			$label_args = array(
-				'title'=> $args['label'],
-				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
-				'label_type' => $args['label_type']
-			);
-			$output .= self::label($label_args);
-		}
-
-		// help text
-		if(!empty($args['help_text'])){
-			$output .= AUI_Component_Helper::help_text($args['help_text']);
-		}
-
-		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
-			$output .= '</div>';
-		}
-
-
-		// wrap
-		if(!$args['no_wrap']){
-			$wrap_class = $args['label_type']=='horizontal' ? 'form-group row' : 'form-group';
-			$wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
-			$output = self::wrap(array(
-				'content' => $output,
-				'class'   => $wrap_class,
-				'element_require'   => $args['element_require'],
-				'argument_id'  => $args['id']
-			));
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function radio($args = array()){
-		$defaults = array(
-			'class'      => '',
-			'wrap_class' => '',
-			'id'         => '',
-			'title'      => '',
-			'horizontal' => false, // sets the lable horizontal
-			'value'      => '',
-			'label'      => '',
-			'label_class'=> '',
-			'label_type' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
-			'inline'     => true,
-			'required'   => false,
-			'options'    => array(),
-			'icon'       => '',
-			'no_wrap'    => false,
-			'element_require'   => '', // [%element_id%] == "1"
-			'extra_attributes'  => array() // an array of extra attributes
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-
-		// for now lets use horizontal for floating
-		if( $args['label_type'] == 'floating' ){$args['label_type'] = 'horizontal';}
-
-		$label_args = array(
-			'title'=> $args['label'],
-			'class' => $args['label_class']." pt-0 ",
-			'label_type' => $args['label_type']
-		);
-
-		$output = '';
-
-
-
-		// label before
-		if(!empty($args['label'])){
-			$output .= self::label( $label_args, 'radio' );
-		}
-
-		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
-			$output .= '<div class="col-sm-10">';
-		}
-
-		if(!empty($args['options'])){
-			$count = 0;
-			foreach($args['options'] as $value => $label){
-				$option_args = $args;
-				$option_args['value'] = $value;
-				$option_args['label'] = $label;
-				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option($option_args,$count);
-				$count++;
-			}
-		}
-
-		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
-			$output .= '</div>';
-		}
-
-
-		// wrap
-		$wrap_class = $args['label_type']=='horizontal' ? 'form-group row' : 'form-group';
-		$wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
-		$output = self::wrap(array(
-			'content' => $output,
-			'class'   => $wrap_class,
-			'element_require'   => $args['element_require'],
-			'argument_id'  => $args['id']
-		));
-
-
-		return $output;
-	}
-
-	/**
-	 * Build the component.
-	 *
-	 * @param array $args
-	 *
-	 * @return string The rendered component.
-	 */
-	public static function radio_option($args = array(),$count = ''){
-		$defaults = array(
-			'class'      => '',
-			'id'         => '',
-			'title'      => '',
-			'value'      => '',
-			'required'   => false,
-			'inline'     => true,
-			'label'      => '',
-			'options'    => array(),
-			'icon'       => '',
-			'no_wrap'    => false,
-			'extra_attributes'  => array() // an array of extra attributes
-		);
-
-		/**
-		 * Parse incoming $args into an array and merge it with $defaults
-		 */
-		$args   = wp_parse_args( $args, $defaults );
-
-		$output = '';
-
-		// open/type
-		$output .= '<input type="radio"';
-
-		// class
-		$output .= ' class="form-check-input" ';
-
-		// name
-		if(!empty($args['name'])){
-			$output .= AUI_Component_Helper::name($args['name']);
-		}
-
-		// id
-		if(!empty($args['id'])){
-			$output .= AUI_Component_Helper::id($args['id'].$count);
-		}
-
-		// title
-		if(!empty($args['title'])){
-			$output .= AUI_Component_Helper::title($args['title']);
-		}
-
-		// value
-		if(isset($args['value'])){
-			$output .= ' value="'.sanitize_text_field($args['value']).'" ';
-		}
-
-		// checked, for radio and checkboxes
-		if( $args['checked'] ){
-			$output .= ' checked ';
-		}
-
-		// data-attributes
-		$output .= AUI_Component_Helper::data_attributes($args);
-
-		// aria-attributes
-		$output .= AUI_Component_Helper::aria_attributes($args);
-
-		// extra attributes
-		if(!empty($args['extra_attributes'])){
-			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
-		}
-
-		// required
-		if(!empty($args['required'])){
-			$output .= ' required ';
-		}
-
-		// close opening tag
-		$output .= ' >';
-
-		// label
-		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label'])){
-			$output .= self::label(array('title'=>$args['label'],'for'=>$args['id'].$count,'class'=>'form-check-label'),'radio');
-		}
-
-		// wrap
-		if(!$args['no_wrap']){
-			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
-			$output = self::wrap(array(
-				'content' => $output,
-				'class' => $wrap_class
-			));
-		}
-
-
-		return $output;
-	}
+            }
+
+            // input group wraps
+            if($args['input_group_left'] || $args['input_group_right']){
+                $w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
+                if($args['input_group_left']){
+                    $output = self::wrap( array(
+                        'content' => $output,
+                        'class'   => $args['input_group_left_inside'] ? 'input-group-inside position-relative'.$w100  : 'input-group',
+                        'input_group_left' => $args['input_group_left'],
+                        'input_group_left_inside'    => $args['input_group_left_inside']
+                    ) );
+                }
+                if($args['input_group_right']){
+                    $output = self::wrap( array(
+                        'content' => $output,
+                        'class'   => $args['input_group_right_inside'] ? 'input-group-inside position-relative'.$w100 : 'input-group',
+                        'input_group_right' => $args['input_group_right'],
+                        'input_group_right_inside'    => $args['input_group_right_inside']
+                    ) );
+                }
+
+            }
+
+            if(!$label_after){
+                $output .= $help_text;
+            }
+
+
+            if($args['label_type']=='horizontal' && $type != 'checkbox'){
+                $output = self::wrap( array(
+                    'content' => $output,
+                    'class'   => 'col-sm-10',
+                ) );
+            }
+
+            if(!$label_after){
+                $output = $label . $output;
+            }
+
+            // wrap
+            if(!$args['no_wrap']){
+
+                $form_group_class = $args['label_type']=='floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
+                $wrap_class = $args['label_type']=='horizontal' ? $form_group_class . ' row' : $form_group_class;
+                $wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
+                $output = self::wrap(array(
+                    'content' => $output,
+                    'class'   => $wrap_class,
+                    'element_require'   => $args['element_require'],
+                    'argument_id'  => $args['id']
+                ));
+            }
+
+
+
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function textarea($args = array()){
+        $defaults = array(
+            'name'       => '',
+            'class'      => '',
+            'wrap_class' => '',
+            'id'         => '',
+            'placeholder'=> '',
+            'title'      => '',
+            'value'      => '',
+            'required'   => false,
+            'label'      => '',
+            'label_after'=> false,
+            'label_class'      => '',
+            'label_type' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'help_text'  => '',
+            'validation_text'   => '',
+            'validation_pattern' => '',
+            'no_wrap'    => false,
+            'rows'      => '',
+            'wysiwyg'   => false,
+            'element_require'   => '', // [%element_id%] == "1"
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        // hidden label option needs to be empty
+        $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+        // floating labels don't work with wysiwyg so set it as top
+        if($args['label_type'] == 'floating' && !empty($args['wysiwyg'])){
+            $args['label_type'] = 'top';
+        }
+
+        $label_after = $args['label_after'];
+
+        // floating labels need label after
+        if( $args['label_type'] == 'floating' && empty($args['wysiwyg']) ){
+            $label_after = true;
+            $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+        }
+
+        // label
+        if(!empty($args['label']) && is_array($args['label'])){
+        }elseif(!empty($args['label']) && !$label_after){
+            $label_args = array(
+                'title'=> $args['label'],
+                'for'=> $args['id'],
+                'class' => $args['label_class']." ",
+                'label_type' => $args['label_type']
+            );
+            $output .= self::label( $label_args );
+        }
+
+        // maybe horizontal label
+        if($args['label_type']=='horizontal'){
+            $output .= '<div class="col-sm-10">';
+        }
+
+        if(!empty($args['wysiwyg'])){
+            ob_start();
+            $content = $args['value'];
+            $editor_id = !empty($args['id']) ? sanitize_html_class($args['id']) : 'wp_editor';
+            $settings = array(
+                'textarea_rows' => !empty(absint($args['rows'])) ? absint($args['rows']) : 4,
+                'quicktags'     => false,
+                'media_buttons' => false,
+                'editor_class'  => 'form-control',
+                'textarea_name' => !empty($args['name']) ? sanitize_html_class($args['name']) : sanitize_html_class($args['id']),
+                'teeny'         => true,
+            );
+
+            // maybe set settings if array
+            if(is_array($args['wysiwyg'])){
+                $settings  = wp_parse_args( $args['wysiwyg'], $settings );
+            }
+
+            wp_editor( $content, $editor_id, $settings );
+            $output .= ob_get_clean();
+        }else{
+
+            // open
+            $output .= '<textarea ';
+
+            // name
+            if(!empty($args['name'])){
+                $output .= ' name="'.sanitize_html_class($args['name']).'" ';
+            }
+
+            // id
+            if(!empty($args['id'])){
+                $output .= ' id="'.sanitize_html_class($args['id']).'" ';
+            }
+
+            // placeholder
+            if(!empty($args['placeholder'])){
+                $output .= ' placeholder="'.esc_attr($args['placeholder']).'" ';
+            }
+
+            // title
+            if(!empty($args['title'])){
+                $output .= ' title="'.esc_attr($args['title']).'" ';
+            }
+
+            // validation text
+            if(!empty($args['validation_text'])){
+                $output .= ' oninvalid="setCustomValidity(\''.esc_attr($args['validation_text']).'\')" ';
+                $output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
+            }
+
+            // validation_pattern
+            if(!empty($args['validation_pattern'])){
+                $output .= ' pattern="'.$args['validation_pattern'].'" ';
+            }
+
+            // required
+            if(!empty($args['required'])){
+                $output .= ' required ';
+            }
+
+            // rows
+            if(!empty($args['rows'])){
+                $output .= ' rows="'.absint($args['rows']).'" ';
+            }
+
+
+            // class
+            $class = !empty($args['class']) ? $args['class'] : '';
+            $output .= ' class="form-control '.$class.'" ';
+
+
+            // close tag
+            $output .= ' >';
+
+            // value
+            if(!empty($args['value'])){
+                $output .= sanitize_textarea_field($args['value']);
+            }
+
+            // closing tag
+            $output .= '</textarea>';
+
+        }
+
+        if(!empty($args['label']) && $label_after){
+            $label_args = array(
+                'title'=> $args['label'],
+                'for'=> $args['id'],
+                'class' => $args['label_class']." ",
+                'label_type' => $args['label_type']
+            );
+            $output .= self::label( $label_args );
+        }
+
+        // help text
+        if(!empty($args['help_text'])){
+            $output .= AUI_Component_Helper::help_text($args['help_text']);
+        }
+
+        // maybe horizontal label
+        if($args['label_type']=='horizontal'){
+            $output .= '</div>';
+        }
+
+
+        // wrap
+        if(!$args['no_wrap']){
+            $form_group_class = $args['label_type']=='floating' ? 'form-label-group' : 'form-group';
+            $wrap_class = $args['label_type']=='horizontal' ? $form_group_class . ' row' : $form_group_class;
+            $wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
+            $output = self::wrap(array(
+                'content' => $output,
+                'class'   => $wrap_class,
+                'element_require'   => $args['element_require'],
+                'argument_id'  => $args['id']
+            ));
+        }
+
+
+        return $output;
+    }
+
+    public static function label($args = array(), $type = ''){
+        //<label for="exampleInputEmail1">Email address</label>
+        $defaults = array(
+            'title'       => 'div',
+            'for'      => '',
+            'class'      => '',
+            'label_type'    => '', // empty = hidden, top, horizontal
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        if($args['title']){
+
+            // maybe hide labels //@todo set a global option for visibility class
+            if($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type']) ){
+                $class = $args['class'];
+            }else{
+                $class = 'sr-only '.$args['class'];
+            }
+
+            // maybe horizontal
+            if($args['label_type']=='horizontal' && $type != 'checkbox'){
+                $class .= ' col-sm-2 col-form-label';
+            }
+
+            // open
+            $output .= '<label ';
+
+            // for
+            if(!empty($args['for'])){
+                $output .= ' for="'.sanitize_text_field($args['for']).'" ';
+            }
+
+            // class
+            $class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
+            $output .= ' class="'.$class.'" ';
+
+            // close
+            $output .= '>';
+
+
+            // title, don't escape fully as can contain html
+            if(!empty($args['title'])){
+                $output .= wp_kses_post($args['title']);
+            }
+
+            // close wrap
+            $output .= '</label>';
+
+
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Wrap some content in a HTML wrapper.
+     *
+     * @param array $args
+     *
+     * @return string
+     */
+    public static function wrap($args = array()){
+        $defaults = array(
+            'type'       => 'div',
+            'class'      => 'form-group',
+            'content'   => '',
+            'input_group_left' => '',
+            'input_group_right' => '',
+            'input_group_left_inside' => false,
+            'input_group_right_inside' => false,
+            'element_require'   => '',
+            'argument_id'   => '',
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+        if($args['type']){
+
+            // open
+            $output .= '<'.sanitize_html_class($args['type']);
+
+            // element require
+            if(!empty($args['element_require'])){
+                $output .= AUI_Component_Helper::element_require($args['element_require']);
+                $args['class'] .= " aui-conditional-field";
+            }
+
+            // argument_id
+            if( !empty($args['argument_id']) ){
+                $output .= ' data-argument="'.esc_attr($args['argument_id']).'"';
+            }
+
+            // class
+            $class = !empty($args['class']) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
+            $output .= ' class="'.$class.'" ';
+
+            // close wrap
+            $output .= ' >';
+
+
+            // Input group left
+            if(!empty($args['input_group_left'])){
+                $position_class = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
+                $input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">'.$args['input_group_left'].'</span>';
+                $output .= '<div class="input-group-prepend '.$position_class.'">'.$input_group_left.'</div>';
+            }
+
+            // content
+            $output .= $args['content'];
+
+            // Input group right
+            if(!empty($args['input_group_right'])){
+                $position_class = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
+                $input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">'.$args['input_group_right'].'</span>';
+                $output .= '<div class="input-group-append '.$position_class.'">'.$input_group_right.'</div>';
+            }
+
+
+            // close wrap
+            $output .= '</'.sanitize_html_class($args['type']).'>';
+
+
+        }else{
+            $output = $args['content'];
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function select($args = array()){
+        $defaults = array(
+            'class'      => '',
+            'wrap_class' => '',
+            'id'         => '',
+            'title'      => '',
+            'value'      => '', // can be an array or a string
+            'required'   => false,
+            'label'      => '',
+            'label_after'=> false,
+            'label_type' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'label_class'      => '',
+            'help_text'  => '',
+            'placeholder'=> '',
+            'options'    => array(), // array or string
+            'icon'       => '',
+            'multiple'   => false,
+            'select2'    => false,
+            'no_wrap'    => false,
+            'element_require'   => '', // [%element_id%] == "1"
+            'extra_attributes'  => array(), // an array of extra attributes
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+        $output = '';
+
+        // for now lets hide floating labels
+        if( $args['label_type'] == 'floating' ){$args['label_type'] = 'hidden';}
+
+        // hidden label option needs to be empty
+        $args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
+
+
+        $label_after = $args['label_after'];
+
+        // floating labels need label after
+        if( $args['label_type'] == 'floating' ){
+            $label_after = true;
+            $args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
+        }
+
+        // Maybe setup select2
+        $is_select2 = false;
+        if(!empty($args['select2'])){
+            $args['class'] .= ' aui-select2';
+            $is_select2 = true;
+        }elseif( strpos($args['class'], 'aui-select2') !== false){
+            $is_select2 = true;
+        }
+
+        // select2 tags
+        if( !empty($args['select2']) && $args['select2'] === 'tags'){ // triple equals needed here for some reason
+            $args['data-tags'] = 'true';
+            $args['data-token-separators'] = "[',']";
+            $args['multiple'] = true;
+        }
+
+        // select2 placeholder
+        if($is_select2 && !empty($args['placeholder']) && empty($args['data-placeholder'])){
+            $args['data-placeholder'] = esc_attr($args['placeholder']);
+            $args['data-allow-clear'] = empty($args['data-allow-clear']) ? true : esc_attr($args['data-allow-clear']);
+        }
+
+        // label
+        if(!empty($args['label']) && is_array($args['label'])){
+        }elseif(!empty($args['label']) && !$label_after){
+            $label_args = array(
+                'title'=> $args['label'],
+                'for'=> $args['id'],
+                'class' => $args['label_class']." ",
+                'label_type' => $args['label_type']
+            );
+            $output .= self::label($label_args);
+        }
+
+        // maybe horizontal label
+        if($args['label_type']=='horizontal'){
+            $output .= '<div class="col-sm-10">';
+        }
+
+        // open/type
+        $output .= '<select ';
+
+        // style
+        if($is_select2){
+            $output .= " style='width:100%;' ";
+        }
+
+        // element require
+        if(!empty($args['element_require'])){
+            $output .= AUI_Component_Helper::element_require($args['element_require']);
+            $args['class'] .= " aui-conditional-field";
+        }
+
+        // class
+        $class = !empty($args['class']) ? $args['class'] : '';
+        $output .= AUI_Component_Helper::class_attr('custom-select '.$class);
+
+        // name
+        if(!empty($args['name'])){
+            $output .= AUI_Component_Helper::name($args['name'],$args['multiple']);
+        }
+
+        // id
+        if(!empty($args['id'])){
+            $output .= AUI_Component_Helper::id($args['id']);
+        }
+
+        // title
+        if(!empty($args['title'])){
+            $output .= AUI_Component_Helper::title($args['title']);
+        }
+
+        // data-attributes
+        $output .= AUI_Component_Helper::data_attributes($args);
+
+        // aria-attributes
+        $output .= AUI_Component_Helper::aria_attributes($args);
+
+        // extra attributes
+        if(!empty($args['extra_attributes'])){
+            $output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
+        }
+
+        // required
+        if(!empty($args['required'])){
+            $output .= ' required ';
+        }
+
+        // multiple
+        if(!empty($args['multiple'])){
+            $output .= ' multiple ';
+        }
+
+        // close opening tag
+        $output .= ' >';
+
+        // placeholder
+        if(!empty($args['placeholder']) && !$is_select2){
+            $output .= '<option value="" disabled selected hidden>'.esc_attr($args['placeholder']).'</option>';
+        }elseif($is_select2 && !empty($args['placeholder'])){
+            $output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
+        }
+
+        // Options
+        if(!empty($args['options'])){
+
+            if(!is_array($args['options'])){
+                $output .= $args['options']; // not the preferred way but an option
+            }else{
+                foreach($args['options'] as $val => $name){
+                    $selected = '';
+                    if(is_array($name)){
+                        if (isset($name['optgroup']) && ($name['optgroup'] == 'start' || $name['optgroup'] == 'end')) {
+                            $option_label = isset($name['label']) ? $name['label'] : '';
+
+                            $output .= $name['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+                        } else {
+                            $option_label = isset($name['label']) ? $name['label'] : '';
+                            $option_value = isset($name['value']) ? $name['value'] : '';
+                            if(!empty($args['multiple']) && !empty($args['value']) && is_array($args['value']) ){
+                                $selected = in_array($option_value, stripslashes_deep($args['value'])) ? "selected" : "";
+                            } elseif(!empty($args['value'])) {
+                                $selected = selected($option_value,stripslashes_deep($args['value']), false);
+                            }
+
+                            $output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+                        }
+                    }else{
+                        if(!empty($args['value'])){
+                            if(is_array($args['value'])){
+                                $selected = in_array($val,$args['value']) ? 'selected="selected"' : '';
+                            } elseif(!empty($args['value'])) {
+                                $selected = selected( $args['value'], $val, false);
+                            }
+                        }
+                        $output .= '<option value="'.esc_attr($val).'" '.$selected.'>'.esc_attr($name).'</option>';
+                    }
+                }
+            }
+
+        }
+
+        // closing tag
+        $output .= '</select>';
+
+        if(!empty($args['label']) && $label_after){
+            $label_args = array(
+                'title'=> $args['label'],
+                'for'=> $args['id'],
+                'class' => $args['label_class']." ",
+                'label_type' => $args['label_type']
+            );
+            $output .= self::label($label_args);
+        }
+
+        // help text
+        if(!empty($args['help_text'])){
+            $output .= AUI_Component_Helper::help_text($args['help_text']);
+        }
+
+        // maybe horizontal label
+        if($args['label_type']=='horizontal'){
+            $output .= '</div>';
+        }
+
+
+        // wrap
+        if(!$args['no_wrap']){
+            $wrap_class = $args['label_type']=='horizontal' ? 'form-group row' : 'form-group';
+            $wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
+            $output = self::wrap(array(
+                'content' => $output,
+                'class'   => $wrap_class,
+                'element_require'   => $args['element_require'],
+                'argument_id'  => $args['id']
+            ));
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function radio($args = array()){
+        $defaults = array(
+            'class'      => '',
+            'wrap_class' => '',
+            'id'         => '',
+            'title'      => '',
+            'horizontal' => false, // sets the lable horizontal
+            'value'      => '',
+            'label'      => '',
+            'label_class'=> '',
+            'label_type' => '', // sets the label type, default: hidden. Options: hidden, top, horizontal, floating
+            'inline'     => true,
+            'required'   => false,
+            'options'    => array(),
+            'icon'       => '',
+            'no_wrap'    => false,
+            'element_require'   => '', // [%element_id%] == "1"
+            'extra_attributes'  => array() // an array of extra attributes
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+
+        // for now lets use horizontal for floating
+        if( $args['label_type'] == 'floating' ){$args['label_type'] = 'horizontal';}
+
+        $label_args = array(
+            'title'=> $args['label'],
+            'class' => $args['label_class']." pt-0 ",
+            'label_type' => $args['label_type']
+        );
+
+        $output = '';
+
+
+
+        // label before
+        if(!empty($args['label'])){
+            $output .= self::label( $label_args, 'radio' );
+        }
+
+        // maybe horizontal label
+        if($args['label_type']=='horizontal'){
+            $output .= '<div class="col-sm-10">';
+        }
+
+        if(!empty($args['options'])){
+            $count = 0;
+            foreach($args['options'] as $value => $label){
+                $option_args = $args;
+                $option_args['value'] = $value;
+                $option_args['label'] = $label;
+                $option_args['checked'] = $value == $args['value'] ? true : false;
+                $output .= self::radio_option($option_args,$count);
+                $count++;
+            }
+        }
+
+        // maybe horizontal label
+        if($args['label_type']=='horizontal'){
+            $output .= '</div>';
+        }
+
+
+        // wrap
+        $wrap_class = $args['label_type']=='horizontal' ? 'form-group row' : 'form-group';
+        $wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
+        $output = self::wrap(array(
+            'content' => $output,
+            'class'   => $wrap_class,
+            'element_require'   => $args['element_require'],
+            'argument_id'  => $args['id']
+        ));
+
+
+        return $output;
+    }
+
+    /**
+     * Build the component.
+     *
+     * @param array $args
+     *
+     * @return string The rendered component.
+     */
+    public static function radio_option($args = array(),$count = ''){
+        $defaults = array(
+            'class'      => '',
+            'id'         => '',
+            'title'      => '',
+            'value'      => '',
+            'required'   => false,
+            'inline'     => true,
+            'label'      => '',
+            'options'    => array(),
+            'icon'       => '',
+            'no_wrap'    => false,
+            'extra_attributes'  => array() // an array of extra attributes
+        );
+
+        /**
+         * Parse incoming $args into an array and merge it with $defaults
+         */
+        $args   = wp_parse_args( $args, $defaults );
+
+        $output = '';
+
+        // open/type
+        $output .= '<input type="radio"';
+
+        // class
+        $output .= ' class="form-check-input" ';
+
+        // name
+        if(!empty($args['name'])){
+            $output .= AUI_Component_Helper::name($args['name']);
+        }
+
+        // id
+        if(!empty($args['id'])){
+            $output .= AUI_Component_Helper::id($args['id'].$count);
+        }
+
+        // title
+        if(!empty($args['title'])){
+            $output .= AUI_Component_Helper::title($args['title']);
+        }
+
+        // value
+        if(isset($args['value'])){
+            $output .= ' value="'.sanitize_text_field($args['value']).'" ';
+        }
+
+        // checked, for radio and checkboxes
+        if( $args['checked'] ){
+            $output .= ' checked ';
+        }
+
+        // data-attributes
+        $output .= AUI_Component_Helper::data_attributes($args);
+
+        // aria-attributes
+        $output .= AUI_Component_Helper::aria_attributes($args);
+
+        // extra attributes
+        if(!empty($args['extra_attributes'])){
+            $output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
+        }
+
+        // required
+        if(!empty($args['required'])){
+            $output .= ' required ';
+        }
+
+        // close opening tag
+        $output .= ' >';
+
+        // label
+        if(!empty($args['label']) && is_array($args['label'])){
+        }elseif(!empty($args['label'])){
+            $output .= self::label(array('title'=>$args['label'],'for'=>$args['id'].$count,'class'=>'form-check-label'),'radio');
+        }
+
+        // wrap
+        if(!$args['no_wrap']){
+            $wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
+            $output = self::wrap(array(
+                'content' => $output,
+                'class' => $wrap_class
+            ));
+        }
+
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +208 added lines, -208 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,7 +18,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function input($args = array()){
+	public static function input($args = array()) {
 		$defaults = array(
 			'type'       => 'text',
 			'name'       => '',
@@ -52,13 +52,13 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if ( ! empty( $args['type'] ) ) {
+		if (!empty($args['type'])) {
 			// hidden label option needs to be empty
 			$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
-			$type = sanitize_html_class( $args['type'] );
+			$type = sanitize_html_class($args['type']);
 
 			$help_text = '';
 			$label = '';
@@ -66,24 +66,24 @@ 
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
 
 			// floating labels need label after
-			if( $args['label_type'] == 'floating' && $type != 'checkbox' ){
+			if ($args['label_type'] == 'floating' && $type != 'checkbox') {
 				$label_after = true;
 				$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 			}
 
 			// Some special sauce for files
-			if($type=='file' ){
+			if ($type == 'file') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-file-input ';
-			}elseif($type=='checkbox'){
+			}elseif ($type == 'checkbox') {
 				$label_after = true; // if type file we need the label after
 				$args['class'] .= ' custom-control-input ';
-			}elseif($type=='datepicker' || $type=='timepicker'){
+			}elseif ($type == 'datepicker' || $type == 'timepicker') {
 				$type = 'text';
 				//$args['class'] .= ' aui-flatpickr bg-initial ';
 				$args['class'] .= ' bg-initial ';
@@ -99,65 +99,65 @@ 
 			$output .= '<input type="' . $type . '" ';
 
 			// name
-			if(!empty($args['name'])){
-				$output .= ' name="'.esc_attr($args['name']).'" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . esc_attr($args['name']) . '" ';
 			}
 
 			// id
-			if(!empty($args['id'])){
-				$output .= ' id="'.sanitize_html_class($args['id']).'" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if(!empty($args['placeholder'])){
-				$output .= ' placeholder="'.esc_attr($args['placeholder']).'" ';
+			if (!empty($args['placeholder'])) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if(!empty($args['title'])){
-				$output .= ' title="'.esc_attr($args['title']).'" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// value
-			if(!empty($args['value'])){
-				$output .= ' value="'.sanitize_text_field($args['value']).'" ';
+			if (!empty($args['value'])) {
+				$output .= ' value="' . sanitize_text_field($args['value']) . '" ';
 			}
 
 			// checked, for radio and checkboxes
-			if( ( $type == 'checkbox' || $type == 'radio' ) && $args['checked'] ){
+			if (($type == 'checkbox' || $type == 'radio') && $args['checked']) {
 				$output .= ' checked ';
 			}
 
 			// validation text
-			if(!empty($args['validation_text'])){
-				$output .= ' oninvalid="setCustomValidity(\''.esc_attr($args['validation_text']).'\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($args['validation_text']) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if(!empty($args['validation_pattern'])){
-				$output .= ' pattern="'.$args['validation_pattern'].'" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . $args['validation_pattern'] . '" ';
 			}
 
 			// step (for numbers)
-			if(!empty($args['step'])){
-				$output .= ' step="'.$args['step'].'" ';
+			if (!empty($args['step'])) {
+				$output .= ' step="' . $args['step'] . '" ';
 			}
 
 			// required
-			if(!empty($args['required'])){
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// class
-			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="form-control '.$class.'" ';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
+			$output .= ' class="form-control ' . $class . '" ';
 
 			// data-attributes
 			$output .= AUI_Component_Helper::data_attributes($args);
 
 			// extra attributes
-			if(!empty($args['extra_attributes'])){
+			if (!empty($args['extra_attributes'])) {
 				$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 			}
 
@@ -166,40 +166,40 @@ 
 
 
 			// label
-			if(!empty($args['label'])){
-				if($type == 'file'){$label_args['class'] .= 'custom-file-label';}
-				elseif($type == 'checkbox'){$label_args['class'] .= 'custom-control-label';}
-				$label = self::label( $label_args, $type );
+			if (!empty($args['label'])) {
+				if ($type == 'file') {$label_args['class'] .= 'custom-file-label'; }
+				elseif ($type == 'checkbox') {$label_args['class'] .= 'custom-control-label'; }
+				$label = self::label($label_args, $type);
 			}
 
 			// help text
-			if(!empty($args['help_text'])){
+			if (!empty($args['help_text'])) {
 				$help_text = AUI_Component_Helper::help_text($args['help_text']);
 			}
 
 
 			// set help text in the correct possition
-			if($label_after){
+			if ($label_after) {
 				$output .= $label . $help_text;
 			}
 
 			// some input types need a separate wrap
-			if($type == 'file') {
-				$output = self::wrap( array(
+			if ($type == 'file') {
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => 'form-group custom-file'
-				) );
-			}elseif($type == 'checkbox'){
+				));
+			}elseif ($type == 'checkbox') {
 				$wrap_class = $args['switch'] ? 'custom-switch' : 'custom-checkbox';
-				$output = self::wrap( array(
+				$output = self::wrap(array(
 					'content' => $output,
-					'class'   => 'custom-control '.$wrap_class
-				) );
+					'class'   => 'custom-control ' . $wrap_class
+				));
 
-				if($args['label_type']=='horizontal'){
+				if ($args['label_type'] == 'horizontal') {
 					$output = '<div class="col-sm-2 col-form-label"></div><div class="col-sm-10">' . $output . '</div>';
 				}
-			}elseif($type == 'password' && $args['password_toggle'] && !$args['input_group_right']){
+			}elseif ($type == 'password' && $args['password_toggle'] && !$args['input_group_right']) {
 
 
 				// allow password field to toggle view
@@ -213,49 +213,49 @@ 
 			}
 
 			// input group wraps
-			if($args['input_group_left'] || $args['input_group_right']){
+			if ($args['input_group_left'] || $args['input_group_right']) {
 				$w100 = strpos($args['class'], 'w-100') !== false ? ' w-100' : '';
-				if($args['input_group_left']){
-					$output = self::wrap( array(
+				if ($args['input_group_left']) {
+					$output = self::wrap(array(
 						'content' => $output,
-						'class'   => $args['input_group_left_inside'] ? 'input-group-inside position-relative'.$w100  : 'input-group',
+						'class'   => $args['input_group_left_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_left' => $args['input_group_left'],
 						'input_group_left_inside'    => $args['input_group_left_inside']
-					) );
+					));
 				}
-				if($args['input_group_right']){
-					$output = self::wrap( array(
+				if ($args['input_group_right']) {
+					$output = self::wrap(array(
 						'content' => $output,
-						'class'   => $args['input_group_right_inside'] ? 'input-group-inside position-relative'.$w100 : 'input-group',
+						'class'   => $args['input_group_right_inside'] ? 'input-group-inside position-relative' . $w100 : 'input-group',
 						'input_group_right' => $args['input_group_right'],
 						'input_group_right_inside'    => $args['input_group_right_inside']
-					) );
+					));
 				}
 
 			}
 
-			if(!$label_after){
+			if (!$label_after) {
 				$output .= $help_text;
 			}
 
 
-			if($args['label_type']=='horizontal' && $type != 'checkbox'){
-				$output = self::wrap( array(
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
+				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => 'col-sm-10',
-				) );
+				));
 			}
 
-			if(!$label_after){
+			if (!$label_after) {
 				$output = $label . $output;
 			}
 
 			// wrap
-			if(!$args['no_wrap']){
+			if (!$args['no_wrap']) {
 
-				$form_group_class = $args['label_type']=='floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
-				$wrap_class = $args['label_type']=='horizontal' ? $form_group_class . ' row' : $form_group_class;
-				$wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
+				$form_group_class = $args['label_type'] == 'floating' && $type != 'checkbox' ? 'form-label-group' : 'form-group';
+				$wrap_class = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+				$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
 				$output = self::wrap(array(
 					'content' => $output,
 					'class'   => $wrap_class,
@@ -278,7 +278,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function textarea($args = array()){
+	public static function textarea($args = array()) {
 		$defaults = array(
 			'name'       => '',
 			'class'      => '',
@@ -304,43 +304,43 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// hidden label option needs to be empty
 		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
 
 		// floating labels don't work with wysiwyg so set it as top
-		if($args['label_type'] == 'floating' && !empty($args['wysiwyg'])){
+		if ($args['label_type'] == 'floating' && !empty($args['wysiwyg'])) {
 			$args['label_type'] = 'top';
 		}
 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if( $args['label_type'] == 'floating' && empty($args['wysiwyg']) ){
+		if ($args['label_type'] == 'floating' && empty($args['wysiwyg'])) {
 			$label_after = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// label
-		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		if (!empty($args['label']) && is_array($args['label'])) {
+		}elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '<div class="col-sm-10">';
 		}
 
-		if(!empty($args['wysiwyg'])){
+		if (!empty($args['wysiwyg'])) {
 			ob_start();
 			$content = $args['value'];
 			$editor_id = !empty($args['id']) ? sanitize_html_class($args['id']) : 'wp_editor';
@@ -354,69 +354,69 @@ 
 			);
 
 			// maybe set settings if array
-			if(is_array($args['wysiwyg'])){
-				$settings  = wp_parse_args( $args['wysiwyg'], $settings );
+			if (is_array($args['wysiwyg'])) {
+				$settings = wp_parse_args($args['wysiwyg'], $settings);
 			}
 
-			wp_editor( $content, $editor_id, $settings );
+			wp_editor($content, $editor_id, $settings);
 			$output .= ob_get_clean();
-		}else{
+		} else {
 
 			// open
 			$output .= '<textarea ';
 
 			// name
-			if(!empty($args['name'])){
-				$output .= ' name="'.sanitize_html_class($args['name']).'" ';
+			if (!empty($args['name'])) {
+				$output .= ' name="' . sanitize_html_class($args['name']) . '" ';
 			}
 
 			// id
-			if(!empty($args['id'])){
-				$output .= ' id="'.sanitize_html_class($args['id']).'" ';
+			if (!empty($args['id'])) {
+				$output .= ' id="' . sanitize_html_class($args['id']) . '" ';
 			}
 
 			// placeholder
-			if(!empty($args['placeholder'])){
-				$output .= ' placeholder="'.esc_attr($args['placeholder']).'" ';
+			if (!empty($args['placeholder'])) {
+				$output .= ' placeholder="' . esc_attr($args['placeholder']) . '" ';
 			}
 
 			// title
-			if(!empty($args['title'])){
-				$output .= ' title="'.esc_attr($args['title']).'" ';
+			if (!empty($args['title'])) {
+				$output .= ' title="' . esc_attr($args['title']) . '" ';
 			}
 
 			// validation text
-			if(!empty($args['validation_text'])){
-				$output .= ' oninvalid="setCustomValidity(\''.esc_attr($args['validation_text']).'\')" ';
+			if (!empty($args['validation_text'])) {
+				$output .= ' oninvalid="setCustomValidity(\'' . esc_attr($args['validation_text']) . '\')" ';
 				$output .= ' onchange="try{setCustomValidity(\'\')}catch(e){}" ';
 			}
 
 			// validation_pattern
-			if(!empty($args['validation_pattern'])){
-				$output .= ' pattern="'.$args['validation_pattern'].'" ';
+			if (!empty($args['validation_pattern'])) {
+				$output .= ' pattern="' . $args['validation_pattern'] . '" ';
 			}
 
 			// required
-			if(!empty($args['required'])){
+			if (!empty($args['required'])) {
 				$output .= ' required ';
 			}
 
 			// rows
-			if(!empty($args['rows'])){
-				$output .= ' rows="'.absint($args['rows']).'" ';
+			if (!empty($args['rows'])) {
+				$output .= ' rows="' . absint($args['rows']) . '" ';
 			}
 
 
 			// class
 			$class = !empty($args['class']) ? $args['class'] : '';
-			$output .= ' class="form-control '.$class.'" ';
+			$output .= ' class="form-control ' . $class . '" ';
 
 
 			// close tag
 			$output .= ' >';
 
 			// value
-			if(!empty($args['value'])){
+			if (!empty($args['value'])) {
 				$output .= sanitize_textarea_field($args['value']);
 			}
 
@@ -425,32 +425,32 @@ 
 
 		}
 
-		if(!empty($args['label']) && $label_after){
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
-			$output .= self::label( $label_args );
+			$output .= self::label($label_args);
 		}
 
 		// help text
-		if(!empty($args['help_text'])){
+		if (!empty($args['help_text'])) {
 			$output .= AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		if(!$args['no_wrap']){
-			$form_group_class = $args['label_type']=='floating' ? 'form-label-group' : 'form-group';
-			$wrap_class = $args['label_type']=='horizontal' ? $form_group_class . ' row' : $form_group_class;
-			$wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
+		if (!$args['no_wrap']) {
+			$form_group_class = $args['label_type'] == 'floating' ? 'form-label-group' : 'form-group';
+			$wrap_class = $args['label_type'] == 'horizontal' ? $form_group_class . ' row' : $form_group_class;
+			$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
 			$output = self::wrap(array(
 				'content' => $output,
 				'class'   => $wrap_class,
@@ -463,7 +463,7 @@ 
 		return $output;
 	}
 
-	public static function label($args = array(), $type = ''){
+	public static function label($args = array(), $type = '') {
 		//<label for="exampleInputEmail1">Email address</label>
 		$defaults = array(
 			'title'       => 'div',
@@ -475,20 +475,20 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
-		if($args['title']){
+		if ($args['title']) {
 
 			// maybe hide labels //@todo set a global option for visibility class
-			if($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type']) ){
+			if ($type == 'file' || $type == 'checkbox' || $type == 'radio' || !empty($args['label_type'])) {
 				$class = $args['class'];
-			}else{
-				$class = 'sr-only '.$args['class'];
+			} else {
+				$class = 'sr-only ' . $args['class'];
 			}
 
 			// maybe horizontal
-			if($args['label_type']=='horizontal' && $type != 'checkbox'){
+			if ($args['label_type'] == 'horizontal' && $type != 'checkbox') {
 				$class .= ' col-sm-2 col-form-label';
 			}
 
@@ -496,20 +496,20 @@ 
 			$output .= '<label ';
 
 			// for
-			if(!empty($args['for'])){
-				$output .= ' for="'.sanitize_text_field($args['for']).'" ';
+			if (!empty($args['for'])) {
+				$output .= ' for="' . sanitize_text_field($args['for']) . '" ';
 			}
 
 			// class
-			$class = $class ? AUI_Component_Helper::esc_classes( $class ) : '';
-			$output .= ' class="'.$class.'" ';
+			$class = $class ? AUI_Component_Helper::esc_classes($class) : '';
+			$output .= ' class="' . $class . '" ';
 
 			// close
 			$output .= '>';
 
 
 			// title, don't escape fully as can contain html
-			if(!empty($args['title'])){
+			if (!empty($args['title'])) {
 				$output .= wp_kses_post($args['title']);
 			}
 
@@ -530,7 +530,7 @@ 
 	 *
 	 * @return string
 	 */
-	public static function wrap($args = array()){
+	public static function wrap($args = array()) {
 		$defaults = array(
 			'type'       => 'div',
 			'class'      => 'form-group',
@@ -546,55 +546,55 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
-		if($args['type']){
+		if ($args['type']) {
 
 			// open
-			$output .= '<'.sanitize_html_class($args['type']);
+			$output .= '<' . sanitize_html_class($args['type']);
 
 			// element require
-			if(!empty($args['element_require'])){
+			if (!empty($args['element_require'])) {
 				$output .= AUI_Component_Helper::element_require($args['element_require']);
 				$args['class'] .= " aui-conditional-field";
 			}
 
 			// argument_id
-			if( !empty($args['argument_id']) ){
-				$output .= ' data-argument="'.esc_attr($args['argument_id']).'"';
+			if (!empty($args['argument_id'])) {
+				$output .= ' data-argument="' . esc_attr($args['argument_id']) . '"';
 			}
 
 			// class
-			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes( $args['class'] ) : '';
-			$output .= ' class="'.$class.'" ';
+			$class = !empty($args['class']) ? AUI_Component_Helper::esc_classes($args['class']) : '';
+			$output .= ' class="' . $class . '" ';
 
 			// close wrap
 			$output .= ' >';
 
 
 			// Input group left
-			if(!empty($args['input_group_left'])){
+			if (!empty($args['input_group_left'])) {
 				$position_class = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
-				$input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">'.$args['input_group_left'].'</span>';
-				$output .= '<div class="input-group-prepend '.$position_class.'">'.$input_group_left.'</div>';
+				$input_group_left = strpos($args['input_group_left'], '<') !== false ? $args['input_group_left'] : '<span class="input-group-text">' . $args['input_group_left'] . '</span>';
+				$output .= '<div class="input-group-prepend ' . $position_class . '">' . $input_group_left . '</div>';
 			}
 
 			// content
 			$output .= $args['content'];
 
 			// Input group right
-			if(!empty($args['input_group_right'])){
+			if (!empty($args['input_group_right'])) {
 				$position_class = !empty($args['input_group_left_inside']) ? 'position-absolute h-100' : '';
-				$input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">'.$args['input_group_right'].'</span>';
-				$output .= '<div class="input-group-append '.$position_class.'">'.$input_group_right.'</div>';
+				$input_group_right = strpos($args['input_group_right'], '<') !== false ? $args['input_group_right'] : '<span class="input-group-text">' . $args['input_group_right'] . '</span>';
+				$output .= '<div class="input-group-append ' . $position_class . '">' . $input_group_right . '</div>';
 			}
 
 
 			// close wrap
-			$output .= '</'.sanitize_html_class($args['type']).'>';
+			$output .= '</' . sanitize_html_class($args['type']) . '>';
 
 
-		}else{
+		} else {
 			$output = $args['content'];
 		}
 
@@ -608,7 +608,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function select($args = array()){
+	public static function select($args = array()) {
 		$defaults = array(
 			'class'      => '',
 			'wrap_class' => '',
@@ -634,11 +634,11 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 		$output = '';
 
 		// for now lets hide floating labels
-		if( $args['label_type'] == 'floating' ){$args['label_type'] = 'hidden';}
+		if ($args['label_type'] == 'floating') {$args['label_type'] = 'hidden'; }
 
 		// hidden label option needs to be empty
 		$args['label_type'] = $args['label_type'] == 'hidden' ? '' : $args['label_type'];
@@ -647,47 +647,47 @@ 
 		$label_after = $args['label_after'];
 
 		// floating labels need label after
-		if( $args['label_type'] == 'floating' ){
+		if ($args['label_type'] == 'floating') {
 			$label_after = true;
 			$args['placeholder'] = ' '; // set the placeholder not empty so the floating label works.
 		}
 
 		// Maybe setup select2
 		$is_select2 = false;
-		if(!empty($args['select2'])){
+		if (!empty($args['select2'])) {
 			$args['class'] .= ' aui-select2';
 			$is_select2 = true;
-		}elseif( strpos($args['class'], 'aui-select2') !== false){
+		}elseif (strpos($args['class'], 'aui-select2') !== false) {
 			$is_select2 = true;
 		}
 
 		// select2 tags
-		if( !empty($args['select2']) && $args['select2'] === 'tags'){ // triple equals needed here for some reason
+		if (!empty($args['select2']) && $args['select2'] === 'tags') { // triple equals needed here for some reason
 			$args['data-tags'] = 'true';
 			$args['data-token-separators'] = "[',']";
 			$args['multiple'] = true;
 		}
 
 		// select2 placeholder
-		if($is_select2 && !empty($args['placeholder']) && empty($args['data-placeholder'])){
+		if ($is_select2 && !empty($args['placeholder']) && empty($args['data-placeholder'])) {
 			$args['data-placeholder'] = esc_attr($args['placeholder']);
 			$args['data-allow-clear'] = empty($args['data-allow-clear']) ? true : esc_attr($args['data-allow-clear']);
 		}
 
 		// label
-		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label']) && !$label_after){
+		if (!empty($args['label']) && is_array($args['label'])) {
+		}elseif (!empty($args['label']) && !$label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
 			$output .= self::label($label_args);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '<div class="col-sm-10">';
 		}
 
@@ -695,32 +695,32 @@ 
 		$output .= '<select ';
 
 		// style
-		if($is_select2){
+		if ($is_select2) {
 			$output .= " style='width:100%;' ";
 		}
 
 		// element require
-		if(!empty($args['element_require'])){
+		if (!empty($args['element_require'])) {
 			$output .= AUI_Component_Helper::element_require($args['element_require']);
 			$args['class'] .= " aui-conditional-field";
 		}
 
 		// class
 		$class = !empty($args['class']) ? $args['class'] : '';
-		$output .= AUI_Component_Helper::class_attr('custom-select '.$class);
+		$output .= AUI_Component_Helper::class_attr('custom-select ' . $class);
 
 		// name
-		if(!empty($args['name'])){
-			$output .= AUI_Component_Helper::name($args['name'],$args['multiple']);
+		if (!empty($args['name'])) {
+			$output .= AUI_Component_Helper::name($args['name'], $args['multiple']);
 		}
 
 		// id
-		if(!empty($args['id'])){
+		if (!empty($args['id'])) {
 			$output .= AUI_Component_Helper::id($args['id']);
 		}
 
 		// title
-		if(!empty($args['title'])){
+		if (!empty($args['title'])) {
 			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
@@ -731,17 +731,17 @@ 
 		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if(!empty($args['extra_attributes'])){
+		if (!empty($args['extra_attributes'])) {
 			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if(!empty($args['required'])){
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
 		// multiple
-		if(!empty($args['multiple'])){
+		if (!empty($args['multiple'])) {
 			$output .= ' multiple ';
 		}
 
@@ -749,21 +749,21 @@ 
 		$output .= ' >';
 
 		// placeholder
-		if(!empty($args['placeholder']) && !$is_select2){
-			$output .= '<option value="" disabled selected hidden>'.esc_attr($args['placeholder']).'</option>';
-		}elseif($is_select2 && !empty($args['placeholder'])){
+		if (!empty($args['placeholder']) && !$is_select2) {
+			$output .= '<option value="" disabled selected hidden>' . esc_attr($args['placeholder']) . '</option>';
+		}elseif ($is_select2 && !empty($args['placeholder'])) {
 			$output .= "<option></option>"; // select2 needs an empty select to fill the placeholder
 		}
 
 		// Options
-		if(!empty($args['options'])){
+		if (!empty($args['options'])) {
 
-			if(!is_array($args['options'])){
+			if (!is_array($args['options'])) {
 				$output .= $args['options']; // not the preferred way but an option
-			}else{
-				foreach($args['options'] as $val => $name){
+			} else {
+				foreach ($args['options'] as $val => $name) {
 					$selected = '';
-					if(is_array($name)){
+					if (is_array($name)) {
 						if (isset($name['optgroup']) && ($name['optgroup'] == 'start' || $name['optgroup'] == 'end')) {
 							$option_label = isset($name['label']) ? $name['label'] : '';
 
@@ -771,23 +771,23 @@ 
 						} else {
 							$option_label = isset($name['label']) ? $name['label'] : '';
 							$option_value = isset($name['value']) ? $name['value'] : '';
-							if(!empty($args['multiple']) && !empty($args['value']) && is_array($args['value']) ){
+							if (!empty($args['multiple']) && !empty($args['value']) && is_array($args['value'])) {
 								$selected = in_array($option_value, stripslashes_deep($args['value'])) ? "selected" : "";
-							} elseif(!empty($args['value'])) {
-								$selected = selected($option_value,stripslashes_deep($args['value']), false);
+							} elseif (!empty($args['value'])) {
+								$selected = selected($option_value, stripslashes_deep($args['value']), false);
 							}
 
 							$output .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
 						}
-					}else{
-						if(!empty($args['value'])){
-							if(is_array($args['value'])){
-								$selected = in_array($val,$args['value']) ? 'selected="selected"' : '';
-							} elseif(!empty($args['value'])) {
-								$selected = selected( $args['value'], $val, false);
+					} else {
+						if (!empty($args['value'])) {
+							if (is_array($args['value'])) {
+								$selected = in_array($val, $args['value']) ? 'selected="selected"' : '';
+							} elseif (!empty($args['value'])) {
+								$selected = selected($args['value'], $val, false);
 							}
 						}
-						$output .= '<option value="'.esc_attr($val).'" '.$selected.'>'.esc_attr($name).'</option>';
+						$output .= '<option value="' . esc_attr($val) . '" ' . $selected . '>' . esc_attr($name) . '</option>';
 					}
 				}
 			}
@@ -797,31 +797,31 @@ 
 		// closing tag
 		$output .= '</select>';
 
-		if(!empty($args['label']) && $label_after){
+		if (!empty($args['label']) && $label_after) {
 			$label_args = array(
 				'title'=> $args['label'],
 				'for'=> $args['id'],
-				'class' => $args['label_class']." ",
+				'class' => $args['label_class'] . " ",
 				'label_type' => $args['label_type']
 			);
 			$output .= self::label($label_args);
 		}
 
 		// help text
-		if(!empty($args['help_text'])){
+		if (!empty($args['help_text'])) {
 			$output .= AUI_Component_Helper::help_text($args['help_text']);
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		if(!$args['no_wrap']){
-			$wrap_class = $args['label_type']=='horizontal' ? 'form-group row' : 'form-group';
-			$wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
+		if (!$args['no_wrap']) {
+			$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
+			$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
 			$output = self::wrap(array(
 				'content' => $output,
 				'class'   => $wrap_class,
@@ -841,7 +841,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio($args = array()){
+	public static function radio($args = array()) {
 		$defaults = array(
 			'class'      => '',
 			'wrap_class' => '',
@@ -864,14 +864,14 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		// for now lets use horizontal for floating
-		if( $args['label_type'] == 'floating' ){$args['label_type'] = 'horizontal';}
+		if ($args['label_type'] == 'floating') {$args['label_type'] = 'horizontal'; }
 
 		$label_args = array(
 			'title'=> $args['label'],
-			'class' => $args['label_class']." pt-0 ",
+			'class' => $args['label_class'] . " pt-0 ",
 			'label_type' => $args['label_type']
 		);
 
@@ -880,36 +880,36 @@ 
 
 
 		// label before
-		if(!empty($args['label'])){
-			$output .= self::label( $label_args, 'radio' );
+		if (!empty($args['label'])) {
+			$output .= self::label($label_args, 'radio');
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '<div class="col-sm-10">';
 		}
 
-		if(!empty($args['options'])){
+		if (!empty($args['options'])) {
 			$count = 0;
-			foreach($args['options'] as $value => $label){
+			foreach ($args['options'] as $value => $label) {
 				$option_args = $args;
 				$option_args['value'] = $value;
 				$option_args['label'] = $label;
 				$option_args['checked'] = $value == $args['value'] ? true : false;
-				$output .= self::radio_option($option_args,$count);
+				$output .= self::radio_option($option_args, $count);
 				$count++;
 			}
 		}
 
 		// maybe horizontal label
-		if($args['label_type']=='horizontal'){
+		if ($args['label_type'] == 'horizontal') {
 			$output .= '</div>';
 		}
 
 
 		// wrap
-		$wrap_class = $args['label_type']=='horizontal' ? 'form-group row' : 'form-group';
-		$wrap_class = !empty($args['wrap_class']) ? $wrap_class." ".$args['wrap_class'] : $wrap_class;
+		$wrap_class = $args['label_type'] == 'horizontal' ? 'form-group row' : 'form-group';
+		$wrap_class = !empty($args['wrap_class']) ? $wrap_class . " " . $args['wrap_class'] : $wrap_class;
 		$output = self::wrap(array(
 			'content' => $output,
 			'class'   => $wrap_class,
@@ -928,7 +928,7 @@ 
 	 *
 	 * @return string The rendered component.
 	 */
-	public static function radio_option($args = array(),$count = ''){
+	public static function radio_option($args = array(), $count = '') {
 		$defaults = array(
 			'class'      => '',
 			'id'         => '',
@@ -946,7 +946,7 @@ 
 		/**
 		 * Parse incoming $args into an array and merge it with $defaults
 		 */
-		$args   = wp_parse_args( $args, $defaults );
+		$args   = wp_parse_args($args, $defaults);
 
 		$output = '';
 
@@ -957,27 +957,27 @@ 
 		$output .= ' class="form-check-input" ';
 
 		// name
-		if(!empty($args['name'])){
+		if (!empty($args['name'])) {
 			$output .= AUI_Component_Helper::name($args['name']);
 		}
 
 		// id
-		if(!empty($args['id'])){
-			$output .= AUI_Component_Helper::id($args['id'].$count);
+		if (!empty($args['id'])) {
+			$output .= AUI_Component_Helper::id($args['id'] . $count);
 		}
 
 		// title
-		if(!empty($args['title'])){
+		if (!empty($args['title'])) {
 			$output .= AUI_Component_Helper::title($args['title']);
 		}
 
 		// value
-		if(isset($args['value'])){
-			$output .= ' value="'.sanitize_text_field($args['value']).'" ';
+		if (isset($args['value'])) {
+			$output .= ' value="' . sanitize_text_field($args['value']) . '" ';
 		}
 
 		// checked, for radio and checkboxes
-		if( $args['checked'] ){
+		if ($args['checked']) {
 			$output .= ' checked ';
 		}
 
@@ -988,12 +988,12 @@ 
 		$output .= AUI_Component_Helper::aria_attributes($args);
 
 		// extra attributes
-		if(!empty($args['extra_attributes'])){
+		if (!empty($args['extra_attributes'])) {
 			$output .= AUI_Component_Helper::extra_attributes($args['extra_attributes']);
 		}
 
 		// required
-		if(!empty($args['required'])){
+		if (!empty($args['required'])) {
 			$output .= ' required ';
 		}
 
@@ -1001,13 +1001,13 @@ 
 		$output .= ' >';
 
 		// label
-		if(!empty($args['label']) && is_array($args['label'])){
-		}elseif(!empty($args['label'])){
-			$output .= self::label(array('title'=>$args['label'],'for'=>$args['id'].$count,'class'=>'form-check-label'),'radio');
+		if (!empty($args['label']) && is_array($args['label'])) {
+		}elseif (!empty($args['label'])) {
+			$output .= self::label(array('title'=>$args['label'], 'for'=>$args['id'] . $count, 'class'=>'form-check-label'), 'radio');
 		}
 
 		// wrap
-		if(!$args['no_wrap']){
+		if (!$args['no_wrap']) {
 			$wrap_class = $args['inline'] ? 'form-check form-check-inline' : 'form-check';
 			$output = self::wrap(array(
 				'content' => $output,

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

Braces +1 added lines, -1 removed lines

@@ -207,7 +207,7 @@
 				foreach($args as $key => $val){
 					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
 				}
-			}else{
+			} else{
 				$output .= ' '.$args.' ';
 			}
 

Indentation +245 added lines, -245 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+    exit; // Exit if accessed directly
 }
 
 /**
@@ -11,249 +11,249 @@ 
  */
 class AUI_Component_Helper {
 
-	/**
-	 * A component helper for generating a input name.
-	 *
-	 * @param $text
-	 *
-	 * @return string
-	 */
-	public static function name($text,$multiple = false){
-		$output = '';
-
-		if($text){
-			$is_multiple = strpos($text, '[]') !== false || (strpos($text, '[]') === false && $multiple ) ? '[]' : '';
-			$output = ' name="'.sanitize_html_class($text).$is_multiple.'" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item id.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function id($text){
-		$output = '';
-
-		if($text){
-			$output = ' id="'.sanitize_html_class($text).'" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item title.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function title($text){
-		$output = '';
-
-		if($text){
-			$output = ' title="'.esc_attr($text).'" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item value.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function value($text){
-		$output = '';
-
-		if($text){
-			$output = ' value="'.sanitize_text_field($text).'" ';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * A component helper for generating a item class attribute.
-	 *
-	 * @param $text string The text to be used as the value.
-	 *
-	 * @return string The sanitized item.
-	 */
-	public static function class_attr($text){
-		$output = '';
-
-		if($text){
-			$classes = self::esc_classes($text);
-			if(!empty($classes)){
-				$output = ' class="'.$classes.'" ';
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Escape a string of classes.
-	 *
-	 * @param $text
-	 *
-	 * @return string
-	 */
-	public static function esc_classes($text){
-		$output = '';
-
-		if($text){
-			$classes = explode(" ",$text);
-			$classes = array_map("trim",$classes);
-			$classes = array_map("sanitize_html_class",$classes);
-			if(!empty($classes)){
-				$output = implode(" ",$classes);
-			}
-		}
-
-		return $output;
-
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function data_attributes($args){
-		$output = '';
-
-		if(!empty($args)){
-
-			foreach($args as $key => $val){
-				if(substr( $key, 0, 5 ) === "data-"){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function aria_attributes($args){
-		$output = '';
-
-		if(!empty($args)){
-
-			foreach($args as $key => $val){
-				if(substr( $key, 0, 5 ) === "aria-"){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Build a font awesome icon from a class.
-	 *
-	 * @param $class
-	 * @param bool $space_after
-	 * @param array $extra_attributes An array of extra attributes.
-	 *
-	 * @return string
-	 */
-	public static function icon($class,$space_after = false, $extra_attributes = array()){
-		$output = '';
-
-		if($class){
-			$classes = self::esc_classes($class);
-			if(!empty($classes)){
-				$output = '<i class="'.$classes.'" ';
-				// extra attributes
-				if(!empty($extra_attributes)){
-					$output .= AUI_Component_Helper::extra_attributes($extra_attributes);
-				}
-				$output .= '></i>';
-				if($space_after){
-					$output .= " ";
-				}
-			}
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function extra_attributes($args){
-		$output = '';
-
-		if(!empty($args)){
-
-			if( is_array($args) ){
-				foreach($args as $key => $val){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
-				}
-			}else{
-				$output .= ' '.$args.' ';
-			}
-
-		}
-
-		return $output;
-	}
-
-	/**
-	 * @param $args
-	 *
-	 * @return string
-	 */
-	public static function help_text($text){
-		$output = '';
-
-		if($text){
-			$output .= '<small class="form-text text-muted">'.wp_kses_post($text).'</small>';
-		}
-
-
-		return $output;
-	}
-
-	/**
-	 * Replace element require context with JS.
-	 *
-	 * @param $input
-	 *
-	 * @return string|void
-	 */
-	public static function element_require( $input ) {
-
-		$input = str_replace( "'", '"', $input );// we only want double quotes
-
-		$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
-			"jQuery(form).find('[data-argument=\"",
-			"\"]').find('input,select,textarea').val()",
-			"\"]').find('input:checked').val()",
-		), $input ) );
-
-		if($output){
-			$output = ' data-element-require="'.$output.'" ';
-		}
-
-		return $output;
-	}
+    /**
+     * A component helper for generating a input name.
+     *
+     * @param $text
+     *
+     * @return string
+     */
+    public static function name($text,$multiple = false){
+        $output = '';
+
+        if($text){
+            $is_multiple = strpos($text, '[]') !== false || (strpos($text, '[]') === false && $multiple ) ? '[]' : '';
+            $output = ' name="'.sanitize_html_class($text).$is_multiple.'" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item id.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function id($text){
+        $output = '';
+
+        if($text){
+            $output = ' id="'.sanitize_html_class($text).'" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item title.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function title($text){
+        $output = '';
+
+        if($text){
+            $output = ' title="'.esc_attr($text).'" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item value.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function value($text){
+        $output = '';
+
+        if($text){
+            $output = ' value="'.sanitize_text_field($text).'" ';
+        }
+
+        return $output;
+    }
+
+    /**
+     * A component helper for generating a item class attribute.
+     *
+     * @param $text string The text to be used as the value.
+     *
+     * @return string The sanitized item.
+     */
+    public static function class_attr($text){
+        $output = '';
+
+        if($text){
+            $classes = self::esc_classes($text);
+            if(!empty($classes)){
+                $output = ' class="'.$classes.'" ';
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Escape a string of classes.
+     *
+     * @param $text
+     *
+     * @return string
+     */
+    public static function esc_classes($text){
+        $output = '';
+
+        if($text){
+            $classes = explode(" ",$text);
+            $classes = array_map("trim",$classes);
+            $classes = array_map("sanitize_html_class",$classes);
+            if(!empty($classes)){
+                $output = implode(" ",$classes);
+            }
+        }
+
+        return $output;
+
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function data_attributes($args){
+        $output = '';
+
+        if(!empty($args)){
+
+            foreach($args as $key => $val){
+                if(substr( $key, 0, 5 ) === "data-"){
+                    $output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function aria_attributes($args){
+        $output = '';
+
+        if(!empty($args)){
+
+            foreach($args as $key => $val){
+                if(substr( $key, 0, 5 ) === "aria-"){
+                    $output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Build a font awesome icon from a class.
+     *
+     * @param $class
+     * @param bool $space_after
+     * @param array $extra_attributes An array of extra attributes.
+     *
+     * @return string
+     */
+    public static function icon($class,$space_after = false, $extra_attributes = array()){
+        $output = '';
+
+        if($class){
+            $classes = self::esc_classes($class);
+            if(!empty($classes)){
+                $output = '<i class="'.$classes.'" ';
+                // extra attributes
+                if(!empty($extra_attributes)){
+                    $output .= AUI_Component_Helper::extra_attributes($extra_attributes);
+                }
+                $output .= '></i>';
+                if($space_after){
+                    $output .= " ";
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function extra_attributes($args){
+        $output = '';
+
+        if(!empty($args)){
+
+            if( is_array($args) ){
+                foreach($args as $key => $val){
+                    $output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+                }
+            }else{
+                $output .= ' '.$args.' ';
+            }
+
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $args
+     *
+     * @return string
+     */
+    public static function help_text($text){
+        $output = '';
+
+        if($text){
+            $output .= '<small class="form-text text-muted">'.wp_kses_post($text).'</small>';
+        }
+
+
+        return $output;
+    }
+
+    /**
+     * Replace element require context with JS.
+     *
+     * @param $input
+     *
+     * @return string|void
+     */
+    public static function element_require( $input ) {
+
+        $input = str_replace( "'", '"', $input );// we only want double quotes
+
+        $output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+            "jQuery(form).find('[data-argument=\"",
+            "\"]').find('input,select,textarea').val()",
+            "\"]').find('input:checked').val()",
+        ), $input ) );
+
+        if($output){
+            $output = ' data-element-require="'.$output.'" ';
+        }
+
+        return $output;
+    }
 
 }
\ No newline at end of file

Spacing +57 added lines, -57 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
@@ -18,12 +18,12 @@ 
 	 *
 	 * @return string
 	 */
-	public static function name($text,$multiple = false){
+	public static function name($text, $multiple = false) {
 		$output = '';
 
-		if($text){
-			$is_multiple = strpos($text, '[]') !== false || (strpos($text, '[]') === false && $multiple ) ? '[]' : '';
-			$output = ' name="'.sanitize_html_class($text).$is_multiple.'" ';
+		if ($text) {
+			$is_multiple = strpos($text, '[]') !== false || (strpos($text, '[]') === false && $multiple) ? '[]' : '';
+			$output = ' name="' . sanitize_html_class($text) . $is_multiple . '" ';
 		}
 
 		return $output;
@@ -36,11 +36,11 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function id($text){
+	public static function id($text) {
 		$output = '';
 
-		if($text){
-			$output = ' id="'.sanitize_html_class($text).'" ';
+		if ($text) {
+			$output = ' id="' . sanitize_html_class($text) . '" ';
 		}
 
 		return $output;
@@ -53,11 +53,11 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function title($text){
+	public static function title($text) {
 		$output = '';
 
-		if($text){
-			$output = ' title="'.esc_attr($text).'" ';
+		if ($text) {
+			$output = ' title="' . esc_attr($text) . '" ';
 		}
 
 		return $output;
@@ -70,11 +70,11 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function value($text){
+	public static function value($text) {
 		$output = '';
 
-		if($text){
-			$output = ' value="'.sanitize_text_field($text).'" ';
+		if ($text) {
+			$output = ' value="' . sanitize_text_field($text) . '" ';
 		}
 
 		return $output;
@@ -87,13 +87,13 @@ 
 	 *
 	 * @return string The sanitized item.
 	 */
-	public static function class_attr($text){
+	public static function class_attr($text) {
 		$output = '';
 
-		if($text){
+		if ($text) {
 			$classes = self::esc_classes($text);
-			if(!empty($classes)){
-				$output = ' class="'.$classes.'" ';
+			if (!empty($classes)) {
+				$output = ' class="' . $classes . '" ';
 			}
 		}
 
@@ -107,15 +107,15 @@ 
 	 *
 	 * @return string
 	 */
-	public static function esc_classes($text){
+	public static function esc_classes($text) {
 		$output = '';
 
-		if($text){
-			$classes = explode(" ",$text);
-			$classes = array_map("trim",$classes);
-			$classes = array_map("sanitize_html_class",$classes);
-			if(!empty($classes)){
-				$output = implode(" ",$classes);
+		if ($text) {
+			$classes = explode(" ", $text);
+			$classes = array_map("trim", $classes);
+			$classes = array_map("sanitize_html_class", $classes);
+			if (!empty($classes)) {
+				$output = implode(" ", $classes);
 			}
 		}
 
@@ -128,14 +128,14 @@ 
 	 *
 	 * @return string
 	 */
-	public static function data_attributes($args){
+	public static function data_attributes($args) {
 		$output = '';
 
-		if(!empty($args)){
+		if (!empty($args)) {
 
-			foreach($args as $key => $val){
-				if(substr( $key, 0, 5 ) === "data-"){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+			foreach ($args as $key => $val) {
+				if (substr($key, 0, 5) === "data-") {
+					$output .= ' ' . sanitize_html_class($key) . '="' . esc_attr($val) . '" ';
 				}
 			}
 		}
@@ -148,14 +148,14 @@ 
 	 *
 	 * @return string
 	 */
-	public static function aria_attributes($args){
+	public static function aria_attributes($args) {
 		$output = '';
 
-		if(!empty($args)){
+		if (!empty($args)) {
 
-			foreach($args as $key => $val){
-				if(substr( $key, 0, 5 ) === "aria-"){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+			foreach ($args as $key => $val) {
+				if (substr($key, 0, 5) === "aria-") {
+					$output .= ' ' . sanitize_html_class($key) . '="' . esc_attr($val) . '" ';
 				}
 			}
 		}
@@ -172,19 +172,19 @@ 
 	 *
 	 * @return string
 	 */
-	public static function icon($class,$space_after = false, $extra_attributes = array()){
+	public static function icon($class, $space_after = false, $extra_attributes = array()) {
 		$output = '';
 
-		if($class){
+		if ($class) {
 			$classes = self::esc_classes($class);
-			if(!empty($classes)){
-				$output = '<i class="'.$classes.'" ';
+			if (!empty($classes)) {
+				$output = '<i class="' . $classes . '" ';
 				// extra attributes
-				if(!empty($extra_attributes)){
+				if (!empty($extra_attributes)) {
 					$output .= AUI_Component_Helper::extra_attributes($extra_attributes);
 				}
 				$output .= '></i>';
-				if($space_after){
+				if ($space_after) {
 					$output .= " ";
 				}
 			}
@@ -198,17 +198,17 @@ 
 	 *
 	 * @return string
 	 */
-	public static function extra_attributes($args){
+	public static function extra_attributes($args) {
 		$output = '';
 
-		if(!empty($args)){
+		if (!empty($args)) {
 
-			if( is_array($args) ){
-				foreach($args as $key => $val){
-					$output .= ' '.sanitize_html_class($key).'="'.esc_attr($val).'" ';
+			if (is_array($args)) {
+				foreach ($args as $key => $val) {
+					$output .= ' ' . sanitize_html_class($key) . '="' . esc_attr($val) . '" ';
 				}
-			}else{
-				$output .= ' '.$args.' ';
+			} else {
+				$output .= ' ' . $args . ' ';
 			}
 
 		}
@@ -221,11 +221,11 @@ 
 	 *
 	 * @return string
 	 */
-	public static function help_text($text){
+	public static function help_text($text) {
 		$output = '';
 
-		if($text){
-			$output .= '<small class="form-text text-muted">'.wp_kses_post($text).'</small>';
+		if ($text) {
+			$output .= '<small class="form-text text-muted">' . wp_kses_post($text) . '</small>';
 		}
 
 
@@ -239,18 +239,18 @@ 
 	 *
 	 * @return string|void
 	 */
-	public static function element_require( $input ) {
+	public static function element_require($input) {
 
-		$input = str_replace( "'", '"', $input );// we only want double quotes
+		$input = str_replace("'", '"', $input); // we only want double quotes
 
-		$output = esc_attr( str_replace( array( "[%", "%]", "%:checked]" ), array(
+		$output = esc_attr(str_replace(array("[%", "%]", "%:checked]"), array(
 			"jQuery(form).find('[data-argument=\"",
 			"\"]').find('input,select,textarea').val()",
 			"\"]').find('input:checked').val()",
-		), $input ) );
+		), $input));
 
-		if($output){
-			$output = ' data-element-require="'.$output.'" ';
+		if ($output) {
+			$output = ' data-element-require="' . $output . '" ';
 		}
 
 		return $output;

includes/admin/class-getpaid-metaboxes.php

Indentation +157 added lines, -157 removed lines

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

Spacing +45 added lines, -45 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Metaboxes Admin Class
@@ -25,93 +25,93 @@ 
 	public static function init() {
 
 		// Register metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::add_meta_boxes', 5, 2);
 
 		// Remove metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::remove_meta_boxes', 30);
 
 		// Rename metaboxes.
-		add_action( 'add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45 );
+		add_action('add_meta_boxes', 'GetPaid_Metaboxes::rename_meta_boxes', 45);
 
 		// Save metaboxes.
-		add_action( 'save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2 );
+		add_action('save_post', 'GetPaid_Metaboxes::save_meta_boxes', 1, 2);
 	}
 
 	/**
 	 * Register core metaboxes.
 	 */
-	public static function add_meta_boxes( $post_type, $post ) {
+	public static function add_meta_boxes($post_type, $post) {
 		global $wpinv_euvat;
 
 		// For invoices...
-		if ( $post_type == 'wpi_invoice' ) {
-			$invoice = new WPInv_Invoice( $post );
+		if ($post_type == 'wpi_invoice') {
+			$invoice = new WPInv_Invoice($post);
 
 			// Resend invoice.
-			if ( ! $invoice->is_draft() && ! $invoice->is_paid() ) {
-				add_meta_box( 'wpinv-mb-resend-invoice', __( 'Resend Invoice', 'invoicing' ), 'GetPaid_Meta_Box_Resend_Invoice::output', 'wpi_invoice', 'side', 'low' );
+			if (!$invoice->is_draft() && !$invoice->is_paid()) {
+				add_meta_box('wpinv-mb-resend-invoice', __('Resend Invoice', 'invoicing'), 'GetPaid_Meta_Box_Resend_Invoice::output', 'wpi_invoice', 'side', 'low');
 			}
 
 			// Subscriptions.
-			$subscription = getpaid_get_invoice_subscription( $invoice );
-			if ( ! empty( $subscription ) ) {
-				add_meta_box( 'wpinv-mb-subscriptions', __( 'Subscription Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output', 'wpi_invoice', 'advanced' );
-				add_meta_box( 'wpinv-mb-subscription-invoices', __( 'Related Payments', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', 'wpi_invoice', 'advanced' );
+			$subscription = getpaid_get_invoice_subscription($invoice);
+			if (!empty($subscription)) {
+				add_meta_box('wpinv-mb-subscriptions', __('Subscription Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output', 'wpi_invoice', 'advanced');
+				add_meta_box('wpinv-mb-subscription-invoices', __('Related Payments', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Subscription::output_invoices', 'wpi_invoice', 'advanced');
 			}
 
 			// Invoice details.
-			add_meta_box( 'wpinv-details', __( 'Invoice Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Details::output', 'wpi_invoice', 'side', 'default' );
+			add_meta_box('wpinv-details', __('Invoice Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Details::output', 'wpi_invoice', 'side', 'default');
 			
 			// Payment details.
-			if ( ! $invoice->is_draft() ) {
-				add_meta_box( 'wpinv-payment-meta', __( 'Payment Meta', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', 'wpi_invoice', 'side', 'default' );
+			if (!$invoice->is_draft()) {
+				add_meta_box('wpinv-payment-meta', __('Payment Meta', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Payment_Meta::output', 'wpi_invoice', 'side', 'default');
 			}
 
 			// Billing details.
-			add_meta_box( 'wpinv-address', __( 'Billing Details', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Address::output', 'wpi_invoice', 'normal', 'high' );
+			add_meta_box('wpinv-address', __('Billing Details', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Address::output', 'wpi_invoice', 'normal', 'high');
 			
 			// Invoice items.
-			add_meta_box( 'wpinv-items', __( 'Invoice Items', 'invoicing' ), 'GetPaid_Meta_Box_Invoice_Items::output', 'wpi_invoice', 'normal', 'high' );
+			add_meta_box('wpinv-items', __('Invoice Items', 'invoicing'), 'GetPaid_Meta_Box_Invoice_Items::output', 'wpi_invoice', 'normal', 'high');
 			
 			// Invoice notes.
-			add_meta_box( 'wpinv-notes', __( 'Invoice Notes', 'invoicing' ), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'side', 'low' );
+			add_meta_box('wpinv-notes', __('Invoice Notes', 'invoicing'), 'WPInv_Meta_Box_Notes::output', 'wpi_invoice', 'side', 'low');
 
 			// Payment form information.
-			if ( ! empty( $post->ID ) && get_post_meta( $post->ID, 'payment_form_data', true ) ) {
-				add_meta_box( 'wpinv-invoice-payment-form-details', __( 'Payment Form Details', 'invoicing' ), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high' );
+			if (!empty($post->ID) && get_post_meta($post->ID, 'payment_form_data', true)) {
+				add_meta_box('wpinv-invoice-payment-form-details', __('Payment Form Details', 'invoicing'), 'WPInv_Meta_Box_Payment_Form::output_details', 'wpi_invoice', 'side', 'high');
 			}
 		}
 
 		// For payment forms.
-		if ( $post_type == 'wpi_payment_form' ) {
+		if ($post_type == 'wpi_payment_form') {
 
 			// Design payment form.
-			add_meta_box( 'wpinv-payment-form-design', __( 'Payment Form', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal' );
+			add_meta_box('wpinv-payment-form-design', __('Payment Form', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form::output', 'wpi_payment_form', 'normal');
 
 			// Payment form information.
-			add_meta_box( 'wpinv-payment-form-info', __( 'Details', 'invoicing' ), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side' );
+			add_meta_box('wpinv-payment-form-info', __('Details', 'invoicing'), 'GetPaid_Meta_Box_Payment_Form_Info::output', 'wpi_payment_form', 'side');
 
 		}
 
 		// For invoice items.
-		if ( $post_type == 'wpi_item' ) {
+		if ($post_type == 'wpi_item') {
 
 			// Item details.
-			add_meta_box( 'wpinv_item_details', __( 'Item Details', 'invoicing' ), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high' );
+			add_meta_box('wpinv_item_details', __('Item Details', 'invoicing'), 'GetPaid_Meta_Box_Item_Details::output', 'wpi_item', 'normal', 'high');
 
 			// If taxes are enabled, register the tax metabox.
-			if ( $wpinv_euvat->allow_vat_rules() || $wpinv_euvat->allow_vat_classes() ) {
-				add_meta_box( 'wpinv_item_vat', __( 'VAT / Tax', 'invoicing' ), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high' );
+			if ($wpinv_euvat->allow_vat_rules() || $wpinv_euvat->allow_vat_classes()) {
+				add_meta_box('wpinv_item_vat', __('VAT / Tax', 'invoicing'), 'GetPaid_Meta_Box_Item_VAT::output', 'wpi_item', 'normal', 'high');
 			}
 
 			// Item info.
-			add_meta_box( 'wpinv_field_item_info', __( 'Item info', 'invoicing' ), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core' );
+			add_meta_box('wpinv_field_item_info', __('Item info', 'invoicing'), 'GetPaid_Meta_Box_Item_Info::output', 'wpi_item', 'side', 'core');
 
 		}
 
 		// For invoice discounts.
-		if ( $post_type == 'wpi_discount' ) {
-			add_meta_box( 'wpinv_discount_details', __( 'Discount Details', 'invoicing' ), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high' );
+		if ($post_type == 'wpi_discount') {
+			add_meta_box('wpinv_discount_details', __('Discount Details', 'invoicing'), 'GetPaid_Meta_Box_Discount_Details::output', 'wpi_discount', 'normal', 'high');
 		}
 		
 
@@ -121,7 +121,7 @@ 
 	 * Remove some metaboxes.
 	 */
 	public static function remove_meta_boxes() {
-		remove_meta_box( 'wpseo_meta', 'wpi_invoice', 'normal' );
+		remove_meta_box('wpseo_meta', 'wpi_invoice', 'normal');
 	}
 
 	/**
@@ -137,37 +137,37 @@ 
 	 * @param  int    $post_id Post ID.
 	 * @param  object $post Post object.
 	 */
-	public static function save_meta_boxes( $post_id, $post ) {
-		$post_id = absint( $post_id );
-		$data    = wp_unslash( $_POST );
+	public static function save_meta_boxes($post_id, $post) {
+		$post_id = absint($post_id);
+		$data    = wp_unslash($_POST);
 
 		// Do not save for ajax requests.
-		if ( ( defined( 'DOING_AJAX') && DOING_AJAX ) || isset( $_REQUEST['bulk_edit'] ) ) {
+		if ((defined('DOING_AJAX') && DOING_AJAX) || isset($_REQUEST['bulk_edit'])) {
 			return;
 		}
 
 		// $post_id and $post are required
-		if ( empty( $post_id ) || empty( $post ) || self::$saved_meta_boxes ) {
+		if (empty($post_id) || empty($post) || self::$saved_meta_boxes) {
 			return;
 		}
 
 		// Dont' save meta boxes for revisions or autosaves.
-		if ( ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) || is_int( wp_is_post_revision( $post ) ) || is_int( wp_is_post_autosave( $post ) ) ) {
+		if ((defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) || is_int(wp_is_post_revision($post)) || is_int(wp_is_post_autosave($post))) {
 			return;
 		}
 
 		// Check the nonce.
-		if ( empty( $data['getpaid_meta_nonce'] ) || ! wp_verify_nonce( $data['getpaid_meta_nonce'], 'getpaid_meta_nonce' ) ) {
+		if (empty($data['getpaid_meta_nonce']) || !wp_verify_nonce($data['getpaid_meta_nonce'], 'getpaid_meta_nonce')) {
 			return;
 		}
 
 		// Check the post being saved == the $post_id to prevent triggering this call for other save_post events.
-		if ( empty( $data['post_ID'] ) || absint( $data['post_ID'] ) !== $post_id ) {
+		if (empty($data['post_ID']) || absint($data['post_ID']) !== $post_id) {
 			return;
 		}
 
 		// Check user has permission to edit.
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if (!current_user_can('edit_post', $post_id)) {
 			return;
 		}
 
@@ -181,7 +181,7 @@ 
 		);
 
 		// Is this our post type?
-		if ( empty( $post->post_type ) || ! isset( $post_types_map[ $post->post_type ] ) ) {
+		if (empty($post->post_type) || !isset($post_types_map[$post->post_type])) {
 			return;
 		}
 
@@ -189,8 +189,8 @@ 
 		self::$saved_meta_boxes = true;
 		
 		// Save the post.
-		$class = $post_types_map[ $post->post_type ];
-		$class::save( $post_id, $_POST, $post );
+		$class = $post_types_map[$post->post_type];
+		$class::save($post_id, $_POST, $post);
 
 	}
 

includes/admin/wpinv-upgrade-functions.php

Spacing +50 added lines, -50 removed lines

@@ -11,55 +11,55 @@ 
  * @since 1.0.0
 */
 function wpinv_automatic_upgrade() {
-    $wpi_version = get_option( 'wpinv_version' );
+    $wpi_version = get_option('wpinv_version');
 
     // Update tables.
-    if ( ! get_option( 'getpaid_created_invoice_tables' ) ) {
+    if (!get_option('getpaid_created_invoice_tables')) {
         wpinv_v119_upgrades();
-        update_option( 'getpaid_created_invoice_tables', true );
+        update_option('getpaid_created_invoice_tables', true);
     }
 
-    if ( $wpi_version == WPINV_VERSION ) {
+    if ($wpi_version == WPINV_VERSION) {
         return;
     }
 
-    if ( version_compare( $wpi_version, '0.0.5', '<' ) ) {
+    if (version_compare($wpi_version, '0.0.5', '<')) {
         wpinv_v005_upgrades();
     }
 
-    if ( version_compare( $wpi_version, '1.0.3', '<' ) ) {
+    if (version_compare($wpi_version, '1.0.3', '<')) {
         wpinv_v110_upgrades();
     }
 
-    update_option( 'wpinv_version', WPINV_VERSION );
+    update_option('wpinv_version', WPINV_VERSION);
 }
-add_action( 'admin_init', 'wpinv_automatic_upgrade' );
+add_action('admin_init', 'wpinv_automatic_upgrade');
 
 function wpinv_v005_upgrades() {
     global $wpdb;
 
     // Invoices status
-    $results = $wpdb->get_results( "SELECT ID FROM " . $wpdb->posts . " WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )" );
+    $results = $wpdb->get_results("SELECT ID FROM " . $wpdb->posts . " WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->posts . " SET post_status = CONCAT( 'wpi-', post_status ) WHERE post_type = 'wpi_invoice' AND post_status IN( 'pending', 'processing', 'onhold', 'refunded', 'cancelled', 'failed', 'renewal' )");
 
         // Clean post cache
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->ID );
+        foreach ($results as $row) {
+            clean_post_cache($row->ID);
         }
     }
 
     // Item meta key changes
     $query = "SELECT DISTINCT post_id FROM " . $wpdb->postmeta . " WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id', '_wpinv_cpt_name', '_wpinv_cpt_singular_name' )";
-    $results = $wpdb->get_results( $query );
+    $results = $wpdb->get_results($query);
 
-    if ( !empty( $results ) ) {
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'" );
-        $wpdb->query( "UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'" );
+    if (!empty($results)) {
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_id' WHERE meta_key IN( '_wpinv_item_id', '_wpinv_package_id', '_wpinv_post_id' )");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_name' WHERE meta_key = '_wpinv_cpt_name'");
+        $wpdb->query("UPDATE " . $wpdb->postmeta . " SET meta_key = '_wpinv_custom_singular_name' WHERE meta_key = '_wpinv_cpt_singular_name'");
         
-        foreach ( $results as $row ) {
-            clean_post_cache( $row->post_id );
+        foreach ($results as $row) {
+            clean_post_cache($row->post_id);
         }
     }
 
@@ -88,7 +88,7 @@ 
 function wpinv_create_invoices_table() {
     global $wpdb;
 
-    require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
     // Create invoices table.
     $table = $wpdb->prefix . 'getpaid_invoices';
@@ -132,7 +132,7 @@ 
             KEY `key` ( `key` )
             ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-    dbDelta( $sql );
+    dbDelta($sql);
 
     // Create invoice items table.
     $table = $wpdb->prefix . 'getpaid_invoice_items';
@@ -160,7 +160,7 @@ 
             KEY post_id ( post_id )
             ) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-    dbDelta( $sql );
+    dbDelta($sql);
 }
 
 /**
@@ -172,29 +172,29 @@ 
     $invoices = array_unique(
         get_posts(
             array(
-                'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+                'post_type'      => array('wpi_invoice', 'wpi_quote'),
                 'posts_per_page' => -1,
                 'fields'         => 'ids',
-                'post_status'    => array_keys( wpinv_get_invoice_statuses( true ) ),
+                'post_status'    => array_keys(wpinv_get_invoice_statuses(true)),
             )
         )
     );
     $invoices_table = $wpdb->prefix . 'getpaid_invoices';
     $invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
 
-    if ( ! class_exists( 'WPInv_Legacy_Invoice' ) ) {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php' );
+    if (!class_exists('WPInv_Legacy_Invoice')) {
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php');
     }
 
     $invoice_rows = array();
-    foreach ( $invoices as $invoice ) {
+    foreach ($invoices as $invoice) {
 
-        $invoice = new WPInv_Legacy_Invoice( $invoice );
-        $fields = array (
+        $invoice = new WPInv_Legacy_Invoice($invoice);
+        $fields = array(
             'post_id'        => $invoice->ID,
             'number'         => $invoice->get_number(),
             'key'            => $invoice->get_key(),
-            'type'           => str_replace( 'wpi_', '', $invoice->post_type ),
+            'type'           => str_replace('wpi_', '', $invoice->post_type),
             'mode'           => $invoice->mode,
             'user_ip'        => $invoice->get_ip(),
             'first_name'     => $invoice->get_first_name(),
@@ -223,27 +223,27 @@ 
             'custom_meta'    => $invoice->payment_meta
         );
 
-        foreach ( $fields as $key => $val ) {
-            if ( is_null( $val ) ) {
+        foreach ($fields as $key => $val) {
+            if (is_null($val)) {
                 $val = '';
             }
-            $val = maybe_serialize( $val );
-            $fields[ $key ] = $wpdb->prepare( '%s', $val );
+            $val = maybe_serialize($val);
+            $fields[$key] = $wpdb->prepare('%s', $val);
         }
 
-        $fields = implode( ', ', $fields );
+        $fields = implode(', ', $fields);
         $invoice_rows[] = "($fields)";
 
         $item_rows    = array();
         $item_columns = array();
-        foreach ( $invoice->get_cart_details() as $details ) {
+        foreach ($invoice->get_cart_details() as $details) {
             $fields = array(
                 'post_id'          => $invoice->ID,
                 'item_id'          => $details['id'],
                 'item_name'        => $details['name'],
-                'item_description' => empty( $details['meta']['description'] ) ? '' : $details['meta']['description'],
+                'item_description' => empty($details['meta']['description']) ? '' : $details['meta']['description'],
                 'vat_rate'         => $details['vat_rate'],
-                'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+                'vat_class'        => empty($details['vat_class']) ? '_standard' : $details['vat_class'],
                 'tax'              => $details['tax'],
                 'item_price'       => $details['item_price'],
                 'custom_price'     => $details['custom_price'],
@@ -255,26 +255,26 @@ 
                 'fees'             => $details['fees'],
             );
 
-            $item_columns = array_keys ( $fields );
+            $item_columns = array_keys($fields);
 
-            foreach ( $fields as $key => $val ) {
-                if ( is_null( $val ) ) {
+            foreach ($fields as $key => $val) {
+                if (is_null($val)) {
                     $val = '';
                 }
-                $val = maybe_serialize( $val );
-                $fields[ $key ] = $wpdb->prepare( '%s', $val );
+                $val = maybe_serialize($val);
+                $fields[$key] = $wpdb->prepare('%s', $val);
             }
 
-            $fields = implode( ', ', $fields );
+            $fields = implode(', ', $fields);
             $item_rows[] = "($fields)";
         }
 
-        $item_rows    = implode( ', ', $item_rows );
-        $item_columns = implode( ', ', $item_columns );
-        $wpdb->query( "INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows" );
+        $item_rows    = implode(', ', $item_rows);
+        $item_columns = implode(', ', $item_columns);
+        $wpdb->query("INSERT INTO $invoice_items_table ($item_columns) VALUES $item_rows");
     }
 
-    $invoice_rows = implode( ', ', $invoice_rows );
-    $wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+    $invoice_rows = implode(', ', $invoice_rows);
+    $wpdb->query("INSERT INTO $invoices_table VALUES $invoice_rows");
 
 }

includes/subscription-functions.php

Indentation +146 added lines, -146 removed lines

@@ -17,28 +17,28 @@ 
  */
 function getpaid_get_subscriptions( $args = array(), $return = 'results' ) {
 
-	// Do not retrieve all fields if we just want the count.
-	if ( 'count' == $return ) {
-		$args['fields'] = 'id';
-		$args['number'] = 1;
-	}
+    // Do not retrieve all fields if we just want the count.
+    if ( 'count' == $return ) {
+        $args['fields'] = 'id';
+        $args['number'] = 1;
+    }
 
-	// Do not count all matches if we just want the results.
-	if ( 'results' == $return ) {
-		$args['count_total'] = false;
-	}
+    // Do not count all matches if we just want the results.
+    if ( 'results' == $return ) {
+        $args['count_total'] = false;
+    }
 
-	$query = new GetPaid_Subscriptions_Query( $args );
+    $query = new GetPaid_Subscriptions_Query( $args );
 
-	if ( 'results' == $return ) {
-		return $query->get_results();
-	}
+    if ( 'results' == $return ) {
+        return $query->get_results();
+    }
 
-	if ( 'count' == $return ) {
-		return $query->get_total();
-	}
+    if ( 'count' == $return ) {
+        return $query->get_total();
+    }
 
-	return $query;
+    return $query;
 }
 
 /**
@@ -48,18 +48,18 @@ 
  */
 function getpaid_get_subscription_statuses() {
 
-	return apply_filters(
-		'getpaid_get_subscription_statuses',
-		array(
-			'pending'    => __( 'Pending', 'invoicing' ),
-			'trialling'  => __( 'Trialing', 'invoicing' ),
-			'active'     => __( 'Active', 'invoicing' ),
-			'failing'    => __( 'Failing', 'invoicing' ),
-			'expired'    => __( 'Expired', 'invoicing' ),
-			'completed'  => __( 'Complete', 'invoicing' ),
-			'cancelled'  => __( 'Cancelled', 'invoicing' ),
-		)
-	);
+    return apply_filters(
+        'getpaid_get_subscription_statuses',
+        array(
+            'pending'    => __( 'Pending', 'invoicing' ),
+            'trialling'  => __( 'Trialing', 'invoicing' ),
+            'active'     => __( 'Active', 'invoicing' ),
+            'failing'    => __( 'Failing', 'invoicing' ),
+            'expired'    => __( 'Expired', 'invoicing' ),
+            'completed'  => __( 'Complete', 'invoicing' ),
+            'cancelled'  => __( 'Cancelled', 'invoicing' ),
+        )
+    );
 
 }
 
@@ -69,8 +69,8 @@ 
  * @return string
  */
 function getpaid_get_subscription_status_label( $status ) {
-	$statuses = getpaid_get_subscription_statuses();
-	return isset( $statuses[ $status ] ) ? $statuses[ $status ] : ucfirst( sanitize_text_field( $status ) );
+    $statuses = getpaid_get_subscription_statuses();
+    return isset( $statuses[ $status ] ) ? $statuses[ $status ] : ucfirst( sanitize_text_field( $status ) );
 }
 
 /**
@@ -80,18 +80,18 @@ 
  */
 function getpaid_get_subscription_status_classes() {
 
-	return apply_filters(
-		'getpaid_get_subscription_status_classes',
-		array(
-			'pending'    => 'getpaid-item-status-pending',
-			'trialling'  => 'getpaid-item-status-trial',
-			'active'     => 'getpaid-item-status-info',
-			'failing'    => 'getpaid-item-status-failing',
-			'expired'    => 'getpaid-item-status-expired',
-			'completed'  => 'getpaid-item-status-success',
-			'cancelled'  => 'getpaid-item-status-canceled',
-		)
-	);
+    return apply_filters(
+        'getpaid_get_subscription_status_classes',
+        array(
+            'pending'    => 'getpaid-item-status-pending',
+            'trialling'  => 'getpaid-item-status-trial',
+            'active'     => 'getpaid-item-status-info',
+            'failing'    => 'getpaid-item-status-failing',
+            'expired'    => 'getpaid-item-status-expired',
+            'completed'  => 'getpaid-item-status-success',
+            'cancelled'  => 'getpaid-item-status-canceled',
+        )
+    );
 
 }
 
@@ -102,15 +102,15 @@ 
  */
 function getpaid_get_subscription_status_counts( $args = array() ) {
 
-	$statuses = array_keys( getpaid_get_subscription_statuses() );
-	$counts   = array();
+    $statuses = array_keys( getpaid_get_subscription_statuses() );
+    $counts   = array();
 
-	foreach ( $statuses as $status ) {
-		$_args             = wp_parse_args( "status=$status", $args );
-		$counts[ $status ] = getpaid_get_subscriptions( $_args, 'count' );
-	}
+    foreach ( $statuses as $status ) {
+        $_args             = wp_parse_args( "status=$status", $args );
+        $counts[ $status ] = getpaid_get_subscriptions( $_args, 'count' );
+    }
 
-	return $counts;
+    return $counts;
 
 }
 
@@ -121,32 +121,32 @@ 
  */
 function getpaid_get_subscription_periods() {
 
-	return apply_filters(
-		'getpaid_get_subscription_periods',
-		array(
+    return apply_filters(
+        'getpaid_get_subscription_periods',
+        array(
 
-			'day'   => array(
-				'singular' => __( '%s day', 'invoicing' ),
-				'plural'   => __( '%d days', 'invoicing' ),
-			),
+            'day'   => array(
+                'singular' => __( '%s day', 'invoicing' ),
+                'plural'   => __( '%d days', 'invoicing' ),
+            ),
 
-			'week'   => array(
-				'singular' => __( '%s week', 'invoicing' ),
-				'plural'   => __( '%d weeks', 'invoicing' ),
-			),
+            'week'   => array(
+                'singular' => __( '%s week', 'invoicing' ),
+                'plural'   => __( '%d weeks', 'invoicing' ),
+            ),
 
-			'month'   => array(
-				'singular' => __( '%s month', 'invoicing' ),
-				'plural'   => __( '%d months', 'invoicing' ),
-			),
+            'month'   => array(
+                'singular' => __( '%s month', 'invoicing' ),
+                'plural'   => __( '%d months', 'invoicing' ),
+            ),
 
-			'year'   => array(
-				'singular' => __( '%s year', 'invoicing' ),
-				'plural'   => __( '%d years', 'invoicing' ),
-			),
+            'year'   => array(
+                'singular' => __( '%s year', 'invoicing' ),
+                'plural'   => __( '%d years', 'invoicing' ),
+            ),
 
-		)
-	);
+        )
+    );
 
 }
 
@@ -157,7 +157,7 @@ 
  * @return int
  */
 function getpaid_get_subscription_trial_period_interval( $trial_period ) {
-	return (int) preg_replace( '/[^0-9]/', '', $trial_period );
+    return (int) preg_replace( '/[^0-9]/', '', $trial_period );
 }
 
 /**
@@ -167,7 +167,7 @@ 
  * @return string
  */
 function getpaid_get_subscription_trial_period_period( $trial_period ) {
-	return preg_replace( '/[^a-z]/', '', strtolower( $trial_period ) );
+    return preg_replace( '/[^a-z]/', '', strtolower( $trial_period ) );
 }
 
 /**
@@ -178,8 +178,8 @@ 
  * @return string
  */
 function getpaid_get_subscription_period_label( $period, $interval = 1, $singular_prefix = '1' ) {
-	$label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label(  $period, $interval ) : getpaid_get_singular_subscription_period_label( $period, $singular_prefix );
-	return strtolower( sanitize_text_field( $label ) );
+    $label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label(  $period, $interval ) : getpaid_get_singular_subscription_period_label( $period, $singular_prefix );
+    return strtolower( sanitize_text_field( $label ) );
 }
 
 /**
@@ -190,22 +190,22 @@ 
  */
 function getpaid_get_singular_subscription_period_label( $period, $singular_prefix = '1' ) {
 
-	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+    $periods = getpaid_get_subscription_periods();
+    $period  = strtolower( $period );
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['singular'], $singular_prefix );
-	}
+    if ( isset( $periods[ $period ] ) ) {
+        return sprintf( $periods[ $period ]['singular'], $singular_prefix );
+    }
 
-	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['singular'], $singular_prefix );
-		}
-	}
+    // Backwards compatibility.
+    foreach ( $periods as $key => $data ) {
+        if ( strpos( $key, $period ) === 0 ) {
+            return sprintf( $data['singular'], $singular_prefix );
+        }
+    }
 
-	// Invalid string.
-	return '';
+    // Invalid string.
+    return '';
 }
 
 /**
@@ -217,22 +217,22 @@ 
  */
 function getpaid_get_plural_subscription_period_label( $period, $interval ) {
 
-	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+    $periods = getpaid_get_subscription_periods();
+    $period  = strtolower( $period );
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['plural'], $interval );
-	}
+    if ( isset( $periods[ $period ] ) ) {
+        return sprintf( $periods[ $period ]['plural'], $interval );
+    }
 
-	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['plural'], $interval );
-		}
-	}
+    // Backwards compatibility.
+    foreach ( $periods as $key => $data ) {
+        if ( strpos( $key, $period ) === 0 ) {
+            return sprintf( $data['plural'], $interval );
+        }
+    }
 
-	// Invalid string.
-	return '';
+    // Invalid string.
+    return '';
 }
 
 /**
@@ -243,50 +243,50 @@ 
  */
 function getpaid_get_formatted_subscription_amount( $subscription ) {
 
-	$initial   = wpinv_price( wpinv_format_amount( $subscription->get_initial_amount() ), $subscription->get_parent_payment()->get_currency() );
-	$recurring = wpinv_price( wpinv_format_amount( $subscription->get_recurring_amount() ), $subscription->get_parent_payment()->get_currency() );
-	$period    = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+    $initial   = wpinv_price( wpinv_format_amount( $subscription->get_initial_amount() ), $subscription->get_parent_payment()->get_currency() );
+    $recurring = wpinv_price( wpinv_format_amount( $subscription->get_recurring_amount() ), $subscription->get_parent_payment()->get_currency() );
+    $period    = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
 
-	// Trial periods.
-	if ( $subscription->has_trial_period() ) {
+    // Trial periods.
+    if ( $subscription->has_trial_period() ) {
 
-		$trial_period   = getpaid_get_subscription_trial_period_period( $subscription->get_trial_period() );
-		$trial_interval = getpaid_get_subscription_trial_period_interval( $subscription->get_trial_period() );
-		return sprintf(
+        $trial_period   = getpaid_get_subscription_trial_period_period( $subscription->get_trial_period() );
+        $trial_interval = getpaid_get_subscription_trial_period_interval( $subscription->get_trial_period() );
+        return sprintf(
 
-			// translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period
-			_x( '%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing' ),
-			$initial,
-			getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
-			$recurring,
-			$period
+            // translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period
+            _x( '%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing' ),
+            $initial,
+            getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
+            $recurring,
+            $period
 
-		);
+        );
 
-	}
+    }
 
-	if ( $initial != $recurring ) {
+    if ( $initial != $recurring ) {
 
-		return sprintf(
+        return sprintf(
 
-			// translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period
-			_x( 'Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing' ),
-			$initial,
-			$recurring,
-			$period
+            // translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period
+            _x( 'Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing' ),
+            $initial,
+            $recurring,
+            $period
 
-		);
+        );
 
-	}
+    }
 
-	return sprintf(
+    return sprintf(
 
-		// translators: $1: is the recurring amount, $2: is the recurring period
-		_x( '%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing' ),
-		$initial,
-		$period
+        // translators: $1: is the recurring amount, $2: is the recurring period
+        _x( '%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing' ),
+        $initial,
+        $period
 
-	);
+    );
 
 }
 
@@ -297,7 +297,7 @@ 
  * @return WPInv_Subscription|bool
  */
 function getpaid_get_invoice_subscription( $invoice ) {
-	return getpaid_subscriptions()->get_invoice_subscription( $invoice );
+    return getpaid_subscriptions()->get_invoice_subscription( $invoice );
 }
 
 /**
@@ -306,10 +306,10 @@ 
  * @param WPInv_Invoice $invoice
  */
 function getpaid_activate_invoice_subscription( $invoice ) {
-	$subscription = getpaid_get_invoice_subscription( $invoice );
-	if ( is_a( $subscription, 'WPInv_Subscription' ) ) {
-		$subscription->activate();
-	}
+    $subscription = getpaid_get_invoice_subscription( $invoice );
+    if ( is_a( $subscription, 'WPInv_Subscription' ) ) {
+        $subscription->activate();
+    }
 }
 
 /**
@@ -318,7 +318,7 @@ 
  * @return WPInv_Subscriptions
  */
 function getpaid_subscriptions() {
-	return getpaid()->get( 'subscriptions' );
+    return getpaid()->get( 'subscriptions' );
 }
 
 /**
@@ -336,14 +336,14 @@ 
         return false;
     }
 
-	// Fetch the invoiec subscription.
-	$subscription = getpaid_get_subscriptions(
-		array(
-			'invoice_in' => $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id(),
-			'number'     => 1,
-		)
-	);
+    // Fetch the invoiec subscription.
+    $subscription = getpaid_get_subscriptions(
+        array(
+            'invoice_in' => $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id(),
+            'number'     => 1,
+        )
+    );
 
-	return empty( $subscription ) ? false : $subscription[0];
+    return empty( $subscription ) ? false : $subscription[0];
 
 }

Spacing +71 added lines, -71 removed lines

@@ -15,26 +15,26 @@ 
  *
  * @return int|array|WPInv_Subscription[]|GetPaid_Subscriptions_Query
  */
-function getpaid_get_subscriptions( $args = array(), $return = 'results' ) {
+function getpaid_get_subscriptions($args = array(), $return = 'results') {
 
 	// Do not retrieve all fields if we just want the count.
-	if ( 'count' == $return ) {
+	if ('count' == $return) {
 		$args['fields'] = 'id';
 		$args['number'] = 1;
 	}
 
 	// Do not count all matches if we just want the results.
-	if ( 'results' == $return ) {
+	if ('results' == $return) {
 		$args['count_total'] = false;
 	}
 
-	$query = new GetPaid_Subscriptions_Query( $args );
+	$query = new GetPaid_Subscriptions_Query($args);
 
-	if ( 'results' == $return ) {
+	if ('results' == $return) {
 		return $query->get_results();
 	}
 
-	if ( 'count' == $return ) {
+	if ('count' == $return) {
 		return $query->get_total();
 	}
 
@@ -51,13 +51,13 @@ 
 	return apply_filters(
 		'getpaid_get_subscription_statuses',
 		array(
-			'pending'    => __( 'Pending', 'invoicing' ),
-			'trialling'  => __( 'Trialing', 'invoicing' ),
-			'active'     => __( 'Active', 'invoicing' ),
-			'failing'    => __( 'Failing', 'invoicing' ),
-			'expired'    => __( 'Expired', 'invoicing' ),
-			'completed'  => __( 'Complete', 'invoicing' ),
-			'cancelled'  => __( 'Cancelled', 'invoicing' ),
+			'pending'    => __('Pending', 'invoicing'),
+			'trialling'  => __('Trialing', 'invoicing'),
+			'active'     => __('Active', 'invoicing'),
+			'failing'    => __('Failing', 'invoicing'),
+			'expired'    => __('Expired', 'invoicing'),
+			'completed'  => __('Complete', 'invoicing'),
+			'cancelled'  => __('Cancelled', 'invoicing'),
 		)
 	);
 
@@ -68,9 +68,9 @@ 
  *
  * @return string
  */
-function getpaid_get_subscription_status_label( $status ) {
+function getpaid_get_subscription_status_label($status) {
 	$statuses = getpaid_get_subscription_statuses();
-	return isset( $statuses[ $status ] ) ? $statuses[ $status ] : ucfirst( sanitize_text_field( $status ) );
+	return isset($statuses[$status]) ? $statuses[$status] : ucfirst(sanitize_text_field($status));
 }
 
 /**
@@ -100,14 +100,14 @@ 
  *
  * @return array
  */
-function getpaid_get_subscription_status_counts( $args = array() ) {
+function getpaid_get_subscription_status_counts($args = array()) {
 
-	$statuses = array_keys( getpaid_get_subscription_statuses() );
+	$statuses = array_keys(getpaid_get_subscription_statuses());
 	$counts   = array();
 
-	foreach ( $statuses as $status ) {
-		$_args             = wp_parse_args( "status=$status", $args );
-		$counts[ $status ] = getpaid_get_subscriptions( $_args, 'count' );
+	foreach ($statuses as $status) {
+		$_args             = wp_parse_args("status=$status", $args);
+		$counts[$status] = getpaid_get_subscriptions($_args, 'count');
 	}
 
 	return $counts;
@@ -126,23 +126,23 @@ 
 		array(
 
 			'day'   => array(
-				'singular' => __( '%s day', 'invoicing' ),
-				'plural'   => __( '%d days', 'invoicing' ),
+				'singular' => __('%s day', 'invoicing'),
+				'plural'   => __('%d days', 'invoicing'),
 			),
 
 			'week'   => array(
-				'singular' => __( '%s week', 'invoicing' ),
-				'plural'   => __( '%d weeks', 'invoicing' ),
+				'singular' => __('%s week', 'invoicing'),
+				'plural'   => __('%d weeks', 'invoicing'),
 			),
 
 			'month'   => array(
-				'singular' => __( '%s month', 'invoicing' ),
-				'plural'   => __( '%d months', 'invoicing' ),
+				'singular' => __('%s month', 'invoicing'),
+				'plural'   => __('%d months', 'invoicing'),
 			),
 
 			'year'   => array(
-				'singular' => __( '%s year', 'invoicing' ),
-				'plural'   => __( '%d years', 'invoicing' ),
+				'singular' => __('%s year', 'invoicing'),
+				'plural'   => __('%d years', 'invoicing'),
 			),
 
 		)
@@ -156,8 +156,8 @@ 
  * @param string $trial_period
  * @return int
  */
-function getpaid_get_subscription_trial_period_interval( $trial_period ) {
-	return (int) preg_replace( '/[^0-9]/', '', $trial_period );
+function getpaid_get_subscription_trial_period_interval($trial_period) {
+	return (int) preg_replace('/[^0-9]/', '', $trial_period);
 }
 
 /**
@@ -166,8 +166,8 @@ 
  * @param string $trial_period
  * @return string
  */
-function getpaid_get_subscription_trial_period_period( $trial_period ) {
-	return preg_replace( '/[^a-z]/', '', strtolower( $trial_period ) );
+function getpaid_get_subscription_trial_period_period($trial_period) {
+	return preg_replace('/[^a-z]/', '', strtolower($trial_period));
 }
 
 /**
@@ -177,9 +177,9 @@ 
  * @param int $interval
  * @return string
  */
-function getpaid_get_subscription_period_label( $period, $interval = 1, $singular_prefix = '1' ) {
-	$label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label(  $period, $interval ) : getpaid_get_singular_subscription_period_label( $period, $singular_prefix );
-	return strtolower( sanitize_text_field( $label ) );
+function getpaid_get_subscription_period_label($period, $interval = 1, $singular_prefix = '1') {
+	$label = (int) $interval > 1 ? getpaid_get_plural_subscription_period_label($period, $interval) : getpaid_get_singular_subscription_period_label($period, $singular_prefix);
+	return strtolower(sanitize_text_field($label));
 }
 
 /**
@@ -188,19 +188,19 @@ 
  * @param string $period
  * @return string
  */
-function getpaid_get_singular_subscription_period_label( $period, $singular_prefix = '1' ) {
+function getpaid_get_singular_subscription_period_label($period, $singular_prefix = '1') {
 
 	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+	$period  = strtolower($period);
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['singular'], $singular_prefix );
+	if (isset($periods[$period])) {
+		return sprintf($periods[$period]['singular'], $singular_prefix);
 	}
 
 	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['singular'], $singular_prefix );
+	foreach ($periods as $key => $data) {
+		if (strpos($key, $period) === 0) {
+			return sprintf($data['singular'], $singular_prefix);
 		}
 	}
 
@@ -215,19 +215,19 @@ 
  * @param int $interval
  * @return string
  */
-function getpaid_get_plural_subscription_period_label( $period, $interval ) {
+function getpaid_get_plural_subscription_period_label($period, $interval) {
 
 	$periods = getpaid_get_subscription_periods();
-	$period  = strtolower( $period );
+	$period  = strtolower($period);
 
-	if ( isset( $periods[ $period ] ) ) {
-		return sprintf( $periods[ $period ]['plural'], $interval );
+	if (isset($periods[$period])) {
+		return sprintf($periods[$period]['plural'], $interval);
 	}
 
 	// Backwards compatibility.
-	foreach ( $periods as $key => $data ) {
-		if ( strpos( $key, $period ) === 0 ) {
-			return sprintf( $data['plural'], $interval );
+	foreach ($periods as $key => $data) {
+		if (strpos($key, $period) === 0) {
+			return sprintf($data['plural'], $interval);
 		}
 	}
 
@@ -241,23 +241,23 @@ 
  * @param WPInv_Subscription $subscription
  * @return string
  */
-function getpaid_get_formatted_subscription_amount( $subscription ) {
+function getpaid_get_formatted_subscription_amount($subscription) {
 
-	$initial   = wpinv_price( wpinv_format_amount( $subscription->get_initial_amount() ), $subscription->get_parent_payment()->get_currency() );
-	$recurring = wpinv_price( wpinv_format_amount( $subscription->get_recurring_amount() ), $subscription->get_parent_payment()->get_currency() );
-	$period    = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+	$initial   = wpinv_price(wpinv_format_amount($subscription->get_initial_amount()), $subscription->get_parent_payment()->get_currency());
+	$recurring = wpinv_price(wpinv_format_amount($subscription->get_recurring_amount()), $subscription->get_parent_payment()->get_currency());
+	$period    = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
 
 	// Trial periods.
-	if ( $subscription->has_trial_period() ) {
+	if ($subscription->has_trial_period()) {
 
-		$trial_period   = getpaid_get_subscription_trial_period_period( $subscription->get_trial_period() );
-		$trial_interval = getpaid_get_subscription_trial_period_interval( $subscription->get_trial_period() );
+		$trial_period   = getpaid_get_subscription_trial_period_period($subscription->get_trial_period());
+		$trial_interval = getpaid_get_subscription_trial_period_interval($subscription->get_trial_period());
 		return sprintf(
 
 			// translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period
-			_x( '%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing' ),
+			_x('%1$s trial for %2$s then %3$s / %4$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year)', 'invoicing'),
 			$initial,
-			getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
+			getpaid_get_subscription_period_label($trial_period, $trial_interval),
 			$recurring,
 			$period
 
@@ -265,12 +265,12 @@ 
 
 	}
 
-	if ( $initial != $recurring ) {
+	if ($initial != $recurring) {
 
 		return sprintf(
 
 			// translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period
-			_x( 'Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing' ),
+			_x('Initial payment of %1$s which renews at %2$s / %3$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year)', 'invoicing'),
 			$initial,
 			$recurring,
 			$period
@@ -282,7 +282,7 @@ 
 	return sprintf(
 
 		// translators: $1: is the recurring amount, $2: is the recurring period
-		_x( '%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing' ),
+		_x('%1$s / %2$s', 'Subscription amount. (e.g.: $120 / year)', 'invoicing'),
 		$initial,
 		$period
 
@@ -296,8 +296,8 @@ 
  * @param WPInv_Invoice $invoice
  * @return WPInv_Subscription|bool
  */
-function getpaid_get_invoice_subscription( $invoice ) {
-	return getpaid_subscriptions()->get_invoice_subscription( $invoice );
+function getpaid_get_invoice_subscription($invoice) {
+	return getpaid_subscriptions()->get_invoice_subscription($invoice);
 }
 
 /**
@@ -305,9 +305,9 @@ 
  *
  * @param WPInv_Invoice $invoice
  */
-function getpaid_activate_invoice_subscription( $invoice ) {
-	$subscription = getpaid_get_invoice_subscription( $invoice );
-	if ( is_a( $subscription, 'WPInv_Subscription' ) ) {
+function getpaid_activate_invoice_subscription($invoice) {
+	$subscription = getpaid_get_invoice_subscription($invoice);
+	if (is_a($subscription, 'WPInv_Subscription')) {
 		$subscription->activate();
 	}
 }
@@ -318,7 +318,7 @@ 
  * @return WPInv_Subscriptions
  */
 function getpaid_subscriptions() {
-	return getpaid()->get( 'subscriptions' );
+	return getpaid()->get('subscriptions');
 }
 
 /**
@@ -326,13 +326,13 @@ 
  *
  * @return WPInv_Subscription|bool
  */
-function wpinv_get_subscription( $invoice ) {
+function wpinv_get_subscription($invoice) {
 
     // Retrieve the invoice.
-    $invoice = new WPInv_Invoice( $invoice );
+    $invoice = new WPInv_Invoice($invoice);
 
     // Ensure it is a recurring invoice.
-    if ( ! $invoice->is_recurring() ) {
+    if (!$invoice->is_recurring()) {
         return false;
     }
 
@@ -344,6 +344,6 @@ 
 		)
 	);
 
-	return empty( $subscription ) ? false : $subscription[0];
+	return empty($subscription) ? false : $subscription[0];
 
 }