AyeCode / invoicing

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

Spacing +17 added lines, -17 removed lines

@@ -7,44 +7,44 @@
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 ?>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Input Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Input Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.input_label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Button Label', 'invoicing' ); ?></span>
+        <span><?php esc_html_e('Button Label', 'invoicing'); ?></span>
         <input v-model='active_form_element.button_label' class='form-control' type="text"/>
     </label>
 </div>
 
 <div class='form-group mb-3'>
-    <label class="form-label" :for="active_form_element.id + '_edit_type'"><?php esc_html_e( 'Button Type', 'invoicing' ); ?></label>
+    <label class="form-label" :for="active_form_element.id + '_edit_type'"><?php esc_html_e('Button Type', 'invoicing'); ?></label>
     <select class='form-control custom-select' :id="active_form_element.id + '_edit_type'" v-model='active_form_element.class'>
-        <option disabled><?php esc_html_e( 'Select button type', 'invoicing' ); ?></option>
-        <option value='btn-primary'><?php esc_html_e( 'Primary', 'invoicing' ); ?></option>
-        <option value='btn-secondary'><?php esc_html_e( 'Secondary', 'invoicing' ); ?></option>
-        <option value='btn-success'><?php esc_html_e( 'Success', 'invoicing' ); ?></option>
-        <option value='btn-danger'><?php esc_html_e( 'Danger', 'invoicing' ); ?></option>
-        <option value='btn-warning'><?php esc_html_e( 'Warning', 'invoicing' ); ?></option>
-        <option value='btn-info'><?php esc_html_e( 'Info', 'invoicing' ); ?></option>
-        <option value='btn-light'><?php esc_html_e( 'Light', 'invoicing' ); ?></option>
-        <option value='btn-dark'><?php esc_html_e( 'Dark', 'invoicing' ); ?></option>
-        <option value='btn-link'><?php esc_html_e( 'Link', 'invoicing' ); ?></option>
+        <option disabled><?php esc_html_e('Select button type', 'invoicing'); ?></option>
+        <option value='btn-primary'><?php esc_html_e('Primary', 'invoicing'); ?></option>
+        <option value='btn-secondary'><?php esc_html_e('Secondary', 'invoicing'); ?></option>
+        <option value='btn-success'><?php esc_html_e('Success', 'invoicing'); ?></option>
+        <option value='btn-danger'><?php esc_html_e('Danger', 'invoicing'); ?></option>
+        <option value='btn-warning'><?php esc_html_e('Warning', 'invoicing'); ?></option>
+        <option value='btn-info'><?php esc_html_e('Info', 'invoicing'); ?></option>
+        <option value='btn-light'><?php esc_html_e('Light', 'invoicing'); ?></option>
+        <option value='btn-dark'><?php esc_html_e('Dark', 'invoicing'); ?></option>
+        <option value='btn-link'><?php esc_html_e('Link', 'invoicing'); ?></option>
     </select>
 </div>
 
 <div class='form-group mb-3'>
     <label class="form-label d-block">
-        <span><?php esc_html_e( 'Help Text', 'invoicing' ); ?></span>
-        <textarea placeholder='<?php esc_attr_e( 'Add some help text for this field', 'invoicing' ); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
-        <small class="form-text text-muted"><?php esc_html_e( 'HTML is allowed', 'invoicing' ); ?></small>
+        <span><?php esc_html_e('Help Text', 'invoicing'); ?></span>
+        <textarea placeholder='<?php esc_attr_e('Add some help text for this field', 'invoicing'); ?>' v-model='active_form_element.description' class='form-control' rows='3'></textarea>
+        <small class="form-text text-muted"><?php esc_html_e('HTML is allowed', 'invoicing'); ?></small>
     </label>
 </div>

templates/payment-forms/elements/discount.php

Spacing +9 added lines, -9 removed lines

@@ -8,35 +8,35 @@
  * @var GetPaid_Payment_Form $form The current payment form
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
-if ( ! getpaid_has_published_discount() ) {
+if (!getpaid_has_published_discount()) {
     return;
 }
 
-if ( ! empty( $description ) ) {
+if (!empty($description)) {
     $description = "<small class='form-text text-muted'>$description</small>";
 } else {
     $description = '';
 }
 
 $discount_code = '';
-if ( ! empty( $form->invoice ) ) {
+if (!empty($form->invoice)) {
     $discount_code = $form->invoice->get_discount_code();
 }
 
-$class = empty( $class ) ? 'btn-secondary' : sanitize_html_class( $class );
+$class = empty($class) ? 'btn-secondary' : sanitize_html_class($class);
 ?>
 
 <div class="form-group mb-3">
     <div class="getpaid-discount-field  border rounded p-3">
         <div class="getpaid-discount-field-inner d-flex flex-column flex-md-row">
-            <input name="discount" placeholder="<?php echo esc_attr( $input_label ); ?>" value="<?php echo esc_attr( $discount_code ); ?>" class="form-control mr-2 mb-2 getpaid-discount-field-input" style="flex: 1;" type="text">
-            <a href="#" class="btn <?php echo esc_attr( $class ); ?> submit-button mb-2 getpaid-discount-button"><?php echo esc_html( $button_label ); ?></a>
+            <input name="discount" placeholder="<?php echo esc_attr($input_label); ?>" value="<?php echo esc_attr($discount_code); ?>" class="form-control mr-2 mb-2 getpaid-discount-field-input" style="flex: 1;" type="text">
+            <a href="#" class="btn <?php echo esc_attr($class); ?> submit-button mb-2 getpaid-discount-button"><?php echo esc_html($button_label); ?></a>
         </div>
-        <?php echo wp_kses_post( $description ); ?>
+        <?php echo wp_kses_post($description); ?>
         <div class="getpaid-custom-payment-form-errors alert alert-danger d-none"></div>
-        <div class="getpaid-custom-payment-form-success alert alert-success d-none"><?php esc_html_e( 'Discount code applied!', 'invoicing' ); ?></div>
+        <div class="getpaid-custom-payment-form-success alert alert-success d-none"><?php esc_html_e('Discount code applied!', 'invoicing'); ?></div>
     </div>
 </div>
 

includes/admin/class-getpaid-installer.php

Indentation +494 added lines, -494 removed lines

@@ -20,411 +20,411 @@ 
  */
 class GetPaid_Installer {
 
-	private static $schema = null;
-	private static $schema_version = null;
-
-	/**
-	 * 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() {
-
-		// 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_118();
-	}
-
-	/**
-	 * Upgrade to version 2.0.0.
-	 *
-	 */
-	public function upgrade_from_118() {
-		$this->migrate_old_invoices();
-		$this->upgrade_from_279();
-	}
-
-	/**
-	 * Upgrade to version 2.0.0.
-	 *
-	 */
-	public function upgrade_from_279() {
-		self::migrate_old_customers();
-	}
-
-	/**
-	 * 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' => '
+    private static $schema = null;
+    private static $schema_version = null;
+
+    /**
+     * 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() {
+
+        // 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_118();
+    }
+
+    /**
+     * Upgrade to version 2.0.0.
+     *
+     */
+    public function upgrade_from_118() {
+        $this->migrate_old_invoices();
+        $this->upgrade_from_279();
+    }
+
+    /**
+     * Upgrade to version 2.0.0.
+     *
+     */
+    public function upgrade_from_279() {
+        self::migrate_old_customers();
+    }
+
+    /**
+     * 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'  => '',
-				),
-
-			)
-		);
-
-	}
-
-	/**
-	 * 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'] );
-		}
-
-	}
-
-	/**
-	 * 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 customers to new table.
-	 *
-	 */
-	public static function migrate_old_customers() {
-		global $wpdb;
-
-		// Fetch post_id from $wpdb->prefix . 'getpaid_invoices' where customer_id = 0 or null.
-		$invoice_ids = $wpdb->get_col( "SELECT post_id FROM {$wpdb->prefix}getpaid_invoices WHERE customer_id = 0 OR customer_id IS NULL" );
-
-		foreach ( $invoice_ids as $invoice_id ) {
-			$invoice = wpinv_get_invoice( $invoice_id );
-
-			if ( empty( $invoice ) ) {
-				continue;
-			}
-
-			// Fetch customer from the user ID.
-			$user_id = $invoice->get_user_id();
-
-			if ( empty( $user_id ) ) {
-				continue;
-			}
-
-			$customer = getpaid_get_customer_by_user_id( $user_id );
-
-			// Create if not exists.
-			if ( empty( $customer ) ) {
-				$customer = new GetPaid_Customer( 0 );
-				$customer->clone_user( $user_id );
-				$customer->save();
-			}
-
-			$invoice->set_customer_id( $customer->get_id() );
-			$invoice->save();
-		}
-
-	}
-
-	/**
-	 * 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'
-			);
-
-		}
-	}
-
-	/**
-	 * Returns the DB schema.
-	 *
-	 */
-	public static function get_db_schema() {
-		global $wpdb;
-
-		if ( ! empty( self::$schema ) ) {
-			return self::$schema;
-		}
+                    'parent'  => '',
+                ),
+
+            )
+        );
+
+    }
+
+    /**
+     * 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'] );
+        }
+
+    }
+
+    /**
+     * 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 customers to new table.
+     *
+     */
+    public static function migrate_old_customers() {
+        global $wpdb;
+
+        // Fetch post_id from $wpdb->prefix . 'getpaid_invoices' where customer_id = 0 or null.
+        $invoice_ids = $wpdb->get_col( "SELECT post_id FROM {$wpdb->prefix}getpaid_invoices WHERE customer_id = 0 OR customer_id IS NULL" );
+
+        foreach ( $invoice_ids as $invoice_id ) {
+            $invoice = wpinv_get_invoice( $invoice_id );
+
+            if ( empty( $invoice ) ) {
+                continue;
+            }
+
+            // Fetch customer from the user ID.
+            $user_id = $invoice->get_user_id();
+
+            if ( empty( $user_id ) ) {
+                continue;
+            }
+
+            $customer = getpaid_get_customer_by_user_id( $user_id );
+
+            // Create if not exists.
+            if ( empty( $customer ) ) {
+                $customer = new GetPaid_Customer( 0 );
+                $customer->clone_user( $user_id );
+                $customer->save();
+            }
+
+            $invoice->set_customer_id( $customer->get_id() );
+            $invoice->save();
+        }
+
+    }
+
+    /**
+     * 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'
+            );
+
+        }
+    }
+
+    /**
+     * Returns the DB schema.
+     *
+     */
+    public static function get_db_schema() {
+        global $wpdb;
+
+        if ( ! empty( self::$schema ) ) {
+            return self::$schema;
+        }
 
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
-		$charset_collate = $wpdb->get_charset_collate();
+        $charset_collate = $wpdb->get_charset_collate();
 
-		$schema = array();
+        $schema = array();
 
-		// Subscriptions.
-		$schema['subscriptions'] = "CREATE TABLE {$wpdb->prefix}wpinv_subscriptions (
+        // Subscriptions.
+        $schema['subscriptions'] = "CREATE TABLE {$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',
@@ -447,8 +447,8 @@ 
 			KEY customer_and_status (customer_id, status)
 		  ) $charset_collate;";
 
-		// Invoices.
-		$schema['invoices'] = "CREATE TABLE {$wpdb->prefix}getpaid_invoices (
+        // Invoices.
+        $schema['invoices'] = "CREATE TABLE {$wpdb->prefix}getpaid_invoices (
 			post_id BIGINT(20) NOT NULL,
 			customer_id BIGINT(20) NOT NULL DEFAULT 0,
             `number` VARCHAR(100),
@@ -485,8 +485,8 @@ 
 			KEY invoice_key (invoice_key)
 		  ) $charset_collate;";
 
-		// Invoice items.
-		$schema['items'] = "CREATE TABLE {$wpdb->prefix}getpaid_invoice_items (
+        // Invoice items.
+        $schema['items'] = "CREATE TABLE {$wpdb->prefix}getpaid_invoice_items (
 			ID BIGINT(20) NOT NULL AUTO_INCREMENT,
             post_id BIGINT(20) NOT NULL,
             item_id BIGINT(20) NOT NULL,
@@ -508,8 +508,8 @@ 
 			KEY post_id (post_id)
 		  ) $charset_collate;";
 
-		// Customers.
-		$schema['customers'] = "CREATE TABLE {$wpdb->prefix}getpaid_customers (
+        // Customers.
+        $schema['customers'] = "CREATE TABLE {$wpdb->prefix}getpaid_customers (
 			id BIGINT(20) NOT NULL AUTO_INCREMENT,
 			user_id BIGINT(20) NOT NULL,
 			email VARCHAR(100) NOT NULL,
@@ -519,38 +519,38 @@ 
 			purchase_count BIGINT(20) NOT NULL DEFAULT 0,
 			";
 
