AyeCode / invoicing

widgets/subscriptions.php

Indentation +347 added lines, -347 removed lines

@@ -14,143 +14,143 @@ 
  */
 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( intval( $_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( intval( $_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">
 
@@ -166,122 +166,122 @@ 
 
 		<?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
-						aui()->alert(
-							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
-								'type'    => 'warning',
-							),
+                        aui()->alert(
+                            array(
+                                'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+                                'type'    => 'warning',
+                            ),
                             true
-						);
-					?>
+                        );
+                    ?>
 
 				</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        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
-		$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        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
+        $view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
+        $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>
@@ -296,145 +296,145 @@ 
 			</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 wp_kses_post(
-					getpaid_paginate_links(
-						array(
-							'base'   => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
-							'format' => '?paged=%#%',
-							'total'  => (int) ceil( $total / 10 ),
-						)
-					)
-				);
-			?>
+                $big = 999999;
+
+                echo wp_kses_post(
+                    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.
-		$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
-		$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
-		$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'             => _n( 'Item', 'Items', $items_count, 'invoicing' ),
-			),
-			$subscription,
-			$items_count
-		);
-
-		if ( isset( $fields['expiry_date'] ) ) {
-
-			if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
-				$fields['expiry_date'] = __( 'End date', 'invoicing' );
-			}
-
-			if ( 'pending' === $subscription->get_status() ) {
-				unset( $fields['expiry_date'] );
-			}
-		}
-
-		if ( isset( $fields['start_date'] ) && 'pending' === $subscription->get_status() ) {
-			unset( $fields['start_date'] );
-		}
-
-		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->exists() ) {
-
-			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() && ! wpinv_current_user_can_manage_invoicing() ) {
-
-			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.
+        $subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
+        $items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+        $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'             => _n( 'Item', 'Items', $items_count, 'invoicing' ),
+            ),
+            $subscription,
+            $items_count
+        );
+
+        if ( isset( $fields['expiry_date'] ) ) {
+
+            if ( ! $subscription->is_active() || $subscription->is_last_renewal() ) {
+                $fields['expiry_date'] = __( 'End date', 'invoicing' );
+            }
+
+            if ( 'pending' === $subscription->get_status() ) {
+                unset( $fields['expiry_date'] );
+            }
+        }
+
+        if ( isset( $fields['start_date'] ) && 'pending' === $subscription->get_status() ) {
+            unset( $fields['start_date'] );
+        }
+
+        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->exists() ) {
+
+            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() && ! wpinv_current_user_can_manage_invoicing() ) {
+
+            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 +79 added lines, -79 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'  => '',
@@ -45,7 +45,7 @@ 
 
 		);
 