-		// Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields( true ) ) as $field ) {
-			// Skip id, user_id and email.
-			if ( in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
-				continue;
-			}
-
-			$field   = sanitize_key( $field );
-			$length  = 100;
-			$default = '';
-
-			// Country.
-			if ( 'country' === $field ) {
-				$length  = 2;
-				$default = wpinv_get_default_country();
-			}
-
-			// State.
-			if ( 'state' === $field ) {
-				$default = wpinv_get_default_state();
-			}
-
-			// Phone, zip.
-			if ( in_array( $field, array( 'phone', 'zip' ), true ) ) {
-				$length = 20;
-			}
-
-			$schema['customers'] .= "`$field` VARCHAR($length) NOT NULL DEFAULT '$default',
+        // Add address fields.
+        foreach ( array_keys( getpaid_user_address_fields( true ) ) as $field ) {
+            // Skip id, user_id and email.
+            if ( in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
+                continue;
+            }
+
+            $field   = sanitize_key( $field );
+            $length  = 100;
+            $default = '';
+
+            // Country.
+            if ( 'country' === $field ) {
+                $length  = 2;
+                $default = wpinv_get_default_country();
+            }
+
+            // State.
+            if ( 'state' === $field ) {
+                $default = wpinv_get_default_state();
+            }
+
+            // Phone, zip.
+            if ( in_array( $field, array( 'phone', 'zip' ), true ) ) {
+                $length = 20;
+            }
+
+            $schema['customers'] .= "`$field` VARCHAR($length) NOT NULL DEFAULT '$default',
 			";
-		}
+        }
 
-		$schema['customers'] .= "date_created DATETIME NOT NULL,
+        $schema['customers'] .= "date_created DATETIME NOT NULL,
 			date_modified DATETIME NOT NULL,
 			uuid VARCHAR(100) NOT NULL,
 			PRIMARY KEY  (id),
@@ -558,8 +558,8 @@ 
 			KEY email (email)
 		  ) $charset_collate;";
 
-		// Customer meta.
-		$schema['customer_meta'] = "CREATE TABLE {$wpdb->prefix}getpaid_customer_meta (
+        // Customer meta.
+        $schema['customer_meta'] = "CREATE TABLE {$wpdb->prefix}getpaid_customer_meta (
 			meta_id BIGINT(20) NOT NULL AUTO_INCREMENT,
 			customer_id BIGINT(20) NOT NULL,
 			meta_key VARCHAR(255) NOT NULL,
@@ -569,75 +569,75 @@ 
 			KEY meta_key (meta_key(191))
 		  ) $charset_collate;";
 
-		// Filter.
-		$schema = apply_filters( 'getpaid_db_schema', $schema );
-
-		self::$schema         = implode( "\n", array_values( $schema ) );
-		self::$schema_version = md5( sanitize_key( self::$schema ) );
-
-		return self::$schema;
-	}
-
-	/**
-	 * Returns the DB schema version.
-	 *
-	 */
-	public static function get_db_schema_version() {
-		if ( ! empty( self::$schema_version ) ) {
-			return self::$schema_version;
-		}
-
-		self::get_db_schema();
-
-		return self::$schema_version;
-	}
-
-	/**
-	 * Checks if the db schema is up to date.
-	 *
-	 * @return bool
-	 */
-	public static function is_db_schema_up_to_date() {
-		return self::get_db_schema_version() === get_option( 'getpaid_db_schema' );
-	}
-
-	/**
-	 * Set up the database tables which the plugin needs to function.
-	 */
-	public static function create_db_tables() {
-		global $wpdb;
-
-		$wpdb->hide_errors();
-
-		require_once ABSPATH . 'wp-admin/includes/upgrade.php';
-
-		$schema = self::get_db_schema();
-
-		// If invoices table exists, rename key to invoice_key.
-		$invoices_table = "{$wpdb->prefix}getpaid_invoices";
-
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) === $invoices_table ) {
-			$fields = $wpdb->get_results( "SHOW COLUMNS FROM {$wpdb->prefix}getpaid_invoices" );
-
-			foreach ( $fields as $field ) {
-				if ( 'key' === $field->Field ) {
-					$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoices CHANGE `key` `invoice_key` VARCHAR(100)" );
-					break;
-				}
-			}
-		}
-
-		dbDelta( $schema );
-		wp_cache_flush();
-		update_option( 'getpaid_db_schema', self::get_db_schema_version() );
-	}
-
-	/**
-	 * Creates tables if schema is not up to date.
-	 */
-	public static function maybe_create_db_tables() {
-		if ( ! self::is_db_schema_up_to_date() ) {
-			self::create_db_tables();
-		}
-	}
+        // Filter.
+        $schema = apply_filters( 'getpaid_db_schema', $schema );
+
+        self::$schema         = implode( "\n", array_values( $schema ) );
+        self::$schema_version = md5( sanitize_key( self::$schema ) );
+
+        return self::$schema;
+    }
+
+    /**
+     * Returns the DB schema version.
+     *
+     */
+    public static function get_db_schema_version() {
+        if ( ! empty( self::$schema_version ) ) {
+            return self::$schema_version;
+        }
+
+        self::get_db_schema();
+
+        return self::$schema_version;
+    }
+
+    /**
+     * Checks if the db schema is up to date.
+     *
+     * @return bool
+     */
+    public static function is_db_schema_up_to_date() {
+        return self::get_db_schema_version() === get_option( 'getpaid_db_schema' );
+    }
+
+    /**
+     * Set up the database tables which the plugin needs to function.
+     */
+    public static function create_db_tables() {
+        global $wpdb;
+
+        $wpdb->hide_errors();
+
+        require_once ABSPATH . 'wp-admin/includes/upgrade.php';
+
+        $schema = self::get_db_schema();
+
+        // If invoices table exists, rename key to invoice_key.
+        $invoices_table = "{$wpdb->prefix}getpaid_invoices";
+
+        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) === $invoices_table ) {
+            $fields = $wpdb->get_results( "SHOW COLUMNS FROM {$wpdb->prefix}getpaid_invoices" );
+
+            foreach ( $fields as $field ) {
+                if ( 'key' === $field->Field ) {
+                    $wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoices CHANGE `key` `invoice_key` VARCHAR(100)" );
+                    break;
+                }
+            }
+        }
+
+        dbDelta( $schema );
+        wp_cache_flush();
+        update_option( 'getpaid_db_schema', self::get_db_schema_version() );
+    }
+
+    /**
+     * Creates tables if schema is not up to date.
+     */
+    public static function maybe_create_db_tables() {
+        if ( ! self::is_db_schema_up_to_date() ) {
+            self::create_db_tables();
+        }
+    }
 }

Spacing +95 added lines, -95 removed lines

@@ -8,7 +8,7 @@ 
  * @since   2.0.2
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * The main installer/updater class.
@@ -28,10 +28,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();
@@ -51,13 +51,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 @@ 
 	public function upgrade_from_0() {
 
 		// 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);
 			}
 		}
 
@@ -130,7 +130,7 @@ 
 	 *
 	 */
 	public function add_capabilities() {
-		$GLOBALS['wp_roles']->add_cap( 'administrator', 'manage_invoicing' );
+		$GLOBALS['wp_roles']->add_cap('administrator', 'manage_invoicing');
 	}
 
 	/**
@@ -145,8 +145,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]
@@ -157,8 +157,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]
@@ -169,8 +169,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]
@@ -181,16 +181,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]
@@ -210,8 +210,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']);
 		}
 
 	}
@@ -225,32 +225,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;
 			}
 
@@ -258,7 +258,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(),
@@ -287,27 +287,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'],
@@ -319,31 +319,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");
 
 	}
 
@@ -355,32 +355,32 @@ 
 		global $wpdb;
 
 		// Fetch post_id from $wpdb->prefix . 'getpaid_invoices' where customer_id = 0 or null.
-		$invoice_ids = $wpdb->get_col( "SELECT post_id FROM {$wpdb->prefix}getpaid_invoices WHERE customer_id = 0 OR customer_id IS NULL" );
+		$invoice_ids = $wpdb->get_col("SELECT post_id FROM {$wpdb->prefix}getpaid_invoices WHERE customer_id = 0 OR customer_id IS NULL");
 
-		foreach ( $invoice_ids as $invoice_id ) {
-			$invoice = wpinv_get_invoice( $invoice_id );
+		foreach ($invoice_ids as $invoice_id) {
+			$invoice = wpinv_get_invoice($invoice_id);
 
-			if ( empty( $invoice ) ) {
+			if (empty($invoice)) {
 				continue;
 			}
 
 			// Fetch customer from the user ID.
 			$user_id = $invoice->get_user_id();
 
-			if ( empty( $user_id ) ) {
+			if (empty($user_id)) {
 				continue;
 			}
 
-			$customer = getpaid_get_customer_by_user_id( $user_id );
+			$customer = getpaid_get_customer_by_user_id($user_id);
 
 			// Create if not exists.
-			if ( empty( $customer ) ) {
-				$customer = new GetPaid_Customer( 0 );
-				$customer->clone_user( $user_id );
+			if (empty($customer)) {
+				$customer = new GetPaid_Customer(0);
+				$customer->clone_user($user_id);
 				$customer->save();
 			}
 
-			$invoice->set_customer_id( $customer->get_id() );
+			$invoice->set_customer_id($customer->get_id());
 			$invoice->save();
 		}
 
@@ -393,12 +393,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'
 			);
@@ -413,7 +413,7 @@ 
 	public static function get_db_schema() {
 		global $wpdb;
 
-		if ( ! empty( self::$schema ) ) {
+		if (!empty(self::$schema)) {
 			return self::$schema;
 		}
 
@@ -520,29 +520,29 @@ 
 			";
 
 		// Add address fields.
-		foreach ( array_keys( getpaid_user_address_fields( true ) ) as $field ) {
+		foreach (array_keys(getpaid_user_address_fields(true)) as $field) {
 			// Skip id, user_id and email.
-			if ( in_array( $field, array( 'id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid' ), true ) ) {
+			if (in_array($field, array('id', 'user_id', 'email', 'purchase_value', 'purchase_count', 'date_created', 'date_modified', 'uuid'), true)) {
 				continue;
 			}
 
-			$field   = sanitize_key( $field );
+			$field   = sanitize_key($field);
 			$length  = 100;
 			$default = '';
 
 			// Country.
-			if ( 'country' === $field ) {
+			if ('country' === $field) {
 				$length  = 2;
 				$default = wpinv_get_default_country();
 			}
 
 			// State.
-			if ( 'state' === $field ) {
+			if ('state' === $field) {
 				$default = wpinv_get_default_state();
 			}
 
 			// Phone, zip.
-			if ( in_array( $field, array( 'phone', 'zip' ), true ) ) {
+			if (in_array($field, array('phone', 'zip'), true)) {
 				$length = 20;
 			}
 
@@ -570,10 +570,10 @@ 
 		  ) $charset_collate;";
 
 		// Filter.
-		$schema = apply_filters( 'getpaid_db_schema', $schema );
+		$schema = apply_filters('getpaid_db_schema', $schema);
 
-		self::$schema         = implode( "\n", array_values( $schema ) );
-		self::$schema_version = md5( sanitize_key( self::$schema ) );
+		self::$schema         = implode("\n", array_values($schema));
+		self::$schema_version = md5(sanitize_key(self::$schema));
 
 		return self::$schema;
 	}
@@ -583,7 +583,7 @@ 
 	 *
 	 */
 	public static function get_db_schema_version() {
-		if ( ! empty( self::$schema_version ) ) {
+		if (!empty(self::$schema_version)) {
 			return self::$schema_version;
 		}
 
@@ -598,7 +598,7 @@ 
 	 * @return bool
 	 */
 	public static function is_db_schema_up_to_date() {
-		return self::get_db_schema_version() === get_option( 'getpaid_db_schema' );
+		return self::get_db_schema_version() === get_option('getpaid_db_schema');
 	}
 
 	/**
@@ -616,27 +616,27 @@ 
 		// If invoices table exists, rename key to invoice_key.
 		$invoices_table = "{$wpdb->prefix}getpaid_invoices";
 
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'" ) === $invoices_table ) {
-			$fields = $wpdb->get_results( "SHOW COLUMNS FROM {$wpdb->prefix}getpaid_invoices" );
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->prefix}getpaid_invoices'") === $invoices_table) {
+			$fields = $wpdb->get_results("SHOW COLUMNS FROM {$wpdb->prefix}getpaid_invoices");
 
-			foreach ( $fields as $field ) {
-				if ( 'key' === $field->Field ) {
-					$wpdb->query( "ALTER TABLE {$wpdb->prefix}getpaid_invoices CHANGE `key` `invoice_key` VARCHAR(100)" );
+			foreach ($fields as $field) {
+				if ('key' === $field->Field) {
+					$wpdb->query("ALTER TABLE {$wpdb->prefix}getpaid_invoices CHANGE `key` `invoice_key` VARCHAR(100)");
 					break;
 				}
 			}
 		}
 
-		dbDelta( $schema );
+		dbDelta($schema);
 		wp_cache_flush();
-		update_option( 'getpaid_db_schema', self::get_db_schema_version() );
+		update_option('getpaid_db_schema', self::get_db_schema_version());
 	}
 
 	/**
 	 * Creates tables if schema is not up to date.
 	 */
 	public static function maybe_create_db_tables() {
-		if ( ! self::is_db_schema_up_to_date() ) {
+		if (!self::is_db_schema_up_to_date()) {
 			self::create_db_tables();
 		}
 	}

includes/class-getpaid-subscription-notification-emails.php

Indentation +283 added lines, -283 removed lines

@@ -13,325 +13,325 @@
 class GetPaid_Subscription_Notification_Emails {
 
     /**
-	 * The array of subscription email actions.
-	 *
-	 * @param array
-	 */
-	public $subscription_actions;
+     * The array of subscription email actions.
+     *
+     * @param array
+     */
+    public $subscription_actions;
 
     /**
-	 * Class constructor
+     * Class constructor
      *
-	 */
-	public function __construct() {
-
-		$this->subscription_actions = apply_filters(
-			'getpaid_notification_email_subscription_triggers',
-			array(
-				'getpaid_subscription_active'    => 'subscription_active',
-				'getpaid_subscription_trialling' => 'subscription_trial',
-				'getpaid_subscription_cancelled' => 'subscription_cancelled',
-				'getpaid_subscription_expired'   => 'subscription_expired',
-				'getpaid_subscription_completed' => 'subscription_complete',
-				'getpaid_daily_maintenance'      => 'renewal_reminder'
-			)
-		);
-
-		$this->init_hooks();
+     */
+    public function __construct() {
+
+        $this->subscription_actions = apply_filters(
+            'getpaid_notification_email_subscription_triggers',
+            array(
+                'getpaid_subscription_active'    => 'subscription_active',
+                'getpaid_subscription_trialling' => 'subscription_trial',
+                'getpaid_subscription_cancelled' => 'subscription_cancelled',
+                'getpaid_subscription_expired'   => 'subscription_expired',
+                'getpaid_subscription_completed' => 'subscription_complete',
+                'getpaid_daily_maintenance'      => 'renewal_reminder'
+            )
+        );
+
+        $this->init_hooks();
 
     }
 
     /**
-	 * Registers email hooks.
-	 */
-	public function init_hooks() {
-
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
-		foreach ( $this->subscription_actions as $hook => $email_type ) {
-
-			$email = new GetPaid_Notification_Email( $email_type );
-
-			if ( ! $email->is_active() ) {
-				continue;
-			}
-
-			if ( method_exists( $this, $email_type ) ) {
-				add_action( $hook, array( $this, $email_type ), 100, 2 );
-				continue;
-			}
-
-			do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
-
-		}
-
-	}
-
-	/**
-	 * Filters subscription merge tags.
-	 *
-	 * @param array $merge_tags
-	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
-	 */
-	public function subscription_merge_tags( $merge_tags, $object ) {
-
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
-			$merge_tags = array_merge(
-				$merge_tags,
-				$this->get_subscription_merge_tags( $object )
-			);
-		}
-
-		return $merge_tags;
-
-	}
-
-	/**
-	 * Generates subscription merge tags.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 * @return array
-	 */
-	public function get_subscription_merge_tags( $subscription ) {
-
-		// Abort if it does not exist.
-		if ( ! $subscription->get_id() ) {
-			return array();
-		}
-
-		$invoice    = $subscription->get_parent_invoice();
-		return array(
-			'{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
-			'{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
-			'{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
-			'{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
-			'{subscription_id}'               => absint( $subscription->get_id() ),
-			'{subscription_recurring_amount}' => sanitize_text_field( wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ) ),
-			'{subscription_initial_amount}'   => sanitize_text_field( wpinv_price( $subscription->get_initial_amount(), $invoice->get_currency() ) ),
-			'{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
-			'{subscription_bill_times}'       => $subscription->get_bill_times(),
-			'{subscription_url}'              => esc_url( $subscription->get_view_url() ),
-		);
-
-	}
-
-	/**
-	 * Checks if we should send a notification for a subscription.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return bool
-	 */
-	public function should_send_notification( $invoice ) {
-		return 0 != $invoice->get_id();
-	}
-
-	/**
-	 * Returns notification recipients.
-	 *
-	 * @param WPInv_Invoice $invoice
-	 * @return array
-	 */
-	public function get_recipients( $invoice ) {
-		$recipients = array( $invoice->get_email() );
-
-		$cc = $invoice->get_email_cc();
-
-		if ( ! empty( $cc ) ) {
-			$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-			$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
-		}
-
-		return $recipients;
-	}
-
-	/**
-	 * Helper function to send an email.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 * @param GetPaid_Notification_Email $email
-	 * @param string $type
-	 * @param array $extra_args Extra template args.
-	 */
-	public function send_email( $subscription, $email, $type, $extra_args = array() ) {
-
-		if ( empty( $subscription ) ) {
-			return;
-		}
-
-		if ( is_array( $subscription ) ) {
-			$subscription = current( $subscription );
-		}
-
-		if ( ! $subscription instanceof WPInv_Subscription ) {
-			return;
-		}
-
-		// Abort in case the parent invoice does not exist.
-		$invoice = $subscription->get_parent_invoice();
-		if ( ! $this->should_send_notification( $invoice ) ) {
-			return;
-		}
-
-		if ( apply_filters( 'getpaid_skip_subscription_email', false, $type, $subscription ) ) {
-			return;
-		}
-
-		do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
-
-		$recipients  = $this->get_recipients( $invoice );
-		$mailer      = new GetPaid_Notification_Email_Sender();
-		$merge_tags  = $email->get_merge_tags();
-		$content     = $email->get_content( $merge_tags, $extra_args );
-		$subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
-		$attachments = $email->get_attachments();
-
-		$result = $mailer->send(
-			apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
-			$subject,
-			$content,
-			$attachments
-		);
-
-		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
-			$mailer->send(
-				wpinv_get_admin_email(),
-				$subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
-				$content,
-				$attachments
-			);
-		}
-
-		if ( $result ) {
-			$invoice->add_system_note(
-				sprintf(
-					__( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
-				)
-			);
-		} else {
-			$invoice->add_system_note(
-				sprintf(
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
-				)
-			);
-		}
-
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
-
-	}
-
-	/**
-	 * Sends a subscription active.
-	 *
-	 * @since 2.8.4
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_active( $subscription ) {
-		$email = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-
-		$this->send_email( $subscription, $email, __FUNCTION__ );
-	}
+     * Registers email hooks.
+     */
+    public function init_hooks() {
+
+        add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
+        foreach ( $this->subscription_actions as $hook => $email_type ) {
+
+            $email = new GetPaid_Notification_Email( $email_type );
+
+            if ( ! $email->is_active() ) {
+                continue;
+            }
+
+            if ( method_exists( $this, $email_type ) ) {
+                add_action( $hook, array( $this, $email_type ), 100, 2 );
+                continue;
+            }
+
+            do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
+
+        }
+
+    }
 
     /**
-	 * Sends a new trial notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_trial( $subscription ) {
+     * Filters subscription merge tags.
+     *
+     * @param array $merge_tags
+     * @param mixed|WPInv_Invoice|WPInv_Subscription $object
+     */
+    public function subscription_merge_tags( $merge_tags, $object ) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+        if ( is_a( $object, 'WPInv_Subscription' ) ) {
+            $merge_tags = array_merge(
+                $merge_tags,
+                $this->get_subscription_merge_tags( $object )
+            );
+        }
 
-	}
+        return $merge_tags;
 
-	/**
-	 * Sends a cancelled subscription notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_cancelled( $subscription ) {
+    }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+    /**
+     * Generates subscription merge tags.
+     *
+     * @param WPInv_Subscription $subscription
+     * @return array
+     */
+    public function get_subscription_merge_tags( $subscription ) {
+
+        // Abort if it does not exist.
+        if ( ! $subscription->get_id() ) {
+            return array();
+        }
+
+        $invoice    = $subscription->get_parent_invoice();
+        return array(
+            '{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
+            '{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
+            '{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
+            '{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
+            '{subscription_id}'               => absint( $subscription->get_id() ),
+            '{subscription_recurring_amount}' => sanitize_text_field( wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ) ),
+            '{subscription_initial_amount}'   => sanitize_text_field( wpinv_price( $subscription->get_initial_amount(), $invoice->get_currency() ) ),
+            '{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
+            '{subscription_bill_times}'       => $subscription->get_bill_times(),
+            '{subscription_url}'              => esc_url( $subscription->get_view_url() ),
+        );
 
-	}
+    }
 
-	/**
-	 * Sends a subscription expired notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_expired( $subscription ) {
+    /**
+     * Checks if we should send a notification for a subscription.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return bool
+     */
+    public function should_send_notification( $invoice ) {
+        return 0 != $invoice->get_id();
+    }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+    /**
+     * Returns notification recipients.
+     *
+     * @param WPInv_Invoice $invoice
+     * @return array
+     */
+    public function get_recipients( $invoice ) {
+        $recipients = array( $invoice->get_email() );
 
-	}
+        $cc = $invoice->get_email_cc();
 
-	/**
-	 * Sends a completed subscription notification.
-	 *
-	 * @param WPInv_Subscription $subscription
-	 */
-	public function subscription_complete( $subscription ) {
+        if ( ! empty( $cc ) ) {
+            $cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
+            $recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+        }
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+        return $recipients;
+    }
 
-	}
+    /**
+     * Helper function to send an email.
+     *
+     * @param WPInv_Subscription $subscription
+     * @param GetPaid_Notification_Email $email
+     * @param string $type
+     * @param array $extra_args Extra template args.
+     */
+    public function send_email( $subscription, $email, $type, $extra_args = array() ) {
+
+        if ( empty( $subscription ) ) {
+            return;
+        }
+
+        if ( is_array( $subscription ) ) {
+            $subscription = current( $subscription );
+        }
+
+        if ( ! $subscription instanceof WPInv_Subscription ) {
+            return;
+        }
+
+        // Abort in case the parent invoice does not exist.
+        $invoice = $subscription->get_parent_invoice();
+        if ( ! $this->should_send_notification( $invoice ) ) {
+            return;
+        }
+
+        if ( apply_filters( 'getpaid_skip_subscription_email', false, $type, $subscription ) ) {
+            return;
+        }
+
+        do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
+
+        $recipients  = $this->get_recipients( $invoice );
+        $mailer      = new GetPaid_Notification_Email_Sender();
+        $merge_tags  = $email->get_merge_tags();
+        $content     = $email->get_content( $merge_tags, $extra_args );
+        $subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
+        $attachments = $email->get_attachments();
+
+        $result = $mailer->send(
+            apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
+            $subject,
+            $content,
+            $attachments
+        );
+
+        // Maybe send a copy to the admin.
+        if ( $email->include_admin_bcc() ) {
+            $mailer->send(
+                wpinv_get_admin_email(),
+                $subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
+                $content,
+                $attachments
+            );
+        }
+
+        if ( $result ) {
+            $invoice->add_system_note(
+                sprintf(
+                    __( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+                )
+            );
+        } else {
+            $invoice->add_system_note(
+                sprintf(
+                    __( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
+                    sanitize_key( $type ),
+                    $email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+                )
+            );
+        }
+
+        do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
 
-	/**
-	 * Sends a subscription renewal reminder notification.
-	 *
-	 */
-	public function renewal_reminder() {
+    }
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+    /**
+     * Sends a subscription active.
+     *
+     * @since 2.8.4
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_active( $subscription ) {
+        $email = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
 
-		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+    }
 
-		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
-			return;
-		}
+    /**
+     * Sends a new trial notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_trial( $subscription ) {
 
-		// Fetch matching subscriptions.
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a cancelled subscription notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_cancelled( $subscription ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a subscription expired notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_expired( $subscription ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a completed subscription notification.
+     *
+     * @param WPInv_Subscription $subscription
+     */
+    public function subscription_complete( $subscription ) {
+
+        $email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+        $this->send_email( $subscription, $email, __FUNCTION__ );
+
+    }
+
+    /**
+     * Sends a subscription renewal reminder notification.
+     *
+     */
+    public function renewal_reminder() {
+
+        $email = new GetPaid_Notification_Email( __FUNCTION__ );
+
+        // Fetch reminder days.
+        $reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+
+        // Abort if non is set.
+        if ( empty( $reminder_days ) ) {
+            return;
+        }
+
+        // Fetch matching subscriptions.
         $args  = array(
             'number'             => -1,
-			'count_total'        => false,
-			'status'             => 'trialling active',
+            'count_total'        => false,
+            'status'             => 'trialling active',
             'date_expires_query' => array(
-				'relation' => 'OR',
+                'relation' => 'OR',
             ),
-		);
+        );
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "+$days days", current_time( 'timestamp' ) ) ) );
+        foreach ( $reminder_days as $days ) {
+            $date = date_parse( date( 'Y-m-d', strtotime( "+$days days", current_time( 'timestamp' ) ) ) );
 
-			$args['date_expires_query'][] = array(
-				'year'  => $date['year'],
-				'month' => $date['month'],
-				'day'   => $date['day'],
-			);
+            $args['date_expires_query'][] = array(
+                'year'  => $date['year'],
+                'month' => $date['month'],
+                'day'   => $date['day'],
+            );
 
-		}
+        }
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+        $subscriptions = new GetPaid_Subscriptions_Query( $args );
 
         foreach ( $subscriptions->get_results() as $subscription ) {
 
-			// Skip packages.
-			if ( apply_filters( 'getpaid_send_subscription_renewal_reminder_email', true ) ) {
-				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
-			}
-		}
+            // Skip packages.
+            if ( apply_filters( 'getpaid_send_subscription_renewal_reminder_email', true ) ) {
+                $email->object = $subscription;
+                $this->send_email( $subscription, $email, __FUNCTION__ );
+            }
+        }
 