-		parent::__construct( $options );
+		parent::__construct($options);
 	}
 
 	/**
@@ -56,12 +56,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);
 
 	}
 
@@ -74,14 +74,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',
 				)
 			);
@@ -89,8 +89,8 @@ 
 		}
 
 		// Are we displaying a single subscription?
-		if ( isset( $_GET['subscription'] ) ) {
-			return $this->display_single_subscription( intval( $_GET['subscription'] ) );
+		if (isset($_GET['subscription'])) {
+			return $this->display_single_subscription(intval($_GET['subscription']));
 		}
 
 		// Retrieve the user's subscriptions.
@@ -100,27 +100,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();
@@ -135,13 +135,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);
 	}
 
 	/**
@@ -156,9 +156,9 @@ 
 
 				<thead>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo esc_attr( $key ); ?>">
-								<?php echo esc_html( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th scope="col" class="font-weight-bold getpaid-subscriptions-table-<?php echo esc_attr($key); ?>">
+								<?php echo esc_html($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -173,12 +173,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);
 		}
 
 	}
@@ -193,12 +193,12 @@ 
 		<tbody>
 
 			<tr>
-				<td colspan="<?php echo count( $this->get_subscriptions_table_columns() ); ?>">
+				<td colspan="<?php echo count($this->get_subscriptions_table_columns()); ?>">
 
 					<?php
 						aui()->alert(
 							array(
-								'content' => wp_kses_post( __( 'No subscriptions found.', 'invoicing' ) ),
+								'content' => wp_kses_post(__('No subscriptions found.', 'invoicing')),
 								'type'    => 'warning',
 							),
                             true
@@ -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,28 +248,28 @@ 
 	 * @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        = getpaid_get_tab_url( 'gp-subscriptions', get_permalink( (int) wpinv_get_option( 'invoice_subscription_page' ) ) );
-		$view_url        = esc_url( add_query_arg( 'subscription', (int) $subscription->get_id(), $view_url ) );
-		$actions['view'] = "<a href='$view_url' class='text-decoration-none'>" . __( 'Manage Subscription', 'invoicing' ) . '</a>';
+		$view_url        = getpaid_get_tab_url('gp-subscriptions', get_permalink((int) wpinv_get_option('invoice_subscription_page')));
+		$view_url        = esc_url(add_query_arg('subscription', (int) $subscription->get_id(), $view_url));
+		$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;
@@ -285,9 +285,9 @@ 
 
 				<tfoot>
 					<tr>
-						<?php foreach ( $this->get_subscriptions_table_columns() as $key => $label ) : ?>
-							<th class="font-weight-bold getpaid-subscriptions-<?php echo esc_attr( $key ); ?>">
-								<?php echo esc_html( $label ); ?>
+						<?php foreach ($this->get_subscriptions_table_columns() as $key => $label) : ?>
+							<th class="font-weight-bold getpaid-subscriptions-<?php echo esc_attr($key); ?>">
+								<?php echo esc_html($label); ?>
 							</th>
 						<?php endforeach; ?>
 					</tr>
@@ -303,22 +303,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;
 		}
 
@@ -331,9 +331,9 @@ 
 				echo wp_kses_post(
 					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),
 						)
 					)
 				);
@@ -350,43 +350,43 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_single_subscription_columns( $subscription ) {
+	public function get_single_subscription_columns($subscription) {
 
 		// Prepare subscription detail columns.
-		$subscription_group = getpaid_get_invoice_subscription_group( $subscription->get_parent_invoice_id(), $subscription->get_id() );
-		$items_count        = empty( $subscription_group ) ? 1 : count( $subscription_group['items'] );
+		$subscription_group = getpaid_get_invoice_subscription_group($subscription->get_parent_invoice_id(), $subscription->get_id());
+		$items_count        = empty($subscription_group) ? 1 : count($subscription_group['items']);
 		$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'             => _n( 'Item', 'Items', $items_count, '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'             => _n('Item', 'Items', $items_count, 'invoicing'),
 			),
 			$subscription,
 			$items_count
 		);
 
-		if ( isset( $fields['expiry_date'] ) ) {
+		if (isset($fields['expiry_date'])) {
 
-			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 ( 'pending' === $subscription->get_status() ) {
-				unset( $fields['expiry_date'] );
+			if ('pending' === $subscription->get_status()) {
+				unset($fields['expiry_date']);
 			}
 		}
 
-		if ( isset( $fields['start_date'] ) && 'pending' === $subscription->get_status() ) {
-			unset( $fields['start_date'] );
+		if (isset($fields['start_date']) && 'pending' === $subscription->get_status()) {
+			unset($fields['start_date']);
 		}
 
-		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;
@@ -399,16 +399,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->exists() ) {
+		if (!$subscription->exists()) {
 
 			return aui()->alert(
 				array(
-					'content' => wp_kses_post( __( 'Subscription not found.', 'invoicing' ) ),
+					'content' => wp_kses_post(__('Subscription not found.', 'invoicing')),
 					'type'    => 'error',
 				)
 			);
@@ -416,11 +416,11 @@ 
 		}
 
 		// Ensure that the user owns this subscription key.
-		if ( get_current_user_id() != $subscription->get_customer_id() && ! wpinv_current_user_can_manage_invoicing() ) {
+		if (get_current_user_id() != $subscription->get_customer_id() && !wpinv_current_user_can_manage_invoicing()) {
 
 			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/class-getpaid-notification-email-sender.php

Indentation +134 added lines, -134 removed lines

@@ -13,17 +13,17 @@ 
 class GetPaid_Notification_Email_Sender {
 
     /**
-	 * Whether or not we should inline CSS into the email.
-	 */
-	public $inline_css = true;
+     * Whether or not we should inline CSS into the email.
+     */
+    public $inline_css = true;
 
     /**
-	 * The wp_mail() data.
-	 */
+     * The wp_mail() data.
+     */
     public $wp_mail_data = null;
 
     /**
-	 * Sends a new email.
+     * Sends a new email.
      *
      * @param string|array $to The recipients email or an array of recipient emails.
      * @param string $subject The email's subject.
@@ -31,49 +31,49 @@ 
      * @param array $attachments The email attachments.
      *
      * @return bool
-	 */
-	public function send( $to, $subject, $email, $attachments = array() ) {
+     */
+    public function send( $to, $subject, $email, $attachments = array() ) {
 
-		/*
+        /*
 		 * Allow to filter data on per-email basis.
 		 */
-		$data = apply_filters(
-			'getpaid_email_data',
-			array(
-				'to'          => array_filter( array_unique( wpinv_parse_list( $to ) ) ),
-				'subject'     => htmlspecialchars_decode( wp_strip_all_tags( $subject ), ENT_QUOTES ),
-				'email'       => apply_filters( 'wpinv_mail_content', $email ),
-				'headers'     => $this->get_headers(),
-				'attachments' => $attachments,
-			),
-			$this
-		);
+        $data = apply_filters(
+            'getpaid_email_data',
+            array(
+                'to'          => array_filter( array_unique( wpinv_parse_list( $to ) ) ),
+                'subject'     => htmlspecialchars_decode( wp_strip_all_tags( $subject ), ENT_QUOTES ),
+                'email'       => apply_filters( 'wpinv_mail_content', $email ),
+                'headers'     => $this->get_headers(),
+                'attachments' => $attachments,
+            ),
+            $this
+        );
 
         // Remove slashes.
         $data               = (array) wp_unslash( $data );
 
         // Cache it.
-		$this->wp_mail_data = $data;
+        $this->wp_mail_data = $data;
 
-		// Attach our own hooks.
-		$this->before_sending();
+        // Attach our own hooks.
+        $this->before_sending();
 
         $result = false;
 
         foreach ( $this->wp_mail_data['to'] as $to ) {
-			$result = $this->_send( $to, $data );
+            $result = $this->_send( $to, $data );
         }
 
-		// Remove our hooks.
-		$this->after_sending();
+        // Remove our hooks.
+        $this->after_sending();
 
-		$this->wp_mail_data = null;
+        $this->wp_mail_data = null;
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * Does the actual sending.
+    /**
+     * Does the actual sending.
      *
      * @param string $to The recipient's email.
      * @param array $data The email's data.
@@ -81,81 +81,81 @@ 
      * @param array $attachments The email attachments.
      *
      * @return bool
-	 */
-	protected function _send( $to, $data ) {
-
-		// Prepare the sending function.
-		$sending_function = apply_filters( 'getpaid_email_email_sending_function', 'wp_mail' );
-
-		// Send the actual email.
-		$result = call_user_func(
-			$sending_function,
-			$to,
-			html_entity_decode( $data['subject'], ENT_QUOTES, get_bloginfo( 'charset' ) ),
-			$data['email'],
-			$data['headers'],
-			$data['attachments']
-		);
-
-		if ( ! $result ) {
-			$log_message = wp_sprintf( __( "\nTime: %1\$s\nTo: %2\$s\nSubject: %3\$s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), $to, $data['subject'] );
-			wpinv_error_log( $log_message, __( 'Email from Invoicing plugin failed to send', 'invoicing' ), __FILE__, __LINE__ );
-		}
-
-		return $result;
-	}
+     */
+    protected function _send( $to, $data ) {
+
+        // Prepare the sending function.
+        $sending_function = apply_filters( 'getpaid_email_email_sending_function', 'wp_mail' );
+
+        // Send the actual email.
+        $result = call_user_func(
+            $sending_function,
+            $to,
+            html_entity_decode( $data['subject'], ENT_QUOTES, get_bloginfo( 'charset' ) ),
+            $data['email'],
+            $data['headers'],
+            $data['attachments']
+        );
+
+        if ( ! $result ) {
+            $log_message = wp_sprintf( __( "\nTime: %1\$s\nTo: %2\$s\nSubject: %3\$s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), $to, $data['subject'] );
+            wpinv_error_log( $log_message, __( 'Email from Invoicing plugin failed to send', 'invoicing' ), __FILE__, __LINE__ );
+        }
+
+        return $result;
+    }
 
     /**
-	 * Retrieves email headers.
-	 */
-	public function get_headers() {
+     * Retrieves email headers.
+     */
+    public function get_headers() {
 
-		$name       = $this->get_from_name();
-		$reply_to   = $this->get_reply_to();
-		$headers    = array( "Reply-To:$name <$reply_to>" );
+        $name       = $this->get_from_name();
+        $reply_to   = $this->get_reply_to();
+        $headers    = array( "Reply-To:$name <$reply_to>" );
 
-		return apply_filters( 'getpaid_email_headers', $headers, $this );
+        return apply_filters( 'getpaid_email_headers', $headers, $this );
 
-	}
+    }
 
     /**
-	 * Fires before an email is sent
-	 *
-	 * @since 1.0.0
-	 */
-	public function before_sending() {
+     * Fires before an email is sent
+     *
+     * @since 1.0.0
+     */
+    public function before_sending() {
 
         do_action( 'getpaid_before_send_email', $this );
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		add_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
+        add_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
+        add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
+        add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
+        add_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
 
-	}
+    }
 
     /**
-	 * Returns the from name.
-	 */
-	public function get_from_name() {
+     * Returns the from name.
+     */
+    public function get_from_name() {
 
         $from_name = wpinv_get_option( 'email_from_name', get_bloginfo( 'name' ) );
 
-		if ( empty( $from_name ) ) {
-			$from_name = get_bloginfo( 'name' );
+        if ( empty( $from_name ) ) {
+            $from_name = get_bloginfo( 'name' );
         }
 
-		return wp_specialchars_decode( $from_name, ENT_QUOTES );
+        return wp_specialchars_decode( $from_name, ENT_QUOTES );
     }
 
     /**
-	 * Returns the from email.
-	 */
-	public function get_from_address() {
+     * Returns the from email.
+     */
+    public function get_from_address() {
 
         $from_address = wpinv_get_option( 'email_from', $this->default_from_address() );
 
-		if ( ! is_email( $from_address ) ) {
-			$from_address = $this->default_from_address();
+        if ( ! is_email( $from_address ) ) {
+            $from_address = $this->default_from_address();
         }
 
         return $from_address;
@@ -163,75 +163,75 @@ 
     }
 
     /**
-	 * The default emails from address.
-	 *
-	 * Defaults to wordpress@$sitename
-	 * Some hosts will block outgoing mail from this address if it doesn't exist,
-	 * but there's no easy alternative. Defaulting to admin_email might appear to be
-	 * another option, but some hosts may refuse to relay mail from an unknown domain.
-	 *
-	 */
-	public function default_from_address() {
-
-		// Get the site domain and get rid of www.
-		$sitename = strtolower( $_SERVER['SERVER_NAME'] );
-		if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-			$sitename = substr( $sitename, 4 );
-		}
-
-		$from_email = 'wordpress@' . $sitename;
-
-		return apply_filters( 'getpaid_default_from_address', $from_email );
+     * The default emails from address.
+     *
+     * Defaults to wordpress@$sitename
+     * Some hosts will block outgoing mail from this address if it doesn't exist,
+     * but there's no easy alternative. Defaulting to admin_email might appear to be
+     * another option, but some hosts may refuse to relay mail from an unknown domain.
+     *
+     */
+    public function default_from_address() {
+
+        // Get the site domain and get rid of www.
+        $sitename = strtolower( $_SERVER['SERVER_NAME'] );
+        if ( substr( $sitename, 0, 4 ) == 'www.' ) {
+            $sitename = substr( $sitename, 4 );
+        }
+
+        $from_email = 'wordpress@' . $sitename;
+
+        return apply_filters( 'getpaid_default_from_address', $from_email );
 
     }
 
     /**
-	 * Get the email reply-to.
-	 *
-	 *
-	 * @return string The email reply-to address.
-	 */
-	public function get_reply_to() {
+     * Get the email reply-to.
+     *
+     *
+     * @return string The email reply-to address.
+     */
+    public function get_reply_to() {
 
-		$reply_to = current( wpinv_parse_list( wpinv_get_admin_email() ) );
+        $reply_to = current( wpinv_parse_list( wpinv_get_admin_email() ) );
 
-		if ( ! is_email( $reply_to ) ) {
-			$reply_to = get_option( 'admin_email' );
-		}
+        if ( ! is_email( $reply_to ) ) {
+            $reply_to = get_option( 'admin_email' );
+        }
 
-		return $reply_to;
+        return $reply_to;
     }
 
     /**
-	 * Get the email content type.
-	 *
-	 */
-	public function get_content_type() {
-		return apply_filters( 'getpaid_email_content_type', 'text/html', $this );
+     * Get the email content type.
+     *
+     */
+    public function get_content_type() {
+        return apply_filters( 'getpaid_email_content_type', 'text/html', $this );
     }
 
     /**
-	 * Ensures that our email messages are not messed up by template plugins.
-	 *
-	 * @return array wp_mail_data.
-	 */
-	public function ensure_email_content( $args ) {
-		$args['message'] = $this->wp_mail_data['email'];
-		return $args;
+     * Ensures that our email messages are not messed up by template plugins.
+     *
+     * @return array wp_mail_data.
+     */
+    public function ensure_email_content( $args ) {
+        $args['message'] = $this->wp_mail_data['email'];
+        return $args;
     }
 
     /**
-	 * A little house keeping after an email is sent.
-	 *
- 	 */
-	public function after_sending() {
+     * A little house keeping after an email is sent.
+     *
+     */
+    public function after_sending() {
 
         do_action( 'getpaid_after_send_email', $this->wp_mail_data );
-		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		remove_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
+        remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
+        remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
+        remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
+        remove_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
 
-	}
+    }
 
 }

Spacing +41 added lines, -41 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This function is responsible for sending emails.
@@ -32,7 +32,7 @@ 
      *
      * @return bool
 	 */
-	public function send( $to, $subject, $email, $attachments = array() ) {
+	public function send($to, $subject, $email, $attachments = array()) {
 
 		/*
 		 * Allow to filter data on per-email basis.
@@ -40,9 +40,9 @@ 
 		$data = apply_filters(
 			'getpaid_email_data',
 			array(
-				'to'          => array_filter( array_unique( wpinv_parse_list( $to ) ) ),
-				'subject'     => htmlspecialchars_decode( wp_strip_all_tags( $subject ), ENT_QUOTES ),
-				'email'       => apply_filters( 'wpinv_mail_content', $email ),
+				'to'          => array_filter(array_unique(wpinv_parse_list($to))),
+				'subject'     => htmlspecialchars_decode(wp_strip_all_tags($subject), ENT_QUOTES),
+				'email'       => apply_filters('wpinv_mail_content', $email),
 				'headers'     => $this->get_headers(),
 				'attachments' => $attachments,
 			),
@@ -50,7 +50,7 @@ 
 		);
 
         // Remove slashes.
-        $data               = (array) wp_unslash( $data );
+        $data = (array) wp_unslash($data);
 
         // Cache it.
 		$this->wp_mail_data = $data;
@@ -60,8 +60,8 @@ 
 
         $result = false;
 
-        foreach ( $this->wp_mail_data['to'] as $to ) {
-			$result = $this->_send( $to, $data );
+        foreach ($this->wp_mail_data['to'] as $to) {
+			$result = $this->_send($to, $data);
         }
 
 		// Remove our hooks.
@@ -82,24 +82,24 @@ 
      *
      * @return bool
 	 */
-	protected function _send( $to, $data ) {
+	protected function _send($to, $data) {
 
 		// Prepare the sending function.
-		$sending_function = apply_filters( 'getpaid_email_email_sending_function', 'wp_mail' );
+		$sending_function = apply_filters('getpaid_email_email_sending_function', 'wp_mail');
 
 		// Send the actual email.
 		$result = call_user_func(
 			$sending_function,
 			$to,
-			html_entity_decode( $data['subject'], ENT_QUOTES, get_bloginfo( 'charset' ) ),
+			html_entity_decode($data['subject'], ENT_QUOTES, get_bloginfo('charset')),
 			$data['email'],
 			$data['headers'],
 			$data['attachments']
 		);
 
-		if ( ! $result ) {
-			$log_message = wp_sprintf( __( "\nTime: %1\$s\nTo: %2\$s\nSubject: %3\$s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), $to, $data['subject'] );
-			wpinv_error_log( $log_message, __( 'Email from Invoicing plugin failed to send', 'invoicing' ), __FILE__, __LINE__ );
+		if (!$result) {
+			$log_message = wp_sprintf(__("\nTime: %1\$s\nTo: %2\$s\nSubject: %3\$s\n", 'invoicing'), date_i18n('F j Y H:i:s', current_time('timestamp')), $to, $data['subject']);
+			wpinv_error_log($log_message, __('Email from Invoicing plugin failed to send', 'invoicing'), __FILE__, __LINE__);
 		}
 
 		return $result;
@@ -112,9 +112,9 @@ 
 
 		$name       = $this->get_from_name();
 		$reply_to   = $this->get_reply_to();
-		$headers    = array( "Reply-To:$name <$reply_to>" );
+		$headers    = array("Reply-To:$name <$reply_to>");
 
-		return apply_filters( 'getpaid_email_headers', $headers, $this );
+		return apply_filters('getpaid_email_headers', $headers, $this);
 
 	}
 
@@ -125,11 +125,11 @@ 
 	 */
 	public function before_sending() {
 
-        do_action( 'getpaid_before_send_email', $this );
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		add_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
+        do_action('getpaid_before_send_email', $this);
+		add_filter('wp_mail_from', array($this, 'get_from_address'), 1000);
+		add_filter('wp_mail_from_name', array($this, 'get_from_name'), 1000);
+		add_filter('wp_mail_content_type', array($this, 'get_content_type'), 1000);
+		add_filter('wp_mail', array($this, 'ensure_email_content'), 1000);
 
 	}
 
@@ -138,13 +138,13 @@ 
 	 */
 	public function get_from_name() {
 
-        $from_name = wpinv_get_option( 'email_from_name', get_bloginfo( 'name' ) );
+        $from_name = wpinv_get_option('email_from_name', get_bloginfo('name'));
 
-		if ( empty( $from_name ) ) {
-			$from_name = get_bloginfo( 'name' );
+		if (empty($from_name)) {
+			$from_name = get_bloginfo('name');
         }
 
-		return wp_specialchars_decode( $from_name, ENT_QUOTES );
+		return wp_specialchars_decode($from_name, ENT_QUOTES);
     }
 
     /**
@@ -152,9 +152,9 @@ 
 	 */
 	public function get_from_address() {
 
-        $from_address = wpinv_get_option( 'email_from', $this->default_from_address() );
+        $from_address = wpinv_get_option('email_from', $this->default_from_address());
 
-		if ( ! is_email( $from_address ) ) {
+		if (!is_email($from_address)) {
 			$from_address = $this->default_from_address();
         }
 
@@ -174,14 +174,14 @@ 
 	public function default_from_address() {
 
 		// Get the site domain and get rid of www.
-		$sitename = strtolower( $_SERVER['SERVER_NAME'] );
-		if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-			$sitename = substr( $sitename, 4 );
+		$sitename = strtolower($_SERVER['SERVER_NAME']);
+		if (substr($sitename, 0, 4) == 'www.') {
+			$sitename = substr($sitename, 4);
 		}
 
 		$from_email = 'wordpress@' . $sitename;
 
-		return apply_filters( 'getpaid_default_from_address', $from_email );
+		return apply_filters('getpaid_default_from_address', $from_email);
 
     }
 
@@ -193,10 +193,10 @@ 
 	 */
 	public function get_reply_to() {
 
-		$reply_to = current( wpinv_parse_list( wpinv_get_admin_email() ) );
+		$reply_to = current(wpinv_parse_list(wpinv_get_admin_email()));
 
-		if ( ! is_email( $reply_to ) ) {
-			$reply_to = get_option( 'admin_email' );
+		if (!is_email($reply_to)) {
+			$reply_to = get_option('admin_email');
 		}
 
 		return $reply_to;
@@ -207,7 +207,7 @@ 
 	 *
 	 */
 	public function get_content_type() {
-		return apply_filters( 'getpaid_email_content_type', 'text/html', $this );
+		return apply_filters('getpaid_email_content_type', 'text/html', $this);
     }
 
     /**
@@ -215,7 +215,7 @@ 
 	 *
 	 * @return array wp_mail_data.
 	 */
-	public function ensure_email_content( $args ) {
+	public function ensure_email_content($args) {
 		$args['message'] = $this->wp_mail_data['email'];
 		return $args;
     }
@@ -226,11 +226,11 @@ 
  	 */
 	public function after_sending() {
 
-        do_action( 'getpaid_after_send_email', $this->wp_mail_data );
-		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ), 1000 );
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ), 1000 );
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ), 1000 );
-		remove_filter( 'wp_mail', array( $this, 'ensure_email_content' ), 1000 );
+        do_action('getpaid_after_send_email', $this->wp_mail_data);
+		remove_filter('wp_mail_from', array($this, 'get_from_address'), 1000);
+		remove_filter('wp_mail_from_name', array($this, 'get_from_name'), 1000);
+		remove_filter('wp_mail_content_type', array($this, 'get_content_type'), 1000);
+		remove_filter('wp_mail', array($this, 'ensure_email_content'), 1000);
 
 	}
 

includes/class-bp-getpaid-component.php

Indentation +132 added lines, -132 removed lines

@@ -17,45 +17,45 @@ 
  */
 class BP_GetPaid_Component extends BP_Component {
 
-	/**
-	 * Start the component setup process.
-	 *
-	 * @since 2.1.5
-	 */
-	public function __construct() {
-		parent::start(
-			'getpaid',
-			'GetPaid',
-			buddypress()->plugin_dir,
-			array(
-				'adminbar_myaccount_order' => 30,
-			)
-		);
-	}
+    /**
+     * Start the component setup process.
+     *
+     * @since 2.1.5
+     */
+    public function __construct() {
+        parent::start(
+            'getpaid',
+            'GetPaid',
+            buddypress()->plugin_dir,
+            array(
+                'adminbar_myaccount_order' => 30,
+            )
+        );
+    }
 
     /**
-	 * Set up component global variables.
-	 *
-	 * @since 2.1.5
-	 *
-	 *
-	 * @param array $args {
-	 *     All values are optional.
-	 *     @type string   $slug                  The component slug. Used to construct certain URLs, such as 'friends' in
-	 *                                           http://example.com/members/joe/friends/. Default: the value of $this->id.
-	 *     @type string   $root_slug             The component root slug. Note that this value is generally unused if the
-	 *                                           component has a root directory (the slug will be overridden by the
-	 *                                           post_name of the directory page). Default: the slug of the directory page
-	 *                                           if one is found, otherwise an empty string.
-	 *     @type bool     $has_directory         Set to true if the component requires an associated WordPress page.
-	 *     @type callable $notification_callback Optional. The callable function that formats the component's notifications.
-	 *     @type string   $search_term           Optional. The placeholder text in the component directory search box. Eg,
-	 *                                           'Search Groups...'.
-	 *     @type array    $global_tables         Optional. An array of database table names.
-	 *     @type array    $meta_tables           Optional. An array of metadata table names.
-	 * }
-	 */
-	public function setup_globals( $args = array() ) {
+     * Set up component global variables.
+     *
+     * @since 2.1.5
+     *
+     *
+     * @param array $args {
+     *     All values are optional.
+     *     @type string   $slug                  The component slug. Used to construct certain URLs, such as 'friends' in
+     *                                           http://example.com/members/joe/friends/. Default: the value of $this->id.
+     *     @type string   $root_slug             The component root slug. Note that this value is generally unused if the
+     *                                           component has a root directory (the slug will be overridden by the
+     *                                           post_name of the directory page). Default: the slug of the directory page
+     *                                           if one is found, otherwise an empty string.
+     *     @type bool     $has_directory         Set to true if the component requires an associated WordPress page.
+     *     @type callable $notification_callback Optional. The callable function that formats the component's notifications.
+     *     @type string   $search_term           Optional. The placeholder text in the component directory search box. Eg,
+     *                                           'Search Groups...'.
+     *     @type array    $global_tables         Optional. An array of database table names.
+     *     @type array    $meta_tables           Optional. An array of metadata table names.
+     * }
+     */
+    public function setup_globals( $args = array() ) {
         parent::setup_globals(
             array(
                 'id'            => 'getpaid',
@@ -64,21 +64,21 @@ 
                 'has_directory' => false,
             )
         );
-	}
-
-	/**
-	 * Set up component navigation.
-	 *
-	 * @since 2.1.5
-	 *
-	 * @see BP_Component::setup_nav() for a description of arguments.
-	 *
-	 * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
-	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
-	 */
-	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-		// Abort if the integration is inactive.
+    }
+
+    /**
+     * Set up component navigation.
+     *
+     * @since 2.1.5
+     *
+     * @see BP_Component::setup_nav() for a description of arguments.
+     *
+     * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
+     * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
+     */
+    public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+
+        // Abort if the integration is inactive.
         if ( ! getpaid_is_buddypress_integration_active() || ! is_user_logged_in() ) {
             return;
         }
@@ -88,25 +88,25 @@ 
             return;
         }
 
-		// Determine user to use.
-		$user_domain   = bp_loggedin_user_domain();
-		$slug          = 'getpaid';
-		$payments_link = trailingslashit( $user_domain . $slug );
-
-		// Add 'Payments' to the main navigation.
-		$main_nav = array(
-			'name'                    => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
-			'slug'                    => $slug,
-			'position'                => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
-			'screen_function'         => array( $this, 'display_current_tab' ),
-			'default_subnav_slug'     => apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
+        // Determine user to use.
+        $user_domain   = bp_loggedin_user_domain();
+        $slug          = 'getpaid';
+        $payments_link = trailingslashit( $user_domain . $slug );
+
+        // Add 'Payments' to the main navigation.
+        $main_nav = array(
+            'name'                    => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
+            'slug'                    => $slug,
+            'position'                => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
+            'screen_function'         => array( $this, 'display_current_tab' ),
+            'default_subnav_slug'     => apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
             'show_for_displayed_user' => false,
-			'item_css_id'             => $this->id,
-			'parent_url'              => $user_domain,
-			'parent_slug'             => buddypress()->slug,
-		);
+            'item_css_id'             => $this->id,
+            'parent_url'              => $user_domain,
+            'parent_slug'             => buddypress()->slug,
+        );
 
-		// Add the subnav items to the payments nav item if we are using a theme that supports this.
+        // Add the subnav items to the payments nav item if we are using a theme that supports this.
         foreach ( getpaid_get_user_content_tabs() as $_slug => $tab ) {
 
             $sub_nav[] = array(
@@ -116,8 +116,8 @@ 
                 'parent_slug'             => $slug,
                 'position'                => 10,
                 'screen_function'         => function() use ( $tab ) {
-					$GLOBALS['getpaid_bp_current_tab'] = $tab;
-					$this->display_current_tab();
+                    $GLOBALS['getpaid_bp_current_tab'] = $tab;
+                    $this->display_current_tab();
                 },
                 'show_for_displayed_user' => false,
                 'item_css_id'             => "getpaid-bp-$_slug",
@@ -125,27 +125,27 @@ 
 
         }
 
-		parent::setup_nav( $main_nav, $sub_nav );
-	}
-
-	/**
-	 * Set up the component entries in the WordPress Admin Bar.
-	 *
-	 * @since 2.1.5
-	 *
-	 * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
-	 *      parameter array.
-	 *
-	 * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
-	 *                            description.
-	 */
-	public function setup_admin_bar( $wp_admin_nav = array() ) {
+        parent::setup_nav( $main_nav, $sub_nav );
+    }
 
-		// Menus for logged in user.
-		if ( is_user_logged_in() ) {
-
-			// Setup the logged in user variables.
-			$payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
+    /**
+     * Set up the component entries in the WordPress Admin Bar.
+     *
+     * @since 2.1.5
+     *
+     * @see BP_Component::setup_nav() for a description of the $wp_admin_nav
+     *      parameter array.
+     *
+     * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
+     *                            description.
+     */
+    public function setup_admin_bar( $wp_admin_nav = array() ) {
+
+        // Menus for logged in user.
+        if ( is_user_logged_in() ) {
+
+            // Setup the logged in user variables.
+            $payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
 
             // Add the "Payments" sub menu.
             $wp_admin_nav[] = array(
@@ -168,48 +168,48 @@ 
             }
 }
 
-		parent::setup_admin_bar( $wp_admin_nav );
-	}
-
-	/**
-	 * Retrieves the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function get_current_tab() {
-		global $getpaid_bp_current_tab;
-
-		if ( empty( $getpaid_bp_current_tab ) ) {
-			return array(
-				'label'   => __( 'Invoices', 'invoicing' ),
-				'content' => '[wpinv_history]',
-				'icon'    => 'fas fa-file-invoice',
-			);
-		}
-
-		return $getpaid_bp_current_tab;
-	}
-
-	/**
-	 * Displays the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function display_current_tab() {
-
-		add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
-		$template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+        parent::setup_admin_bar( $wp_admin_nav );
+    }
+
+    /**
+     * Retrieves the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function get_current_tab() {
+        global $getpaid_bp_current_tab;
+
+        if ( empty( $getpaid_bp_current_tab ) ) {
+            return array(
+                'label'   => __( 'Invoices', 'invoicing' ),
+                'content' => '[wpinv_history]',
+                'icon'    => 'fas fa-file-invoice',
+            );
+        }
+
+        return $getpaid_bp_current_tab;
+    }
+
+    /**
+     * Displays the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function display_current_tab() {
+
+        add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
+        $template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
 
         bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
-	}
-
-	/**
-	 * Handles the actual display of the current tab.
-	 *
-	 * @since 2.1.5
-	 */
-	public function handle_display_current_tab() {
-		echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
-	}
+    }
+
+    /**
+     * Handles the actual display of the current tab.
+     *
+     * @since 2.1.5
+     */
+    public function handle_display_current_tab() {
+        echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
+    }
 
 }

Spacing +27 added lines, -27 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 // Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Main GetPaid Class.
@@ -55,7 +55,7 @@ 
 	 *     @type array    $meta_tables           Optional. An array of metadata table names.
 	 * }
 	 */
-	public function setup_globals( $args = array() ) {
+	public function setup_globals($args = array()) {
         parent::setup_globals(
             array(
                 'id'            => 'getpaid',
@@ -76,30 +76,30 @@ 
 	 * @param array $main_nav Optional. See BP_Component::setup_nav() for description.
 	 * @param array $sub_nav  Optional. See BP_Component::setup_nav() for description.
 	 */
-	public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
+	public function setup_nav($main_nav = array(), $sub_nav = array()) {
 
 		// Abort if the integration is inactive.
-        if ( ! getpaid_is_buddypress_integration_active() || ! is_user_logged_in() ) {
+        if (!getpaid_is_buddypress_integration_active() || !is_user_logged_in()) {
             return;
         }
 
         // Or a user is not viewing their profile.
-        if ( bp_displayed_user_id() !== bp_loggedin_user_id() ) {
+        if (bp_displayed_user_id() !== bp_loggedin_user_id()) {
             return;
         }
 
 		// Determine user to use.
 		$user_domain   = bp_loggedin_user_domain();
 		$slug          = 'getpaid';
-		$payments_link = trailingslashit( $user_domain . $slug );
+		$payments_link = trailingslashit($user_domain . $slug);
 
 		// Add 'Payments' to the main navigation.
 		$main_nav = array(
-			'name'                    => _x( 'Billing', 'BuddyPress profile payments screen nav', 'invoicing' ),
+			'name'                    => _x('Billing', 'BuddyPress profile payments screen nav', 'invoicing'),
 			'slug'                    => $slug,
-			'position'                => apply_filters( 'wpinv_bp_nav_position', wpinv_get_option( 'wpinv_menu_position', 91 ), $slug ),
-			'screen_function'         => array( $this, 'display_current_tab' ),
-			'default_subnav_slug'     => apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
+			'position'                => apply_filters('wpinv_bp_nav_position', wpinv_get_option('wpinv_menu_position', 91), $slug),
+			'screen_function'         => array($this, 'display_current_tab'),
+			'default_subnav_slug'     => apply_filters('getpaid_default_tab', 'gp-edit-address'),
             'show_for_displayed_user' => false,
 			'item_css_id'             => $this->id,
 			'parent_url'              => $user_domain,
@@ -107,7 +107,7 @@ 
 		);
 
 		// Add the subnav items to the payments nav item if we are using a theme that supports this.
-        foreach ( getpaid_get_user_content_tabs() as $_slug => $tab ) {
+        foreach (getpaid_get_user_content_tabs() as $_slug => $tab) {
 
             $sub_nav[] = array(
                 'name'                    => $tab['label'],
@@ -115,7 +115,7 @@ 
                 'parent_url'              => $payments_link,
                 'parent_slug'             => $slug,
                 'position'                => 10,
-                'screen_function'         => function() use ( $tab ) {
+                'screen_function'         => function() use ($tab) {
 					$GLOBALS['getpaid_bp_current_tab'] = $tab;
 					$this->display_current_tab();
                 },
@@ -125,7 +125,7 @@ 
 
         }
 
-		parent::setup_nav( $main_nav, $sub_nav );
+		parent::setup_nav($main_nav, $sub_nav);
 	}
 
 	/**
@@ -139,36 +139,36 @@ 
 	 * @param array $wp_admin_nav See BP_Component::setup_admin_bar() for a
 	 *                            description.
 	 */
-	public function setup_admin_bar( $wp_admin_nav = array() ) {
+	public function setup_admin_bar($wp_admin_nav = array()) {
 
 		// Menus for logged in user.
-		if ( is_user_logged_in() ) {
+		if (is_user_logged_in()) {
 
 			// Setup the logged in user variables.
-			$payments_link = trailingslashit( bp_loggedin_user_domain() . 'getpaid/' );
+			$payments_link = trailingslashit(bp_loggedin_user_domain() . 'getpaid/');
 
             // Add the "Payments" sub menu.
             $wp_admin_nav[] = array(
                 'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-getpaid',
-                'title'  => _x( 'Billing', 'BuddyPress my account payments sub nav', 'invoicing' ),
-                'href'   => $payments_link . apply_filters( 'getpaid_default_tab', 'gp-edit-address' ),
+                'title'  => _x('Billing', 'BuddyPress my account payments sub nav', 'invoicing'),
+                'href'   => $payments_link . apply_filters('getpaid_default_tab', 'gp-edit-address'),
             );
 
-            foreach ( getpaid_get_user_content_tabs() as $slug => $tab ) {
+            foreach (getpaid_get_user_content_tabs() as $slug => $tab) {
 
                 $wp_admin_nav[] = array(
                     'parent'   => 'my-account-getpaid',
                     'id'       => 'my-account-getpaid' . $slug,
                     'title'    => $tab['label'],
-                    'href'     => trailingslashit( $payments_link . $slug ),
+                    'href'     => trailingslashit($payments_link . $slug),
                     'position' => 20,
                 );
 
             }
 }
 
-		parent::setup_admin_bar( $wp_admin_nav );
+		parent::setup_admin_bar($wp_admin_nav);
 	}
 
 	/**
@@ -179,9 +179,9 @@ 
 	public function get_current_tab() {
 		global $getpaid_bp_current_tab;
 
-		if ( empty( $getpaid_bp_current_tab ) ) {
+		if (empty($getpaid_bp_current_tab)) {
 			return array(
-				'label'   => __( 'Invoices', 'invoicing' ),
+				'label'   => __('Invoices', 'invoicing'),
 				'content' => '[wpinv_history]',
 				'icon'    => 'fas fa-file-invoice',
 			);
@@ -197,10 +197,10 @@ 
 	 */
 	public function display_current_tab() {
 
-		add_action( 'bp_template_content', array( $this, 'handle_display_current_tab' ) );
-		$template = apply_filters( 'bp_core_template_plugin', 'members/single/plugins' );
+		add_action('bp_template_content', array($this, 'handle_display_current_tab'));
+		$template = apply_filters('bp_core_template_plugin', 'members/single/plugins');
 
-        bp_core_load_template( apply_filters( 'wpinv_bp_core_template_plugin', $template ) );
+        bp_core_load_template(apply_filters('wpinv_bp_core_template_plugin', $template));
 	}
 
 	/**
@@ -209,7 +209,7 @@ 
 	 * @since 2.1.5
 	 */
 	public function handle_display_current_tab() {
-		echo getpaid_prepare_user_content_tab( $this->get_current_tab() );
+		echo getpaid_prepare_user_content_tab($this->get_current_tab());
 	}
 
 }

includes/subscription-functions.php

Spacing +144 added lines, -144 removed lines

@@ -13,18 +13,18 @@ 
  * @return      WPInv_Subscription[]|WPInv_Subscription|false
  * @since       2.3.0
  */
-function getpaid_get_invoice_subscriptions( $invoice ) {
+function getpaid_get_invoice_subscriptions($invoice) {
 
     // Retrieve subscription groups.
-    $subscription_ids = wp_list_pluck( getpaid_get_invoice_subscription_groups( $invoice->get_id() ), 'subscription_id' );
+    $subscription_ids = wp_list_pluck(getpaid_get_invoice_subscription_groups($invoice->get_id()), 'subscription_id');
 
     // No subscription groups, normal subscription.
-    if ( empty( $subscription_ids ) ) {
-        return getpaid_subscriptions()->get_invoice_subscription( $invoice );
+    if (empty($subscription_ids)) {
+        return getpaid_subscriptions()->get_invoice_subscription($invoice);
     }
 
     // Subscription groups.
-    return array_filter( array_map( 'getpaid_get_subscription', $subscription_ids ) );
+    return array_filter(array_map('getpaid_get_subscription', $subscription_ids));
 
 }
 
@@ -35,9 +35,9 @@ 
  * @return      array
  * @since       2.3.0
  */
-function getpaid_get_invoice_subscription_groups( $invoice_id ) {
-    $subscription_groups = get_post_meta( $invoice_id, 'getpaid_subscription_groups', true );
-    return empty( $subscription_groups ) ? array() : $subscription_groups;
+function getpaid_get_invoice_subscription_groups($invoice_id) {
+    $subscription_groups = get_post_meta($invoice_id, 'getpaid_subscription_groups', true);
+    return empty($subscription_groups) ? array() : $subscription_groups;
 }
 
 /**
@@ -48,10 +48,10 @@ 
  * @return      array|false
  * @since       2.3.0
  */
-function getpaid_get_invoice_subscription_group( $invoice_id, $subscription_id ) {
-    $subscription_groups = getpaid_get_invoice_subscription_groups( $invoice_id );
-	$matching_group      = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
-    return reset( $matching_group );
+function getpaid_get_invoice_subscription_group($invoice_id, $subscription_id) {
+    $subscription_groups = getpaid_get_invoice_subscription_groups($invoice_id);
+	$matching_group = wp_list_filter($subscription_groups, compact('subscription_id'));
+    return reset($matching_group);
 }
 
 /**
@@ -61,10 +61,10 @@ 
  * @since       2.3.0
  * @return WPInv_Subscription|false
  */
-function getpaid_get_subscription( $subscription ) {
+function getpaid_get_subscription($subscription) {
 
-	if ( ! is_a( $subscription, 'WPInv_Subscription' ) ) {
-		$subscription = new WPInv_Subscription( $subscription );
+	if (!is_a($subscription, 'WPInv_Subscription')) {
+		$subscription = new WPInv_Subscription($subscription);
 	}
 
 	return $subscription->exists() ? $subscription : false;
@@ -79,26 +79,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();
 	}
 
@@ -115,13 +115,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'),
 		)
 	);
 
@@ -132,9 +132,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));
 }
 
 /**
@@ -164,14 +164,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;
@@ -190,23 +190,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'),
 			),
 
 		)
@@ -220,8 +220,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);
 }
 
 /**
@@ -230,8 +230,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));
 }
 
 /**
@@ -241,9 +241,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));
 }
 
 /**
@@ -252,19 +252,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);
 		}
 	}
 
@@ -279,19 +279,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);
 		}
 	}
 
@@ -305,33 +305,33 @@ 
  * @param WPInv_Subscription $subscription
  * @return string
  */
-function getpaid_get_formatted_subscription_amount( $subscription ) {
+function getpaid_get_formatted_subscription_amount($subscription) {
 
-	$initial    = wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
-	$recurring  = wpinv_price( $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($subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency());
+	$recurring  = wpinv_price($subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency());
+	$period     = getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), '');
 	$bill_times = $subscription->get_bill_times();
 	$bill_times_less = $bill_times - 1;
 
-	if ( ! empty( $bill_times ) ) {
+	if (!empty($bill_times)) {
 		$bill_times = $subscription->get_frequency() * $bill_times;
-		$bill_times_less = getpaid_get_subscription_period_label( $subscription->get_frequency(), $bill_times - $subscription->get_frequency() );
-		$bill_times = getpaid_get_subscription_period_label( $subscription->get_period(), $bill_times );
+		$bill_times_less = getpaid_get_subscription_period_label($subscription->get_frequency(), $bill_times - $subscription->get_frequency());
+		$bill_times = getpaid_get_subscription_period_label($subscription->get_period(), $bill_times);
 	}
 
 	// 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());
 
-		if ( empty( $bill_times ) ) {
+		if (empty($bill_times)) {
 
 			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
 			);
@@ -340,9 +340,9 @@ 
 
 		return sprintf(
 			// translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period, $5: is the bill times
-			_x( '%1$s trial for %2$s then %3$s / %4$s for %5$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year for 4 years)', 'invoicing' ),
+			_x('%1$s trial for %2$s then %3$s / %4$s for %5$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year for 4 years)', 'invoicing'),
 			$initial,
-			getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
+			getpaid_get_subscription_period_label($trial_period, $trial_interval),
 			$recurring,
 			$period,
 			$bill_times
@@ -350,13 +350,13 @@ 
 
 	}
 
-	if ( $initial != $recurring ) {
+	if ($initial != $recurring) {
 
-		if ( empty( $bill_times ) ) {
+		if (empty($bill_times)) {
 
 			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
@@ -366,7 +366,7 @@ 
 
 		return sprintf(
 			// translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period, $4: is the bill times
-			_x( 'Initial payment of %1$s which renews at %2$s / %3$s for %4$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year for 5 years)', 'invoicing' ),
+			_x('Initial payment of %1$s which renews at %2$s / %3$s for %4$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year for 5 years)', 'invoicing'),
 			$initial,
 			$recurring,
 			$period,
@@ -375,11 +375,11 @@ 
 
 	}
 
-	if ( empty( $bill_times ) ) {
+	if (empty($bill_times)) {
 
 		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
 		);
@@ -388,7 +388,7 @@ 
 
 	return sprintf(
 		// translators: $1: is the bill times, $2: is the recurring amount, $3: is the recurring period
-		_x( '%2$s / %3$s for %1$s', 'Subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing' ),
+		_x('%2$s / %3$s for %1$s', 'Subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing'),
 		$bill_times,
 		$initial,
 		$period
@@ -402,8 +402,8 @@ 
  * @param WPInv_Invoice $invoice
  * @return WPInv_Subscription|false
  */
-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);
 }
 
 /**
@@ -411,9 +411,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();
 	}
 }
@@ -424,7 +424,7 @@ 
  * @return WPInv_Subscriptions
  */
 function getpaid_subscriptions() {
-	return getpaid()->get( 'subscriptions' );
+	return getpaid()->get('subscriptions');
 }
 
 /**
@@ -433,13 +433,13 @@ 
  * @since 2.3.0
  * @return WPInv_Subscription|bool
  */
-function wpinv_get_invoice_subscription( $invoice ) {
+function wpinv_get_invoice_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;
     }
 
@@ -451,7 +451,7 @@ 
 		)
 	);
 
-	return empty( $subscription ) ? false : $subscription[0];
+	return empty($subscription) ? false : $subscription[0];
 
 }
 
@@ -466,50 +466,50 @@ 
  * @param GetPaid_Form_Item|WPInv_Item $cart_item
  * @return string
  */
-function getpaid_get_recurring_item_key( $cart_item ) {
+function getpaid_get_recurring_item_key($cart_item) {
 
 	$cart_key     = 'renews_';
 	$interval     = $cart_item->get_recurring_interval();
-	$period       = $cart_item->get_recurring_period( true );
+	$period       = $cart_item->get_recurring_period(true);
 	$length       = $cart_item->get_recurring_limit() * $interval;
-	$trial_period = $cart_item->get_trial_period( true );
+	$trial_period = $cart_item->get_trial_period(true);
 	$trial_length = $cart_item->get_trial_interval();
 
 	// First start with the billing interval and period
-	switch ( $interval ) {
+	switch ($interval) {
 		case 1:
-			if ( 'day' == $period ) {
+			if ('day' == $period) {
 				$cart_key .= 'daily';
 			} else {
-				$cart_key .= sprintf( '%sly', $period );
+				$cart_key .= sprintf('%sly', $period);
 			}
 			break;
 		case 2:
-			$cart_key .= sprintf( 'every_2nd_%s', $period );
+			$cart_key .= sprintf('every_2nd_%s', $period);
 			break;
 		case 3:
-			$cart_key .= sprintf( 'every_3rd_%s', $period );
+			$cart_key .= sprintf('every_3rd_%s', $period);
 		    break;
 		default:
-			$cart_key .= sprintf( 'every_%dth_%s', $interval, $period );
+			$cart_key .= sprintf('every_%dth_%s', $interval, $period);
 			break;
 	}
 
 	// Maybe add the optional maximum billing periods...
-	if ( $length > 0 ) {
+	if ($length > 0) {
 		$cart_key .= '_for_';
-		$cart_key .= sprintf( '%d_%s', $length, $period );
-		if ( $length > 1 ) {
+		$cart_key .= sprintf('%d_%s', $length, $period);
+		if ($length > 1) {
 			$cart_key .= 's';
 		}
 	}
 
 	// And an optional free trial.
-	if ( $cart_item->has_free_trial() ) {
-		$cart_key .= sprintf( '_after_a_%d_%s_trial', $trial_length, $trial_period );
+	if ($cart_item->has_free_trial()) {
+		$cart_key .= sprintf('_after_a_%d_%s_trial', $trial_length, $trial_period);
 	}
 
-	return apply_filters( 'getpaid_get_recurring_item_key', $cart_key, $cart_item );
+	return apply_filters('getpaid_get_recurring_item_key', $cart_key, $cart_item);
 }
 
 /**
@@ -518,14 +518,14 @@ 
  * @param WPInv_Invoice|GetPaid_Payment_Form_Submission|GetPaid_Payment_Form $invoice
  * @return array
  */
-function getpaid_get_subscription_groups( $invoice ) {
+function getpaid_get_subscription_groups($invoice) {
 
 	// Generate subscription groups.
 	$subscription_groups = array();
-	foreach ( $invoice->get_items() as $item ) {
+	foreach ($invoice->get_items() as $item) {
 
-		if ( $item->is_recurring() ) {
-			$subscription_groups[ getpaid_get_recurring_item_key( $item ) ][] = $item;
+		if ($item->is_recurring()) {
+			$subscription_groups[getpaid_get_recurring_item_key($item)][] = $item;
 		}
 }
 
@@ -541,19 +541,19 @@ 
  * @param WPInv_Invoice|GetPaid_Payment_Form_Submission|GetPaid_Payment_Form $invoice
  * @return array
  */
-function getpaid_calculate_subscription_totals( $invoice ) {
+function getpaid_calculate_subscription_totals($invoice) {
 
 	// Generate subscription groups.
-	$subscription_groups = getpaid_get_subscription_groups( $invoice );
+	$subscription_groups = getpaid_get_subscription_groups($invoice);
 
 	// Now let's calculate the totals for each group of subscriptions
 	$subscription_totals = array();
 
-	foreach ( $subscription_groups as $subscription_key => $items ) {
+	foreach ($subscription_groups as $subscription_key => $items) {
 
-		if ( empty( $subscription_totals[ $subscription_key ] ) ) {
+		if (empty($subscription_totals[$subscription_key])) {
 
-			$subscription_totals[ $subscription_key ] = array(
+			$subscription_totals[$subscription_key] = array(
 				'initial_total'   => 0,
 				'recurring_total' => 0,
 				'items'           => array(),
@@ -566,33 +566,33 @@ 
 		 * Get the totals of the group.
 		 * @var GetPaid_Form_Item $item
 		 */
-		foreach ( $items as $item ) {
+		foreach ($items as $item) {
 
-			$subscription_totals[ $subscription_key ]['items'][ $item->get_id() ]  = $item->prepare_data_for_saving();
-			$subscription_totals[ $subscription_key ]['item_id']                 = $item->get_id();
-			$subscription_totals[ $subscription_key ]['period']                  = $item->get_recurring_period( true );
-			$subscription_totals[ $subscription_key ]['interval']                = $item->get_recurring_interval();
-			$subscription_totals[ $subscription_key ]['initial_total']          += $item->get_sub_total() + $item->item_tax - $item->item_discount;
-			$subscription_totals[ $subscription_key ]['recurring_total']        += $item->get_recurring_sub_total() + $item->item_tax - $item->recurring_item_discount;
-			$subscription_totals[ $subscription_key ]['recurring_limit']         = $item->get_recurring_limit();
+			$subscription_totals[$subscription_key]['items'][$item->get_id()] = $item->prepare_data_for_saving();
+			$subscription_totals[$subscription_key]['item_id']                 = $item->get_id();
+			$subscription_totals[$subscription_key]['period']                  = $item->get_recurring_period(true);
+			$subscription_totals[$subscription_key]['interval']                = $item->get_recurring_interval();
+			$subscription_totals[$subscription_key]['initial_total']          += $item->get_sub_total() + $item->item_tax - $item->item_discount;
+			$subscription_totals[$subscription_key]['recurring_total']        += $item->get_recurring_sub_total() + $item->item_tax - $item->recurring_item_discount;
+			$subscription_totals[$subscription_key]['recurring_limit']         = $item->get_recurring_limit();
 
 			// Calculate the next renewal date.
-			$period       = $item->get_recurring_period( true );
+			$period       = $item->get_recurring_period(true);
 			$interval     = $item->get_recurring_interval();
 
 			// If the subscription item has a trial period...
-			if ( $item->has_free_trial() ) {
-				$period   = $item->get_trial_period( true );
+			if ($item->has_free_trial()) {
+				$period   = $item->get_trial_period(true);
 				$interval = $item->get_trial_interval();
-				$subscription_totals[ $subscription_key ]['trialling'] = $interval . ' ' . $period;
+				$subscription_totals[$subscription_key]['trialling'] = $interval . ' ' . $period;
 			}
 
-			$subscription_totals[ $subscription_key ]['renews_on'] = date( 'Y-m-d H:i:s', strtotime( "+$interval $period", current_time( 'timestamp' ) ) );
+			$subscription_totals[$subscription_key]['renews_on'] = date('Y-m-d H:i:s', strtotime("+$interval $period", current_time('timestamp')));
 
 		}
 }
 
-	return apply_filters( 'getpaid_calculate_subscription_totals', $subscription_totals, $invoice );
+	return apply_filters('getpaid_calculate_subscription_totals', $subscription_totals, $invoice);
 }
 
 /**
@@ -601,18 +601,18 @@ 
  * @param WPInv_Invoice|GetPaid_Payment_Form_Submission|GetPaid_Payment_Form $invoice
  * @return array
  */
-function getpaid_should_group_subscriptions( $invoice ) {
+function getpaid_should_group_subscriptions($invoice) {
 
 	$recurring_items = 0;
 
-	foreach ( $invoice->get_items() as $item ) {
+	foreach ($invoice->get_items() as $item) {
 
-		if ( $item->is_recurring() ) {
-			$recurring_items ++;
+		if ($item->is_recurring()) {
+			$recurring_items++;
 		}
 }
 
-	return apply_filters( 'getpaid_should_group_subscriptions', $recurring_items > 1, $invoice );
+	return apply_filters('getpaid_should_group_subscriptions', $recurring_items > 1, $invoice);
 }
 
 /**
@@ -622,12 +622,12 @@ 
  * @param int|false $subscription_id
  * @return int
  */
-function getpaid_count_subscription_invoices( $parent_invoice_id, $subscription_id = false ) {
+function getpaid_count_subscription_invoices($parent_invoice_id, $subscription_id = false) {
 	global $wpdb;
 
 	$parent_invoice_id = (int) $parent_invoice_id;
 
-	if ( false === $subscription_id || ! (bool) get_post_meta( $parent_invoice_id, '_wpinv_subscription_id', true ) ) {
+	if (false === $subscription_id || !(bool) get_post_meta($parent_invoice_id, '_wpinv_subscription_id', true)) {
 
 		return (int) $wpdb->get_var(
 			$wpdb->prepare(
@@ -649,10 +649,10 @@ 
 
 	$count = 0;
 
-	foreach ( wp_parse_id_list( $invoice_ids ) as $invoice_id ) {
+	foreach (wp_parse_id_list($invoice_ids) as $invoice_id) {
 
-		if ( $invoice_id == $parent_invoice_id || $subscription_id == (int) get_post_meta( $invoice_id, '_wpinv_subscription_id', true ) ) {
-			$count ++;
+		if ($invoice_id == $parent_invoice_id || $subscription_id == (int) get_post_meta($invoice_id, '_wpinv_subscription_id', true)) {
+			$count++;
 			continue;
 		}
 }

Indentation +323 added lines, -323 removed lines

@@ -50,7 +50,7 @@ 
  */
 function getpaid_get_invoice_subscription_group( $invoice_id, $subscription_id ) {
     $subscription_groups = getpaid_get_invoice_subscription_groups( $invoice_id );
-	$matching_group      = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
+    $matching_group      = wp_list_filter( $subscription_groups, compact( 'subscription_id' ) );
     return reset( $matching_group );
 }
 
@@ -63,11 +63,11 @@ 
  */
 function getpaid_get_subscription( $subscription ) {
 
-	if ( ! is_a( $subscription, 'WPInv_Subscription' ) ) {
-		$subscription = new WPInv_Subscription( $subscription );
-	}
+    if ( ! is_a( $subscription, 'WPInv_Subscription' ) ) {
+        $subscription = new WPInv_Subscription( $subscription );
+    }
 
-	return $subscription->exists() ? $subscription : false;
+    return $subscription->exists() ? $subscription : false;
 }
 
 /**
@@ -81,28 +81,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;
 }
 
 /**
@@ -112,18 +112,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' ),
+        )
+    );
 
 }
 
@@ -133,8 +133,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 ) );
 }
 
 /**
@@ -144,18 +144,18 @@ 
  */
 function getpaid_get_subscription_status_classes() {
 
-	return apply_filters(
-		'getpaid_get_subscription_status_classes',
-		array(
-			'pending'   => 'bg-dark',
-			'trialling' => 'bg-info',
-			'active'    => 'bg-success',
-			'failing'   => 'bg-warning text-dark',
-			'expired'   => 'bg-danger',
-			'completed' => 'bg-primary',
-			'cancelled' => 'bg-secondary',
-		)
-	);
+    return apply_filters(
+        'getpaid_get_subscription_status_classes',
+        array(
+            'pending'   => 'bg-dark',
+            'trialling' => 'bg-info',
+            'active'    => 'bg-success',
+            'failing'   => 'bg-warning text-dark',
+            'expired'   => 'bg-danger',
+            'completed' => 'bg-primary',
+            'cancelled' => 'bg-secondary',
+        )
+    );
 
 }
 
@@ -166,15 +166,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;
 
 }
 
@@ -185,32 +185,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' ),
+            ),
 
-		)
-	);
+        )
+    );
 
 }
 
@@ -221,7 +221,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 );
 }
 
 /**
@@ -231,7 +231,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 ) );
 }
 
 /**
@@ -242,8 +242,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 ) );
 }
 
 /**
@@ -254,22 +254,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 '';
 }
 
 /**
@@ -281,22 +281,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 '';
 }
 
 /**
@@ -307,92 +307,92 @@ 
  */
 function getpaid_get_formatted_subscription_amount( $subscription ) {
 
-	$initial    = wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
-	$recurring  = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
-	$period     = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
-	$bill_times = $subscription->get_bill_times();
-	$bill_times_less = $bill_times - 1;
-
-	if ( ! empty( $bill_times ) ) {
-		$bill_times = $subscription->get_frequency() * $bill_times;
-		$bill_times_less = getpaid_get_subscription_period_label( $subscription->get_frequency(), $bill_times - $subscription->get_frequency() );
-		$bill_times = getpaid_get_subscription_period_label( $subscription->get_period(), $bill_times );
-	}
-
-	// 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() );
-
-		if ( empty( $bill_times ) ) {
-
-			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
-			);
-
-		}
-
-		return sprintf(
-			// translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period, $5: is the bill times
-			_x( '%1$s trial for %2$s then %3$s / %4$s for %5$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year for 4 years)', 'invoicing' ),
-			$initial,
-			getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
-			$recurring,
-			$period,
-			$bill_times
-		);
-
-	}
-
-	if ( $initial != $recurring ) {
-
-		if ( empty( $bill_times ) ) {
-
-			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
-			);
-
-		}
-
-		return sprintf(
-			// translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period, $4: is the bill times
-			_x( 'Initial payment of %1$s which renews at %2$s / %3$s for %4$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year for 5 years)', 'invoicing' ),
-			$initial,
-			$recurring,
-			$period,
-			$bill_times_less
-		);
-
-	}
-
-	if ( empty( $bill_times ) ) {
-
-		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
-		);
-
-	}
-
-	return sprintf(
-		// translators: $1: is the bill times, $2: is the recurring amount, $3: is the recurring period
-		_x( '%2$s / %3$s for %1$s', 'Subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing' ),
-		$bill_times,
-		$initial,
-		$period
-	);
+    $initial    = wpinv_price( $subscription->get_initial_amount(), $subscription->get_parent_payment()->get_currency() );
+    $recurring  = wpinv_price( $subscription->get_recurring_amount(), $subscription->get_parent_payment()->get_currency() );
+    $period     = getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' );
+    $bill_times = $subscription->get_bill_times();
+    $bill_times_less = $bill_times - 1;
+
+    if ( ! empty( $bill_times ) ) {
+        $bill_times = $subscription->get_frequency() * $bill_times;
+        $bill_times_less = getpaid_get_subscription_period_label( $subscription->get_frequency(), $bill_times - $subscription->get_frequency() );
+        $bill_times = getpaid_get_subscription_period_label( $subscription->get_period(), $bill_times );
+    }
+
+    // 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() );
+
+        if ( empty( $bill_times ) ) {
+
+            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
+            );
+
+        }
+
+        return sprintf(
+            // translators: $1: is the initial amount, $2: is the trial period, $3: is the recurring amount, $4: is the recurring period, $5: is the bill times
+            _x( '%1$s trial for %2$s then %3$s / %4$s for %5$s', 'Subscription amount. (e.g.: $10 trial for 1 month then $120 / year for 4 years)', 'invoicing' ),
+            $initial,
+            getpaid_get_subscription_period_label( $trial_period, $trial_interval ),
+            $recurring,
+            $period,
+            $bill_times
+        );
+
+    }
+
+    if ( $initial != $recurring ) {
+
+        if ( empty( $bill_times ) ) {
+
+            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
+            );
+
+        }
+
+        return sprintf(
+            // translators: $1: is the initial amount, $2: is the recurring amount, $3: is the recurring period, $4: is the bill times
+            _x( 'Initial payment of %1$s which renews at %2$s / %3$s for %4$s', 'Subscription amount. (e.g.:Initial payment of $100 which renews at $120 / year for 5 years)', 'invoicing' ),
+            $initial,
+            $recurring,
+            $period,
+            $bill_times_less
+        );
+
+    }
+
+    if ( empty( $bill_times ) ) {
+
+        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
+        );
+
+    }
+
+    return sprintf(
+        // translators: $1: is the bill times, $2: is the recurring amount, $3: is the recurring period
+        _x( '%2$s / %3$s for %1$s', 'Subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing' ),
+        $bill_times,
+        $initial,
+        $period
+    );
 
 }
 
@@ -403,7 +403,7 @@ 
  * @return WPInv_Subscription|false
  */
 function getpaid_get_invoice_subscription( $invoice ) {
-	return getpaid_subscriptions()->get_invoice_subscription( $invoice );
+    return getpaid_subscriptions()->get_invoice_subscription( $invoice );
 }
 
 /**
@@ -412,10 +412,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();
+    }
 }
 
 /**
@@ -424,7 +424,7 @@ 
  * @return WPInv_Subscriptions
  */
 function getpaid_subscriptions() {
-	return getpaid()->get( 'subscriptions' );
+    return getpaid()->get( 'subscriptions' );
 }
 
 /**
@@ -443,15 +443,15 @@ 
         return false;
     }
 
-	// Fetch the invoice subscription.
-	$subscription = getpaid_get_subscriptions(
-		array(
-			'invoice_in' => $invoice->is_renewal() ? $invoice->get_parent_id() : $invoice->get_id(),
-			'number'     => 1,
-		)
-	);
+    // Fetch the invoice 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];
 
 }
 
@@ -468,48 +468,48 @@ 
  */
 function getpaid_get_recurring_item_key( $cart_item ) {
 
-	$cart_key     = 'renews_';
-	$interval     = $cart_item->get_recurring_interval();
-	$period       = $cart_item->get_recurring_period( true );
-	$length       = $cart_item->get_recurring_limit() * $interval;
-	$trial_period = $cart_item->get_trial_period( true );
-	$trial_length = $cart_item->get_trial_interval();
-
-	// First start with the billing interval and period
-	switch ( $interval ) {
-		case 1:
-			if ( 'day' == $period ) {
-				$cart_key .= 'daily';
-			} else {
-				$cart_key .= sprintf( '%sly', $period );
-			}
-			break;
-		case 2:
-			$cart_key .= sprintf( 'every_2nd_%s', $period );
-			break;
-		case 3:
-			$cart_key .= sprintf( 'every_3rd_%s', $period );
-		    break;
-		default:
-			$cart_key .= sprintf( 'every_%dth_%s', $interval, $period );
-			break;
-	}
-
-	// Maybe add the optional maximum billing periods...
-	if ( $length > 0 ) {
-		$cart_key .= '_for_';
-		$cart_key .= sprintf( '%d_%s', $length, $period );
-		if ( $length > 1 ) {
-			$cart_key .= 's';
-		}
-	}
-
-	// And an optional free trial.
-	if ( $cart_item->has_free_trial() ) {
-		$cart_key .= sprintf( '_after_a_%d_%s_trial', $trial_length, $trial_period );
-	}
-
-	return apply_filters( 'getpaid_get_recurring_item_key', $cart_key, $cart_item );
+    $cart_key     = 'renews_';
+    $interval     = $cart_item->get_recurring_interval();
+    $period       = $cart_item->get_recurring_period( true );
+    $length       = $cart_item->get_recurring_limit() * $interval;
+    $trial_period = $cart_item->get_trial_period( true );
+    $trial_length = $cart_item->get_trial_interval();
+
+    // First start with the billing interval and period
+    switch ( $interval ) {
+        case 1:
+            if ( 'day' == $period ) {
+                $cart_key .= 'daily';
+            } else {
+                $cart_key .= sprintf( '%sly', $period );
+            }
+            break;
+        case 2:
+            $cart_key .= sprintf( 'every_2nd_%s', $period );
+            break;
+        case 3:
+            $cart_key .= sprintf( 'every_3rd_%s', $period );
+            break;
+        default:
+            $cart_key .= sprintf( 'every_%dth_%s', $interval, $period );
+            break;
+    }
+
+    // Maybe add the optional maximum billing periods...
+    if ( $length > 0 ) {
+        $cart_key .= '_for_';
+        $cart_key .= sprintf( '%d_%s', $length, $period );
+        if ( $length > 1 ) {
+            $cart_key .= 's';
+        }
+    }
+
+    // And an optional free trial.
+    if ( $cart_item->has_free_trial() ) {
+        $cart_key .= sprintf( '_after_a_%d_%s_trial', $trial_length, $trial_period );
+    }
+
+    return apply_filters( 'getpaid_get_recurring_item_key', $cart_key, $cart_item );
 }
 
 /**
@@ -520,16 +520,16 @@ 
  */
 function getpaid_get_subscription_groups( $invoice ) {
 
-	// Generate subscription groups.
-	$subscription_groups = array();
-	foreach ( $invoice->get_items() as $item ) {
+    // Generate subscription groups.
+    $subscription_groups = array();
+    foreach ( $invoice->get_items() as $item ) {
 
-		if ( $item->is_recurring() ) {
-			$subscription_groups[ getpaid_get_recurring_item_key( $item ) ][] = $item;
-		}
+        if ( $item->is_recurring() ) {
+            $subscription_groups[ getpaid_get_recurring_item_key( $item ) ][] = $item;
+        }
 }
 
-	return $subscription_groups;
+    return $subscription_groups;
 }
 
 /**
@@ -543,56 +543,56 @@ 
  */
 function getpaid_calculate_subscription_totals( $invoice ) {
 
-	// Generate subscription groups.
-	$subscription_groups = getpaid_get_subscription_groups( $invoice );
+    // Generate subscription groups.
+    $subscription_groups = getpaid_get_subscription_groups( $invoice );
 
-	// Now let's calculate the totals for each group of subscriptions
-	$subscription_totals = array();
+    // Now let's calculate the totals for each group of subscriptions
+    $subscription_totals = array();
 
-	foreach ( $subscription_groups as $subscription_key => $items ) {
+    foreach ( $subscription_groups as $subscription_key => $items ) {
 
-		if ( empty( $subscription_totals[ $subscription_key ] ) ) {
+        if ( empty( $subscription_totals[ $subscription_key ] ) ) {
 
-			$subscription_totals[ $subscription_key ] = array(
-				'initial_total'   => 0,
-				'recurring_total' => 0,
-				'items'           => array(),
-				'trialling'       => false,
-			);
+            $subscription_totals[ $subscription_key ] = array(
+                'initial_total'   => 0,
+                'recurring_total' => 0,
+                'items'           => array(),
+                'trialling'       => false,
+            );
 
-		}
+        }
 
-		/**
-		 * Get the totals of the group.
-		 * @var GetPaid_Form_Item $item
-		 */
-		foreach ( $items as $item ) {
+        /**
+         * Get the totals of the group.
+         * @var GetPaid_Form_Item $item
+         */
+        foreach ( $items as $item ) {
 
-			$subscription_totals[ $subscription_key ]['items'][ $item->get_id() ]  = $item->prepare_data_for_saving();
-			$subscription_totals[ $subscription_key ]['item_id']                 = $item->get_id();
-			$subscription_totals[ $subscription_key ]['period']                  = $item->get_recurring_period( true );
-			$subscription_totals[ $subscription_key ]['interval']                = $item->get_recurring_interval();
-			$subscription_totals[ $subscription_key ]['initial_total']          += $item->get_sub_total() + $item->item_tax - $item->item_discount;
-			$subscription_totals[ $subscription_key ]['recurring_total']        += $item->get_recurring_sub_total() + $item->item_tax - $item->recurring_item_discount;
-			$subscription_totals[ $subscription_key ]['recurring_limit']         = $item->get_recurring_limit();
+            $subscription_totals[ $subscription_key ]['items'][ $item->get_id() ]  = $item->prepare_data_for_saving();
+            $subscription_totals[ $subscription_key ]['item_id']                 = $item->get_id();
+            $subscription_totals[ $subscription_key ]['period']                  = $item->get_recurring_period( true );
+            $subscription_totals[ $subscription_key ]['interval']                = $item->get_recurring_interval();
+            $subscription_totals[ $subscription_key ]['initial_total']          += $item->get_sub_total() + $item->item_tax - $item->item_discount;
+            $subscription_totals[ $subscription_key ]['recurring_total']        += $item->get_recurring_sub_total() + $item->item_tax - $item->recurring_item_discount;
+            $subscription_totals[ $subscription_key ]['recurring_limit']         = $item->get_recurring_limit();
 
-			// Calculate the next renewal date.
-			$period       = $item->get_recurring_period( true );
-			$interval     = $item->get_recurring_interval();
+            // Calculate the next renewal date.
+            $period       = $item->get_recurring_period( true );
+            $interval     = $item->get_recurring_interval();
 
-			// If the subscription item has a trial period...
-			if ( $item->has_free_trial() ) {
-				$period   = $item->get_trial_period( true );
-				$interval = $item->get_trial_interval();
-				$subscription_totals[ $subscription_key ]['trialling'] = $interval . ' ' . $period;
-			}
+            // If the subscription item has a trial period...
+            if ( $item->has_free_trial() ) {
+                $period   = $item->get_trial_period( true );
+                $interval = $item->get_trial_interval();
+                $subscription_totals[ $subscription_key ]['trialling'] = $interval . ' ' . $period;
+            }
 
-			$subscription_totals[ $subscription_key ]['renews_on'] = date( 'Y-m-d H:i:s', strtotime( "+$interval $period", current_time( 'timestamp' ) ) );
+            $subscription_totals[ $subscription_key ]['renews_on'] = date( 'Y-m-d H:i:s', strtotime( "+$interval $period", current_time( 'timestamp' ) ) );
 
-		}
+        }
 }
 
-	return apply_filters( 'getpaid_calculate_subscription_totals', $subscription_totals, $invoice );
+    return apply_filters( 'getpaid_calculate_subscription_totals', $subscription_totals, $invoice );
 }
 
 /**
@@ -603,16 +603,16 @@ 
  */
 function getpaid_should_group_subscriptions( $invoice ) {
 
-	$recurring_items = 0;
+    $recurring_items = 0;
 
-	foreach ( $invoice->get_items() as $item ) {
+    foreach ( $invoice->get_items() as $item ) {
 
-		if ( $item->is_recurring() ) {
-			$recurring_items ++;
-		}
+        if ( $item->is_recurring() ) {
+            $recurring_items ++;
+        }
 }
 
-	return apply_filters( 'getpaid_should_group_subscriptions', $recurring_items > 1, $invoice );
+    return apply_filters( 'getpaid_should_group_subscriptions', $recurring_items > 1, $invoice );
 }
 
 /**
@@ -623,39 +623,39 @@ 
  * @return int
  */
 function getpaid_count_subscription_invoices( $parent_invoice_id, $subscription_id = false ) {
-	global $wpdb;
+    global $wpdb;
 
-	$parent_invoice_id = (int) $parent_invoice_id;
+    $parent_invoice_id = (int) $parent_invoice_id;
 
-	if ( false === $subscription_id || ! (bool) get_post_meta( $parent_invoice_id, '_wpinv_subscription_id', true ) ) {
+    if ( false === $subscription_id || ! (bool) get_post_meta( $parent_invoice_id, '_wpinv_subscription_id', true ) ) {
 
-		return (int) $wpdb->get_var(
-			$wpdb->prepare(
-				"SELECT COUNT(ID) FROM $wpdb->posts WHERE ( post_parent=%d OR ID=%d ) AND post_status IN ( 'publish', 'wpi-processing', 'wpi-renewal' )",
-				$parent_invoice_id,
-				$parent_invoice_id
-			)
-		);
+        return (int) $wpdb->get_var(
+            $wpdb->prepare(
+                "SELECT COUNT(ID) FROM $wpdb->posts WHERE ( post_parent=%d OR ID=%d ) AND post_status IN ( 'publish', 'wpi-processing', 'wpi-renewal' )",
+                $parent_invoice_id,
+                $parent_invoice_id
+            )
+        );
 
-	}
+    }
 
-	$invoice_ids = $wpdb->get_col(
-		$wpdb->prepare(
-			"SELECT ID FROM $wpdb->posts WHERE ( post_parent=%d OR ID=%d ) AND post_status IN ( 'publish', 'wpi-processing', 'wpi-renewal' )",
-			$parent_invoice_id,
-			$parent_invoice_id
-		)
-	);
+    $invoice_ids = $wpdb->get_col(
+        $wpdb->prepare(
+            "SELECT ID FROM $wpdb->posts WHERE ( post_parent=%d OR ID=%d ) AND post_status IN ( 'publish', 'wpi-processing', 'wpi-renewal' )",
+            $parent_invoice_id,
+            $parent_invoice_id
+        )
+    );
 
-	$count = 0;
+    $count = 0;
 
-	foreach ( wp_parse_id_list( $invoice_ids ) as $invoice_id ) {
+    foreach ( wp_parse_id_list( $invoice_ids ) as $invoice_id ) {
 
-		if ( $invoice_id == $parent_invoice_id || $subscription_id == (int) get_post_meta( $invoice_id, '_wpinv_subscription_id', true ) ) {
-			$count ++;
-			continue;
-		}
+        if ( $invoice_id == $parent_invoice_id || $subscription_id == (int) get_post_meta( $invoice_id, '_wpinv_subscription_id', true ) ) {
+            $count ++;
+            continue;
+        }
 }
 
-	return $count;
+    return $count;
 }

includes/wpinv-item-functions.php

Indentation +25 added lines, -25 removed lines

@@ -57,16 +57,16 @@ 
     $args = wp_parse_args(
         $args,
         array(
-			'status'     => array( 'publish' ),
-			'limit'      => get_option( 'posts_per_page' ),
-			'page'       => 1,
-			'exclude'    => array(),
-			'orderby'    => 'date',
-			'order'      => 'DESC',
-			'type'       => wpinv_item_types(),
-			'meta_query' => array(),
-			'return'     => 'objects',
-			'paginate'   => false,
+            'status'     => array( 'publish' ),
+            'limit'      => get_option( 'posts_per_page' ),
+            'page'       => 1,
+            'exclude'    => array(),
+            'orderby'    => 'date',
+            'order'      => 'DESC',
+            'type'       => wpinv_item_types(),
+            'meta_query' => array(),
+            'return'     => 'objects',
+            'paginate'   => false,
         )
     );
 
@@ -206,9 +206,9 @@ 
 
 function wpinv_get_item_types() {
     $item_types = array(
-		'custom' => __( 'Standard', 'invoicing' ),
-		'fee'    => __( 'Fee', 'invoicing' ),
-	);
+        'custom' => __( 'Standard', 'invoicing' ),
+        'fee'    => __( 'Fee', 'invoicing' ),
+    );
     return apply_filters( 'wpinv_get_item_types', $item_types );
 }
 
@@ -249,17 +249,17 @@ 
 function wpinv_get_random_items( $num = 3, $post_ids = true ) {
     if ( $post_ids ) {
         $args = array(
-			'post_type'  => 'wpi_item',
-			'orderby'    => 'rand',
-			'post_count' => $num,
-			'fields'     => 'ids',
-		);
+            'post_type'  => 'wpi_item',
+            'orderby'    => 'rand',
+            'post_count' => $num,
+            'fields'     => 'ids',
+        );
     } else {
         $args = array(
-			'post_type'  => 'wpi_item',
-			'orderby'    => 'rand',
-			'post_count' => $num,
-		);
+            'post_type'  => 'wpi_item',
+            'orderby'    => 'rand',
+            'post_count' => $num,
+        );
     }
 
     $args  = apply_filters( 'wpinv_get_random_items', $args );
@@ -427,10 +427,10 @@ 
     $bill_times_less = $bill_times - 1;
 
     if ( ! empty( $bill_times ) ) {
-		$bill_times = $item->get_recurring_interval() * $bill_times;
+        $bill_times = $item->get_recurring_interval() * $bill_times;
         $bill_times_less = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times - $item->get_recurring_interval() );
-		$bill_times = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times );
-	}
+        $bill_times = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times );
+    }
 
     if ( $item instanceof GetPaid_Form_Item && false === $_initial_price ) {
         $initial_price   = wpinv_price( $item->get_sub_total(), $currency );

Spacing +131 added lines, -131 removed lines

@@ -6,7 +6,7 @@ 
  * @package Invoicing
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * Retrieves an item by it's ID.
@@ -14,9 +14,9 @@ 
  * @param int the item ID to retrieve.
  * @return WPInv_Item|false
  */
-function wpinv_get_item_by_id( $id ) {
-    $item = wpinv_get_item( $id );
-    return empty( $item ) || $id != $item->get_id() ? false : $item;
+function wpinv_get_item_by_id($id) {
+    $item = wpinv_get_item($id);
+    return empty($item) || $id != $item->get_id() ? false : $item;
 }
 
 /**
@@ -24,14 +24,14 @@ 
  *
  * @return WPInv_Item|false
  */
-function wpinv_get_item_by( $field = '', $value = '', $type = '' ) {
+function wpinv_get_item_by($field = '', $value = '', $type = '') {
 
-    if ( 'id' === strtolower( $field ) ) {
-        return wpinv_get_item_by_id( $value );
+    if ('id' === strtolower($field)) {
+        return wpinv_get_item_by_id($value);
     }
 
-    $id = WPInv_Item::get_item_id_by_field( $value, strtolower( $field ), $type );
-    return empty( $id ) ? false : wpinv_get_item( $id );
+    $id = WPInv_Item::get_item_id_by_field($value, strtolower($field), $type);
+    return empty($id) ? false : wpinv_get_item($id);
 
 }
 
@@ -41,24 +41,24 @@ 
  * @param int|WPInv_Item the item to retrieve.
  * @return WPInv_Item|false
  */
-function wpinv_get_item( $item = 0 ) {
+function wpinv_get_item($item = 0) {
 
-    if ( empty( $item ) ) {
+    if (empty($item)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item );
+    $item = new WPInv_Item($item);
     return $item->exists() ? $item : false;
 
 }
 
-function wpinv_get_all_items( $args = array() ) {
+function wpinv_get_all_items($args = array()) {
 
     $args = wp_parse_args(
         $args,
         array(
-			'status'     => array( 'publish' ),
-			'limit'      => get_option( 'posts_per_page' ),
+			'status'     => array('publish'),
+			'limit'      => get_option('posts_per_page'),
 			'page'       => 1,
 			'exclude'    => array(),
 			'orderby'    => 'date',
@@ -78,44 +78,44 @@ 
         'fields'         => 'ids',
         'orderby'        => $args['orderby'],
         'order'          => $args['order'],
-        'paged'          => absint( $args['page'] ),
+        'paged'          => absint($args['page']),
     );
 
-    if ( ! empty( $args['exclude'] ) ) {
-        $wp_query_args['post__not_in'] = array_map( 'absint', $args['exclude'] );
+    if (!empty($args['exclude'])) {
+        $wp_query_args['post__not_in'] = array_map('absint', $args['exclude']);
     }
 
-    if ( ! $args['paginate'] ) {
+    if (!$args['paginate']) {
         $wp_query_args['no_found_rows'] = true;
     }
 
-    if ( ! empty( $args['search'] ) ) {
+    if (!empty($args['search'])) {
         $wp_query_args['s'] = $args['search'];
     }
 
-    if ( ! empty( $args['type'] ) && $args['type'] !== wpinv_item_types() ) {
-        $types = wpinv_parse_list( $args['type'] );
+    if (!empty($args['type']) && $args['type'] !== wpinv_item_types()) {
+        $types = wpinv_parse_list($args['type']);
         $wp_query_args['meta_query'][] = array(
             'key'     => '_wpinv_type',
-            'value'   => implode( ',', $types ),
+            'value'   => implode(',', $types),
             'compare' => 'IN',
         );
     }
 
-    $wp_query_args = apply_filters( 'wpinv_get_items_args', $wp_query_args, $args );
+    $wp_query_args = apply_filters('wpinv_get_items_args', $wp_query_args, $args);
 
     // Get results.
-    $items = new WP_Query( $wp_query_args );
+    $items = new WP_Query($wp_query_args);
 
-    if ( 'objects' === $args['return'] ) {
-        $return = array_map( 'wpinv_get_item_by_id', $items->posts );
-    } elseif ( 'self' === $args['return'] ) {
+    if ('objects' === $args['return']) {
+        $return = array_map('wpinv_get_item_by_id', $items->posts);
+    } elseif ('self' === $args['return']) {
         return $items;
     } else {
         $return = $items->posts;
     }
 
-    if ( $args['paginate'] ) {
+    if ($args['paginate']) {
         return (object) array(
             'items'         => $return,
             'total'         => $items->found_posts,
@@ -127,12 +127,12 @@ 
 
 }
 
-function wpinv_is_free_item( $item_id = 0 ) {
-    if ( empty( $item_id ) ) {
+function wpinv_is_free_item($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
 
     return $item->is_free();
 }
@@ -142,21 +142,21 @@ 
  *
  * @param WP_Post|WPInv_Item|Int $item The item to check for.
  */
-function wpinv_item_is_editable( $item = 0 ) {
+function wpinv_item_is_editable($item = 0) {
 
     // Fetch the item.
-    $item = new WPInv_Item( $item );
+    $item = new WPInv_Item($item);
 
     // Check if it is editable.
     return $item->is_editable();
 }
 
-function wpinv_get_item_price( $item_id = 0 ) {
-    if ( empty( $item_id ) ) {
+function wpinv_get_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
 
     return $item->get_price();
 }
@@ -166,88 +166,88 @@ 
  *
  * @param WPInv_Item|int $item
  */
-function wpinv_is_recurring_item( $item = 0 ) {
-    $item = new WPInv_Item( $item );
+function wpinv_is_recurring_item($item = 0) {
+    $item = new WPInv_Item($item);
     return $item->is_recurring();
 }
 
-function wpinv_item_price( $item_id = 0 ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_price($item_id = 0) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $price = wpinv_get_item_price( $item_id );
-    $price = wpinv_price( $price );
+    $price = wpinv_get_item_price($item_id);
+    $price = wpinv_price($price);
 
-    return apply_filters( 'wpinv_item_price', $price, $item_id );
+    return apply_filters('wpinv_item_price', $price, $item_id);
 }
 
-function wpinv_get_item_final_price( $item_id = 0, $amount_override = null ) {
-    if ( is_null( $amount_override ) ) {
-        $original_price = get_post_meta( $item_id, '_wpinv_price', true );
+function wpinv_get_item_final_price($item_id = 0, $amount_override = null) {
+    if (is_null($amount_override)) {
+        $original_price = get_post_meta($item_id, '_wpinv_price', true);
     } else {
         $original_price = $amount_override;
     }
 
     $price = $original_price;
 
-    return apply_filters( 'wpinv_get_item_final_price', $price, $item_id );
+    return apply_filters('wpinv_get_item_final_price', $price, $item_id);
 }
 
-function wpinv_item_custom_singular_name( $item_id ) {
-    if ( empty( $item_id ) ) {
+function wpinv_item_custom_singular_name($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
 
     return $item->get_custom_singular_name();
 }
 
 function wpinv_get_item_types() {
     $item_types = array(
-		'custom' => __( 'Standard', 'invoicing' ),
-		'fee'    => __( 'Fee', 'invoicing' ),
+		'custom' => __('Standard', 'invoicing'),
+		'fee'    => __('Fee', 'invoicing'),
 	);
-    return apply_filters( 'wpinv_get_item_types', $item_types );
+    return apply_filters('wpinv_get_item_types', $item_types);
 }
 
 function wpinv_item_types() {
     $item_types = wpinv_get_item_types();
 
-    return ( ! empty( $item_types ) ? array_keys( $item_types ) : array() );
+    return (!empty($item_types) ? array_keys($item_types) : array());
 }
 
-function wpinv_get_item_type( $item_id ) {
-    if ( empty( $item_id ) ) {
+function wpinv_get_item_type($item_id) {
+    if (empty($item_id)) {
         return false;
     }
 
-    $item = new WPInv_Item( $item_id );
+    $item = new WPInv_Item($item_id);
 
     return $item->get_type();
 }
 
-function wpinv_item_type( $item_id ) {
+function wpinv_item_type($item_id) {
     $item_types = wpinv_get_item_types();
 
-    $item_type = wpinv_get_item_type( $item_id );
+    $item_type = wpinv_get_item_type($item_id);
 
-    if ( empty( $item_type ) ) {
+    if (empty($item_type)) {
         $item_type = '-';
     }
 
-    $item_type = isset( $item_types[ $item_type ] ) ? $item_types[ $item_type ] : __( $item_type, 'invoicing' );
+    $item_type = isset($item_types[$item_type]) ? $item_types[$item_type] : __($item_type, 'invoicing');
 
-    return apply_filters( 'wpinv_item_type', $item_type, $item_id );
+    return apply_filters('wpinv_item_type', $item_type, $item_id);
 }
 
-function wpinv_get_random_item( $post_ids = true ) {
-    wpinv_get_random_items( 1, $post_ids );
+function wpinv_get_random_item($post_ids = true) {
+    wpinv_get_random_items(1, $post_ids);
 }
 
-function wpinv_get_random_items( $num = 3, $post_ids = true ) {
-    if ( $post_ids ) {
+function wpinv_get_random_items($num = 3, $post_ids = true) {
+    if ($post_ids) {
         $args = array(
 			'post_type'  => 'wpi_item',
 			'orderby'    => 'rand',
@@ -262,9 +262,9 @@ 
 		);
     }
 
-    $args  = apply_filters( 'wpinv_get_random_items', $args );
+    $args = apply_filters('wpinv_get_random_items', $args);
 
-    return get_posts( $args );
+    return get_posts($args);
 }
 
 /**
@@ -273,13 +273,13 @@ 
  * @param WPInv_Item|int $item
  * @param bool $html
  */
-function wpinv_get_item_suffix( $item, $html = true ) {
+function wpinv_get_item_suffix($item, $html = true) {
 
-    $item   = new WPInv_Item( $item );
-    $suffix = $item->is_recurring() ? ' ' . __( '(r)', 'invoicing' ) : '';
-    $suffix = $html ? $suffix : wp_strip_all_tags( $suffix );
+    $item   = new WPInv_Item($item);
+    $suffix = $item->is_recurring() ? ' ' . __('(r)', 'invoicing') : '';
+    $suffix = $html ? $suffix : wp_strip_all_tags($suffix);
 
-    return apply_filters( 'wpinv_get_item_suffix', $suffix, $item, $html );
+    return apply_filters('wpinv_get_item_suffix', $suffix, $item, $html);
 }
 
 /**
@@ -288,9 +288,9 @@ 
  * @param WPInv_Item|int $item
  * @param bool $force_delete
  */
-function wpinv_remove_item( $item = 0, $force_delete = false ) {
-    $item = new WPInv_Item( $item );
-    $item->delete( $force_delete );
+function wpinv_remove_item($item = 0, $force_delete = false) {
+    $item = new WPInv_Item($item);
+    $item->delete($force_delete);
 }
 
 /**
@@ -329,44 +329,44 @@ 
  * @param bool $wp_error whether or not to return a WP_Error on failure.
  * @return bool|WP_Error|WPInv_Item
  */
-function wpinv_create_item( $args = array(), $wp_error = false ) {
+function wpinv_create_item($args = array(), $wp_error = false) {
 
     // Prepare the item.
-    if ( ! empty( $args['custom_id'] ) && empty( $args['ID'] ) ) {
-        $type = empty( $args['type'] ) ? 'custom' : $args['type'];
-        $item = wpinv_get_item_by( 'custom_id', $args['custom_id'], $type );
+    if (!empty($args['custom_id']) && empty($args['ID'])) {
+        $type = empty($args['type']) ? 'custom' : $args['type'];
+        $item = wpinv_get_item_by('custom_id', $args['custom_id'], $type);
 
-        if ( ! empty( $item ) ) {
+        if (!empty($item)) {
             $args['ID'] = $item->get_id();
         }
     }
 
     // Do we have an item?
-    if ( ! empty( $args['ID'] ) ) {
-        $item = new WPInv_Item( $args['ID'] );
+    if (!empty($args['ID'])) {
+        $item = new WPInv_Item($args['ID']);
     } else {
         $item = new WPInv_Item();
     }
 
     // Do we have an error?
-    if ( ! empty( $item->last_error ) ) {
-        return $wp_error ? new WP_Error( 'invalid_item', $item->last_error ) : false;
+    if (!empty($item->last_error)) {
+        return $wp_error ? new WP_Error('invalid_item', $item->last_error) : false;
     }
 
     // Update item props.
-    $item->set_props( $args );
+    $item->set_props($args);
 
     // Save the item.
     $item->save();
 
     // Do we have an error?
-    if ( ! empty( $item->last_error ) ) {
-        return $wp_error ? new WP_Error( 'not_saved', $item->last_error ) : false;
+    if (!empty($item->last_error)) {
+        return $wp_error ? new WP_Error('not_saved', $item->last_error) : false;
     }
 
     // Was the item saved?
-    if ( ! $item->get_id() ) {
-        return $wp_error ? new WP_Error( 'not_saved', __( 'An error occured while saving the item', 'invoicing' ) ) : false;
+    if (!$item->get_id()) {
+        return $wp_error ? new WP_Error('not_saved', __('An error occured while saving the item', 'invoicing')) : false;
     }
 
     return $item;
@@ -378,14 +378,14 @@ 
  *
  * @see wpinv_create_item()
  */
-function wpinv_update_item( $args = array(), $wp_error = false ) {
-    return wpinv_create_item( $args, $wp_error );
+function wpinv_update_item($args = array(), $wp_error = false) {
+    return wpinv_create_item($args, $wp_error);
 }
 
 /**
  * Sanitizes a recurring period
  */
-function getpaid_sanitize_recurring_period( $period, $full = false ) {
+function getpaid_sanitize_recurring_period($period, $full = false) {
 
     $periods = array(
         'D' => 'day',
@@ -394,16 +394,16 @@ 
         'Y' => 'year',
     );
 
-    if ( ! isset( $periods[ $period ] ) ) {
+    if (!isset($periods[$period])) {
         $period = 'D';
     }
 
-    return $full ? $periods[ $period ] : $period;
+    return $full ? $periods[$period] : $period;
 
 }
 
-function wpinv_item_max_buyable_quantity( $item_id ) {
-    return apply_filters( 'wpinv_item_max_buyable_quantity', 5, $item_id );
+function wpinv_item_max_buyable_quantity($item_id) {
+    return apply_filters('wpinv_item_max_buyable_quantity', 5, $item_id);
 }
 
 /**
@@ -411,47 +411,47 @@ 
  *
  * @param WPInv_Item|GetPaid_Form_Item $item
  */
-function getpaid_item_recurring_price_help_text( $item, $currency = '', $_initial_price = false, $_recurring_price = false ) {
+function getpaid_item_recurring_price_help_text($item, $currency = '', $_initial_price = false, $_recurring_price = false) {
 
     // Abort if it is not recurring.
-    if ( ! $item->is_recurring() ) {
+    if (!$item->is_recurring()) {
         return '';
     }
 
-    $initial_price   = false === $_initial_price ? wpinv_price( $item->get_initial_price(), $currency ) : $_initial_price;
-    $recurring_price = false === $_recurring_price ? wpinv_price( $item->get_recurring_price(), $currency ) : $_recurring_price;
-    $period          = getpaid_get_subscription_period_label( $item->get_recurring_period(), $item->get_recurring_interval(), '' );
+    $initial_price   = false === $_initial_price ? wpinv_price($item->get_initial_price(), $currency) : $_initial_price;
+    $recurring_price = false === $_recurring_price ? wpinv_price($item->get_recurring_price(), $currency) : $_recurring_price;
+    $period          = getpaid_get_subscription_period_label($item->get_recurring_period(), $item->get_recurring_interval(), '');
     $initial_class   = 'getpaid-item-initial-price';
     $recurring_class = 'getpaid-item-recurring-price';
     $bill_times      = $item->get_recurring_limit();
     $bill_times_less = $bill_times - 1;
 
-    if ( ! empty( $bill_times ) ) {
+    if (!empty($bill_times)) {
 		$bill_times = $item->get_recurring_interval() * $bill_times;
-        $bill_times_less = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times - $item->get_recurring_interval() );
-		$bill_times = getpaid_get_subscription_period_label( $item->get_recurring_period(), $bill_times );
+        $bill_times_less = getpaid_get_subscription_period_label($item->get_recurring_period(), $bill_times - $item->get_recurring_interval());
+		$bill_times = getpaid_get_subscription_period_label($item->get_recurring_period(), $bill_times);
 	}
 
-    if ( $item instanceof GetPaid_Form_Item && false === $_initial_price ) {
-        $initial_price   = wpinv_price( $item->get_sub_total(), $currency );
-        $recurring_price = wpinv_price( $item->get_recurring_sub_total(), $currency );
+    if ($item instanceof GetPaid_Form_Item && false === $_initial_price) {
+        $initial_price   = wpinv_price($item->get_sub_total(), $currency);
+        $recurring_price = wpinv_price($item->get_recurring_sub_total(), $currency);
     }
 
-    if ( wpinv_price( 0, $currency ) == $initial_price && wpinv_price( 0, $currency ) == $recurring_price ) {
-        return __( 'Free forever', 'invoicing' );
+    if (wpinv_price(0, $currency) == $initial_price && wpinv_price(0, $currency) == $recurring_price) {
+        return __('Free forever', 'invoicing');
     }
 
     // For free trial items.
-    if ( $item->has_free_trial() ) {
-        $trial_period = getpaid_get_subscription_period_label( $item->get_trial_period(), $item->get_trial_interval() );
+    if ($item->has_free_trial()) {
+        $trial_period = getpaid_get_subscription_period_label($item->get_trial_period(), $item->get_trial_interval());
 
-        if ( wpinv_price( 0, $currency ) == $initial_price ) {
+        if (wpinv_price(0, $currency) == $initial_price) {
 
-            if ( empty( $bill_times ) ) {
+            if (empty($bill_times)) {
 
                 return sprintf(
                     // translators: $1: is the trial period, $2: is the recurring price, $3: is the susbcription period
-                    _x( 'Free for %1$s then %2$s / %3$s', 'Item subscription amount. (e.g.: Free for 1 month then $120 / year)', 'invoicing' ),
+                    _x('Free for %1$s then %2$s / %3$s', 'Item subscription amount. (e.g.: Free for 1 month then $120 / year)', 'invoicing'),
                     "<span class='getpaid-item-trial-period'>$trial_period</span>",
                     "<span class='$recurring_class'>$recurring_price</span>",
                     "<span class='getpaid-item-recurring-period'>$period</span>"
@@ -461,7 +461,7 @@ 
 
             return sprintf(
                 // translators: $1: is the trial period, $2: is the recurring price, $3: is the susbcription period, $4: is the bill times
-                _x( 'Free for %1$s then %2$s / %3$s for %4$s', 'Item subscription amount. (e.g.: Free for 1 month then $120 / year for 4 years)', 'invoicing' ),
+                _x('Free for %1$s then %2$s / %3$s for %4$s', 'Item subscription amount. (e.g.: Free for 1 month then $120 / year for 4 years)', 'invoicing'),
                 "<span class='getpaid-item-trial-period'>$trial_period</span>",
                 "<span class='$recurring_class'>$recurring_price</span>",
                 "<span class='getpaid-item-recurring-period'>$period</span>",
@@ -470,11 +470,11 @@ 
 
         }
 
-        if ( empty( $bill_times ) ) {
+        if (empty($bill_times)) {
 
             return sprintf(
                 // translators: $1: is the initial price, $2: is the trial period, $3: is the recurring price, $4: is the susbcription period
-                _x( '%1$s for %2$s then %3$s / %4$s', 'Item subscription amount. (e.g.: $7 for 1 month then $120 / year)', 'invoicing' ),
+                _x('%1$s for %2$s then %3$s / %4$s', 'Item subscription amount. (e.g.: $7 for 1 month then $120 / year)', 'invoicing'),
                 "<span class='$initial_class'>$initial_price</span>",
                 "<span class='getpaid-item-trial-period'>$trial_period</span>",
                 "<span class='$recurring_class'>$recurring_price</span>",
@@ -485,7 +485,7 @@ 
 
         return sprintf(
             // translators: $1: is the initial price, $2: is the trial period, $3: is the recurring price, $4: is the susbcription period, $4: is the susbcription bill times
-            _x( '%1$s for %2$s then %3$s / %4$s for %5$s', 'Item subscription amount. (e.g.: $7 for 1 month then $120 / year for 5 years)', 'invoicing' ),
+            _x('%1$s for %2$s then %3$s / %4$s for %5$s', 'Item subscription amount. (e.g.: $7 for 1 month then $120 / year for 5 years)', 'invoicing'),
             "<span class='$initial_class'>$initial_price</span>",
             "<span class='getpaid-item-trial-period'>$trial_period</span>",
             "<span class='$recurring_class'>$recurring_price</span>",
@@ -495,13 +495,13 @@ 
 
     }
 
-    if ( $initial_price == $recurring_price ) {
+    if ($initial_price == $recurring_price) {
 
-        if ( empty( $bill_times ) ) {
+        if (empty($bill_times)) {
 
             return sprintf(
                 // translators: $1: is the recurring price, $2: is the susbcription period
-                _x( '%1$s / %2$s', 'Item subscription amount. (e.g.: $120 / year)', 'invoicing' ),
+                _x('%1$s / %2$s', 'Item subscription amount. (e.g.: $120 / year)', 'invoicing'),
                 "<span class='$recurring_class'>$recurring_price</span>",
                 "<span class='getpaid-item-recurring-period'>$period</span>"
             );
@@ -510,7 +510,7 @@ 
 
         return sprintf(
             // translators: $1: is the recurring price, $2: is the susbcription period, $3: is the susbcription bill times
-            _x( '%1$s / %2$s for %3$s', 'Item subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing' ),
+            _x('%1$s / %2$s for %3$s', 'Item subscription amount. (e.g.: $120 / year for 5 years)', 'invoicing'),
             "<span class='$recurring_class'>$recurring_price</span>",
             "<span class='getpaid-item-recurring-period'>$period</span>",
             "<span class='getpaid-item-recurring-bill-times'>$bill_times</span>"
@@ -518,13 +518,13 @@ 
 
     }
 
-    if ( $initial_price == wpinv_price( 0, $currency ) ) {
+    if ($initial_price == wpinv_price(0, $currency)) {
 
-        if ( empty( $bill_times ) ) {
+        if (empty($bill_times)) {
 
             return sprintf(
                 // translators: $1: is the recurring period, $2: is the recurring price
-                _x( 'Free for %1$s then %2$s / %1$s', 'Item subscription amount. (e.g.: Free for 3 months then $7 / 3 months)', 'invoicing' ),
+                _x('Free for %1$s then %2$s / %1$s', 'Item subscription amount. (e.g.: Free for 3 months then $7 / 3 months)', 'invoicing'),
                 "<span class='getpaid-item-recurring-period'>$period</span>",
                 "<span class='$recurring_class'>$recurring_price</span>"
             );
@@ -533,7 +533,7 @@ 
 
         return sprintf(
             // translators: $1: is the recurring period, $2: is the recurring price, $3: is the bill times
-            _x( 'Free for %1$s then %2$s / %1$s for %3$s', 'Item subscription amount. (e.g.: Free for 3 months then $7 / 3 months for 12 months)', 'invoicing' ),
+            _x('Free for %1$s then %2$s / %1$s for %3$s', 'Item subscription amount. (e.g.: Free for 3 months then $7 / 3 months for 12 months)', 'invoicing'),
             "<span class='getpaid-item-recurring-period'>$period</span>",
             "<span class='$recurring_class'>$recurring_price</span>",
             "<span class='getpaid-item-recurring-bill-times'>$bill_times_less</span>"
@@ -541,11 +541,11 @@ 
 
     }
 
-    if ( empty( $bill_times ) ) {
+    if (empty($bill_times)) {
 
         return sprintf(
             // translators: $1: is the initial price, $2: is the recurring price, $3: is the susbcription period
-            _x( 'Initial payment of %1$s then %2$s / %3$s', 'Item subscription amount. (e.g.: Initial payment of $7 then $120 / year)', 'invoicing' ),
+            _x('Initial payment of %1$s then %2$s / %3$s', 'Item subscription amount. (e.g.: Initial payment of $7 then $120 / year)', 'invoicing'),
             "<span class='$initial_class'>$initial_price</span>",
             "<span class='$recurring_class'>$recurring_price</span>",
             "<span class='getpaid-item-recurring-period'>$period</span>"
@@ -555,7 +555,7 @@ 
 
     return sprintf(
         // translators: $1: is the initial price, $2: is the recurring price, $3: is the susbcription period, $4: is the susbcription bill times
-        _x( 'Initial payment of %1$s then %2$s / %3$s for %4$s', 'Item subscription amount. (e.g.: Initial payment of $7 then $120 / year for 4 years)', 'invoicing' ),
+        _x('Initial payment of %1$s then %2$s / %3$s for %4$s', 'Item subscription amount. (e.g.: Initial payment of $7 then $120 / year for 4 years)', 'invoicing'),
         "<span class='$initial_class'>$initial_price</span>",
         "<span class='$recurring_class'>$recurring_price</span>",
         "<span class='getpaid-item-recurring-period'>$period</span>",

templates/payment-forms/elements/date.php

Indentation +39 added lines, -39 removed lines

@@ -12,59 +12,59 @@
 $label       = empty( $label ) ? '' : wp_kses_post( $label );
 $label_class = sanitize_key( preg_replace( '/[^A-Za-z0-9_-]/', '-', $label ) );
 if ( ! empty( $required ) ) {
-	$label .= "<span class='text-danger'> *</span>";
+    $label .= "<span class='text-danger'> *</span>";
 }
 
 $disable_dates = array();
 
 if ( ! empty( $disabled_dates ) ) {
-	$disabled_dates = preg_replace( '/\s+/', '', $disabled_dates );
-	$disabled_dates = str_ireplace( 'today', current_time( 'Y-m-d' ), $disabled_dates );
-	$disabled_dates = array_filter( explode( ',', $disabled_dates ) );
+    $disabled_dates = preg_replace( '/\s+/', '', $disabled_dates );
+    $disabled_dates = str_ireplace( 'today', current_time( 'Y-m-d' ), $disabled_dates );
+    $disabled_dates = array_filter( explode( ',', $disabled_dates ) );
 
-	foreach ( $disabled_dates as $disabled_date ) {
+    foreach ( $disabled_dates as $disabled_date ) {
 
-		$disabled_date = trim( $disabled_date );
+        $disabled_date = trim( $disabled_date );
 
-		if ( false === strpos( $disabled_date, '|' ) ) {
-			$disable_dates[] = $disabled_date;
-			continue;
-		}
+        if ( false === strpos( $disabled_date, '|' ) ) {
+            $disable_dates[] = $disabled_date;
+            continue;
+        }
 
-		$disabled_date   = explode( '|', $disabled_date );
-		$disable_dates[] = array(
-			'from' => trim( $disabled_date[0] ),
-			'to'   => trim( $disabled_date[1] ),
-		);
+        $disabled_date   = explode( '|', $disabled_date );
+        $disable_dates[] = array(
+            'from' => trim( $disabled_date[0] ),
+            'to'   => trim( $disabled_date[1] ),
+        );
 
-	}
+    }
 }
 
 $options = array(
-	'data-default-date'     => empty( $default_date ) ? false : $default_date,
-	'data-min-date'         => empty( $min_date ) ? false : $min_date,
-	'data-max-date'         => empty( $max_date ) ? false : $max_date,
-	'data-mode'             => empty( $mode ) ? 'single' : $mode,
-	'data-alt-format'       => get_option( 'date_format', 'F j, Y' ),
-	'data-date-format'      => 'Y-m-d',
-	'data-alt-input'        => 'true',
-	'data-disable_alt'      => empty( $disabled_dates ) ? false : wp_json_encode( $disable_dates ),
-	'data-disable_days_alt' => empty( $disable_days ) ? false : wp_json_encode( wp_parse_id_list( $disable_days ) ),
+    'data-default-date'     => empty( $default_date ) ? false : $default_date,
+    'data-min-date'         => empty( $min_date ) ? false : $min_date,
+    'data-max-date'         => empty( $max_date ) ? false : $max_date,
+    'data-mode'             => empty( $mode ) ? 'single' : $mode,
+    'data-alt-format'       => get_option( 'date_format', 'F j, Y' ),
+    'data-date-format'      => 'Y-m-d',
+    'data-alt-input'        => 'true',
+    'data-disable_alt'      => empty( $disabled_dates ) ? false : wp_json_encode( $disable_dates ),
+    'data-disable_days_alt' => empty( $disable_days ) ? false : wp_json_encode( wp_parse_id_list( $disable_days ) ),
 );
 
 aui()->input(
-	array(
-		'name'             => esc_attr( $id ),
-		'id'               => esc_attr( $element_id ),
-		'placeholder'      => empty( $placeholder ) ? '' : esc_attr( $placeholder ),
-		'required'         => ! empty( $required ),
-		'label'            => $label,
-		'label_type'       => 'vertical',
-		'help_text'        => empty( $description ) ? '' : wp_kses_post( $description ),
-		'type'             => 'datepicker',
-		'class'            => $label_class . ' getpaid-init-flatpickr flatpickr-input',
-		'extra_attributes' => array_filter( apply_filters( 'getpaid_date_field_attributes', $options ) ),
-		'value'            => $query_value,
-	),
-	true
+    array(
+        'name'             => esc_attr( $id ),
+        'id'               => esc_attr( $element_id ),
+        'placeholder'      => empty( $placeholder ) ? '' : esc_attr( $placeholder ),
+        'required'         => ! empty( $required ),
+        'label'            => $label,
+        'label_type'       => 'vertical',
+        'help_text'        => empty( $description ) ? '' : wp_kses_post( $description ),
+        'type'             => 'datepicker',
+        'class'            => $label_class . ' getpaid-init-flatpickr flatpickr-input',
+        'extra_attributes' => array_filter( apply_filters( 'getpaid_date_field_attributes', $options ) ),
+        'value'            => $query_value,
+    ),
+    true
 );

Spacing +27 added lines, -27 removed lines

@@ -7,63 +7,63 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-$label       = empty( $label ) ? '' : wp_kses_post( $label );
-$label_class = sanitize_key( preg_replace( '/[^A-Za-z0-9_-]/', '-', $label ) );
-if ( ! empty( $required ) ) {
+$label       = empty($label) ? '' : wp_kses_post($label);
+$label_class = sanitize_key(preg_replace('/[^A-Za-z0-9_-]/', '-', $label));
+if (!empty($required)) {
 	$label .= "<span class='text-danger'> *</span>";
 }
 
 $disable_dates = array();
 
-if ( ! empty( $disabled_dates ) ) {
-	$disabled_dates = preg_replace( '/\s+/', '', $disabled_dates );
-	$disabled_dates = str_ireplace( 'today', current_time( 'Y-m-d' ), $disabled_dates );
-	$disabled_dates = array_filter( explode( ',', $disabled_dates ) );
+if (!empty($disabled_dates)) {
+	$disabled_dates = preg_replace('/\s+/', '', $disabled_dates);
+	$disabled_dates = str_ireplace('today', current_time('Y-m-d'), $disabled_dates);
+	$disabled_dates = array_filter(explode(',', $disabled_dates));
 
-	foreach ( $disabled_dates as $disabled_date ) {
+	foreach ($disabled_dates as $disabled_date) {
 
-		$disabled_date = trim( $disabled_date );
+		$disabled_date = trim($disabled_date);
 
-		if ( false === strpos( $disabled_date, '|' ) ) {
+		if (false === strpos($disabled_date, '|')) {
 			$disable_dates[] = $disabled_date;
 			continue;
 		}
 
-		$disabled_date   = explode( '|', $disabled_date );
+		$disabled_date   = explode('|', $disabled_date);
 		$disable_dates[] = array(
-			'from' => trim( $disabled_date[0] ),
-			'to'   => trim( $disabled_date[1] ),
+			'from' => trim($disabled_date[0]),
+			'to'   => trim($disabled_date[1]),
 		);
 
 	}
 }
 
 $options = array(
-	'data-default-date'     => empty( $default_date ) ? false : $default_date,
-	'data-min-date'         => empty( $min_date ) ? false : $min_date,
-	'data-max-date'         => empty( $max_date ) ? false : $max_date,
-	'data-mode'             => empty( $mode ) ? 'single' : $mode,
-	'data-alt-format'       => get_option( 'date_format', 'F j, Y' ),
+	'data-default-date'     => empty($default_date) ? false : $default_date,
+	'data-min-date'         => empty($min_date) ? false : $min_date,
+	'data-max-date'         => empty($max_date) ? false : $max_date,
+	'data-mode'             => empty($mode) ? 'single' : $mode,
+	'data-alt-format'       => get_option('date_format', 'F j, Y'),
 	'data-date-format'      => 'Y-m-d',
 	'data-alt-input'        => 'true',
-	'data-disable_alt'      => empty( $disabled_dates ) ? false : wp_json_encode( $disable_dates ),
-	'data-disable_days_alt' => empty( $disable_days ) ? false : wp_json_encode( wp_parse_id_list( $disable_days ) ),
+	'data-disable_alt'      => empty($disabled_dates) ? false : wp_json_encode($disable_dates),
+	'data-disable_days_alt' => empty($disable_days) ? false : wp_json_encode(wp_parse_id_list($disable_days)),
 );
 
 aui()->input(
 	array(
-		'name'             => esc_attr( $id ),
-		'id'               => esc_attr( $element_id ),
-		'placeholder'      => empty( $placeholder ) ? '' : esc_attr( $placeholder ),
-		'required'         => ! empty( $required ),
+		'name'             => esc_attr($id),
+		'id'               => esc_attr($element_id),
+		'placeholder'      => empty($placeholder) ? '' : esc_attr($placeholder),
+		'required'         => !empty($required),
 		'label'            => $label,
 		'label_type'       => 'vertical',
-		'help_text'        => empty( $description ) ? '' : wp_kses_post( $description ),
+		'help_text'        => empty($description) ? '' : wp_kses_post($description),
 		'type'             => 'datepicker',
 		'class'            => $label_class . ' getpaid-init-flatpickr flatpickr-input',
-		'extra_attributes' => array_filter( apply_filters( 'getpaid_date_field_attributes', $options ) ),
+		'extra_attributes' => array_filter(apply_filters('getpaid_date_field_attributes', $options)),
 		'value'            => $query_value,
 	),
 	true

includes/admin/class-getpaid-installer.php

Indentation +384 added lines, -384 removed lines

@@ -20,237 +20,237 @@ 
  */
 class GetPaid_Installer {
 
-	/**
-	 * Upgrades the install.
-	 *
-	 * @param string $upgrade_from The current invoicing version.
-	 */
-	public function upgrade_db( $upgrade_from ) {
-
-		// Save the current invoicing version.
-		update_option( 'wpinv_version', WPINV_VERSION );
-
-		// Setup the invoice Custom Post Type.
-		GetPaid_Post_Types::register_post_types();
-
-		// Clear the permalinks
-		flush_rewrite_rules();
-
-		// Maybe create new/missing pages.
-		$this->create_pages();
-
-		// Maybe re(add) admin capabilities.
-		$this->add_capabilities();
-
-		// Maybe create the default payment form.
-		wpinv_get_default_payment_form();
-
-		// Create any missing database tables.
-		$method = "upgrade_from_$upgrade_from";
-
-		$installed = get_option( 'gepaid_installed_on' );
-
-		if ( empty( $installed ) ) {
-			update_option( 'gepaid_installed_on', time() );
-		}
-
-		if ( method_exists( $this, $method ) ) {
-			$this->$method();
-		}
-
-	}
-
-	/**
-	 * Do a fresh install.
-	 *
-	 */
-	public function upgrade_from_0() {
-		$this->create_subscriptions_table();
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-
-		// Save default tax rates.
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
-	}
-
-	/**
-	 * Upgrade to 0.0.5
-	 *
-	 */
-	public function upgrade_from_004() {
-		global $wpdb;
-
-		// Invoices.
-		$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 );
-			}
-		}
-
-		// 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 );
-
-		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 );
-			}
-		}
-
-		$this->upgrade_from_102();
-	}
-
-	/**
-	 * Upgrade to 1.0.3
-	 *
-	 */
-	public function upgrade_from_102() {
-		$this->create_subscriptions_table();
-		$this->upgrade_from_118();
-	}
-
-	/**
-	 * Upgrade to version 2.0.0.
-	 *
-	 */
-	public function upgrade_from_118() {
-		$this->create_invoices_table();
-		$this->create_invoice_items_table();
-		$this->migrate_old_invoices();
-	}
-
-	/**
-	 * Upgrade to version 2.0.8.
-	 *
-	 */
-	public function upgrade_from_207() {
-		global $wpdb;
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
-		$this->upgrade_from_2615();
-	}
-
-	/**
-	 * Upgrade to version 2.6.16.
-	 *
-	 */
-	public function upgrade_from_2615() {
-		global $wpdb;
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN item_price DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY custom_price DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY discount DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY subtotal DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY price DECIMAL(16,4) NOT NULL DEFAULT '0';" );
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoices MODIFY COLUMN subtotal DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY tax DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY fees_total DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY total DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY discount DECIMAL(16,4) NOT NULL DEFAULT '0';" );
-	}
-
-	/**
-	 * Give administrators the capability to manage GetPaid.
-	 *
-	 */
-	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
-	}
-
-	/**
-	 * Retreives GetPaid pages.
-	 *
-	 */
-	public static function get_pages() {
-
-		return apply_filters(
-			'wpinv_create_pages',
-			array(
-
-				// Checkout page.
-				'checkout_page'             => array(
-					'name'    => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Checkout', 'Page title', 'invoicing' ),
-					'content' => '
+    /**
+     * Upgrades the install.
+     *
+     * @param string $upgrade_from The current invoicing version.
+     */
+    public function upgrade_db( $upgrade_from ) {
+
+        // Save the current invoicing version.
+        update_option( 'wpinv_version', WPINV_VERSION );
+
+        // Setup the invoice Custom Post Type.
+        GetPaid_Post_Types::register_post_types();
+
+        // Clear the permalinks
+        flush_rewrite_rules();
+
+        // Maybe create new/missing pages.
+        $this->create_pages();
+
+        // Maybe re(add) admin capabilities.
+        $this->add_capabilities();
+
+        // Maybe create the default payment form.
+        wpinv_get_default_payment_form();
+
+        // Create any missing database tables.
+        $method = "upgrade_from_$upgrade_from";
+
+        $installed = get_option( 'gepaid_installed_on' );
+
+        if ( empty( $installed ) ) {
+            update_option( 'gepaid_installed_on', time() );
+        }
+
+        if ( method_exists( $this, $method ) ) {
+            $this->$method();
+        }
+
+    }
+
+    /**
+     * Do a fresh install.
+     *
+     */
+    public function upgrade_from_0() {
+        $this->create_subscriptions_table();
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+
+        // Save default tax rates.
+        update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+    }
+
+    /**
+     * Upgrade to 0.0.5
+     *
+     */
+    public function upgrade_from_004() {
+        global $wpdb;
+
+        // Invoices.
+        $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 );
+            }
+        }
+
+        // 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 );
+
+        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 );
+            }
+        }
+
+        $this->upgrade_from_102();
+    }
+
+    /**
+     * Upgrade to 1.0.3
+     *
+     */
+    public function upgrade_from_102() {
+        $this->create_subscriptions_table();
+        $this->upgrade_from_118();
+    }
+
+    /**
+     * Upgrade to version 2.0.0.
+     *
+     */
+    public function upgrade_from_118() {
+        $this->create_invoices_table();
+        $this->create_invoice_items_table();
+        $this->migrate_old_invoices();
+    }
+
+    /**
+     * Upgrade to version 2.0.8.
+     *
+     */
+    public function upgrade_from_207() {
+        global $wpdb;
+        $wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
+        $this->upgrade_from_2615();
+    }
+
+    /**
+     * Upgrade to version 2.6.16.
+     *
+     */
+    public function upgrade_from_2615() {
+        global $wpdb;
+        $wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN item_price DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY custom_price DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY discount DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY subtotal DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY price DECIMAL(16,4) NOT NULL DEFAULT '0';" );
+        $wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoices MODIFY COLUMN subtotal DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY tax DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY fees_total DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY total DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY discount DECIMAL(16,4) NOT NULL DEFAULT '0';" );
+    }
+
+    /**
+     * Give administrators the capability to manage GetPaid.
+     *
+     */
+    public function add_capabilities() {
+        $GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+    }
+
+    /**
+     * Retreives GetPaid pages.
+     *
+     */
+    public static function get_pages() {
+
+        return apply_filters(
+            'wpinv_create_pages',
+            array(
+
+                // Checkout page.
+                'checkout_page'             => array(
+                    'name'    => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Checkout', 'Page title', 'invoicing' ),
+                    'content' => '
 						<!-- wp:shortcode -->
 						[wpinv_checkout]
 						<!-- /wp:shortcode -->
 					',
-					'parent'  => '',
-				),
-
-				// Invoice history page.
-				'invoice_history_page'      => array(
-					'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'  => '',
+                ),
+
+                // Invoice history page.
+                'invoice_history_page'      => array(
+                    'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_history]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => '',
-				),
-
-				// Success page content.
-				'success_page'              => array(
-					'name'    => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'  => '',
+                ),
+
+                // Success page content.
+                'success_page'              => array(
+                    'name'    => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_receipt]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => 'gp-checkout',
-				),
-
-				// Failure page content.
-				'failure_page'              => array(
-					'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
-					'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
-					'parent'  => 'gp-checkout',
-				),
-
-				// Subscriptions history page.
-				'invoice_subscription_page' => array(
-					'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
-					'content' => '
+                    'parent'  => 'gp-checkout',
+                ),
+
+                // Failure page content.
+                'failure_page'              => array(
+                    'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
+                    'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
+                    'parent'  => 'gp-checkout',
+                ),
+
+                // Subscriptions history page.
+                'invoice_subscription_page' => array(
+                    'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
+                    'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
+                    'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_subscriptions]
 					<!-- /wp:shortcode -->
 				',
-					'parent'  => '',
-				),
+                    'parent'  => '',
+                ),
 
-			)
-		);
+            )
+        );
 
-	}
+    }
 
-	/**
-	 * Re-create GetPaid pages.
-	 *
-	 */
-	public function create_pages() {
+    /**
+     * Re-create GetPaid pages.
+     *
+     */
+    public function create_pages() {
 
-		foreach ( self::get_pages() as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
-		}
+        foreach ( self::get_pages() as $key => $page ) {
+            wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+        }
 
-	}
+    }
 
-	/**
-	 * Create subscriptions table.
-	 *
-	 */
-	public function create_subscriptions_table() {
+    /**
+     * Create subscriptions table.
+     *
+     */
+    public function create_subscriptions_table() {
 
-		global $wpdb;
+        global $wpdb;
 
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpinv_subscriptions (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}wpinv_subscriptions (
 			id bigint(20) unsigned NOT NULL auto_increment,
 			customer_id bigint(20) NOT NULL,
 			frequency int(11) NOT NULL DEFAULT '1',
@@ -273,22 +273,22 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoices table.
-	 *
-	 */
-	public function create_invoices_table() {
-		global $wpdb;
+    /**
+     * Create invoices table.
+     *
+     */
+    public function create_invoices_table() {
+        global $wpdb;
 
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoices (
 			post_id BIGINT(20) NOT NULL,
             `number` VARCHAR(100),
             `key` VARCHAR(100),
@@ -324,22 +324,22 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+        dbDelta( $sql );
 
-	}
+    }
 
-	/**
-	 * Create invoice items table.
-	 *
-	 */
-	public function create_invoice_items_table() {
-		global $wpdb;
+    /**
+     * Create invoice items table.
+     *
+     */
+    public function create_invoice_items_table() {
+        global $wpdb;
 
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		// Create tables.
-		$charset_collate = $wpdb->get_charset_collate();
-		$sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
+        // Create tables.
+        $charset_collate = $wpdb->get_charset_collate();
+        $sql             = "CREATE TABLE IF NOT EXISTS {$wpdb->prefix}getpaid_invoice_items (
 			ID BIGINT(20) NOT NULL AUTO_INCREMENT,
             post_id BIGINT(20) NOT NULL,
             item_id BIGINT(20) NOT NULL,
@@ -361,159 +361,159 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public function migrate_old_invoices() {
-		global $wpdb;
-
-		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
-		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-		$migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
-		$invoices            = array_unique(
-			get_posts(
-				array(
-					'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
-					'posts_per_page' => -1,
-					'fields'         => 'ids',
-					'post_status'    => array_keys( get_post_stati() ),
-					'exclude'        => (array) $migrated,
-				)
-			)
-		);
-
-		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
-			return;
-		}
-
-		require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php';
-
-		$invoice_rows = array();
-		foreach ( $invoices as $invoice ) {
-
-			$invoice = new WPInv_Legacy_Invoice( $invoice );
-
-			if ( empty( $invoice->ID ) ) {
-				return;
-			}
-
-			$fields = array(
-				'post_id'            => $invoice->ID,
-				'number'             => $invoice->get_number(),
-				'key'                => $invoice->get_key(),
-				'type'               => str_replace( 'wpi_', '', $invoice->post_type ),
-				'mode'               => $invoice->mode,
-				'user_ip'            => $invoice->get_ip(),
-				'first_name'         => $invoice->get_first_name(),
-				'last_name'          => $invoice->get_last_name(),
-				'address'            => $invoice->get_address(),
-				'city'               => $invoice->city,
-				'state'              => $invoice->state,
-				'country'            => $invoice->country,
-				'zip'                => $invoice->zip,
-				'adddress_confirmed' => (int) $invoice->adddress_confirmed,
-				'gateway'            => $invoice->get_gateway(),
-				'transaction_id'     => $invoice->get_transaction_id(),
-				'currency'           => $invoice->get_currency(),
-				'subtotal'           => $invoice->get_subtotal(),
-				'tax'                => $invoice->get_tax(),
-				'fees_total'         => $invoice->get_fees_total(),
-				'total'              => $invoice->get_total(),
-				'discount'           => $invoice->get_discount(),
-				'discount_code'      => $invoice->get_discount_code(),
-				'disable_taxes'      => $invoice->disable_taxes,
-				'due_date'           => $invoice->get_due_date(),
-				'completed_date'     => $invoice->get_completed_date(),
-				'company'            => $invoice->company,
-				'vat_number'         => $invoice->vat_number,
-				'vat_rate'           => $invoice->vat_rate,
-				'custom_meta'        => $invoice->payment_meta,
-			);
-
-			foreach ( $fields as $key => $val ) {
-				if ( is_null( $val ) ) {
-					$val = '';
-				}
-				$val = maybe_serialize( $val );
-				$fields[ $key ] = $wpdb->prepare( '%s', $val );
-			}
-
-			$fields = implode( ', ', $fields );
-			$invoice_rows[] = "($fields)";
-
-			$item_rows    = array();
-			$item_columns = array();
-			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'],
-					'vat_rate'         => $details['vat_rate'],
-					'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
-					'tax'              => $details['tax'],
-					'item_price'       => $details['item_price'],
-					'custom_price'     => $details['custom_price'],
-					'quantity'         => $details['quantity'],
-					'discount'         => $details['discount'],
-					'subtotal'         => $details['subtotal'],
-					'price'            => $details['price'],
-					'meta'             => $details['meta'],
-					'fees'             => $details['fees'],
-				);
-
-				$item_columns = array_keys( $fields );
-
-				foreach ( $fields as $key => $val ) {
-					if ( is_null( $val ) ) {
-						$val = '';
-					}
-					$val = maybe_serialize( $val );
-					$fields[ $key ] = $wpdb->prepare( '%s', $val );
-				}
-
-				$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" );
-		}
-
-		if ( empty( $invoice_rows ) ) {
-			return;
-		}
-
-		$invoice_rows = implode( ', ', $invoice_rows );
-		$wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
-
-	}
-
-	/**
-	 * Migrates old invoices to new invoices.
-	 *
-	 */
-	public static function rename_gateways_label() {
-		global $wpdb;
-
-		foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
-
-			$wpdb->update(
-				$wpdb->prefix . 'getpaid_invoices',
-				array( 'gateway' => $gateway ),
-				array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
-				'%s',
-				'%s'
-			);
-
-		}
-	}
+        dbDelta( $sql );
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public function migrate_old_invoices() {
+        global $wpdb;
+
+        $invoices_table      = $wpdb->prefix . 'getpaid_invoices';
+        $invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
+        $migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
+        $invoices            = array_unique(
+            get_posts(
+                array(
+                    'post_type'      => array( 'wpi_invoice', 'wpi_quote' ),
+                    'posts_per_page' => -1,
+                    'fields'         => 'ids',
+                    'post_status'    => array_keys( get_post_stati() ),
+                    'exclude'        => (array) $migrated,
+                )
+            )
+        );
+
+        // Abort if we do not have any invoices.
+        if ( empty( $invoices ) ) {
+            return;
+        }
+
+        require_once WPINV_PLUGIN_DIR . 'includes/class-wpinv-legacy-invoice.php';
+
+        $invoice_rows = array();
+        foreach ( $invoices as $invoice ) {
+
+            $invoice = new WPInv_Legacy_Invoice( $invoice );
+
+            if ( empty( $invoice->ID ) ) {
+                return;
+            }
+
+            $fields = array(
+                'post_id'            => $invoice->ID,
+                'number'             => $invoice->get_number(),
+                'key'                => $invoice->get_key(),
+                'type'               => str_replace( 'wpi_', '', $invoice->post_type ),
+                'mode'               => $invoice->mode,
+                'user_ip'            => $invoice->get_ip(),
+                'first_name'         => $invoice->get_first_name(),
+                'last_name'          => $invoice->get_last_name(),
+                'address'            => $invoice->get_address(),
+                'city'               => $invoice->city,
+                'state'              => $invoice->state,
+                'country'            => $invoice->country,
+                'zip'                => $invoice->zip,
+                'adddress_confirmed' => (int) $invoice->adddress_confirmed,
+                'gateway'            => $invoice->get_gateway(),
+                'transaction_id'     => $invoice->get_transaction_id(),
+                'currency'           => $invoice->get_currency(),
+                'subtotal'           => $invoice->get_subtotal(),
+                'tax'                => $invoice->get_tax(),
+                'fees_total'         => $invoice->get_fees_total(),
+                'total'              => $invoice->get_total(),
+                'discount'           => $invoice->get_discount(),
+                'discount_code'      => $invoice->get_discount_code(),
+                'disable_taxes'      => $invoice->disable_taxes,
+                'due_date'           => $invoice->get_due_date(),
+                'completed_date'     => $invoice->get_completed_date(),
+                'company'            => $invoice->company,
+                'vat_number'         => $invoice->vat_number,
+                'vat_rate'           => $invoice->vat_rate,
+                'custom_meta'        => $invoice->payment_meta,
+            );
+
+            foreach ( $fields as $key => $val ) {
+                if ( is_null( $val ) ) {
+                    $val = '';
+                }
+                $val = maybe_serialize( $val );
+                $fields[ $key ] = $wpdb->prepare( '%s', $val );
+            }
+
+            $fields = implode( ', ', $fields );
+            $invoice_rows[] = "($fields)";
+
+            $item_rows    = array();
+            $item_columns = array();
+            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'],
+                    'vat_rate'         => $details['vat_rate'],
+                    'vat_class'        => empty( $details['vat_class'] ) ? '_standard' : $details['vat_class'],
+                    'tax'              => $details['tax'],
+                    'item_price'       => $details['item_price'],
+                    'custom_price'     => $details['custom_price'],
+                    'quantity'         => $details['quantity'],
+                    'discount'         => $details['discount'],
+                    'subtotal'         => $details['subtotal'],
+                    'price'            => $details['price'],
+                    'meta'             => $details['meta'],
+                    'fees'             => $details['fees'],
+                );
+
+                $item_columns = array_keys( $fields );
+
+                foreach ( $fields as $key => $val ) {
+                    if ( is_null( $val ) ) {
+                        $val = '';
+                    }
+                    $val = maybe_serialize( $val );
+                    $fields[ $key ] = $wpdb->prepare( '%s', $val );
+                }
+
+                $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" );
+        }
+
+        if ( empty( $invoice_rows ) ) {
+            return;
+        }
+
+        $invoice_rows = implode( ', ', $invoice_rows );
+        $wpdb->query( "INSERT INTO $invoices_table VALUES $invoice_rows" );
+
+    }
+
+    /**
+     * Migrates old invoices to new invoices.
+     *
+     */
+    public static function rename_gateways_label() {
+        global $wpdb;
+
+        foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
+
+            $wpdb->update(
+                $wpdb->prefix . 'getpaid_invoices',
+                array( 'gateway' => $gateway ),
+                array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
+                '%s',
+                '%s'
+            );
+
+        }
+    }
 
 }

Spacing +71 added lines, -71 removed lines

@@ -8,7 +8,7 @@ 
  * @since   2.0.2
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main installer/updater class.
@@ -25,10 +25,10 @@ 
 	 *
 	 * @param string $upgrade_from The current invoicing version.
 	 */
-	public function upgrade_db( $upgrade_from ) {
+	public function upgrade_db($upgrade_from) {
 
 		// Save the current invoicing version.
-		update_option( 'wpinv_version', WPINV_VERSION );
+		update_option('wpinv_version', WPINV_VERSION);
 
 		// Setup the invoice Custom Post Type.
 		GetPaid_Post_Types::register_post_types();
@@ -48,13 +48,13 @@ 
 		// Create any missing database tables.
 		$method = "upgrade_from_$upgrade_from";
 
-		$installed = get_option( 'gepaid_installed_on' );
+		$installed = get_option('gepaid_installed_on');
 
-		if ( empty( $installed ) ) {
-			update_option( 'gepaid_installed_on', time() );
+		if (empty($installed)) {
+			update_option('gepaid_installed_on', time());
 		}
 
-		if ( method_exists( $this, $method ) ) {
+		if (method_exists($this, $method)) {
 			$this->$method();
 		}
 
@@ -70,7 +70,7 @@ 
 		$this->create_invoice_items_table();
 
 		// Save default tax rates.
-		update_option( 'wpinv_tax_rates', wpinv_get_data( 'tax-rates' ) );
+		update_option('wpinv_tax_rates', wpinv_get_data('tax-rates'));
 	}
 
 	/**
@@ -81,27 +81,27 @@ 
 		global $wpdb;
 
 		// Invoices.
-		$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);
 			}
 		}
 
@@ -133,7 +133,7 @@ 
 	 */
 	public function upgrade_from_207() {
 		global $wpdb;
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);" );
+		$wpdb->query("ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN quantity FLOAT(20);");
 		$this->upgrade_from_2615();
 	}
 
@@ -143,8 +143,8 @@ 
 	 */
 	public function upgrade_from_2615() {
 		global $wpdb;
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN item_price DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY custom_price DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY discount DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY subtotal DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY price DECIMAL(16,4) NOT NULL DEFAULT '0';" );
-		$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoices MODIFY COLUMN subtotal DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY tax DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY fees_total DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY total DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY discount DECIMAL(16,4) NOT NULL DEFAULT '0';" );
+		$wpdb->query("ALTER TABLE {$wpdb->prefix}getpaid_invoice_items MODIFY COLUMN item_price DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY custom_price DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY discount DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY subtotal DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY price DECIMAL(16,4) NOT NULL DEFAULT '0';");
+		$wpdb->query("ALTER TABLE {$wpdb->prefix}getpaid_invoices MODIFY COLUMN subtotal DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY tax DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY fees_total DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY total DECIMAL(16,4) NOT NULL DEFAULT '0', MODIFY discount DECIMAL(16,4) NOT NULL DEFAULT '0';");
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 *
 	 */
 	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+		$GLOBALS['wp_roles']->add_cap('administrator', 'manage_invoicing');
 	}
 
 	/**
@@ -167,8 +167,8 @@ 
 
 				// Checkout page.
 				'checkout_page'             => array(
-					'name'    => _x( 'gp-checkout', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Checkout', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-checkout', 'Page slug', 'invoicing'),
+					'title'   => _x('Checkout', 'Page title', 'invoicing'),
 					'content' => '
 						<!-- wp:shortcode -->
 						[wpinv_checkout]
@@ -179,8 +179,8 @@ 
 
 				// Invoice history page.
 				'invoice_history_page'      => array(
-					'name'    => _x( 'gp-invoices', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Invoices', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-invoices', 'Page slug', 'invoicing'),
+					'title'   => _x('My Invoices', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_history]
@@ -191,8 +191,8 @@ 
 
 				// Success page content.
 				'success_page'              => array(
-					'name'    => _x( 'gp-receipt', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Payment Confirmation', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-receipt', 'Page slug', 'invoicing'),
+					'title'   => _x('Payment Confirmation', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_receipt]
@@ -203,16 +203,16 @@ 
 
 				// Failure page content.
 				'failure_page'              => array(
-					'name'    => _x( 'gp-transaction-failed', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'Transaction Failed', 'Page title', 'invoicing' ),
-					'content' => __( 'Your transaction failed, please try again or contact site support.', 'invoicing' ),
+					'name'    => _x('gp-transaction-failed', 'Page slug', 'invoicing'),
+					'title'   => _x('Transaction Failed', 'Page title', 'invoicing'),
+					'content' => __('Your transaction failed, please try again or contact site support.', 'invoicing'),
 					'parent'  => 'gp-checkout',
 				),
 
 				// Subscriptions history page.
 				'invoice_subscription_page' => array(
-					'name'    => _x( 'gp-subscriptions', 'Page slug', 'invoicing' ),
-					'title'   => _x( 'My Subscriptions', 'Page title', 'invoicing' ),
+					'name'    => _x('gp-subscriptions', 'Page slug', 'invoicing'),
+					'title'   => _x('My Subscriptions', 'Page title', 'invoicing'),
 					'content' => '
 					<!-- wp:shortcode -->
 					[wpinv_subscriptions]
@@ -232,8 +232,8 @@ 
 	 */
 	public function create_pages() {
 
-		foreach ( self::get_pages() as $key => $page ) {
-			wpinv_create_page( esc_sql( $page['name'] ), $key, $page['title'], $page['content'], $page['parent'] );
+		foreach (self::get_pages() as $key => $page) {
+			wpinv_create_page(esc_sql($page['name']), $key, $page['title'], $page['content'], $page['parent']);
 		}
 
 	}
@@ -273,7 +273,7 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -324,7 +324,7 @@ 
 			KEY `key` (`key`)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -361,7 +361,7 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
 	}
 
@@ -374,32 +374,32 @@ 
 
 		$invoices_table      = $wpdb->prefix . 'getpaid_invoices';
 		$invoice_items_table = $wpdb->prefix . 'getpaid_invoice_items';
-		$migrated            = $wpdb->get_col( "SELECT post_id FROM $invoices_table" );
+		$migrated            = $wpdb->get_col("SELECT post_id FROM $invoices_table");
 		$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( get_post_stati() ),
+					'post_status'    => array_keys(get_post_stati()),
 					'exclude'        => (array) $migrated,
 				)
 			)
 		);
 
 		// Abort if we do not have any invoices.
-		if ( empty( $invoices ) ) {
+		if (empty($invoices)) {
 			return;
 		}
 
 		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 );
+			$invoice = new WPInv_Legacy_Invoice($invoice);
 
-			if ( empty( $invoice->ID ) ) {
+			if (empty($invoice->ID)) {
 				return;
 			}
 
@@ -407,7 +407,7 @@ 
 				'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(),
@@ -436,27 +436,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'],
@@ -468,31 +468,31 @@ 
 					'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");
 		}
 
-		if ( empty( $invoice_rows ) ) {
+		if (empty($invoice_rows)) {
 			return;
 		}
 
-		$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");
 
 	}
 
@@ -503,12 +503,12 @@ 
 	public static function rename_gateways_label() {
 		global $wpdb;
 
-		foreach ( array_keys( wpinv_get_payment_gateways() ) as $gateway ) {
+		foreach (array_keys(wpinv_get_payment_gateways()) as $gateway) {
 
 			$wpdb->update(
 				$wpdb->prefix . 'getpaid_invoices',
-				array( 'gateway' => $gateway ),
-				array( 'gateway' => wpinv_get_gateway_admin_label( $gateway ) ),
+				array('gateway' => $gateway),
+				array('gateway' => wpinv_get_gateway_admin_label($gateway)),
 				'%s',
 				'%s'
 			);

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

Indentation +188 added lines, -188 removed lines

@@ -12,47 +12,47 @@ 
  */
 class GetPaid_Reports_Export {
 
-	/**
-	 * Displays the reports tab.
-	 *
-	 */
-	public function display() {
-
-		echo "<div class='row mt-4' style='max-width: 920px;' >";
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$this->display_post_type_export( $post_type );
-		}
-		$this->display_subscription_export();
-		echo '</div>';
-
-	}
-
-	/**
-	 * Retrieves the download url.
-	 *
-	 */
-	public function get_download_url( $post_type ) {
-
-		return wp_nonce_url(
-			add_query_arg(
-				array(
-					'getpaid-admin-action' => 'export_invoices',
-					'post_type'            => urlencode( $post_type ),
-				)
-			),
-			'getpaid-nonce',
-			'getpaid-nonce'
-		);
-
-	}
-
-	/**
-	 * Displays a single post type export card.
-	 *
-	 */
-	public function display_post_type_export( $post_type ) {
-
-		?>
+    /**
+     * Displays the reports tab.
+     *
+     */
+    public function display() {
+
+        echo "<div class='row mt-4' style='max-width: 920px;' >";
+        foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
+            $this->display_post_type_export( $post_type );
+        }
+        $this->display_subscription_export();
+        echo '</div>';
+
+    }
+
+    /**
+     * Retrieves the download url.
+     *
+     */
+    public function get_download_url( $post_type ) {
+
+        return wp_nonce_url(
+            add_query_arg(
+                array(
+                    'getpaid-admin-action' => 'export_invoices',
+                    'post_type'            => urlencode( $post_type ),
+                )
+            ),
+            'getpaid-nonce',
+            'getpaid-nonce'
+        );
+
+    }
+
+    /**
+     * Displays a single post type export card.
+     *
+     */
+    public function display_post_type_export( $post_type ) {
+
+        ?>
 
 		<div class="col-12 col-md-6">
 			<div class="card m-0 p-0" style="max-width:100%">
@@ -60,11 +60,11 @@ 
 				<div class="card-header">
 					<strong>
 						<?php
-							printf(
-								esc_html__( 'Export %s', 'invoicing' ),
-								esc_html( getpaid_get_post_type_label( $post_type ) )
-							);
-						?>
+                            printf(
+                                esc_html__( 'Export %s', 'invoicing' ),
+                                esc_html( getpaid_get_post_type_label( $post_type ) )
+                            );
+                        ?>
 					</strong>
 				</div>
 
@@ -73,12 +73,12 @@ 
 					<form method="post" action="<?php echo esc_url( $this->get_download_url( $post_type ) ); ?>">
 
 						<?php
-							$this->generate_from_date( $post_type );
-							$this->generate_to_date( $post_type );
-							$this->generate_post_status_select( $post_type );
-							$this->generate_file_type_select( $post_type );
-							submit_button( __( 'Download', 'invoicing' ) );
-						?>
+                            $this->generate_from_date( $post_type );
+                            $this->generate_to_date( $post_type );
+                            $this->generate_post_status_select( $post_type );
+                            $this->generate_file_type_select( $post_type );
+                            submit_button( __( 'Download', 'invoicing' ) );
+                        ?>
 
 					</form>
 
@@ -89,135 +89,135 @@ 
 
 		<?php
 
-	}
-
-	/**
-	 * Generates the from date input field.
-	 *
-	 */
-	public function generate_from_date( $post_type ) {
-
-		aui()->input(
-			array(
-				'type'             => 'datepicker',
-				'id'               => esc_attr( "$post_type-from_date" ),
-				'name'             => 'from_date',
-				'label'            => __( 'From Date', 'invoicing' ),
-				'label_type'       => 'vertical',
-				'placeholder'      => 'YYYY-MM-DD',
-				'extra_attributes' => array(
-					'data-enable-time' => 'false',
-					'data-allow-input' => 'true',
-				),
-			),
-			true
-		);
-
-	}
-
-	/**
-	 * Generates the to date input field.
-	 *
-	 */
-	public function generate_to_date( $post_type ) {
-
-		aui()->input(
-			array(
-				'type'             => 'datepicker',
-				'id'               => esc_attr( "$post_type-to_date" ),
-				'name'             => 'to_date',
-				'label'            => __( 'To Date', 'invoicing' ),
-				'label_type'       => 'vertical',
-				'placeholder'      => 'YYYY-MM-DD',
-				'extra_attributes' => array(
-					'data-enable-time' => 'false',
-					'data-allow-input' => 'true',
-				),
-			),
-			true
-		);
-	}
-
-	/**
-	 * Generates the to post status select field.
-	 *
-	 */
-	public function generate_post_status_select( $post_type ) {
-
-		if ( 'subscriptions' === $post_type ) {
-			$options = getpaid_get_subscription_statuses();
-		} else {
-			$options = wpinv_get_invoice_statuses( true, false, $post_type );
-		}
-
-		aui()->select(
-			array(
-				'name'        => 'status',
-				'id'          => esc_attr( "$post_type-status" ),
-				'placeholder' => __( 'All Statuses', 'invoicing' ),
-				'label'       => __( 'Status', 'invoicing' ),
-				'label_type'  => 'vertical',
-				'label_class' => 'd-block',
-				'options'     => $options,
-			),
-			true
-		);
-
-	}
-
-	/**
-	 * Generates the to file type select field.
-	 *
-	 */
-	public function generate_file_type_select( $post_type ) {
-
-		aui()->select(
-			array(
-				'name'        => 'file_type',
-				'id'          => esc_attr( "$post_type-file_type" ),
-				'placeholder' => __( 'Select File Type', 'invoicing' ),
-				'label'       => __( 'Export File', 'invoicing' ),
-				'label_type'  => 'vertical',
-				'label_class' => 'd-block',
-				'value'       => 'csv',
-				'options'     => array(
-					'csv'  => __( 'CSV', 'invoicing' ),
-					'xml'  => __( 'XML', 'invoicing' ),
-					'json' => __( 'JSON', 'invoicing' ),
-				),
-			),
-			true
-		);
-
-	}
-
-	/**
-	 * Displays a field's markup.
-	 *
-	 */
-	public function display_markup( $markup ) {
-
-		echo wp_kses(
-			str_replace(
-				array(
-					'form-control',
-					'custom-select',
-				),
-				'regular-text',
-				$markup
-			),
-			getpaid_allowed_html()
-		);
-
-	}
-
-	/**
-	 * Displays a subscription export card.
-	 *
-	 */
-	public function display_subscription_export() {
-
-		?>
+    }
+
+    /**
+     * Generates the from date input field.
+     *
+     */
+    public function generate_from_date( $post_type ) {
+
+        aui()->input(
+            array(
+                'type'             => 'datepicker',
+                'id'               => esc_attr( "$post_type-from_date" ),
+                'name'             => 'from_date',
+                'label'            => __( 'From Date', 'invoicing' ),
+                'label_type'       => 'vertical',
+                'placeholder'      => 'YYYY-MM-DD',
+                'extra_attributes' => array(
+                    'data-enable-time' => 'false',
+                    'data-allow-input' => 'true',
+                ),
+            ),
+            true
+        );
+
+    }
+
+    /**
+     * Generates the to date input field.
+     *
+     */
+    public function generate_to_date( $post_type ) {
+
+        aui()->input(
+            array(
+                'type'             => 'datepicker',
+                'id'               => esc_attr( "$post_type-to_date" ),
+                'name'             => 'to_date',
+                'label'            => __( 'To Date', 'invoicing' ),
+                'label_type'       => 'vertical',
+                'placeholder'      => 'YYYY-MM-DD',
+                'extra_attributes' => array(
+                    'data-enable-time' => 'false',
+                    'data-allow-input' => 'true',
+                ),
+            ),
+            true
+        );
+    }
+
+    /**
+     * Generates the to post status select field.
+     *
+     */
+    public function generate_post_status_select( $post_type ) {
+
+        if ( 'subscriptions' === $post_type ) {
+            $options = getpaid_get_subscription_statuses();
+        } else {
+            $options = wpinv_get_invoice_statuses( true, false, $post_type );
+        }
+
+        aui()->select(
+            array(
+                'name'        => 'status',
+                'id'          => esc_attr( "$post_type-status" ),
+                'placeholder' => __( 'All Statuses', 'invoicing' ),
+                'label'       => __( 'Status', 'invoicing' ),
+                'label_type'  => 'vertical',
+                'label_class' => 'd-block',
+                'options'     => $options,
+            ),
+            true
+        );
+
+    }
+
+    /**
+     * Generates the to file type select field.
+     *
+     */
+    public function generate_file_type_select( $post_type ) {
+
+        aui()->select(
+            array(
+                'name'        => 'file_type',
+                'id'          => esc_attr( "$post_type-file_type" ),
+                'placeholder' => __( 'Select File Type', 'invoicing' ),
+                'label'       => __( 'Export File', 'invoicing' ),
+                'label_type'  => 'vertical',
+                'label_class' => 'd-block',
+                'value'       => 'csv',
+                'options'     => array(
+                    'csv'  => __( 'CSV', 'invoicing' ),
+                    'xml'  => __( 'XML', 'invoicing' ),
+                    'json' => __( 'JSON', 'invoicing' ),
+                ),
+            ),
+            true
+        );
+
+    }
+
+    /**
+     * Displays a field's markup.
+     *
+     */
+    public function display_markup( $markup ) {
+
+        echo wp_kses(
+            str_replace(
+                array(
+                    'form-control',
+                    'custom-select',
+                ),
+                'regular-text',
+                $markup
+            ),
+            getpaid_allowed_html()
+        );
+
+    }
+
+    /**
+     * Displays a subscription export card.
+     *
+     */
+    public function display_subscription_export() {
+
+        ?>
 
 		<div class="col-12 col-md-6">
 			<div class="card m-0 p-0" style="max-width:100%">
@@ -233,12 +233,12 @@ 
 					<form method="post" action="<?php echo esc_url( $this->get_download_url( 'subscriptions' ) ); ?>">
 
 						<?php
-							$this->generate_from_date( 'subscriptions' );
-							$this->generate_to_date( 'subscriptions' );
-							$this->generate_post_status_select( 'subscriptions' );
-							$this->generate_file_type_select( 'subscriptions' );
-							submit_button( __( 'Download', 'invoicing' ) );
-						?>
+                            $this->generate_from_date( 'subscriptions' );
+                            $this->generate_to_date( 'subscriptions' );
+                            $this->generate_post_status_select( 'subscriptions' );
+                            $this->generate_file_type_select( 'subscriptions' );
+                            submit_button( __( 'Download', 'invoicing' ) );
+                        ?>
 
 					</form>
 
@@ -249,6 +249,6 @@ 
 
 		<?php
 
-	}
+    }
 
 }

Spacing +41 added lines, -41 removed lines

@@ -5,7 +5,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * GetPaid_Reports_Export Class.
@@ -19,8 +19,8 @@ 
 	public function display() {
 
 		echo "<div class='row mt-4' style='max-width: 920px;' >";
-		foreach ( array_keys( getpaid_get_invoice_post_types() ) as $post_type ) {
-			$this->display_post_type_export( $post_type );
+		foreach (array_keys(getpaid_get_invoice_post_types()) as $post_type) {
+			$this->display_post_type_export($post_type);
 		}
 		$this->display_subscription_export();
 		echo '</div>';
@@ -31,13 +31,13 @@ 
 	 * Retrieves the download url.
 	 *
 	 */
-	public function get_download_url( $post_type ) {
+	public function get_download_url($post_type) {
 
 		return wp_nonce_url(
 			add_query_arg(
 				array(
 					'getpaid-admin-action' => 'export_invoices',
-					'post_type'            => urlencode( $post_type ),
+					'post_type'            => urlencode($post_type),
 				)
 			),
 			'getpaid-nonce',
@@ -50,7 +50,7 @@ 
 	 * Displays a single post type export card.
 	 *
 	 */
-	public function display_post_type_export( $post_type ) {
+	public function display_post_type_export($post_type) {
 
 		?>
 
@@ -61,8 +61,8 @@ 
 					<strong>
 						<?php
 							printf(
-								esc_html__( 'Export %s', 'invoicing' ),
-								esc_html( getpaid_get_post_type_label( $post_type ) )
+								esc_html__('Export %s', 'invoicing'),
+								esc_html(getpaid_get_post_type_label($post_type))
 							);
 						?>
 					</strong>
@@ -70,14 +70,14 @@ 
 
 				<div class="card-body">
 
-					<form method="post" action="<?php echo esc_url( $this->get_download_url( $post_type ) ); ?>">
+					<form method="post" action="<?php echo esc_url($this->get_download_url($post_type)); ?>">
 
 						<?php
-							$this->generate_from_date( $post_type );
-							$this->generate_to_date( $post_type );
-							$this->generate_post_status_select( $post_type );
-							$this->generate_file_type_select( $post_type );
-							submit_button( __( 'Download', 'invoicing' ) );
+							$this->generate_from_date($post_type);
+							$this->generate_to_date($post_type);
+							$this->generate_post_status_select($post_type);
+							$this->generate_file_type_select($post_type);
+							submit_button(__('Download', 'invoicing'));
 						?>
 
 					</form>
@@ -95,14 +95,14 @@ 
 	 * Generates the from date input field.
 	 *
 	 */
-	public function generate_from_date( $post_type ) {
+	public function generate_from_date($post_type) {
 
 		aui()->input(
 			array(
 				'type'             => 'datepicker',
-				'id'               => esc_attr( "$post_type-from_date" ),
+				'id'               => esc_attr("$post_type-from_date"),
 				'name'             => 'from_date',
-				'label'            => __( 'From Date', 'invoicing' ),
+				'label'            => __('From Date', 'invoicing'),
 				'label_type'       => 'vertical',
 				'placeholder'      => 'YYYY-MM-DD',
 				'extra_attributes' => array(
@@ -119,14 +119,14 @@ 
 	 * Generates the to date input field.
 	 *
 	 */
-	public function generate_to_date( $post_type ) {
+	public function generate_to_date($post_type) {
 
 		aui()->input(
 			array(
 				'type'             => 'datepicker',
-				'id'               => esc_attr( "$post_type-to_date" ),
+				'id'               => esc_attr("$post_type-to_date"),
 				'name'             => 'to_date',
-				'label'            => __( 'To Date', 'invoicing' ),
+				'label'            => __('To Date', 'invoicing'),
 				'label_type'       => 'vertical',
 				'placeholder'      => 'YYYY-MM-DD',
 				'extra_attributes' => array(
@@ -142,20 +142,20 @@ 
 	 * Generates the to post status select field.
 	 *
 	 */
-	public function generate_post_status_select( $post_type ) {
+	public function generate_post_status_select($post_type) {
 
-		if ( 'subscriptions' === $post_type ) {
+		if ('subscriptions' === $post_type) {
 			$options = getpaid_get_subscription_statuses();
 		} else {
-			$options = wpinv_get_invoice_statuses( true, false, $post_type );
+			$options = wpinv_get_invoice_statuses(true, false, $post_type);
 		}
 
 		aui()->select(
 			array(
 				'name'        => 'status',
-				'id'          => esc_attr( "$post_type-status" ),
-				'placeholder' => __( 'All Statuses', 'invoicing' ),
-				'label'       => __( 'Status', 'invoicing' ),
+				'id'          => esc_attr("$post_type-status"),
+				'placeholder' => __('All Statuses', 'invoicing'),
+				'label'       => __('Status', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'options'     => $options,
@@ -169,21 +169,21 @@ 
 	 * Generates the to file type select field.
 	 *
 	 */
-	public function generate_file_type_select( $post_type ) {
+	public function generate_file_type_select($post_type) {
 
 		aui()->select(
 			array(
 				'name'        => 'file_type',
-				'id'          => esc_attr( "$post_type-file_type" ),
-				'placeholder' => __( 'Select File Type', 'invoicing' ),
-				'label'       => __( 'Export File', 'invoicing' ),
+				'id'          => esc_attr("$post_type-file_type"),
+				'placeholder' => __('Select File Type', 'invoicing'),
+				'label'       => __('Export File', 'invoicing'),
 				'label_type'  => 'vertical',
 				'label_class' => 'd-block',
 				'value'       => 'csv',
 				'options'     => array(
-					'csv'  => __( 'CSV', 'invoicing' ),
-					'xml'  => __( 'XML', 'invoicing' ),
-					'json' => __( 'JSON', 'invoicing' ),
+					'csv'  => __('CSV', 'invoicing'),
+					'xml'  => __('XML', 'invoicing'),
+					'json' => __('JSON', 'invoicing'),
 				),
 			),
 			true
@@ -195,7 +195,7 @@ 
 	 * Displays a field's markup.
 	 *
 	 */
-	public function display_markup( $markup ) {
+	public function display_markup($markup) {
 
 		echo wp_kses(
 			str_replace(
@@ -224,20 +224,20 @@ 
 
 				<div class="card-header">
 					<strong>
-						<?php esc_html_e( 'Export Subscriptions', 'invoicing' ); ?>
+						<?php esc_html_e('Export Subscriptions', 'invoicing'); ?>
 					</strong>
 				</div>
 
 				<div class="card-body">
 
-					<form method="post" action="<?php echo esc_url( $this->get_download_url( 'subscriptions' ) ); ?>">
+					<form method="post" action="<?php echo esc_url($this->get_download_url('subscriptions')); ?>">
 
 						<?php
-							$this->generate_from_date( 'subscriptions' );
-							$this->generate_to_date( 'subscriptions' );
-							$this->generate_post_status_select( 'subscriptions' );
-							$this->generate_file_type_select( 'subscriptions' );
-							submit_button( __( 'Download', 'invoicing' ) );
+							$this->generate_from_date('subscriptions');
+							$this->generate_to_date('subscriptions');
+							$this->generate_post_status_select('subscriptions');
+							$this->generate_file_type_select('subscriptions');
+							submit_button(__('Download', 'invoicing'));
 						?>
 
 					</form>

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

Spacing +214 added lines, -214 removed lines

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

Indentation +763 added lines, -763 removed lines

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