-	}
+    }
 
 }

Spacing +76 added lines, -76 removed lines

@@ -4,7 +4,7 @@ 
  *
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 /**
  * This class handles subscription notificaiton emails.
@@ -46,21 +46,21 @@ 
 	 */
 	public function init_hooks() {
 
-		add_filter( 'getpaid_get_email_merge_tags', array( $this, 'subscription_merge_tags' ), 10, 2 );
-		foreach ( $this->subscription_actions as $hook => $email_type ) {
+		add_filter('getpaid_get_email_merge_tags', array($this, 'subscription_merge_tags'), 10, 2);
+		foreach ($this->subscription_actions as $hook => $email_type) {
 
-			$email = new GetPaid_Notification_Email( $email_type );
+			$email = new GetPaid_Notification_Email($email_type);
 
-			if ( ! $email->is_active() ) {
+			if (!$email->is_active()) {
 				continue;
 			}
 
-			if ( method_exists( $this, $email_type ) ) {
-				add_action( $hook, array( $this, $email_type ), 100, 2 );
+			if (method_exists($this, $email_type)) {
+				add_action($hook, array($this, $email_type), 100, 2);
 				continue;
 			}
 
-			do_action( 'getpaid_subscription_notification_email_register_hook', $email_type, $hook );
+			do_action('getpaid_subscription_notification_email_register_hook', $email_type, $hook);
 
 		}
 
@@ -72,12 +72,12 @@ 
 	 * @param array $merge_tags
 	 * @param mixed|WPInv_Invoice|WPInv_Subscription $object
 	 */
-	public function subscription_merge_tags( $merge_tags, $object ) {
+	public function subscription_merge_tags($merge_tags, $object) {
 
-		if ( is_a( $object, 'WPInv_Subscription' ) ) {
+		if (is_a($object, 'WPInv_Subscription')) {
 			$merge_tags = array_merge(
 				$merge_tags,
-				$this->get_subscription_merge_tags( $object )
+				$this->get_subscription_merge_tags($object)
 			);
 		}
 
@@ -91,25 +91,25 @@ 
 	 * @param WPInv_Subscription $subscription
 	 * @return array
 	 */
-	public function get_subscription_merge_tags( $subscription ) {
+	public function get_subscription_merge_tags($subscription) {
 
 		// Abort if it does not exist.
-		if ( ! $subscription->get_id() ) {
+		if (!$subscription->get_id()) {
 			return array();
 		}
 
-		$invoice    = $subscription->get_parent_invoice();
+		$invoice = $subscription->get_parent_invoice();
 		return array(
-			'{subscription_renewal_date}'     => getpaid_format_date_value( $subscription->get_next_renewal_date(), __( 'Never', 'invoicing' ) ),
-			'{subscription_created}'          => getpaid_format_date_value( $subscription->get_date_created() ),
-			'{subscription_status}'           => sanitize_text_field( $subscription->get_status_label() ),
-			'{subscription_profile_id}'       => sanitize_text_field( $subscription->get_profile_id() ),
-			'{subscription_id}'               => absint( $subscription->get_id() ),
-			'{subscription_recurring_amount}' => sanitize_text_field( wpinv_price( $subscription->get_recurring_amount(), $invoice->get_currency() ) ),
-			'{subscription_initial_amount}'   => sanitize_text_field( wpinv_price( $subscription->get_initial_amount(), $invoice->get_currency() ) ),
-			'{subscription_recurring_period}' => getpaid_get_subscription_period_label( $subscription->get_period(), $subscription->get_frequency(), '' ),
+			'{subscription_renewal_date}'     => getpaid_format_date_value($subscription->get_next_renewal_date(), __('Never', 'invoicing')),
+			'{subscription_created}'          => getpaid_format_date_value($subscription->get_date_created()),
+			'{subscription_status}'           => sanitize_text_field($subscription->get_status_label()),
+			'{subscription_profile_id}'       => sanitize_text_field($subscription->get_profile_id()),
+			'{subscription_id}'               => absint($subscription->get_id()),
+			'{subscription_recurring_amount}' => sanitize_text_field(wpinv_price($subscription->get_recurring_amount(), $invoice->get_currency())),
+			'{subscription_initial_amount}'   => sanitize_text_field(wpinv_price($subscription->get_initial_amount(), $invoice->get_currency())),
+			'{subscription_recurring_period}' => getpaid_get_subscription_period_label($subscription->get_period(), $subscription->get_frequency(), ''),
 			'{subscription_bill_times}'       => $subscription->get_bill_times(),
-			'{subscription_url}'              => esc_url( $subscription->get_view_url() ),
+			'{subscription_url}'              => esc_url($subscription->get_view_url()),
 		);
 
 	}
@@ -120,7 +120,7 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return bool
 	 */
-	public function should_send_notification( $invoice ) {
+	public function should_send_notification($invoice) {
 		return 0 != $invoice->get_id();
 	}
 
@@ -130,14 +130,14 @@ 
 	 * @param WPInv_Invoice $invoice
 	 * @return array
 	 */
-	public function get_recipients( $invoice ) {
-		$recipients = array( $invoice->get_email() );
+	public function get_recipients($invoice) {
+		$recipients = array($invoice->get_email());
 
 		$cc = $invoice->get_email_cc();
 
-		if ( ! empty( $cc ) ) {
-			$cc = array_map( 'sanitize_email', wpinv_parse_list( $cc ) );
-			$recipients = array_filter( array_unique( array_merge( $recipients, $cc ) ) );
+		if (!empty($cc)) {
+			$cc = array_map('sanitize_email', wpinv_parse_list($cc));
+			$recipients = array_filter(array_unique(array_merge($recipients, $cc)));
 		}
 
 		return $recipients;
@@ -151,75 +151,75 @@ 
 	 * @param string $type
 	 * @param array $extra_args Extra template args.
 	 */
-	public function send_email( $subscription, $email, $type, $extra_args = array() ) {
+	public function send_email($subscription, $email, $type, $extra_args = array()) {
 
-		if ( empty( $subscription ) ) {
+		if (empty($subscription)) {
 			return;
 		}
 
-		if ( is_array( $subscription ) ) {
-			$subscription = current( $subscription );
+		if (is_array($subscription)) {
+			$subscription = current($subscription);
 		}
 
-		if ( ! $subscription instanceof WPInv_Subscription ) {
+		if (!$subscription instanceof WPInv_Subscription) {
 			return;
 		}
 
 		// Abort in case the parent invoice does not exist.
 		$invoice = $subscription->get_parent_invoice();
-		if ( ! $this->should_send_notification( $invoice ) ) {
+		if (!$this->should_send_notification($invoice)) {
 			return;
 		}
 
-		if ( apply_filters( 'getpaid_skip_subscription_email', false, $type, $subscription ) ) {
+		if (apply_filters('getpaid_skip_subscription_email', false, $type, $subscription)) {
 			return;
 		}
 
-		do_action( 'getpaid_before_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_before_send_subscription_notification', $type, $subscription, $email);
 
-		$recipients  = $this->get_recipients( $invoice );
+		$recipients  = $this->get_recipients($invoice);
 		$mailer      = new GetPaid_Notification_Email_Sender();
 		$merge_tags  = $email->get_merge_tags();
-		$content     = $email->get_content( $merge_tags, $extra_args );
-		$subject     = $email->add_merge_tags( $email->get_subject(), $merge_tags );
+		$content     = $email->get_content($merge_tags, $extra_args);
+		$subject     = $email->add_merge_tags($email->get_subject(), $merge_tags);
 		$attachments = $email->get_attachments();
 
 		$result = $mailer->send(
-			apply_filters( 'getpaid_subscription_email_recipients', wpinv_parse_list( $recipients ), $email ),
+			apply_filters('getpaid_subscription_email_recipients', wpinv_parse_list($recipients), $email),
 			$subject,
 			$content,
 			$attachments
 		);
 
 		// Maybe send a copy to the admin.
-		if ( $email->include_admin_bcc() ) {
+		if ($email->include_admin_bcc()) {
 			$mailer->send(
 				wpinv_get_admin_email(),
-				$subject . __( ' - ADMIN BCC COPY', 'invoicing' ),
+				$subject . __(' - ADMIN BCC COPY', 'invoicing'),
 				$content,
 				$attachments
 			);
 		}
 
-		if ( $result ) {
+		if ($result) {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Successfully sent %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Successfully sent %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		} else {
 			$invoice->add_system_note(
 				sprintf(
-					__( 'Failed sending %1$s notification email to %2$s.', 'invoicing' ),
-					sanitize_key( $type ),
-					$email->is_admin_email() ? __( 'admin' ) : __( 'the customer' )
+					__('Failed sending %1$s notification email to %2$s.', 'invoicing'),
+					sanitize_key($type),
+					$email->is_admin_email() ? __('admin') : __('the customer')
 				)
 			);
 		}
 
-		do_action( 'getpaid_after_send_subscription_notification', $type, $subscription, $email );
+		do_action('getpaid_after_send_subscription_notification', $type, $subscription, $email);
 
 	}
 
@@ -230,10 +230,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_active( $subscription ) {
-		$email = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
+	public function subscription_active($subscription) {
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
 
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$this->send_email($subscription, $email, __FUNCTION__);
 	}
 
     /**
@@ -241,10 +241,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_trial( $subscription ) {
+	public function subscription_trial($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -253,10 +253,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_cancelled( $subscription ) {
+	public function subscription_cancelled($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -265,10 +265,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_expired( $subscription ) {
+	public function subscription_expired($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -277,10 +277,10 @@ 
 	 *
 	 * @param WPInv_Subscription $subscription
 	 */
-	public function subscription_complete( $subscription ) {
+	public function subscription_complete($subscription) {
 
-		$email     = new GetPaid_Notification_Email( __FUNCTION__, $subscription );
-		$this->send_email( $subscription, $email, __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__, $subscription);
+		$this->send_email($subscription, $email, __FUNCTION__);
 
 	}
 
@@ -290,18 +290,18 @@ 
 	 */
 	public function renewal_reminder() {
 
-		$email = new GetPaid_Notification_Email( __FUNCTION__ );
+		$email = new GetPaid_Notification_Email(__FUNCTION__);
 
 		// Fetch reminder days.
-		$reminder_days = array_unique( wp_parse_id_list( $email->get_option( 'days' ) ) );
+		$reminder_days = array_unique(wp_parse_id_list($email->get_option('days')));
 
 		// Abort if non is set.
-		if ( empty( $reminder_days ) ) {
+		if (empty($reminder_days)) {
 			return;
 		}
 
 		// Fetch matching subscriptions.
-        $args  = array(
+        $args = array(
             'number'             => -1,
 			'count_total'        => false,
 			'status'             => 'trialling active',
@@ -310,8 +310,8 @@ 
             ),
 		);
 
-		foreach ( $reminder_days as $days ) {
-			$date = date_parse( date( 'Y-m-d', strtotime( "+$days days", current_time( 'timestamp' ) ) ) );
+		foreach ($reminder_days as $days) {
+			$date = date_parse(date('Y-m-d', strtotime("+$days days", current_time('timestamp'))));
 
 			$args['date_expires_query'][] = array(
 				'year'  => $date['year'],
@@ -321,14 +321,14 @@ 
 
 		}
 
-		$subscriptions = new GetPaid_Subscriptions_Query( $args );
+		$subscriptions = new GetPaid_Subscriptions_Query($args);
 
-        foreach ( $subscriptions->get_results() as $subscription ) {
+        foreach ($subscriptions->get_results() as $subscription) {
 
 			// Skip packages.
-			if ( apply_filters( 'getpaid_send_subscription_renewal_reminder_email', true ) ) {
+			if (apply_filters('getpaid_send_subscription_renewal_reminder_email', true)) {
 				$email->object = $subscription;
-            	$this->send_email( $subscription, $email, __FUNCTION__ );
+            	$this->send_email($subscription, $email, __FUNCTION__);
 			}
 		}
 

includes/data/email-settings.php

Spacing +243 added lines, -243 removed lines

@@ -8,24 +8,24 @@ 
  * @version 1.0.19
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 // Prepare the due date reminder options.
 $overdue_days_options       = array();
-$overdue_days_options['0']  = __( 'On the Due Date', 'invoicing' );
-$overdue_days_options['1']  = __( '1 day after Due Date', 'invoicing' );
+$overdue_days_options['0']  = __('On the Due Date', 'invoicing');
+$overdue_days_options['1']  = __('1 day after Due Date', 'invoicing');
 
-for ( $i = 2; $i <= 45; $i++ ) {
-    $overdue_days_options[ "$i" ] = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
+for ($i = 2; $i <= 45; $i++) {
+    $overdue_days_options["$i"] = wp_sprintf(__('%d days after Due Date', 'invoicing'), $i);
 }
 
 // Prepare up coming renewal reminder options.
 $renewal_days_options       = array();
-$renewal_days_options['0']  = __( 'On the renewal date', 'invoicing' );
-$renewal_days_options['1']  = __( '1 day before the renewal date', 'invoicing' );
+$renewal_days_options['0']  = __('On the renewal date', 'invoicing');
+$renewal_days_options['1']  = __('1 day before the renewal date', 'invoicing');
 
-for ( $i = 2; $i <= 45; $i++ ) {
-    $renewal_days_options[ "$i" ]   = wp_sprintf( __( '%d days before the renewal date', 'invoicing' ), $i );
+for ($i = 2; $i <= 45; $i++) {
+    $renewal_days_options["$i"] = wp_sprintf(__('%d days before the renewal date', 'invoicing'), $i);
 }
 
 // Default, built-in gateways
@@ -34,45 +34,45 @@ 
 
         'email_new_invoice_header'  => array(
             'id'   => 'email_new_invoice_header',
-            'name' => '<h3>' . __( 'New Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to the site admin whenever there is a new invoice.', 'invoicing' ),
+            'name' => '<h3>' . __('New Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to the site admin whenever there is a new invoice.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_new_invoice_active'  => array(
             'id'   => 'email_new_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_new_invoice_subject' => array(
             'id'       => 'email_new_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing' ),
+            'std'      => __('[{site_title}] New invoice ({invoice_number}) for {invoice_total} {invoice_currency}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_new_invoice_heading' => array(
             'id'       => 'email_new_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'New invoice', 'invoicing' ),
+            'std'      => __('New invoice', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_new_invoice_body'    => array(
             'id'    => 'email_new_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>A new invoice <a href="{invoice_link}">({invoice_number})</a> to {name} for {invoice_total} {invoice_currency} has been created on your site. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -82,53 +82,53 @@ 
 
         'email_cancelled_invoice_header'    => array(
             'id'   => 'email_cancelled_invoice_header',
-            'name' => '<h3>' . __( 'Cancelled Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers whenever invoices are cancelled.', 'invoicing' ),
+            'name' => '<h3>' . __('Cancelled Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers whenever invoices are cancelled.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_cancelled_invoice_active'    => array(
             'id'   => 'email_cancelled_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_cancelled_invoice_admin_bcc' => array(
             'id'   => 'email_cancelled_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_cancelled_invoice_subject'   => array(
             'id'       => 'email_cancelled_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Invoice ({invoice_number}) Cancelled', 'invoicing' ),
+            'std'      => __('[{site_title}] Invoice ({invoice_number}) Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_cancelled_invoice_heading'   => array(
             'id'       => 'email_cancelled_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Invoice Cancelled', 'invoicing' ),
+            'std'      => __('Invoice Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_cancelled_invoice_body'      => array(
             'id'    => 'email_cancelled_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>The invoice <a href="{invoice_link}">#{invoice_number}</a> created for {name} on {site_title} has been cancelled. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -139,45 +139,45 @@ 
 
         'email_failed_invoice_header'  => array(
             'id'   => 'email_failed_invoice_header',
-            'name' => '<h3>' . __( 'Failed Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing' ),
+            'name' => '<h3>' . __('Failed Invoice', 'invoicing') . '</h3>',
+            'desc' => __('Failed invoice emails are sent to the site admin when invoice payments fail.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_failed_invoice_active'  => array(
             'id'   => 'email_failed_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_failed_invoice_subject' => array(
             'id'       => 'email_failed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Invoice ({invoice_number}) Payment Failed', 'invoicing' ),
+            'std'      => __('[{site_title}] Invoice ({invoice_number}) Payment Failed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_failed_invoice_heading' => array(
             'id'       => 'email_failed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Invoice Payment Failed', 'invoicing' ),
+            'std'      => __('Invoice Payment Failed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_failed_invoice_body'    => array(
             'id'    => 'email_failed_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title} has failed to go through. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -187,53 +187,53 @@ 
 
         'email_onhold_invoice_header'    => array(
             'id'   => 'email_onhold_invoice_header',
-            'name' => '<h3>' . __( 'On Hold Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers whenever their invoices are held.', 'invoicing' ),
+            'name' => '<h3>' . __('On Hold Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers whenever their invoices are held.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_onhold_invoice_active'    => array(
             'id'   => 'email_onhold_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_onhold_invoice_admin_bcc' => array(
             'id'   => 'email_onhold_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send this notification email to site Admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send this notification email to site Admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_onhold_invoice_subject'   => array(
             'id'       => 'email_onhold_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice is on hold', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice is on hold', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_onhold_invoice_heading'   => array(
             'id'       => 'email_onhold_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice is on hold', 'invoicing' ),
+            'std'      => __('Your invoice is on hold', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_onhold_invoice_body'      => array(
             'id'    => 'email_onhold_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>Your invoice is on-hold and will be processed when we receive your payment. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -244,53 +244,53 @@ 
 
         'email_processing_invoice_header'    => array(
             'id'   => 'email_processing_invoice_header',
-            'name' => '<h3>' . __( 'Processing Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to users whenever payments for their invoices are processing.', 'invoicing' ),
+            'name' => '<h3>' . __('Processing Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to users whenever payments for their invoices are processing.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_processing_invoice_active'    => array(
             'id'   => 'email_processing_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_processing_invoice_admin_bcc' => array(
             'id'   => 'email_processing_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_processing_invoice_subject'   => array(
             'id'       => 'email_processing_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your payment is being processed', 'invoicing' ),
+            'std'      => __('[{site_title}] Your payment is being processed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_processing_invoice_heading'   => array(
             'id'       => 'email_processing_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your payment is being processed', 'invoicing' ),
+            'std'      => __('Your payment is being processed', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_processing_invoice_body'      => array(
             'id'    => 'email_processing_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>I would like to let you know that we have received and are currently processing your payment for the invoice <a href="{invoice_link}">#{invoice_number}</a> on {site_title}. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -301,61 +301,61 @@ 
 
         'email_completed_invoice_header'         => array(
             'id'   => 'email_completed_invoice_header',
-            'name' => '<h3>' . __( 'Paid Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers when their invoices are marked as paid.', 'invoicing' ),
+            'name' => '<h3>' . __('Paid Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers when their invoices are marked as paid.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_completed_invoice_active'         => array(
             'id'   => 'email_completed_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_completed_invoice_renewal_active' => array(
             'id'   => 'email_completed_invoice_renewal_active',
-            'name' => __( 'Enable renewal notification', 'invoicing' ),
-            'desc' => __( 'Should this email be sent for renewals too?', 'invoicing' ),
+            'name' => __('Enable renewal notification', 'invoicing'),
+            'desc' => __('Should this email be sent for renewals too?', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_completed_invoice_admin_bcc'      => array(
             'id'   => 'email_completed_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_completed_invoice_subject'        => array(
             'id'       => 'email_completed_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been paid', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_completed_invoice_heading'        => array(
             'id'       => 'email_completed_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been paid', 'invoicing' ),
+            'std'      => __('Your invoice has been paid', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_completed_invoice_body'           => array(
             'id'    => 'email_completed_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>Your recent invoice on {site_title} has been paid. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -366,53 +366,53 @@ 
 
         'email_refunded_invoice_header'    => array(
             'id'   => 'email_refunded_invoice_header',
-            'name' => '<h3>' . __( 'Refunded Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to users when their invoices are marked as refunded.', 'invoicing' ),
+            'name' => '<h3>' . __('Refunded Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to users when their invoices are marked as refunded.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_refunded_invoice_active'    => array(
             'id'   => 'email_refunded_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_refunded_invoice_admin_bcc' => array(
             'id'   => 'email_refunded_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_refunded_invoice_subject'   => array(
             'id'       => 'email_refunded_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date} has been refunded', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_refunded_invoice_heading'   => array(
             'id'       => 'email_refunded_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice has been refunded', 'invoicing' ),
+            'std'      => __('Your invoice has been refunded', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_refunded_invoice_body'      => array(
             'id'    => 'email_refunded_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>Your invoice on {site_title} has been refunded. <a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -423,53 +423,53 @@ 
 
         'email_user_invoice_header'    => array(
             'id'   => 'email_user_invoice_header',
-            'name' => '<h3>' . __( 'Customer Invoice', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers containing their invoice information and payment links.', 'invoicing' ),
+            'name' => '<h3>' . __('Customer Invoice', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers containing their invoice information and payment links.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_user_invoice_active'    => array(
             'id'   => 'email_user_invoice_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_user_invoice_admin_bcc' => array(
             'id'   => 'email_user_invoice_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_user_invoice_subject'   => array(
             'id'       => 'email_user_invoice_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your invoice from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Your invoice from {invoice_date}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_invoice_heading'   => array(
             'id'       => 'email_user_invoice_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Your invoice {invoice_number} details', 'invoicing' ),
+            'std'      => __('Your invoice {invoice_number} details', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_invoice_body'      => array(
             'id'    => 'email_user_invoice_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>An invoice of {invoice_total} has been created for you on {site_title}. You can <a href="{invoice_link}">view</a> or <a href="{invoice_pay_link}">pay</a> the invoice. Please reply to this email if you have any questions about the invoice.', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -479,53 +479,53 @@ 
 
         'email_user_note_header'    => array(
             'id'   => 'email_user_note_header',
-            'name' => '<h3>' . __( 'Customer Note', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when you add a customer note to an invoice/quote.', 'invoicing' ),
+            'name' => '<h3>' . __('Customer Note', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when you add a customer note to an invoice/quote.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_user_note_active'    => array(
             'id'   => 'email_user_note_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_user_note_admin_bcc' => array(
             'id'   => 'email_user_note_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_user_note_subject'   => array(
             'id'       => 'email_user_note_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing' ),
+            'std'      => __('[{site_title}] Note added to your {invoice_label} #{invoice_number} from {invoice_date}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_note_heading'   => array(
             'id'       => 'email_user_note_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'A note has been added to your {invoice_label}', 'invoicing' ),
+            'std'      => __('A note has been added to your {invoice_label}', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_user_note_body'      => array(
             'id'    => 'email_user_note_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {name},</p><p>The following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing' ),
+            'std'   => __('<p>Hi {name},</p><p>The following note has been added to your {invoice_label} <a href="{invoice_link}">#{invoice_number}</a>:</p><blockquote class="wpinv-note">{customer_note}</blockquote><a class="btn btn-success" href="{invoice_link}">View / Print Invoice</a>', 'invoicing'),
             'class' => 'large',
             'size'  => '10',
         ),
@@ -535,63 +535,63 @@ 
 
         'email_overdue_header'    => array(
             'id'   => 'email_overdue_header',
-            'name' => '<h3>' . __( 'Payment Reminder', 'invoicing' ) . '</h3>',
-            'desc' => __( 'Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing' ),
+            'name' => '<h3>' . __('Payment Reminder', 'invoicing') . '</h3>',
+            'desc' => __('Payment reminder emails are sent to customers whenever their invoices are due.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_overdue_active'    => array(
             'id'   => 'email_overdue_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_overdue_admin_bcc' => array(
             'id'   => 'email_overdue_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_overdue_days'      => array(
             'id'       => 'email_overdue_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like payment reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like payment reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1' ),
+            'std'      => array('1'),
             'type'     => 'multicheck',
             'options'  => $overdue_days_options,
         ),
 
         'email_overdue_subject'   => array(
             'id'       => 'email_overdue_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the invoice receipt email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the invoice receipt email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Payment Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Payment Reminder', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_overdue_heading'   => array(
             'id'       => 'email_overdue_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Payment reminder for your invoice', 'invoicing' ),
+            'std'      => __('Payment reminder for your invoice', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_overdue_body'      => array(
             'id'    => 'email_overdue_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
+            'name'  => __('Email Content', 'invoicing'),
             'desc'  => wpinv_get_merge_tags_help_text(),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing' ),
+            'std'   => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your invoice <a href="{invoice_link}">#{invoice_number}</a> {is_was} due on {invoice_due_date}.</p><p>The total of this invoice is {invoice_total}</p><p>To view / pay now for this invoice please use the following link: <a class="btn btn-success" href="{invoice_link}">View / Pay</a></p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -602,63 +602,63 @@ 
 
         'email_renewal_reminder_header'    => array(
             'id'   => 'email_renewal_reminder_header',
-            'name' => '<h3>' . __( 'Renewal Reminder', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent to customers whenever their subscription is about to renew.', 'invoicing' ),
+            'name' => '<h3>' . __('Renewal Reminder', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent to customers whenever their subscription is about to renew.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_renewal_reminder_active'    => array(
             'id'   => 'email_renewal_reminder_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_renewal_reminder_admin_bcc' => array(
             'id'   => 'email_renewal_reminder_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_renewal_reminder_days'      => array(
             'id'       => 'email_renewal_reminder_days',
-            'name'     => __( 'When to Send', 'invoicing' ),
-            'desc'     => __( 'Check when you would like renewal reminders sent out.', 'invoicing' ),
+            'name'     => __('When to Send', 'invoicing'),
+            'desc'     => __('Check when you would like renewal reminders sent out.', 'invoicing'),
             'help-tip' => true,
-            'std'      => array( '1', '5', '10' ),
+            'std'      => array('1', '5', '10'),
             'type'     => 'multicheck',
             'options'  => $renewal_days_options,
         ),
 
         'email_renewal_reminder_subject'   => array(
             'id'       => 'email_renewal_reminder_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Renewal Reminder', 'invoicing' ),
+            'std'      => __('[{site_title}] Renewal Reminder', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_renewal_reminder_heading'   => array(
             'id'       => 'email_renewal_reminder_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading contained within the email notification.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading contained within the email notification.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Upcoming renewal reminder', 'invoicing' ),
+            'std'      => __('Upcoming renewal reminder', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_renewal_reminder_body'      => array(
             'id'    => 'email_renewal_reminder_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {full_name},</p><p>This is just a friendly reminder that your subscription for invoice <a href="{invoice_link}">#{invoice_number}</a> will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -669,53 +669,53 @@ 
 
         'email_subscription_active_header'    => array(
             'id'   => 'email_subscription_active_header',
-            'name' => '<h3>' . __( 'Subscription Active', 'invoicing' ) . '</h3>',
-            'desc' => __( 'This email is sent when a subscription is activated.', 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Active', 'invoicing') . '</h3>',
+            'desc' => __('This email is sent when a subscription is activated.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_active_active'    => array(
             'id'   => 'email_subscription_active_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_active_admin_bcc' => array(
             'id'   => 'email_subscription_active_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_active_subject'   => array(
             'id'       => 'email_subscription_active_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription active email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription active email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Your subscription #{subscription_id} has been activated', 'invoicing' ),
+            'std'      => __('[{site_title}] Your subscription #{subscription_id} has been activated', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_active_heading'   => array(
             'id'       => 'email_subscription_active_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Activated', 'invoicing' ),
+            'std'      => __('Subscription Activated', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_active_body'      => array(
             'id'    => 'email_subscription_active_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription #{subscription_id} for {subscription_name} has been activated.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription #{subscription_id} for {subscription_name} has been activated.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -725,53 +725,53 @@ 
 
         'email_subscription_trial_header'    => array(
             'id'   => 'email_subscription_trial_header',
-            'name' => '<h3>' . __( 'Trial Started', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when a customer starts a subscription trial.', 'invoicing' ),
+            'name' => '<h3>' . __('Trial Started', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when a customer starts a subscription trial.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_trial_active'    => array(
             'id'   => 'email_subscription_trial_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_subscription_trial_admin_bcc' => array(
             'id'   => 'email_subscription_trial_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 0,
         ),
 
         'email_subscription_trial_subject'   => array(
             'id'       => 'email_subscription_trial_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription trial email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription trial email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Trial Started', 'invoicing' ),
+            'std'      => __('[{site_title}] Trial Started', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_trial_heading'   => array(
             'id'       => 'email_subscription_trial_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Trial Started', 'invoicing' ),
+            'std'      => __('Trial Started', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_trial_body'      => array(
             'id'    => 'email_subscription_trial_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your trial for {subscription_name} is now active and will renew on {subscription_renewal_date}.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -781,53 +781,53 @@ 
 
         'email_subscription_cancelled_header'    => array(
             'id'   => 'email_subscription_cancelled_header',
-            'name' => '<h3>' . __( 'Subscription Cancelled', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when a customer cancels their subscription.', 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Cancelled', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when a customer cancels their subscription.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_cancelled_active'    => array(
             'id'   => 'email_subscription_cancelled_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_cancelled_admin_bcc' => array(
             'id'   => 'email_subscription_cancelled_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_cancelled_subject'   => array(
             'id'       => 'email_subscription_cancelled_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription cancelled email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription cancelled email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Cancelled', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_cancelled_heading'   => array(
             'id'       => 'email_subscription_cancelled_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Cancelled', 'invoicing' ),
+            'std'      => __('Subscription Cancelled', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_cancelled_body'      => array(
             'id'    => 'email_subscription_cancelled_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has been cancelled and will no longer renew.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -837,53 +837,53 @@ 
 
         'email_subscription_expired_header'    => array(
             'id'   => 'email_subscription_expired_header',
-            'name' => '<h3>' . __( 'Subscription Expired', 'invoicing' ) . '</h3>',
-            'desc' => __( "These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Expired', 'invoicing') . '</h3>',
+            'desc' => __("These emails are sent when a customer's subscription expires and automatic renewal fails.", 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_expired_active'    => array(
             'id'   => 'email_subscription_expired_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_expired_admin_bcc' => array(
             'id'   => 'email_subscription_expired_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_expired_subject'   => array(
             'id'       => 'email_subscription_expired_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription expired email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription expired email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Expired', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Expired', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_expired_heading'   => array(
             'id'       => 'email_subscription_expired_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'type'     => 'text',
-            'std'      => __( 'Subscription Expired', 'invoicing' ),
+            'std'      => __('Subscription Expired', 'invoicing'),
             'help-tip' => true,
             'size'     => 'large',
         ),
 
         'email_subscription_expired_body'      => array(
             'id'    => 'email_subscription_expired_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} has expired.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),
@@ -893,53 +893,53 @@ 
 
         'email_subscription_complete_header'    => array(
             'id'   => 'email_subscription_complete_header',
-            'name' => '<h3>' . __( 'Subscription Complete', 'invoicing' ) . '</h3>',
-            'desc' => __( 'These emails are sent when a customer completes their subscription.', 'invoicing' ),
+            'name' => '<h3>' . __('Subscription Complete', 'invoicing') . '</h3>',
+            'desc' => __('These emails are sent when a customer completes their subscription.', 'invoicing'),
             'type' => 'header',
         ),
 
         'email_subscription_complete_active'    => array(
             'id'   => 'email_subscription_complete_active',
-            'name' => __( 'Enable/Disable', 'invoicing' ),
-            'desc' => __( 'Enable this email notification', 'invoicing' ),
+            'name' => __('Enable/Disable', 'invoicing'),
+            'desc' => __('Enable this email notification', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_complete_admin_bcc' => array(
             'id'   => 'email_subscription_complete_admin_bcc',
-            'name' => __( 'Enable Admin BCC', 'invoicing' ),
-            'desc' => __( 'Check if you want to send a copy of this notification email to the site admin.', 'invoicing' ),
+            'name' => __('Enable Admin BCC', 'invoicing'),
+            'desc' => __('Check if you want to send a copy of this notification email to the site admin.', 'invoicing'),
             'type' => 'checkbox',
             'std'  => 1,
         ),
 
         'email_subscription_complete_subject'   => array(
             'id'       => 'email_subscription_complete_subject',
-            'name'     => __( 'Subject', 'invoicing' ),
-            'desc'     => __( 'Enter the subject line for the subscription complete email.', 'invoicing' ),
+            'name'     => __('Subject', 'invoicing'),
+            'desc'     => __('Enter the subject line for the subscription complete email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( '[{site_title}] Subscription Complete', 'invoicing' ),
+            'std'      => __('[{site_title}] Subscription Complete', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_complete_heading'   => array(
             'id'       => 'email_subscription_complete_heading',
-            'name'     => __( 'Email Heading', 'invoicing' ),
-            'desc'     => __( 'Enter the main heading of this email.', 'invoicing' ),
+            'name'     => __('Email Heading', 'invoicing'),
+            'desc'     => __('Enter the main heading of this email.', 'invoicing'),
             'help-tip' => true,
             'type'     => 'text',
-            'std'      => __( 'Subscription Complete', 'invoicing' ),
+            'std'      => __('Subscription Complete', 'invoicing'),
             'size'     => 'large',
         ),
 
         'email_subscription_complete_body'      => array(
             'id'    => 'email_subscription_complete_body',
-            'name'  => __( 'Email Content', 'invoicing' ),
-            'desc'  => wpinv_get_merge_tags_help_text( true ),
+            'name'  => __('Email Content', 'invoicing'),
+            'desc'  => wpinv_get_merge_tags_help_text(true),
             'type'  => 'rich_editor',
-            'std'   => __( '<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing' ),
+            'std'   => __('<p>Hi {first_name},</p><p>Your subscription for {subscription_name} is now complete.</p>', 'invoicing'),
             'class' => 'large',
             'size'  => 10,
         ),

templates/emails/wpinv-email-subscription_active.php

Spacing +4 added lines, -4 removed lines

@@ -8,15 +8,15 @@
  * @var WPInv_Subscription $object
  */
 
-defined( 'ABSPATH' ) || exit;
+defined('ABSPATH') || exit;
 
 $invoice = $object->get_parent_payment();
 
 // Print the email header.
-do_action( 'wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_header', $email_heading, $invoice, $email_type, $sent_to_admin);
 
 // Generate the custom message body.
-echo wp_kses_post( $message_body );
+echo wp_kses_post($message_body);
 
 // Print the email footer.
-do_action( 'wpinv_email_footer', $invoice, $email_type, $sent_to_admin );
+do_action('wpinv_email_footer', $invoice, $email_type, $sent_to_admin);

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

Indentation +108 added lines, -108 removed lines

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

Spacing +32 added lines, -32 removed lines

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

Switch Indentation +103 added lines, -103 removed lines

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

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

Indentation +2 added lines, -2 removed lines

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

Spacing +2 added lines, -2 removed lines

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

Switch Indentation +3 added lines, -3 removed lines

@@ -1,4 +1,4 @@ 
-<?php // @todo eventually we need to convert this to non jQuery ?>
+    <?php // @todo eventually we need to convert this to non jQuery ?>
 <script>
     /**
      * An AUI bootstrap adaptation of GreedyNav.js ( by Luke Jackson ).
@@ -1066,8 +1066,8 @@ 
     aui_flip_color_scheme_on_scroll();
 
 	<?php
-	// FSE tweaks.
-	if(!empty($_REQUEST['postType'])){ ?>
+	    // FSE tweaks.
+	    if(!empty($_REQUEST['postType'])){ ?>
     function aui_fse_set_data_scroll() {
         console.log('init scroll');
         let Iframe = document.getElementsByClassName("edit-site-visual-editor__editor-canvas");

vendor/ayecode/ayecode-connect-helper/ayecode-connect-helper.php

Indentation +302 added lines, -302 removed lines

@@ -1,264 +1,264 @@ 
 <?php
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
-	/**
-	 * Allow the quick setup and connection of our AyeCode Connect plugin.
-	 *
-	 * Class AyeCode_Connect_Helper
-	 */
-	class AyeCode_Connect_Helper {
-
-		// Hold the version number
-		var $version = "1.0.4";
-
-		// Hold the default strings.
-		var $strings = array();
-
-		// Hold the default pages.
-		var $pages = array();
-
-		/**
-		 * The constructor.
-		 *
-		 * AyeCode_Connect_Helper constructor.
-		 *
-		 * @param array $strings
-		 * @param array $pages
-		 */
-		public function __construct( $strings = array(), $pages = array() ) {
-			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
-				// set default strings
-				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
-					'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
-					'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
-					'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
-				);
-				$this->strings   = array_merge( $default_strings, $strings );
-
-				// set default pages
-				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
-
-				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
-
-				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
-				}
-			}
-
-			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
-			}
-		}
-
-		/**
-		 * Give a way to check we can connect via a external redirect.
-		 */
-		public function ayecode_connect_helper_installed(){
-			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
-			);
-			wp_send_json_success( $active );
-			wp_die();
-		}
-
-		/**
-		 * Get slug from path
-		 *
-		 * @param  string $key
-		 *
-		 * @return string
-		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
-
-			return $slug[0];
-		}
-
-		/**
-		 * Install and activate the AyeCode Connect Plugin
-		 */
-		public function ayecode_connect_install() {
-			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-
-			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
-
-			$success     = true;
-			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-
-				WP_Filesystem();
-
-				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
-				$plugin_slug       = $plugin_slug;
-				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
-				$installed         = false;
-				$activate          = false;
-
-				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
-					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
-				}
-
-				// Install this thing!
-				if ( ! $installed ) {
-
-					// Suppress feedback
-					ob_start();
-
-					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
-							'slug'   => $plugin_slug,
-							'fields' => array(
-								'short_description' => false,
-								'sections'          => false,
-								'requires'          => false,
-								'rating'            => false,
-								'ratings'           => false,
-								'downloaded'        => false,
-								'last_updated'      => false,
-								'added'             => false,
-								'tags'              => false,
-								'homepage'          => false,
-								'donate_link'       => false,
-								'author_profile'    => false,
-								'author'            => false,
-							),
-						) );
-
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
-						}
-
-						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
-
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
-						}
-
-						$working_dir = $upgrader->unpack_package( $download, true );
-
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
-						}
-
-						$result = $upgrader->install_package( array(
-							'source'                      => $working_dir,
-							'destination'                 => WP_PLUGIN_DIR,
-							'clear_destination'           => false,
-							'abort_if_destination_exists' => false,
-							'clear_working'               => true,
-							'hook_extra'                  => array(
-								'type'   => 'plugin',
-								'action' => 'install',
-							),
-						) );
-
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
-						}
-
-						$activate = true;
-
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-
-					// Discard feedback
-					ob_end_clean();
-				}
-
-				wp_clean_plugins_cache();
-
-				// Activate this thing
-				if ( $activate ) {
-					try {
-						$result = activate_plugin( $plugin );
-
-						if ( is_wp_error( $result ) ) {
-							$success = false;
-						} else {
-							$success = true;
-						}
-					} catch ( Exception $e ) {
-						$success = false;
-					}
-				}
-			}
-
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
-				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
-			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
-			}
-			wp_die();
-		}
-
-		/**
-		 * Check if maybe localhost.
-		 *
-		 * @return bool
-		 */
-		public function is_localhost() {
-			$localhost = false;
-
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
-			$localhost_domains = array(
-				'localhost',
-				'localhost.localdomain',
-				'127.0.0.1',
-				'::1'
-			);
-
-			if ( in_array( $host, $localhost_domains ) ) {
-				$localhost = true;
-			}
-
-			return $localhost;
-		}
-
-		/**
-		 * Show notice to connect site.
-		 */
-		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
-				$connect_title_string     = $this->strings['connect_title'];
-				$connect_external_string  = $this->strings['connect_external'];
-				$connect_string           = $this->strings['connect'];
-				$connect_button_string    = $this->strings['connect_button'];
-				$connecting_button_string = $this->strings['connecting_button'];
-				?>
+    /**
+     * Allow the quick setup and connection of our AyeCode Connect plugin.
+     *
+     * Class AyeCode_Connect_Helper
+     */
+    class AyeCode_Connect_Helper {
+
+        // Hold the version number
+        var $version = "1.0.4";
+
+        // Hold the default strings.
+        var $strings = array();
+
+        // Hold the default pages.
+        var $pages = array();
+
+        /**
+         * The constructor.
+         *
+         * AyeCode_Connect_Helper constructor.
+         *
+         * @param array $strings
+         * @param array $pages
+         */
+        public function __construct( $strings = array(), $pages = array() ) {
+            // Only fire if not localhost and the current user has the right permissions.
+            if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+                // set default strings
+                $default_strings = array(
+                    'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
+                    'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
+                    'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
+                    'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
+                    'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
+                    'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
+                    'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
+                );
+                $this->strings   = array_merge( $default_strings, $strings );
+
+                // set default pages
+                $default_pages = array();
+                $this->pages   = array_merge( $default_pages, $pages );
+
+                // maybe show connect site notice
+                add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+
+                // add ajax action if not already added
+                if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
+                    add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+                }
+            }
+
+            // add ajax action if not already added
+            if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
+                add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+            }
+        }
+
+        /**
+         * Give a way to check we can connect via a external redirect.
+         */
+        public function ayecode_connect_helper_installed(){
+            $active = array(
+                'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
+                'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
+                'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+            );
+            wp_send_json_success( $active );
+            wp_die();
+        }
+
+        /**
+         * Get slug from path
+         *
+         * @param  string $key
+         *
+         * @return string
+         */
+        private function format_plugin_slug( $key ) {
+            $slug = explode( '/', $key );
+            $slug = explode( '.', end( $slug ) );
+
+            return $slug[0];
+        }
+
+        /**
+         * Install and activate the AyeCode Connect Plugin
+         */
+        public function ayecode_connect_install() {
+            // bail if localhost
+            if ( $this->is_localhost() ) {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+
+            // Explicitly clear the event.
+            wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+
+            $success     = true;
+            $plugin_slug = "ayecode-connect";
+            if ( ! empty( $plugin_slug ) ) {
+                require_once( ABSPATH . 'wp-admin/includes/file.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+                require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+                require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+
+                WP_Filesystem();
+
+                $skin              = new Automatic_Upgrader_Skin;
+                $upgrader          = new WP_Upgrader( $skin );
+                $installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+                $plugin_slug       = $plugin_slug;
+                $plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
+                $installed         = false;
+                $activate          = false;
+
+                // See if the plugin is installed already
+                if ( in_array( $plugin_slug, $installed_plugins ) ) {
+                    $installed = true;
+                    $activate  = ! is_plugin_active( $plugin );
+                }
+
+                // Install this thing!
+                if ( ! $installed ) {
+
+                    // Suppress feedback
+                    ob_start();
+
+                    try {
+                        $plugin_information = plugins_api( 'plugin_information', array(
+                            'slug'   => $plugin_slug,
+                            'fields' => array(
+                                'short_description' => false,
+                                'sections'          => false,
+                                'requires'          => false,
+                                'rating'            => false,
+                                'ratings'           => false,
+                                'downloaded'        => false,
+                                'last_updated'      => false,
+                                'added'             => false,
+                                'tags'              => false,
+                                'homepage'          => false,
+                                'donate_link'       => false,
+                                'author_profile'    => false,
+                                'author'            => false,
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $plugin_information ) ) {
+                            throw new Exception( $plugin_information->get_error_message() );
+                        }
+
+                        $package  = $plugin_information->download_link;
+                        $download = $upgrader->download_package( $package );
+
+                        if ( is_wp_error( $download ) ) {
+                            throw new Exception( $download->get_error_message() );
+                        }
+
+                        $working_dir = $upgrader->unpack_package( $download, true );
+
+                        if ( is_wp_error( $working_dir ) ) {
+                            throw new Exception( $working_dir->get_error_message() );
+                        }
+
+                        $result = $upgrader->install_package( array(
+                            'source'                      => $working_dir,
+                            'destination'                 => WP_PLUGIN_DIR,
+                            'clear_destination'           => false,
+                            'abort_if_destination_exists' => false,
+                            'clear_working'               => true,
+                            'hook_extra'                  => array(
+                                'type'   => 'plugin',
+                                'action' => 'install',
+                            ),
+                        ) );
+
+                        if ( is_wp_error( $result ) ) {
+                            throw new Exception( $result->get_error_message() );
+                        }
+
+                        $activate = true;
+
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+
+                    // Discard feedback
+                    ob_end_clean();
+                }
+
+                wp_clean_plugins_cache();
+
+                // Activate this thing
+                if ( $activate ) {
+                    try {
+                        $result = activate_plugin( $plugin );
+
+                        if ( is_wp_error( $result ) ) {
+                            $success = false;
+                        } else {
+                            $success = true;
+                        }
+                    } catch ( Exception $e ) {
+                        $success = false;
+                    }
+                }
+            }
+
+            if ( $success && function_exists( 'ayecode_connect_args' ) ) {
+                ayecode_connect();// init
+                $args        = ayecode_connect_args();
+                $client      = new AyeCode_Connect( $args );
+                $redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
+                $redirect    = $client->build_connect_url( $redirect_to );
+                wp_send_json_success( array( 'connect_url' => $redirect ) );
+            } else {
+                wp_send_json_error( $this->strings['error_localhost'] );
+            }
+            wp_die();
+        }
+
+        /**
+         * Check if maybe localhost.
+         *
+         * @return bool
+         */
+        public function is_localhost() {
+            $localhost = false;
+
+            $host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+            $localhost_domains = array(
+                'localhost',
+                'localhost.localdomain',
+                '127.0.0.1',
+                '::1'
+            );
+
+            if ( in_array( $host, $localhost_domains ) ) {
+                $localhost = true;
+            }
+
+            return $localhost;
+        }
+
+        /**
+         * Show notice to connect site.
+         */
+        public function ayecode_connect_install_notice() {
+            if ( $this->maybe_show() ) {
+                $connect_title_string     = $this->strings['connect_title'];
+                $connect_external_string  = $this->strings['connect_external'];
+                $connect_string           = $this->strings['connect'];
+                $connect_button_string    = $this->strings['connect_button'];
+                $connecting_button_string = $this->strings['connecting_button'];
+                ?>
 				<div class="notice notice-info acch-notice">
 					<span class="acch-float-left">
 						<svg width="61px" height="61px" viewBox="0 0 61 61" version="1.1"
@@ -305,9 +305,9 @@ 
 				</div>
 
 				<?php
-				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-					?>
+                // only include the popup HTML if needed.
+                if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                    ?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
 					<span class="acch-float-left">
@@ -353,23 +353,23 @@ 
 						</div>
 					</div>
 					<?php
-				}
-
-				// add required scripts
-				$this->script();
-			}
-		}
-
-		/**
-		 * Get the JS Script.
-		 */
-		public function script() {
-
-			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
-				add_thickbox();
-			}
-			?>
+                }
+
+                // add required scripts
+                $this->script();
+            }
+        }
+
+        /**
+         * Get the JS Script.
+         */
+        public function script() {
+
+            // add thickbox if external request is requested
+            if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+                add_thickbox();
+            }
+            ?>
 			<style>
 				.acch-title {
 					margin: 0;
@@ -435,38 +435,38 @@ 
 					});
 				} 
 				<?php
-				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
-				?>
+                // add thickbox if external request is requested
+                if(! empty( $_REQUEST['external-connect-request'] )) {
+                ?>
 				jQuery(function () {
 					setTimeout(function () {
 						tb_show("AyeCode Connect", "?TB_inline?width=300&height=80&inlineId=ayecode-connect-helper-external-confirm");
 					}, 200);
 				});
 				<?php
-				}
-				?>
+                }
+                ?>
 			</script>
 			<?php
-		}
-
-		/**
-		 * Decide what pages to show on.
-		 *
-		 * @return bool
-		 */
-		public function maybe_show() {
-			$show = false;
-
-			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
-				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
-					$show = true;
-				}
-			}
-
-			return $show;
-		}
-	}
+        }
+
+        /**
+         * Decide what pages to show on.
+         *
+         * @return bool
+         */
+        public function maybe_show() {
+            $show = false;
+
+            // check if on a page set to show
+            if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+                // check if not active and connected
+                if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+                    $show = true;
+                }
+            }
+
+            return $show;
+        }
+    }
 }

Spacing +78 added lines, -78 removed lines

@@ -1,9 +1,9 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( "AyeCode_Connect_Helper" ) ) {
+if (!class_exists("AyeCode_Connect_Helper")) {
 	/**
 	 * Allow the quick setup and connection of our AyeCode Connect plugin.
 	 *
@@ -28,50 +28,50 @@ 
 		 * @param array $strings
 		 * @param array $pages
 		 */
-		public function __construct( $strings = array(), $pages = array() ) {
+		public function __construct($strings = array(), $pages = array()) {
 			// Only fire if not localhost and the current user has the right permissions.
-			if ( ! $this->is_localhost() && current_user_can( 'manage_options' ) ) {
+			if (!$this->is_localhost() && current_user_can('manage_options')) {
 				// set default strings
 				$default_strings = array(
-					'connect_title'     => __( "Thanks for choosing an AyeCode Product!", 'ayecode-connect' ),
-					'connect_external'  => __( "Please confirm you wish to connect your site?", 'ayecode-connect' ),
-					'connect'           => wp_sprintf( __( "<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect' ), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>" ),
-					'connect_button'    => __( "Connect Site", 'ayecode-connect' ),
-					'connecting_button' => __( "Connecting...", 'ayecode-connect' ),
-					'error_localhost'   => __( "This service will only work with a live domain, not a localhost.", 'ayecode-connect' ),
-					'error'             => __( "Something went wrong, please refresh and try again.", 'ayecode-connect' ),
+					'connect_title'     => __("Thanks for choosing an AyeCode Product!", 'ayecode-connect'),
+					'connect_external'  => __("Please confirm you wish to connect your site?", 'ayecode-connect'),
+					'connect'           => wp_sprintf(__("<strong>Have a license?</strong> Forget about entering license keys or downloading zip files, connect your site for instant access. %slearn more%s", 'ayecode-connect'), "<a href='https://ayecode.io/introducing-ayecode-connect/' target='_blank'>", "</a>"),
+					'connect_button'    => __("Connect Site", 'ayecode-connect'),
+					'connecting_button' => __("Connecting...", 'ayecode-connect'),
+					'error_localhost'   => __("This service will only work with a live domain, not a localhost.", 'ayecode-connect'),
+					'error'             => __("Something went wrong, please refresh and try again.", 'ayecode-connect'),
 				);
-				$this->strings   = array_merge( $default_strings, $strings );
+				$this->strings = array_merge($default_strings, $strings);
 
 				// set default pages
 				$default_pages = array();
-				$this->pages   = array_merge( $default_pages, $pages );
+				$this->pages   = array_merge($default_pages, $pages);
 
 				// maybe show connect site notice
-				add_action( 'admin_notices', array( $this, 'ayecode_connect_install_notice' ) );
+				add_action('admin_notices', array($this, 'ayecode_connect_install_notice'));
 
 				// add ajax action if not already added
-				if ( ! has_action( 'wp_ajax_ayecode_connect_helper' ) ) {
-					add_action( 'wp_ajax_ayecode_connect_helper', array( $this, 'ayecode_connect_install' ) );
+				if (!has_action('wp_ajax_ayecode_connect_helper')) {
+					add_action('wp_ajax_ayecode_connect_helper', array($this, 'ayecode_connect_install'));
 				}
 			}
 
 			// add ajax action if not already added
-			if ( ! has_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed' ) ) {
-				add_action( 'wp_ajax_nopriv_ayecode_connect_helper_installed', array( $this, 'ayecode_connect_helper_installed' ) );
+			if (!has_action('wp_ajax_nopriv_ayecode_connect_helper_installed')) {
+				add_action('wp_ajax_nopriv_ayecode_connect_helper_installed', array($this, 'ayecode_connect_helper_installed'));
 			}
 		}
 
 		/**
 		 * Give a way to check we can connect via a external redirect.
 		 */
-		public function ayecode_connect_helper_installed(){
+		public function ayecode_connect_helper_installed() {
 			$active = array(
-				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION,'2.0.0.79','>') ? 1 : 0,
-				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION,'1.2.1.5','>') ? 1 : 0,
-				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION,'1.0.14','>') ? 1 : 0,
+				'gd'    =>  defined('GEODIRECTORY_VERSION') && version_compare(GEODIRECTORY_VERSION, '2.0.0.79', '>') ? 1 : 0,
+				'uwp'    =>  defined('USERSWP_VERSION') && version_compare(USERSWP_VERSION, '1.2.1.5', '>') ? 1 : 0,
+				'wpi'    =>  defined('WPINV_VERSION') && version_compare(WPINV_VERSION, '1.0.14', '>') ? 1 : 0,
 			);
-			wp_send_json_success( $active );
+			wp_send_json_success($active);
 			wp_die();
 		}
 
@@ -82,9 +82,9 @@ 
 		 *
 		 * @return string
 		 */
-		private function format_plugin_slug( $key ) {
-			$slug = explode( '/', $key );
-			$slug = explode( '.', end( $slug ) );
+		private function format_plugin_slug($key) {
+			$slug = explode('/', $key);
+			$slug = explode('.', end($slug));
 
 			return $slug[0];
 		}
@@ -94,45 +94,45 @@ 
 		 */
 		public function ayecode_connect_install() {
 			// bail if localhost
-			if ( $this->is_localhost() ) {
-				wp_send_json_error( $this->strings['error_localhost'] );
+			if ($this->is_localhost()) {
+				wp_send_json_error($this->strings['error_localhost']);
 			}
 
 			// Explicitly clear the event.
-			wp_clear_scheduled_hook( 'geodir_plugin_background_installer', func_get_args() );
+			wp_clear_scheduled_hook('geodir_plugin_background_installer', func_get_args());
 
 			$success     = true;
 			$plugin_slug = "ayecode-connect";
-			if ( ! empty( $plugin_slug ) ) {
-				require_once( ABSPATH . 'wp-admin/includes/file.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
-				require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
-				require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+			if (!empty($plugin_slug)) {
+				require_once(ABSPATH . 'wp-admin/includes/file.php');
+				require_once(ABSPATH . 'wp-admin/includes/plugin-install.php');
+				require_once(ABSPATH . 'wp-admin/includes/class-wp-upgrader.php');
+				require_once(ABSPATH . 'wp-admin/includes/plugin.php');
 
 				WP_Filesystem();
 
 				$skin              = new Automatic_Upgrader_Skin;
-				$upgrader          = new WP_Upgrader( $skin );
-				$installed_plugins = array_map( array( $this, 'format_plugin_slug' ), array_keys( get_plugins() ) );
+				$upgrader          = new WP_Upgrader($skin);
+				$installed_plugins = array_map(array($this, 'format_plugin_slug'), array_keys(get_plugins()));
 				$plugin_slug       = $plugin_slug;
 				$plugin            = $plugin_slug . '/' . $plugin_slug . '.php';
 				$installed         = false;
 				$activate          = false;
 
 				// See if the plugin is installed already
-				if ( in_array( $plugin_slug, $installed_plugins ) ) {
+				if (in_array($plugin_slug, $installed_plugins)) {
 					$installed = true;
-					$activate  = ! is_plugin_active( $plugin );
+					$activate  = !is_plugin_active($plugin);
 				}
 
 				// Install this thing!
-				if ( ! $installed ) {
+				if (!$installed) {
 
 					// Suppress feedback
 					ob_start();
 
 					try {
-						$plugin_information = plugins_api( 'plugin_information', array(
+						$plugin_information = plugins_api('plugin_information', array(
 							'slug'   => $plugin_slug,
 							'fields' => array(
 								'short_description' => false,
@@ -149,26 +149,26 @@ 
 								'author_profile'    => false,
 								'author'            => false,
 							),
-						) );
+						));
 
-						if ( is_wp_error( $plugin_information ) ) {
-							throw new Exception( $plugin_information->get_error_message() );
+						if (is_wp_error($plugin_information)) {
+							throw new Exception($plugin_information->get_error_message());
 						}
 
 						$package  = $plugin_information->download_link;
-						$download = $upgrader->download_package( $package );
+						$download = $upgrader->download_package($package);
 
-						if ( is_wp_error( $download ) ) {
-							throw new Exception( $download->get_error_message() );
+						if (is_wp_error($download)) {
+							throw new Exception($download->get_error_message());
 						}
 
-						$working_dir = $upgrader->unpack_package( $download, true );
+						$working_dir = $upgrader->unpack_package($download, true);
 
-						if ( is_wp_error( $working_dir ) ) {
-							throw new Exception( $working_dir->get_error_message() );
+						if (is_wp_error($working_dir)) {
+							throw new Exception($working_dir->get_error_message());
 						}
 
-						$result = $upgrader->install_package( array(
+						$result = $upgrader->install_package(array(
 							'source'                      => $working_dir,
 							'destination'                 => WP_PLUGIN_DIR,
 							'clear_destination'           => false,
@@ -178,15 +178,15 @@ 
 								'type'   => 'plugin',
 								'action' => 'install',
 							),
-						) );
+						));
 
-						if ( is_wp_error( $result ) ) {
-							throw new Exception( $result->get_error_message() );
+						if (is_wp_error($result)) {
+							throw new Exception($result->get_error_message());
 						}
 
 						$activate = true;
 
-					} catch ( Exception $e ) {
+					} catch (Exception $e) {
 						$success = false;
 					}
 
@@ -197,30 +197,30 @@ 
 				wp_clean_plugins_cache();
 
 				// Activate this thing
-				if ( $activate ) {
+				if ($activate) {
 					try {
-						$result = activate_plugin( $plugin );
+						$result = activate_plugin($plugin);
 
-						if ( is_wp_error( $result ) ) {
+						if (is_wp_error($result)) {
 							$success = false;
 						} else {
 							$success = true;
 						}
-					} catch ( Exception $e ) {
+					} catch (Exception $e) {
 						$success = false;
 					}
 				}
 			}
 
-			if ( $success && function_exists( 'ayecode_connect_args' ) ) {
-				ayecode_connect();// init
+			if ($success && function_exists('ayecode_connect_args')) {
+				ayecode_connect(); // init
 				$args        = ayecode_connect_args();
-				$client      = new AyeCode_Connect( $args );
-				$redirect_to = ! empty( $_POST['redirect_to'] ) ? esc_url_raw( $_POST['redirect_to'] ) : '';
-				$redirect    = $client->build_connect_url( $redirect_to );
-				wp_send_json_success( array( 'connect_url' => $redirect ) );
+				$client      = new AyeCode_Connect($args);
+				$redirect_to = !empty($_POST['redirect_to']) ? esc_url_raw($_POST['redirect_to']) : '';
+				$redirect    = $client->build_connect_url($redirect_to);
+				wp_send_json_success(array('connect_url' => $redirect));
 			} else {
-				wp_send_json_error( $this->strings['error_localhost'] );
+				wp_send_json_error($this->strings['error_localhost']);
 			}
 			wp_die();
 		}
@@ -233,7 +233,7 @@ 
 		public function is_localhost() {
 			$localhost = false;
 
-			$host              = isset( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : '';
+			$host              = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
 			$localhost_domains = array(
 				'localhost',
 				'localhost.localdomain',
@@ -241,7 +241,7 @@ 
 				'::1'
 			);
 
-			if ( in_array( $host, $localhost_domains ) ) {
+			if (in_array($host, $localhost_domains)) {
 				$localhost = true;
 			}
 
@@ -252,7 +252,7 @@ 
 		 * Show notice to connect site.
 		 */
 		public function ayecode_connect_install_notice() {
-			if ( $this->maybe_show() ) {
+			if ($this->maybe_show()) {
 				$connect_title_string     = $this->strings['connect_title'];
 				$connect_external_string  = $this->strings['connect_external'];
 				$connect_string           = $this->strings['connect'];
@@ -294,19 +294,19 @@ 
 					</svg>
 					</span>
 					<span class="acch-float-left acch-text">
-						<h3 class="acch-title"><?php echo esc_attr( $connect_title_string ); ?></h3>
+						<h3 class="acch-title"><?php echo esc_attr($connect_title_string); ?></h3>
 					<p><?php echo $connect_string; ?>
 					</p>
 					</span>
 
 					<span class="acch-float-left acch-button">
-						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr($connecting_button_string); ?>"><?php echo esc_attr($connect_button_string) ?></button>
 					</span>
 				</div>
 
 				<?php
 				// only include the popup HTML if needed.
-				if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+				if (!empty($_REQUEST['external-connect-request'])) {
 					?>
 					<div id="ayecode-connect-helper-external-confirm" style="display:none;">
 						<div class="noticex notice-info acch-notice" style="border: none;">
@@ -344,11 +344,11 @@ 
 					</svg>
 					</span>
 					<span class="acch-float-left acch-text">
-						<h3 class="acch-title"><?php echo esc_attr( $connect_external_string ); ?></h3>
+						<h3 class="acch-title"><?php echo esc_attr($connect_external_string); ?></h3>
 					</span>
 
 					<span class="acch-float-left acch-button">
-						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr( $connecting_button_string ); ?>"><?php echo esc_attr( $connect_button_string ) ?></button>
+						<button onclick="ayecode_connect_helper(this);" id="gd-connect-site" class="button button-primary" data-connecting="<?php echo esc_attr($connecting_button_string); ?>"><?php echo esc_attr($connect_button_string) ?></button>
 					</span>
 						</div>
 					</div>
@@ -366,7 +366,7 @@ 
 		public function script() {
 
 			// add thickbox if external request is requested
-			if ( ! empty( $_REQUEST['external-connect-request'] ) ) {
+			if (!empty($_REQUEST['external-connect-request'])) {
 				add_thickbox();
 			}
 			?>
@@ -417,7 +417,7 @@ 
 						url: ajaxurl,
 						data: {
 							action: 'ayecode_connect_helper',
-							security: '<?php echo wp_create_nonce( 'ayecode-connect-helper' );?>',
+							security: '<?php echo wp_create_nonce('ayecode-connect-helper'); ?>',
 							redirect_to: $current_url
 						},
 						beforeSend: function () {
@@ -436,7 +436,7 @@ 
 				} 
 				<?php
 				// add thickbox if external request is requested
-				if(! empty( $_REQUEST['external-connect-request'] )) {
+				if (!empty($_REQUEST['external-connect-request'])) {
 				?>
 				jQuery(function () {
 					setTimeout(function () {
@@ -459,9 +459,9 @@ 
 			$show = false;
 
 			// check if on a page set to show
-			if ( isset( $_REQUEST['page'] ) && in_array( $_REQUEST['page'], $this->pages ) ) {
+			if (isset($_REQUEST['page']) && in_array($_REQUEST['page'], $this->pages)) {
 				// check if not active and connected
-				if ( ! defined( 'AYECODE_CONNECT_VERSION' ) || ! get_option( 'ayecode_connect_blog_token' ) ) {
+				if (!defined('AYECODE_CONNECT_VERSION') || !get_option('ayecode_connect_blog_token')) {
 					$show = true;
 				}
 			}