AyeCode / invoicing

includes/wpinv-email-functions.php

Spacing +492 added lines, -492 removed lines

@@ -7,12 +7,12 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 function wpinv_init_transactional_emails() {
-    $email_actions = apply_filters( 'wpinv_email_actions', array(
+    $email_actions = apply_filters('wpinv_email_actions', array(
         'wpinv_status_pending_to_processing',
         'wpinv_status_pending_to_publish',
         'wpinv_status_pending_to_cancelled',
@@ -28,74 +28,74 @@ 
         'wpinv_fully_refunded',
         'wpinv_partially_refunded',
         'wpinv_new_invoice_note'
-    ) );
+    ));
 
-    foreach ( $email_actions as $action ) {
-        add_action( $action, 'wpinv_send_transactional_email', 10, 10 );
+    foreach ($email_actions as $action) {
+        add_action($action, 'wpinv_send_transactional_email', 10, 10);
     }
 }
-add_action( 'init', 'wpinv_init_transactional_emails' );
+add_action('init', 'wpinv_init_transactional_emails');
 
 // New invoice email
-add_action( 'wpinv_status_pending_to_processing_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_pending_to_publish_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_pending_to_onhold_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_failed_to_processing_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_failed_to_publish_notification', 'wpinv_new_invoice_notification' );
-add_action( 'wpinv_status_failed_to_onhold_notification', 'wpinv_new_invoice_notification' );
+add_action('wpinv_status_pending_to_processing_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_pending_to_publish_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_pending_to_onhold_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_failed_to_processing_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_failed_to_publish_notification', 'wpinv_new_invoice_notification');
+add_action('wpinv_status_failed_to_onhold_notification', 'wpinv_new_invoice_notification');
 
 // Cancelled invoice email
-add_action( 'wpinv_status_pending_to_cancelled_notification', 'wpinv_cancelled_invoice_notification' );
-add_action( 'wpinv_status_onhold_to_cancelled_notification', 'wpinv_cancelled_invoice_notification' );
+add_action('wpinv_status_pending_to_cancelled_notification', 'wpinv_cancelled_invoice_notification');
+add_action('wpinv_status_onhold_to_cancelled_notification', 'wpinv_cancelled_invoice_notification');
 
 // Failed invoice email
-add_action( 'wpinv_status_pending_to_failed_notification', 'wpinv_failed_invoice_notification' );
-add_action( 'wpinv_status_onhold_to_failed_notification', 'wpinv_failed_invoice_notification' );
+add_action('wpinv_status_pending_to_failed_notification', 'wpinv_failed_invoice_notification');
+add_action('wpinv_status_onhold_to_failed_notification', 'wpinv_failed_invoice_notification');
 
 // On hold invoice email
-add_action( 'wpinv_status_pending_to_onhold_notification', 'wpinv_onhold_invoice_notification' );
-add_action( 'wpinv_status_failed_to_onhold_notification', 'wpinv_onhold_invoice_notification' );
+add_action('wpinv_status_pending_to_onhold_notification', 'wpinv_onhold_invoice_notification');
+add_action('wpinv_status_failed_to_onhold_notification', 'wpinv_onhold_invoice_notification');
 
 // Processing invoice email
-add_action( 'wpinv_status_pending_to_processing_notification', 'wpinv_processing_invoice_notification' );
+add_action('wpinv_status_pending_to_processing_notification', 'wpinv_processing_invoice_notification');
 
 // Paid invoice email
-add_action( 'wpinv_status_publish_notification', 'wpinv_completed_invoice_notification' );
+add_action('wpinv_status_publish_notification', 'wpinv_completed_invoice_notification');
 
 // Refunded invoice email
-add_action( 'wpinv_fully_refunded_notification', 'wpinv_fully_refunded_notification' );
-add_action( 'wpinv_partially_refunded_notification', 'wpinv_partially_refunded_notification' );
+add_action('wpinv_fully_refunded_notification', 'wpinv_fully_refunded_notification');
+add_action('wpinv_partially_refunded_notification', 'wpinv_partially_refunded_notification');
 
 // Invoice note
-add_action( 'wpinv_new_invoice_note_notification', 'wpinv_new_invoice_note_notification' );
+add_action('wpinv_new_invoice_note_notification', 'wpinv_new_invoice_note_notification');
 
-add_action( 'wpinv_email_header', 'wpinv_email_header' );
-add_action( 'wpinv_email_footer', 'wpinv_email_footer' );
-add_action( 'wpinv_email_invoice_details', 'wpinv_email_invoice_details', 10, 3 );
-add_action( 'wpinv_email_invoice_items', 'wpinv_email_invoice_items', 10, 3 );
-add_action( 'wpinv_email_billing_details', 'wpinv_email_billing_details', 10, 3 );
+add_action('wpinv_email_header', 'wpinv_email_header');
+add_action('wpinv_email_footer', 'wpinv_email_footer');
+add_action('wpinv_email_invoice_details', 'wpinv_email_invoice_details', 10, 3);
+add_action('wpinv_email_invoice_items', 'wpinv_email_invoice_items', 10, 3);
+add_action('wpinv_email_billing_details', 'wpinv_email_billing_details', 10, 3);
 
 function wpinv_send_transactional_email() {
     $args       = func_get_args();
     $function   = current_filter() . '_notification';
-    do_action_ref_array( $function, $args );
+    do_action_ref_array($function, $args);
 }
     
-function wpinv_new_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_new_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'new_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -112,37 +112,37 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => true,
             'plain_text'    => false,
-        ) );
+        ));
     
-    return wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    return wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 }
 
-function wpinv_cancelled_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_cancelled_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'cancelled_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -159,37 +159,37 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => true,
             'plain_text'    => false,
-        ) );
+        ));
     
-    return wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    return wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 }
 
-function wpinv_failed_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_failed_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'failed_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -206,37 +206,37 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => true,
             'plain_text'    => false,
-        ) );
+        ));
     
-    return wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    return wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
 }
 
-function wpinv_onhold_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_onhold_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'onhold_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -253,45 +253,45 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_processing_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_processing_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'processing_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -308,45 +308,45 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_completed_invoice_notification( $invoice_id, $new_status = '' ) {
+function wpinv_completed_invoice_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'completed_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -363,45 +363,45 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_fully_refunded_notification( $invoice_id, $new_status = '' ) {
+function wpinv_fully_refunded_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'refunded_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -418,46 +418,46 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'           => $invoice,
             'email_type'        => $email_type,
             'email_heading'     => $email_heading,
             'sent_to_admin'     => false,
             'plain_text'        => false,
             'partial_refund'    => false
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_partially_refunded_notification( $invoice_id, $new_status = '' ) {
+function wpinv_partially_refunded_notification($invoice_id, $new_status = '') {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'refunded_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -474,49 +474,49 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'           => $invoice,
             'email_type'        => $email_type,
             'email_heading'     => $email_heading,
             'sent_to_admin'     => false,
             'plain_text'        => false,
             'partial_refund'    => true
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_new_invoice_note_notification( $invoice_id, $new_status = '' ) {
+function wpinv_new_invoice_note_notification($invoice_id, $new_status = '') {
 }
 
-function wpinv_user_invoice_notification( $invoice_id ) {
+function wpinv_user_invoice_notification($invoice_id) {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'user_invoice';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -533,52 +533,52 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
-        ) );
+        ));
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     
-    if ( $sent ) {
-        $note = __( 'Invoice has been emailed to the user.', 'invoicing' );
+    if ($sent) {
+        $note = __('Invoice has been emailed to the user.', 'invoicing');
     } else {
-        $note = __( 'Fail to send invoice to the user!', 'invoicing' );
+        $note = __('Fail to send invoice to the user!', 'invoicing');
     }
-    $invoice->add_note( $note ); // Add private note.
+    $invoice->add_note($note); // Add private note.
     
-    if ( wpinv_mail_admin_bcc_active( $email_type ) ) {
-        $recipient  = wpinv_get_admin_email();
-        $subject    .= ' - ADMIN BCC COPY';
-        wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    if (wpinv_mail_admin_bcc_active($email_type)) {
+        $recipient = wpinv_get_admin_email();
+        $subject .= ' - ADMIN BCC COPY';
+        wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
     }
     
     return $sent;
 }
 
-function wpinv_user_note_notification( $invoice_id, $args = array() ) {
+function wpinv_user_note_notification($invoice_id, $args = array()) {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'user_note';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    $recipient      = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
     
@@ -586,7 +586,7 @@ 
         'user_note' => ''
     );
 
-    $args = wp_parse_args( $args, $defaults );
+    $args = wp_parse_args($args, $defaults);
         
     $search                     = array();
     $search['invoice_number']   = '{invoice_number}';
@@ -603,46 +603,46 @@ 
     $wpinv_email_search     = $search;
     $wpinv_email_replace    = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
             'customer_note' => $args['user_note']
-        ) );
+        ));
         
-    $content        = wpinv_email_format_text( $content );
+    $content = wpinv_email_format_text($content);
     
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
         
     return $sent;
 }
 
 function wpinv_mail_get_from_address() {
-    $from_address = apply_filters( 'wpinv_mail_from_address', wpinv_get_option( 'email_from' ) );
-    return sanitize_email( $from_address );
+    $from_address = apply_filters('wpinv_mail_from_address', wpinv_get_option('email_from'));
+    return sanitize_email($from_address);
 }
 
 function wpinv_mail_get_from_name() {
-    $from_name = apply_filters( 'wpinv_mail_from_name', wpinv_get_option( 'email_from_name' ) );
-    return wp_specialchars_decode( esc_html( $from_name ), ENT_QUOTES );
+    $from_name = apply_filters('wpinv_mail_from_name', wpinv_get_option('email_from_name'));
+    return wp_specialchars_decode(esc_html($from_name), ENT_QUOTES);
 }
 
-function wpinv_mail_admin_bcc_active( $mail_type = '' ) {
-    $active = apply_filters( 'wpinv_mail_admin_bcc_active', wpinv_get_option( 'email_' . $mail_type . '_admin_bcc' ) );
-    return ( $active ? true : false );
+function wpinv_mail_admin_bcc_active($mail_type = '') {
+    $active = apply_filters('wpinv_mail_admin_bcc_active', wpinv_get_option('email_' . $mail_type . '_admin_bcc'));
+    return ($active ? true : false);
 }
     
-function wpinv_mail_get_content_type(  $content_type = 'text/html', $email_type = 'html' ) {
-    $email_type = apply_filters( 'wpinv_mail_content_type', $email_type );
+function wpinv_mail_get_content_type($content_type = 'text/html', $email_type = 'html') {
+    $email_type = apply_filters('wpinv_mail_content_type', $email_type);
     
-    switch ( $email_type ) {
+    switch ($email_type) {
         case 'html' :
             $content_type = 'text/html';
             break;
@@ -657,35 +657,35 @@ 
     return $content_type;
 }
     
-function wpinv_mail_send( $to, $subject, $message, $headers, $attachments ) {
-    add_filter( 'wp_mail_from', 'wpinv_mail_get_from_address' );
-    add_filter( 'wp_mail_from_name', 'wpinv_mail_get_from_name' );
-    add_filter( 'wp_mail_content_type', 'wpinv_mail_get_content_type' );
+function wpinv_mail_send($to, $subject, $message, $headers, $attachments) {
+    add_filter('wp_mail_from', 'wpinv_mail_get_from_address');
+    add_filter('wp_mail_from_name', 'wpinv_mail_get_from_name');
+    add_filter('wp_mail_content_type', 'wpinv_mail_get_content_type');
 
-    $message = wpinv_email_style_body( $message );
-    $message = apply_filters( 'wpinv_mail_content', $message );
+    $message = wpinv_email_style_body($message);
+    $message = apply_filters('wpinv_mail_content', $message);
     
-    $sent  = wp_mail( $to, $subject, $message, $headers, $attachments );
+    $sent = wp_mail($to, $subject, $message, $headers, $attachments);
     
-    if ( !$sent ) {
-        $log_message = wp_sprintf( __( "\nTime: %s\nTo: %s\nSubject: %s\n", 'invoicing' ), date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ), ( is_array( $to ) ? implode( ', ', $to ) : $to ), $subject );
-        wpinv_error_log( $log_message, __( "Email from Invoicing plugin failed to send", 'invoicing' ), __FILE__, __LINE__ );
+    if (!$sent) {
+        $log_message = wp_sprintf(__("\nTime: %s\nTo: %s\nSubject: %s\n", 'invoicing'), date_i18n('F j Y H:i:s', current_time('timestamp')), (is_array($to) ? implode(', ', $to) : $to), $subject);
+        wpinv_error_log($log_message, __("Email from Invoicing plugin failed to send", 'invoicing'), __FILE__, __LINE__);
     }
 
-    remove_filter( 'wp_mail_from', 'wpinv_mail_get_from_address' );
-    remove_filter( 'wp_mail_from_name', 'wpinv_mail_get_from_name' );
-    remove_filter( 'wp_mail_content_type', 'wpinv_mail_get_content_type' );
+    remove_filter('wp_mail_from', 'wpinv_mail_get_from_address');
+    remove_filter('wp_mail_from_name', 'wpinv_mail_get_from_name');
+    remove_filter('wp_mail_content_type', 'wpinv_mail_get_content_type');
 
     return $sent;
 }
     
 function wpinv_get_emails() {
     $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 <= 10; $i++ ) {
-        $overdue_days_options[$i]   = wp_sprintf( __( '%d days after Due Date', 'invoicing' ), $i );
+    for ($i = 2; $i <= 10; $i++) {
+        $overdue_days_options[$i] = wp_sprintf(__('%d days after Due Date', 'invoicing'), $i);
     }
 
 	// Default, built-in gateways
@@ -693,130 +693,130 @@ 
 		'new_invoice' => array(
             'email_new_invoice_header' => array(
                 'id'   => 'email_new_invoice_header',
-                'name' => '<h3>' . __( 'New Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'New invoice emails are sent to admin when a new invoice is received.', 'invoicing' ),
+                'name' => '<h3>' . __('New Invoice', 'invoicing') . '</h3>',
+                'desc' => __('New invoice emails are sent to admin when a new invoice is received.', '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'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] New payment invoice ({invoice_number}) - {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] New payment invoice ({invoice_number}) - {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_new_invoice_heading' => array(
                 'id'   => 'email_new_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'New payment invoice', 'invoicing' ),
+                'std'  => __('New payment invoice', 'invoicing'),
                 'size' => 'large'
             ),
         ),
         'cancelled_invoice' => array(
             'email_cancelled_invoice_header' => array(
                 'id'   => 'email_cancelled_invoice_header',
-                'name' => '<h3>' . __( 'Cancelled Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Cancelled invoice emails are sent to admin when invoices have been marked cancelled.', 'invoicing' ),
+                'name' => '<h3>' . __('Cancelled Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Cancelled invoice emails are sent to admin when invoices have been marked 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_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'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Cancelled invoice ({invoice_number})', 'invoicing' ),
+                'std'  => __('[{site_title}] Cancelled invoice ({invoice_number})', 'invoicing'),
                 'size' => 'large'
             ),
             'email_cancelled_invoice_heading' => array(
                 'id'   => 'email_cancelled_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Cancelled invoice', 'invoicing' ),
+                'std'  => __('Cancelled invoice', 'invoicing'),
                 'size' => 'large'
             ),
         ),
         'failed_invoice' => array(
             'email_failed_invoice_header' => array(
                 'id'   => 'email_failed_invoice_header',
-                'name' => '<h3>' . __( 'Failed Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Failed invoice emails are sent to admin when invoices have been marked failed (if they were previously processing or on-hold).', 'invoicing' ),
+                'name' => '<h3>' . __('Failed Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Failed invoice emails are sent to admin when invoices have been marked failed (if they were previously processing or on-hold).', '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'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Failed invoice ({invoice_number})', 'invoicing' ),
+                'std'  => __('[{site_title}] Failed invoice ({invoice_number})', 'invoicing'),
                 'size' => 'large'
             ),
             'email_failed_invoice_heading' => array(
                 'id'   => 'email_failed_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Failed invoice', 'invoicing' ),
+                'std'  => __('Failed invoice', 'invoicing'),
                 'size' => 'large'
             )
         ),
         'onhold_invoice' => array(
             'email_onhold_invoice_header' => array(
                 'id'   => 'email_onhold_invoice_header',
-                'name' => '<h3>' . __( 'On Hold Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'This is an invoice notification sent to users containing invoice details after an invoice is placed on-hold.', 'invoicing' ),
+                'name' => '<h3>' . __('On Hold Invoice', 'invoicing') . '</h3>',
+                'desc' => __('This is an invoice notification sent to users containing invoice details after an invoice is placed on-hold.', '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_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'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_onhold_invoice_heading' => array(
                 'id'   => 'email_onhold_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Thank you for your invoice', 'invoicing' ),
+                'std'  => __('Thank you for your invoice', 'invoicing'),
                 'size' => 'large'
             ),
             '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
             ),
@@ -824,37 +824,37 @@ 
         'processing_invoice' => array(
             'email_processing_invoice_header' => array(
                 'id'   => 'email_processing_invoice_header',
-                'name' => '<h3>' . __( 'Processing Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'This is an invoice notification sent to users containing invoice details after payment.', 'invoicing' ),
+                'name' => '<h3>' . __('Processing Invoice', 'invoicing') . '</h3>',
+                'desc' => __('This is an invoice notification sent to users containing invoice details after payment.', '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_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'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Your invoice receipt from {invoice_date}', 'invoicing'),
                 'size' => 'large'
             ),
             'email_processing_invoice_heading' => array(
                 'id'   => 'email_processing_invoice_heading',
-                'name' => __( 'Email Heading', 'invoicing' ),
-                'desc' => __( 'Enter the the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Thank you for your invoice', 'invoicing' ),
+                'std'  => __('Thank you for your invoice', 'invoicing'),
                 'size' => 'large'
             ),
             'email_processing_invoice_admin_bcc' => array(
                 'id'   => 'email_processing_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
             ),
@@ -862,37 +862,37 @@ 
         'completed_invoice' => array(
             'email_completed_invoice_header' => array(
                 'id'   => 'email_completed_invoice_header',
-                'name' => '<h3>' . __( 'Paid Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Invoice paid emails are sent to users when their invoices are marked paid and usually indicate that their payment has been done.', 'invoicing' ),
+                'name' => '<h3>' . __('Paid Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Invoice paid emails are sent to users when their invoices are marked paid and usually indicate that their payment has been done.', '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_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'),
                 '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 the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Your invoice has been paid', 'invoicing' ),
+                'std'  => __('Your invoice has been paid', 'invoicing'),
                 'size' => 'large'
             ),
             'email_completed_invoice_admin_bcc' => array(
                 'id'   => 'email_completed_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
@@ -900,37 +900,37 @@ 
         'refunded_invoice' => array(
             'email_refunded_invoice_header' => array(
                 'id'   => 'email_refunded_invoice_header',
-                'name' => '<h3>' . __( 'Refunded Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Invoice refunded emails are sent to users when their invoices are marked refunded.', 'invoicing' ),
+                'name' => '<h3>' . __('Refunded Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Invoice refunded emails are sent to users when their invoices are marked 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_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'),
                 '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 the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Your invoice has been refunded', 'invoicing' ),
+                'std'  => __('Your invoice has been refunded', 'invoicing'),
                 'size' => 'large'
             ),
             'email_refunded_invoice_admin_bcc' => array(
                 'id'   => 'email_refunded_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
             ),
@@ -938,37 +938,37 @@ 
         'user_invoice' => array(
             'email_user_invoice_header' => array(
                 'id'   => 'email_user_invoice_header',
-                'name' => '<h3>' . __( 'Customer Invoice', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Customer invoice emails can be sent to customers containing their invoice information and payment links.', 'invoicing' ),
+                'name' => '<h3>' . __('Customer Invoice', 'invoicing') . '</h3>',
+                'desc' => __('Customer invoice emails can be 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_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'),
                 '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 the main heading contained within the email notification for the invoice receipt email.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification for the invoice receipt email.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'Your invoice {invoice_number} details', 'invoicing' ),
+                'std'  => __('Your invoice {invoice_number} details', 'invoicing'),
                 'size' => 'large'
             ),
             'email_user_invoice_admin_bcc' => array(
                 'id'   => 'email_user_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
             ),
@@ -976,177 +976,177 @@ 
         'user_note' => array(
             'email_user_note_header' => array(
                 'id'   => 'email_user_note_header',
-                'name' => '<h3>' . __( 'Customer Note', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Customer note emails are sent when you add a note to an invoice.', 'invoicing' ),
+                'name' => '<h3>' . __('Customer Note', 'invoicing') . '</h3>',
+                'desc' => __('Customer note emails are sent when you add a note to an invoice.', '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_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'),
                 'type' => 'text',
-                'std'  => __( '[{site_title}] Note added to your invoice #{invoice_number} from {invoice_date}', 'invoicing' ),
+                'std'  => __('[{site_title}] Note added to your invoice #{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 the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification.', 'invoicing'),
                 'type' => 'text',
-                'std'  => __( 'A note has been added to your invoice', 'invoicing' ),
+                'std'  => __('A note has been added to your invoice', 'invoicing'),
                 'size' => 'large'
             ),
         ),
         'overdue' => array(
             'email_overdue_header' => array(
                 'id'   => 'email_overdue_header',
-                'name' => '<h3>' . __( 'Payment Reminder', 'invoicing' ) . '</h3>',
-                'desc' => __( 'Payment reminder emails are sent to user automatically.', 'invoicing' ),
+                'name' => '<h3>' . __('Payment Reminder', 'invoicing') . '</h3>',
+                'desc' => __('Payment reminder emails are sent to user automatically.', '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_due_reminder_days' => array(
                 'id'        => 'email_due_reminder_days',
-                'name'      => __( 'When to Send', 'sliced-invoices' ),
-                'desc'      => __( 'Check when you would like payment reminders sent out.', 'invoicing' ),
+                'name'      => __('When to Send', 'sliced-invoices'),
+                'desc'      => __('Check when you would like payment reminders sent out.', 'invoicing'),
                 'default'   => '',
                 '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'),
                 '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 the main heading contained within the email notification.', 'invoicing' ),
+                'name' => __('Email Heading', 'invoicing'),
+                'desc' => __('Enter the the main heading contained within the email notification.', 'invoicing'),
                 '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' ),
-                'desc' => __( 'The content of the email.', 'invoicing' ),
+                'name' => __('Email Content', 'invoicing'),
+                'desc' => __('The content of the email.', 'invoicing'),
                 'type' => 'rich_editor',
-                'std'  => __( '<p>Hi {full_name},</p><p>This is just a friendly reminder 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 pay now for this invoice please use the following link: <a href="{invoice_pay_link}">Pay Now</a></p>', 'invoicing' ),
+                'std'  => __('<p>Hi {full_name},</p><p>This is just a friendly reminder 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 pay now for this invoice please use the following link: <a href="{invoice_pay_link}">Pay Now</a></p>', 'invoicing'),
                 'class' => 'large',
                 'size'  => 10,
             ),
         ),
     );
 
-    return apply_filters( 'wpinv_get_emails', $emails );
+    return apply_filters('wpinv_get_emails', $emails);
 }
 
-function wpinv_settings_emails( $settings = array() ) {
+function wpinv_settings_emails($settings = array()) {
     $emails = wpinv_get_emails();
     
-    if ( !empty( $emails ) ) {
-        foreach ( $emails as $key => $email ) {
+    if (!empty($emails)) {
+        foreach ($emails as $key => $email) {
             $settings[$key] = $email;
         }
     }
     
-    return apply_filters( 'wpinv_settings_get_emails', $settings );
+    return apply_filters('wpinv_settings_get_emails', $settings);
 }
-add_filter( 'wpinv_settings_emails', 'wpinv_settings_emails', 10, 1 );
+add_filter('wpinv_settings_emails', 'wpinv_settings_emails', 10, 1);
 
-function wpinv_settings_sections_emails( $settings ) {
+function wpinv_settings_sections_emails($settings) {
     $emails = wpinv_get_emails();
     
     if (!empty($emails)) {
-        foreach  ($emails as $key => $email) {
-            $settings[$key] = !empty( $email['email_' . $key . '_header']['name'] ) ? strip_tags( $email['email_' . $key . '_header']['name'] ) : $key;
+        foreach ($emails as $key => $email) {
+            $settings[$key] = !empty($email['email_' . $key . '_header']['name']) ? strip_tags($email['email_' . $key . '_header']['name']) : $key;
         }
     }
     
     return $settings;    
 }
-add_filter( 'wpinv_settings_sections_emails', 'wpinv_settings_sections_emails', 10, 1 );
+add_filter('wpinv_settings_sections_emails', 'wpinv_settings_sections_emails', 10, 1);
 
-function wpinv_email_is_enabled( $email_type ) {
+function wpinv_email_is_enabled($email_type) {
     $emails = wpinv_get_emails();
-    $enabled = isset( $emails[$email_type] ) && wpinv_get_option( $email_type . '_active', 1 ) ? true : false;
+    $enabled = isset($emails[$email_type]) && wpinv_get_option($email_type . '_active', 1) ? true : false;
 
-    return apply_filters( 'wpinv_email_is_enabled', $enabled, $email_type );
+    return apply_filters('wpinv_email_is_enabled', $enabled, $email_type);
 }
 
-function wpinv_email_get_recipient( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    switch ( $email_type ) {
+function wpinv_email_get_recipient($email_type = '', $invoice_id = 0, $invoice = array()) {
+    switch ($email_type) {
         case 'new_invoice':
         case 'cancelled_invoice':
         case 'failed_invoice':
             $recipient  = wpinv_get_admin_email();
         break;
         default:
-            $invoice    = !empty( $invoice ) && is_object( $invoice ) ? $invoice : ( $invoice_id > 0 ? wpinv_get_invoice( $invoice_id ) : NULL );
-            $recipient  = !empty( $invoice ) ? $invoice->get_email() : '';
+            $invoice    = !empty($invoice) && is_object($invoice) ? $invoice : ($invoice_id > 0 ? wpinv_get_invoice($invoice_id) : NULL);
+            $recipient  = !empty($invoice) ? $invoice->get_email() : '';
         break;
     }
     
-    return apply_filters( 'wpinv_email_recipient', $recipient, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_recipient', $recipient, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_subject( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $subject    = wpinv_get_option( 'email_' . $email_type . '_subject' );
+function wpinv_email_get_subject($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $subject    = wpinv_get_option('email_' . $email_type . '_subject');
     
-    $subject    = wpinv_email_format_text( $subject );
+    $subject    = wpinv_email_format_text($subject);
     
-    return apply_filters( 'wpinv_email_subject', $subject, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_subject', $subject, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_heading( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $email_heading = wpinv_get_option( 'email_' . $email_type . '_heading' );
+function wpinv_email_get_heading($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $email_heading = wpinv_get_option('email_' . $email_type . '_heading');
     
-    $email_heading = wpinv_email_format_text( $email_heading );
+    $email_heading = wpinv_email_format_text($email_heading);
     
-    return apply_filters( 'wpinv_email_heading', $email_heading, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_heading', $email_heading, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_content( $email_type = '', $invoice_id = 0, $invoice = array() ) {
-    $content    = wpinv_get_option( 'email_' . $email_type . '_body' );
+function wpinv_email_get_content($email_type = '', $invoice_id = 0, $invoice = array()) {
+    $content    = wpinv_get_option('email_' . $email_type . '_body');
     
-    $content    = wpinv_email_format_text( $content );
+    $content    = wpinv_email_format_text($content);
     
-    return apply_filters( 'wpinv_email_content', $content, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_content', $content, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_headers( $email_type = '', $invoice_id = 0, $invoice = array() ) {
+function wpinv_email_get_headers($email_type = '', $invoice_id = 0, $invoice = array()) {
     $from_name = wpinv_mail_get_from_address();
     $from_email = wpinv_mail_get_from_address();
     
-    $invoice    = !empty( $invoice ) && is_object( $invoice ) ? $invoice : ( $invoice_id > 0 ? wpinv_get_invoice( $invoice_id ) : NULL );
+    $invoice    = !empty($invoice) && is_object($invoice) ? $invoice : ($invoice_id > 0 ? wpinv_get_invoice($invoice_id) : NULL);
     
-    $headers    = "From: " . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
-    $headers    .= "Reply-To: ". $from_email . "\r\n";
+    $headers    = "From: " . stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8')) . " <$from_email>\r\n";
+    $headers    .= "Reply-To: " . $from_email . "\r\n";
     $headers    .= "Content-Type: " . wpinv_mail_get_content_type() . "\r\n";
     
-    return apply_filters( 'wpinv_email_headers', $headers, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_headers', $headers, $email_type, $invoice_id, $invoice);
 }
 
-function wpinv_email_get_attachments( $email_type = '', $invoice_id = 0, $invoice = array() ) {
+function wpinv_email_get_attachments($email_type = '', $invoice_id = 0, $invoice = array()) {
     $attachments = array();
     
-    return apply_filters( 'wpinv_email_attachments', $attachments, $email_type, $invoice_id, $invoice );
+    return apply_filters('wpinv_email_attachments', $attachments, $email_type, $invoice_id, $invoice);
 }
 
 function wpinv_email_global_vars() {
@@ -1163,73 +1163,73 @@ 
     $replace['sitename']    = $blogname;
     $replace['site-title']  = $blogname;
     
-    return apply_filters( 'wpinv_email_global_vars', array( $search, $replace ) );
+    return apply_filters('wpinv_email_global_vars', array($search, $replace));
 }
 
-function wpinv_email_format_text( $content ) {
+function wpinv_email_format_text($content) {
     global $wpinv_email_search, $wpinv_email_replace;
     
-    if ( empty( $wpinv_email_search ) ) {
+    if (empty($wpinv_email_search)) {
         $wpinv_email_search = array();
     }
     
-    if ( empty( $wpinv_email_replace ) ) {
+    if (empty($wpinv_email_replace)) {
         $wpinv_email_replace = array();
     }
     
-    $wpinv_email_search     = (array)apply_filters( 'wpinv_email_format_text_search', $wpinv_email_search );
-    $wpinv_email_replace    = (array)apply_filters( 'wpinv_email_format_text_replace', $wpinv_email_replace );
+    $wpinv_email_search     = (array)apply_filters('wpinv_email_format_text_search', $wpinv_email_search);
+    $wpinv_email_replace    = (array)apply_filters('wpinv_email_format_text_replace', $wpinv_email_replace);
     
     $global_vars    = wpinv_email_global_vars();
     
-    $search         = array_merge( $global_vars[0], $wpinv_email_search );
-    $replace        = array_merge( $global_vars[1], $wpinv_email_replace );
+    $search         = array_merge($global_vars[0], $wpinv_email_search);
+    $replace        = array_merge($global_vars[1], $wpinv_email_replace);
     
-    if ( empty( $search ) || empty( $replace ) || !is_array( $search ) || !is_array( $replace ) ) {
+    if (empty($search) || empty($replace) || !is_array($search) || !is_array($replace)) {
         return  $content;
     }
         
-    return str_replace( $search, $replace, $content );
+    return str_replace($search, $replace, $content);
 }
 
-function wpinv_email_style_body( $content ) {
+function wpinv_email_style_body($content) {
     // make sure we only inline CSS for html emails
-    if ( in_array( wpinv_mail_get_content_type(), array( 'text/html', 'multipart/alternative' ) ) && class_exists( 'DOMDocument' ) ) {
+    if (in_array(wpinv_mail_get_content_type(), array('text/html', 'multipart/alternative')) && class_exists('DOMDocument')) {
         ob_start();
-        wpinv_get_template( 'emails/wpinv-email-styles.php' );
-        $css = apply_filters( 'wpinv_email_styles', ob_get_clean() );
+        wpinv_get_template('emails/wpinv-email-styles.php');
+        $css = apply_filters('wpinv_email_styles', ob_get_clean());
         
         // apply CSS styles inline for picky email clients
         try {
-            $emogrifier = new Emogrifier( $content, $css );
+            $emogrifier = new Emogrifier($content, $css);
             $content    = $emogrifier->emogrify();
-        } catch ( Exception $e ) {
-            wpinv_error_log( $e->getMessage(), 'emogrifier' );
+        } catch (Exception $e) {
+            wpinv_error_log($e->getMessage(), 'emogrifier');
         }
     }
     return $content;
 }
 
-function wpinv_email_header( $email_heading = '', $invoice = array(), $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-header.php', array( 'email_heading' => $email_heading, 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_header($email_heading = '', $invoice = array(), $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-header.php', array('email_heading' => $email_heading, 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
 /**
  * Get the email footer.
  */
-function wpinv_email_footer( $invoice = array(), $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-footer.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_footer($invoice = array(), $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-footer.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_email_wrap_message( $message ) {
+function wpinv_email_wrap_message($message) {
     // Buffer
     ob_start();
 
-    do_action( 'wpinv_email_header' );
+    do_action('wpinv_email_header');
 
-    echo wpautop( wptexturize( $message ) );
+    echo wpautop(wptexturize($message));
 
-    do_action( 'wpinv_email_footer' );
+    do_action('wpinv_email_footer');
 
     // Get contents
     $message = ob_get_clean();
@@ -1237,86 +1237,86 @@ 
     return $message;
 }
 
-function wpinv_email_invoice_details( $invoice, $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-invoice-details.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_invoice_details($invoice, $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-invoice-details.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_email_invoice_items( $invoice, $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-invoice-items.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_invoice_items($invoice, $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-invoice-items.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_email_billing_details( $invoice, $email_type = '', $sent_to_admin = false ) {
-    wpinv_get_template( 'emails/wpinv-email-billing-details.php', array( 'invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin ) );
+function wpinv_email_billing_details($invoice, $email_type = '', $sent_to_admin = false) {
+    wpinv_get_template('emails/wpinv-email-billing-details.php', array('invoice' => $invoice, 'email_type' => $email_type, 'sent_to_admin' => $sent_to_admin));
 }
 
-function wpinv_send_customer_invoice( $data = array() ) {
-    $invoice_id = !empty( $data['invoice_id'] ) ? absint( $data['invoice_id'] ) : NULL;
+function wpinv_send_customer_invoice($data = array()) {
+    $invoice_id = !empty($data['invoice_id']) ? absint($data['invoice_id']) : NULL;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return;
     }
 
-    if ( !current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to send invoice notification', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to send invoice notification', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
-    $sent = wpinv_user_invoice_notification( $invoice_id );
+    $sent = wpinv_user_invoice_notification($invoice_id);
     
     $status = $sent ? 'email_sent' : 'email_fail';
     
-    $redirect = add_query_arg( array( 'wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false ) );
-    wp_redirect( $redirect );
+    $redirect = add_query_arg(array('wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false));
+    wp_redirect($redirect);
     exit;
 }
-add_action( 'wpinv_send_invoice', 'wpinv_send_customer_invoice' );
+add_action('wpinv_send_invoice', 'wpinv_send_customer_invoice');
 
-function wpinv_send_overdue_reminder( $data = array() ) {
-    $invoice_id = !empty( $data['invoice_id'] ) ? absint( $data['invoice_id'] ) : NULL;
+function wpinv_send_overdue_reminder($data = array()) {
+    $invoice_id = !empty($data['invoice_id']) ? absint($data['invoice_id']) : NULL;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return;
     }
 
-    if ( !current_user_can( 'manage_options' ) ) {
-        wp_die( __( 'You do not have permission to send reminder notification', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+    if (!current_user_can('manage_options')) {
+        wp_die(__('You do not have permission to send reminder notification', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
-    $sent = wpinv_send_payment_reminder_notification( $invoice_id );
+    $sent = wpinv_send_payment_reminder_notification($invoice_id);
     
     $status = $sent ? 'email_sent' : 'email_fail';
     
-    $redirect = add_query_arg( array( 'wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false ) );
-    wp_redirect( $redirect );
+    $redirect = add_query_arg(array('wpinv-message' => $status, 'wpi_action' => false, 'invoice_id' => false));
+    wp_redirect($redirect);
     exit;
 }
-add_action( 'wpinv_send_reminder', 'wpinv_send_overdue_reminder' );
+add_action('wpinv_send_reminder', 'wpinv_send_overdue_reminder');
 
-function wpinv_send_customer_note_email( $data ) {
-    $invoice_id = !empty( $data['invoice_id'] ) ? absint( $data['invoice_id'] ) : NULL;
+function wpinv_send_customer_note_email($data) {
+    $invoice_id = !empty($data['invoice_id']) ? absint($data['invoice_id']) : NULL;
     
-    if ( empty( $invoice_id ) ) {
+    if (empty($invoice_id)) {
         return;
     }
     
-    $sent = wpinv_user_note_notification( $invoice_id, $data );
+    $sent = wpinv_user_note_notification($invoice_id, $data);
 }
-add_action( 'wpinv_new_customer_note', 'wpinv_send_customer_note_email', 10, 1 );
+add_action('wpinv_new_customer_note', 'wpinv_send_customer_note_email', 10, 1);
 
-function wpinv_add_notes_to_invoice_email( $invoice, $email_type, $sent_to_admin ) {
-    if ( !empty( $invoice ) && $email_type == 'user_invoice' && $invoice_notes = wpinv_get_invoice_notes( $invoice->ID, true ) ) {
-        $date_format = get_option( 'date_format' );
-        $time_format = get_option( 'time_format' );
+function wpinv_add_notes_to_invoice_email($invoice, $email_type, $sent_to_admin) {
+    if (!empty($invoice) && $email_type == 'user_invoice' && $invoice_notes = wpinv_get_invoice_notes($invoice->ID, true)) {
+        $date_format = get_option('date_format');
+        $time_format = get_option('time_format');
         ?>
         <div id="wpinv-email-notes">
-            <h3 class="wpinv-notes-t"><?php echo apply_filters( 'wpinv_email_invoice_notes_title', __( 'Invoice Notes', 'invoicing' ) ); ?></h3>
+            <h3 class="wpinv-notes-t"><?php echo apply_filters('wpinv_email_invoice_notes_title', __('Invoice Notes', 'invoicing')); ?></h3>
             <ol class="wpinv-notes-lists">
         <?php
-        foreach ( $invoice_notes as $note ) {
-            $note_time = strtotime( $note->comment_date );
+        foreach ($invoice_notes as $note) {
+            $note_time = strtotime($note->comment_date);
             ?>
             <li class="comment wpinv-note">
-            <p class="wpinv-note-date meta"><?php printf( __( '%2$s at %3$s', 'invoicing' ), $note->comment_author, date_i18n( $date_format, $note_time ), date_i18n( $time_format, $note_time ), $note_time ); ?></p>
-            <div class="wpinv-note-desc description"><?php echo wpautop( wptexturize( $note->comment_content ) ); ?></div>
+            <p class="wpinv-note-date meta"><?php printf(__('%2$s at %3$s', 'invoicing'), $note->comment_author, date_i18n($date_format, $note_time), date_i18n($time_format, $note_time), $note_time); ?></p>
+            <div class="wpinv-note-desc description"><?php echo wpautop(wptexturize($note->comment_content)); ?></div>
             </li>
             <?php
         }
@@ -1325,21 +1325,21 @@ 
         <?php
     }
 }
-add_action( 'wpinv_email_billing_details', 'wpinv_add_notes_to_invoice_email', 10, 3 );
+add_action('wpinv_email_billing_details', 'wpinv_add_notes_to_invoice_email', 10, 3);
 
 function wpinv_email_payment_reminders() {    
     global $wpi_auto_reminder;
-    if ( !wpinv_get_option( 'email_overdue_active' ) ) {
+    if (!wpinv_get_option('email_overdue_active')) {
         return;
     }
     
-    if ( $reminder_days = wpinv_get_option( 'email_due_reminder_days' ) ) {
-        $reminder_days  = is_array( $reminder_days ) ? array_values( $reminder_days ) : '';
+    if ($reminder_days = wpinv_get_option('email_due_reminder_days')) {
+        $reminder_days  = is_array($reminder_days) ? array_values($reminder_days) : '';
         
-        if ( empty( $reminder_days ) ) {
+        if (empty($reminder_days)) {
             return;
         }
-        $reminder_days  = array_unique( array_map( 'absint', $reminder_days ) );
+        $reminder_days = array_unique(array_map('absint', $reminder_days));
         
         $args = array(
             'post_type'     => 'wpi_invoice',
@@ -1349,7 +1349,7 @@ 
             'meta_query'    => array(
                 array(
                     'key'       =>  '_wpinv_due_date',
-                    'value'     =>  array( '', 'none' ),
+                    'value'     =>  array('', 'none'),
                     'compare'   =>  'NOT IN',
                 )
             ),
@@ -1358,64 +1358,64 @@ 
             'order'         => 'ASC',
         );
         
-        $invoices = get_posts( $args );
+        $invoices = get_posts($args);
         
-        if ( empty( $invoices ) ) {
+        if (empty($invoices)) {
             return;
         }
         
-        $date_to_send   = array();
+        $date_to_send = array();
         
-        foreach ( $invoices as $id ) {
-            $due_date = get_post_meta( $id, '_wpinv_due_date', true );
+        foreach ($invoices as $id) {
+            $due_date = get_post_meta($id, '_wpinv_due_date', true);
             
-            foreach ( $reminder_days as $key => $days ) {
-                if ( $days !== '' ) {
-                    $date_to_send[$id][] = date_i18n( 'Y-m-d', strtotime( $due_date ) + ( $days * DAY_IN_SECONDS ) );
+            foreach ($reminder_days as $key => $days) {
+                if ($days !== '') {
+                    $date_to_send[$id][] = date_i18n('Y-m-d', strtotime($due_date) + ($days * DAY_IN_SECONDS));
                 }
             }
         }
 
-        $today              = date_i18n( 'Y-m-d' );
+        $today              = date_i18n('Y-m-d');
         $wpi_auto_reminder  = true;
 
-        foreach ( $date_to_send as $id => $values ) {
-            if ( in_array( $today, $values ) ) {
-                $sent = get_post_meta( $id, '_wpinv_reminder_sent', true );
+        foreach ($date_to_send as $id => $values) {
+            if (in_array($today, $values)) {
+                $sent = get_post_meta($id, '_wpinv_reminder_sent', true);
 
-                if ( isset( $sent ) && !empty( $sent ) ) {
-                    if ( !in_array( $today, $sent ) ) {
-                        do_action( 'wpinv_send_payment_reminder_notification', $id );
+                if (isset($sent) && !empty($sent)) {
+                    if (!in_array($today, $sent)) {
+                        do_action('wpinv_send_payment_reminder_notification', $id);
                     }
                 } else {
-                    do_action( 'wpinv_send_payment_reminder_notification', $id );
+                    do_action('wpinv_send_payment_reminder_notification', $id);
                 }
             }
         }
         
-        $wpi_auto_reminder  = false;
+        $wpi_auto_reminder = false;
     }
 }
 
-function wpinv_send_payment_reminder_notification( $invoice_id ) {
+function wpinv_send_payment_reminder_notification($invoice_id) {
     global $wpinv_email_search, $wpinv_email_replace;
     
     $email_type = 'overdue';
-    if ( !wpinv_email_is_enabled( $email_type ) ) {
+    if (!wpinv_email_is_enabled($email_type)) {
         return false;
     }
     
-    $invoice    = wpinv_get_invoice( $invoice_id );
-    if ( empty( $invoice ) ) {
+    $invoice = wpinv_get_invoice($invoice_id);
+    if (empty($invoice)) {
         return false;
     }
     
-    if ( !$invoice->needs_payment() ) {
+    if (!$invoice->needs_payment()) {
         return false;
     }
     
-    $recipient  = wpinv_email_get_recipient( $email_type, $invoice_id, $invoice );
-    if ( !is_email( $recipient ) ) {
+    $recipient = wpinv_email_get_recipient($email_type, $invoice_id, $invoice);
+    if (!is_email($recipient)) {
         return false;
     }
         
@@ -1431,60 +1431,60 @@ 
     $replace                    = array();
     $replace['full_name']       = $invoice->get_user_full_name();
     $replace['invoice_number']  = $invoice->get_number();
-    $replace['invoice_due_date']= $invoice->get_due_date( true );
-    $replace['invoice_total']   = $invoice->get_total( true );
-    $replace['invoice_link']    = $invoice->get_view_url( true );
-    $replace['invoice_pay_link']= $invoice->get_checkout_payment_url( false, true );
-    $replace['is_was']          = strtotime( $invoice->get_due_date() ) < strtotime( date_i18n( 'Y-m-d' ) ) ? __( 'was', 'invoicing' ) : __( 'is', 'invoicing' );
+    $replace['invoice_due_date'] = $invoice->get_due_date(true);
+    $replace['invoice_total']   = $invoice->get_total(true);
+    $replace['invoice_link']    = $invoice->get_view_url(true);
+    $replace['invoice_pay_link'] = $invoice->get_checkout_payment_url(false, true);
+    $replace['is_was']          = strtotime($invoice->get_due_date()) < strtotime(date_i18n('Y-m-d')) ? __('was', 'invoicing') : __('is', 'invoicing');
 
     $wpinv_email_search         = $search;
     $wpinv_email_replace        = $replace;
     
-    $subject        = wpinv_email_get_subject( $email_type, $invoice_id, $invoice );
-    $email_heading  = wpinv_email_get_heading( $email_type, $invoice_id, $invoice );
-    $headers        = wpinv_email_get_headers( $email_type, $invoice_id, $invoice );
-    $attachments    = wpinv_email_get_attachments( $email_type, $invoice_id, $invoice );
+    $subject        = wpinv_email_get_subject($email_type, $invoice_id, $invoice);
+    $email_heading  = wpinv_email_get_heading($email_type, $invoice_id, $invoice);
+    $headers        = wpinv_email_get_headers($email_type, $invoice_id, $invoice);
+    $attachments    = wpinv_email_get_attachments($email_type, $invoice_id, $invoice);
     
-    $message_body   = wpinv_email_get_content( $email_type, $invoice_id, $invoice );
+    $message_body   = wpinv_email_get_content($email_type, $invoice_id, $invoice);
     
-    $content        = wpinv_get_template_html( 'emails/wpinv-email-' . $email_type . '.php', array(
+    $content        = wpinv_get_template_html('emails/wpinv-email-' . $email_type . '.php', array(
             'invoice'       => $invoice,
             'email_type'    => $email_type,
             'email_heading' => $email_heading,
             'sent_to_admin' => false,
             'plain_text'    => false,
             'message_body'  => $message_body
-        ) );
+        ));
         
-    $content        = wpinv_email_format_text( $content );
+    $content = wpinv_email_format_text($content);
 
-    $sent = wpinv_mail_send( $recipient, $subject, $content, $headers, $attachments );
-    if ( $sent ) {
-        do_action( 'wpinv_payment_reminder_sent', $invoice_id, $invoice );
+    $sent = wpinv_mail_send($recipient, $subject, $content, $headers, $attachments);
+    if ($sent) {
+        do_action('wpinv_payment_reminder_sent', $invoice_id, $invoice);
     }
         
     return $sent;
 }
-add_action( 'wpinv_send_payment_reminder_notification', 'wpinv_send_payment_reminder_notification', 10, 1 );
+add_action('wpinv_send_payment_reminder_notification', 'wpinv_send_payment_reminder_notification', 10, 1);
 
-function wpinv_payment_reminder_sent( $invoice_id, $invoice ) {
+function wpinv_payment_reminder_sent($invoice_id, $invoice) {
     global $wpi_auto_reminder;
     
-    $sent = get_post_meta( $invoice_id, '_wpinv_reminder_sent', true );
+    $sent = get_post_meta($invoice_id, '_wpinv_reminder_sent', true);
     
-    if ( empty( $sent ) ) {
+    if (empty($sent)) {
         $sent = array();
     }
-    $sent[] = date_i18n( 'Y-m-d' );
+    $sent[] = date_i18n('Y-m-d');
     
-    update_post_meta( $invoice_id, '_wpinv_reminder_sent', $sent );
+    update_post_meta($invoice_id, '_wpinv_reminder_sent', $sent);
     
-    if ( $wpi_auto_reminder ) { // Auto reminder note.
-        $note = __( 'Manual reminder sent to the user.', 'invoicing' );
-        $invoice->add_note( $note, false, false, true );
+    if ($wpi_auto_reminder) { // Auto reminder note.
+        $note = __('Manual reminder sent to the user.', 'invoicing');
+        $invoice->add_note($note, false, false, true);
     } else { // Menual reminder note.
-        $note = __( 'Manual reminder sent to the user.', 'invoicing' );
-        $invoice->add_note( $note );
+        $note = __('Manual reminder sent to the user.', 'invoicing');
+        $invoice->add_note($note);
     }
 }
-add_action( 'wpinv_payment_reminder_sent', 'wpinv_payment_reminder_sent', 10, 2 );
\ No newline at end of file
+add_action('wpinv_payment_reminder_sent', 'wpinv_payment_reminder_sent', 10, 2);
\ No newline at end of file

includes/class-wpinv.php

Spacing +153 added lines, -153 removed lines

@@ -7,15 +7,15 @@ 
  */
  
 // MUST have WordPress.
-if ( !defined( 'WPINC' ) ) {
-    exit( 'Do NOT access this file directly: ' . basename( __FILE__ ) );
+if (!defined('WPINC')) {
+    exit('Do NOT access this file directly: ' . basename(__FILE__));
 }
 
 class WPInv_Plugin {
     private static $instance;
     
     public static function run() {
-        if ( !isset( self::$instance ) && !( self::$instance instanceof WPInv_Plugin ) ) {
+        if (!isset(self::$instance) && !(self::$instance instanceof WPInv_Plugin)) {
             self::$instance = new WPInv_Plugin;
             self::$instance->includes();
             self::$instance->actions();
@@ -23,7 +23,7 @@ 
             self::$instance->reports    = new WPInv_Reports();
         }
         
-        do_action( 'wpinv_loaded' );
+        do_action('wpinv_loaded');
         
         return self::$instance;
     }
@@ -33,31 +33,31 @@ 
     }
     
     public function define_constants() {
-        define( 'WPINV_PLUGIN_DIR', plugin_dir_path( WPINV_PLUGIN_FILE ) );
-        define( 'WPINV_PLUGIN_URL', plugin_dir_url( WPINV_PLUGIN_FILE ) );
+        define('WPINV_PLUGIN_DIR', plugin_dir_path(WPINV_PLUGIN_FILE));
+        define('WPINV_PLUGIN_URL', plugin_dir_url(WPINV_PLUGIN_FILE));
     }
     
     private function actions() {
         /* Internationalize the text strings used. */
-        add_action( 'plugins_loaded', array( &$this, 'plugins_loaded' ) );
+        add_action('plugins_loaded', array(&$this, 'plugins_loaded'));
         
         /* Perform actions on admin initialization. */
-        add_action( 'admin_init', array( &$this, 'admin_init') );
-        add_action( 'init', array( &$this, 'init' ), 3 );
-        add_action( 'init', array( 'WPInv_Shortcodes', 'init' ) );
-        add_action( 'init', array( &$this, 'wpinv_actions' ) );
+        add_action('admin_init', array(&$this, 'admin_init'));
+        add_action('init', array(&$this, 'init'), 3);
+        add_action('init', array('WPInv_Shortcodes', 'init'));
+        add_action('init', array(&$this, 'wpinv_actions'));
         
-        if ( class_exists( 'BuddyPress' ) ) {
-            add_action( 'bp_include', array( &$this, 'bp_invoicing_init' ) );
+        if (class_exists('BuddyPress')) {
+            add_action('bp_include', array(&$this, 'bp_invoicing_init'));
         }
 
-        add_action( 'wp_enqueue_scripts', array( &$this, 'enqueue_scripts' ) );
+        add_action('wp_enqueue_scripts', array(&$this, 'enqueue_scripts'));
         
-        if ( is_admin() ) {
-            add_action( 'admin_enqueue_scripts', array( &$this, 'admin_enqueue_scripts' ) );
-            add_action( 'admin_body_class', array( &$this, 'admin_body_class' ) );
+        if (is_admin()) {
+            add_action('admin_enqueue_scripts', array(&$this, 'admin_enqueue_scripts'));
+            add_action('admin_body_class', array(&$this, 'admin_body_class'));
         } else {
-            add_filter( 'pre_get_posts', array( &$this, 'pre_get_posts' ) );
+            add_filter('pre_get_posts', array(&$this, 'pre_get_posts'));
         }
         
         /**
@@ -67,9 +67,9 @@ 
          *
          * @param WPInv_Plugin $this. Current WPInv_Plugin instance. Passed by reference.
          */
-        do_action_ref_array( 'wpinv_actions', array( &$this ) );
+        do_action_ref_array('wpinv_actions', array(&$this));
 
-        add_action( 'admin_init', array( &$this, 'activation_redirect') );
+        add_action('admin_init', array(&$this, 'activation_redirect'));
     }
     
     public function plugins_loaded() {
@@ -83,187 +83,187 @@ 
      * @since 1.0
      */
     public function load_textdomain() {
-        $locale = apply_filters( 'plugin_locale', get_locale(), 'invoicing' );
+        $locale = apply_filters('plugin_locale', get_locale(), 'invoicing');
         
-        load_textdomain( 'invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo' );
-        load_plugin_textdomain( 'invoicing', false, WPINV_PLUGIN_DIR . 'languages' );
+        load_textdomain('invoicing', WP_LANG_DIR . '/invoicing/invoicing-' . $locale . '.mo');
+        load_plugin_textdomain('invoicing', false, WPINV_PLUGIN_DIR . 'languages');
         
         /**
          * Define language constants.
          */
-        require_once( WPINV_PLUGIN_DIR . 'language.php' );
+        require_once(WPINV_PLUGIN_DIR . 'language.php');
     }
         
     public function includes() {
         global $wpinv_options;
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/register-settings.php');
         $wpinv_options = wpinv_get_settings();
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-gd-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-session.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php' );
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php' );
-        if ( !class_exists( 'Geodir_EUVat' ) ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-post-types.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-email-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-general-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-helper-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-tax-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-template-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-address-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-invoice-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-item-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-discount-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gateway-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-payment-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-user-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-gd-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/wpinv-error-functions.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-invoice.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-item.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-notes.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-session.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-ajax.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-api.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-reports.php');
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-shortcodes.php');
+        if (!class_exists('Geodir_EUVat')) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/libraries/wpinv-euvat/class-wpinv-euvat.php');
         }
         
-        $gateways = array_keys( wpinv_get_enabled_payment_gateways() );
-        if ( !empty( $gateways ) ) {
-            foreach ( $gateways as $gateway ) {
-                if ( $gateway == 'manual' ) {
+        $gateways = array_keys(wpinv_get_enabled_payment_gateways());
+        if (!empty($gateways)) {
+            foreach ($gateways as $gateway) {
+                if ($gateway == 'manual') {
                     continue;
                 }
                 
                 $gateway_file = WPINV_PLUGIN_DIR . 'includes/gateways/' . $gateway . '.php';
                 
-                if ( file_exists( $gateway_file ) ) {
-                    require_once( $gateway_file );
+                if (file_exists($gateway_file)) {
+                    require_once($gateway_file);
                 }
             }
         }
-        require_once( WPINV_PLUGIN_DIR . 'includes/gateways/manual.php' );
-        
-        if ( is_admin() ) {
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php' );
-            require_once( WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/gateways/manual.php');
+        
+        if (is_admin()) {
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/wpinv-admin-functions.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-meta-boxes.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-details.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-items.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-notes.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/meta-boxes/class-mb-invoice-address.php');
+            require_once(WPINV_PLUGIN_DIR . 'includes/admin/admin-pages.php');
         }
         
         // include css inliner
-        if ( ! class_exists( 'Emogrifier' ) && class_exists( 'DOMDocument' ) ) {
-            include_once( WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php' );
+        if (!class_exists('Emogrifier') && class_exists('DOMDocument')) {
+            include_once(WPINV_PLUGIN_DIR . 'includes/libraries/class-emogrifier.php');
         }
         
-        require_once( WPINV_PLUGIN_DIR . 'includes/admin/install.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/admin/install.php');
     }
     
     public function init() {
     }
     
     public function admin_init() {
-        if (!(defined( 'DOING_AJAX' ) && DOING_AJAX)) {
+        if (!(defined('DOING_AJAX') && DOING_AJAX)) {
         }
         
-        add_action( 'admin_print_scripts-edit.php', array( &$this, 'admin_print_scripts_edit_php' ) );
+        add_action('admin_print_scripts-edit.php', array(&$this, 'admin_print_scripts_edit_php'));
     }
 
     public function activation_redirect() {
         // Bail if no activation redirect
-        if ( !get_transient( '_wpinv_activation_redirect' ) ) {
+        if (!get_transient('_wpinv_activation_redirect')) {
             return;
         }
 
         // Delete the redirect transient
-        delete_transient( '_wpinv_activation_redirect' );
+        delete_transient('_wpinv_activation_redirect');
 
         // Bail if activating from network, or bulk
-        if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+        if (is_network_admin() || isset($_GET['activate-multi'])) {
             return;
         }
 
-        wp_safe_redirect( admin_url( 'admin.php?page=wpinv-settings&tab=general' ) );
+        wp_safe_redirect(admin_url('admin.php?page=wpinv-settings&tab=general'));
         exit;
     }
     
     public function enqueue_scripts() {
-        $suffix       = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_deregister_style( 'font-awesome' );
-        wp_register_style( 'font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0' );
-        wp_enqueue_style( 'font-awesome' );
+        wp_deregister_style('font-awesome');
+        wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0');
+        wp_enqueue_style('font-awesome');
         
-        wp_register_style( 'wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_front_style' );
+        wp_register_style('wpinv_front_style', WPINV_PLUGIN_URL . 'assets/css/invoice-front.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_front_style');
                
         // Register scripts
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
-        wp_register_script( 'wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front' . $suffix . '.js', array( 'jquery', 'wpinv-vat-script' ),  WPINV_VERSION );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
+        wp_register_script('wpinv-front-script', WPINV_PLUGIN_URL . 'assets/js/invoice-front' . $suffix . '.js', array('jquery', 'wpinv-vat-script'), WPINV_VERSION);
         
         $localize                         = array();
-        $localize['ajax_url']             = admin_url( 'admin-ajax.php' );
-        $localize['nonce']                = wp_create_nonce( 'wpinv-nonce' );
+        $localize['ajax_url']             = admin_url('admin-ajax.php');
+        $localize['nonce']                = wp_create_nonce('wpinv-nonce');
         $localize['currency_symbol']      = wpinv_currency_symbol();
         $localize['currency_pos']         = wpinv_currency_position();
         $localize['thousand_sep']         = wpinv_thousands_seperator();
         $localize['decimal_sep']          = wpinv_decimal_seperator();
         $localize['decimals']             = wpinv_decimals();
         
-        $localize = apply_filters( 'wpinv_front_js_localize', $localize );
+        $localize = apply_filters('wpinv_front_js_localize', $localize);
         
-        wp_enqueue_script( 'jquery-blockui' );
-        wp_enqueue_script( 'wpinv-front-script' );
-        wp_localize_script( 'wpinv-front-script', 'WPInv', $localize );
+        wp_enqueue_script('jquery-blockui');
+        wp_enqueue_script('wpinv-front-script');
+        wp_localize_script('wpinv-front-script', 'WPInv', $localize);
     }
     
     public function admin_enqueue_scripts() {
         global $post, $pagenow;
         
         $post_type  = wpinv_admin_post_type();
-        $suffix     = '';//defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+        $suffix     = ''; //defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
         
-        wp_deregister_style( 'font-awesome' );
-        wp_register_style( 'font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0' );
-        wp_enqueue_style( 'font-awesome' );
+        wp_deregister_style('font-awesome');
+        wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome' . $suffix . '.css', array(), '4.7.0');
+        wp_enqueue_style('font-awesome');
         
-        wp_register_style( 'jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16' );
-        wp_enqueue_style( 'jquery-ui-css' );
+        wp_register_style('jquery-ui-css', WPINV_PLUGIN_URL . 'assets/css/jquery-ui' . $suffix . '.css', array(), '1.8.16');
+        wp_enqueue_style('jquery-ui-css');
         
-        wp_register_style( 'jquery-chosen', WPINV_PLUGIN_URL . 'assets/css/chosen' . $suffix . '.css', array(), '1.6.2' );
-        wp_enqueue_style( 'jquery-chosen' );
+        wp_register_style('jquery-chosen', WPINV_PLUGIN_URL . 'assets/css/chosen' . $suffix . '.css', array(), '1.6.2');
+        wp_enqueue_style('jquery-chosen');
 
-        wp_register_script( 'jquery-chosen', WPINV_PLUGIN_URL . 'assets/js/chosen.jquery' . $suffix . '.js', array( 'jquery' ), '1.6.2' );
-        wp_enqueue_script( 'jquery-chosen' );
+        wp_register_script('jquery-chosen', WPINV_PLUGIN_URL . 'assets/js/chosen.jquery' . $suffix . '.js', array('jquery'), '1.6.2');
+        wp_enqueue_script('jquery-chosen');
         
-        wp_register_style( 'wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_meta_box_style' );
+        wp_register_style('wpinv_meta_box_style', WPINV_PLUGIN_URL . 'assets/css/meta-box.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_meta_box_style');
         
-        wp_register_style( 'wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION );
-        wp_enqueue_style( 'wpinv_admin_style' );
+        wp_register_style('wpinv_admin_style', WPINV_PLUGIN_URL . 'assets/css/admin.css', array(), WPINV_VERSION);
+        wp_enqueue_style('wpinv_admin_style');
         
-        if ( $post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ( $pagenow == 'post-new.php' || $pagenow == 'post.php' ) ) {
-            wp_enqueue_script( 'jquery-ui-datepicker' );
+        if ($post_type == 'wpi_discount' || $post_type == 'wpi_invoice' && ($pagenow == 'post-new.php' || $pagenow == 'post.php')) {
+            wp_enqueue_script('jquery-ui-datepicker');
         }
 
-        wp_enqueue_style( 'wp-color-picker' );
-        wp_enqueue_script( 'wp-color-picker' );
+        wp_enqueue_style('wp-color-picker');
+        wp_enqueue_script('wp-color-picker');
         
-        wp_register_script( 'jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array( 'jquery' ), '2.70', true );
+        wp_register_script('jquery-blockui', WPINV_PLUGIN_URL . 'assets/js/jquery.blockUI.min.js', array('jquery'), '2.70', true);
         
-        wp_register_script( 'wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array( 'jquery', 'jquery-blockui' ),  WPINV_VERSION );
-        wp_enqueue_script( 'wpinv-admin-script' );
+        wp_register_script('wpinv-admin-script', WPINV_PLUGIN_URL . 'assets/js/admin' . $suffix . '.js', array('jquery', 'jquery-blockui'), WPINV_VERSION);
+        wp_enqueue_script('wpinv-admin-script');
         
         $localize                               = array();
-        $localize['ajax_url']                   = admin_url( 'admin-ajax.php' );
-        $localize['post_ID']                    = isset( $post->ID ) ? $post->ID : '';
-        $localize['wpinv_nonce']                = wp_create_nonce( 'wpinv-nonce' );
-        $localize['add_invoice_note_nonce']     = wp_create_nonce( 'add-invoice-note' );
-        $localize['delete_invoice_note_nonce']  = wp_create_nonce( 'delete-invoice-note' );
-        $localize['invoice_item_nonce']         = wp_create_nonce( 'invoice-item' );
-        $localize['billing_details_nonce']      = wp_create_nonce( 'get-billing-details' );
+        $localize['ajax_url']                   = admin_url('admin-ajax.php');
+        $localize['post_ID']                    = isset($post->ID) ? $post->ID : '';
+        $localize['wpinv_nonce']                = wp_create_nonce('wpinv-nonce');
+        $localize['add_invoice_note_nonce']     = wp_create_nonce('add-invoice-note');
+        $localize['delete_invoice_note_nonce']  = wp_create_nonce('delete-invoice-note');
+        $localize['invoice_item_nonce']         = wp_create_nonce('invoice-item');
+        $localize['billing_details_nonce']      = wp_create_nonce('get-billing-details');
         $localize['tax']                        = wpinv_tax_amount();
         $localize['discount']                   = wpinv_discount_amount();
         $localize['currency_symbol']            = wpinv_currency_symbol();
@@ -271,55 +271,55 @@ 
         $localize['thousand_sep']               = wpinv_thousands_seperator();
         $localize['decimal_sep']                = wpinv_decimal_seperator();
         $localize['decimals']                   = wpinv_decimals();
-        $localize['save_invoice']               = __( 'Save Invoice', 'invoicing' );
-        $localize['status_publish']             = wpinv_status_nicename( 'publish' );
-        $localize['status_pending']             = wpinv_status_nicename( 'pending' );
-        $localize['delete_tax_rate']            = __( 'Are you sure you wish to delete this tax rate?', 'invoicing' );
-        $localize['OneItemMin']                 = __( 'Invoice must contain at least one item', 'invoicing' );
-        $localize['DeleteInvoiceItem']          = __( 'Are you sure you wish to delete this item?', 'invoicing' );
-        $localize['FillBillingDetails']         = __( 'Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing' );
-        $localize['confirmCalcTotals']          = __( 'Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing' );
-        $localize['AreYouSure']                 = __( 'Are you sure?', 'invoicing' );
-        $localize['hasGD']                      = wpinv_gd_active();;
+        $localize['save_invoice']               = __('Save Invoice', 'invoicing');
+        $localize['status_publish']             = wpinv_status_nicename('publish');
+        $localize['status_pending']             = wpinv_status_nicename('pending');
+        $localize['delete_tax_rate']            = __('Are you sure you wish to delete this tax rate?', 'invoicing');
+        $localize['OneItemMin']                 = __('Invoice must contain at least one item', 'invoicing');
+        $localize['DeleteInvoiceItem']          = __('Are you sure you wish to delete this item?', 'invoicing');
+        $localize['FillBillingDetails']         = __('Fill the user\'s billing information? This will remove any currently entered billing information', 'invoicing');
+        $localize['confirmCalcTotals']          = __('Recalculate totals? This will recalculate totals based on the user billing country. If no billing country is set it will use the base country.', 'invoicing');
+        $localize['AreYouSure']                 = __('Are you sure?', 'invoicing');
+        $localize['hasGD']                      = wpinv_gd_active(); ;
         $localize['hasPM']                      = wpinv_pm_active();
-        $localize['emptyInvoice']               = __( 'Add atleast one item to save invoice!', 'invoicing' );
-        $localize['deletePackage']              = __( 'GD package items should be deleted from GD payment manager only, otherwise it will break invoices that created with this package!', 'invoicing' );
-        $localize['deletePackages']             = __( 'GD package items should be deleted from GD payment manager only', 'invoicing' );
-        $localize['deleteInvoiceFirst']         = __( 'This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing' );
+        $localize['emptyInvoice']               = __('Add atleast one item to save invoice!', 'invoicing');
+        $localize['deletePackage']              = __('GD package items should be deleted from GD payment manager only, otherwise it will break invoices that created with this package!', 'invoicing');
+        $localize['deletePackages']             = __('GD package items should be deleted from GD payment manager only', 'invoicing');
+        $localize['deleteInvoiceFirst']         = __('This item is in use! Before delete this item, you need to delete all the invoice(s) using this item.', 'invoicing');
         
-        wp_localize_script( 'wpinv-admin-script', 'WPInv_Admin', $localize );
+        wp_localize_script('wpinv-admin-script', 'WPInv_Admin', $localize);
     }
     
-    public function admin_body_class( $classes ) {
+    public function admin_body_class($classes) {
         global $pagenow;
         
-        $page = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
+        $page = isset($_GET['page']) ? strtolower($_GET['page']) : false;
 
         $add_class = false;
-        if ( $pagenow == 'admin.php' && $page ) {
-            $add_class = strpos( $page, 'wpinv-' );
+        if ($pagenow == 'admin.php' && $page) {
+            $add_class = strpos($page, 'wpinv-');
         }
         
         $settings_class = array();
-        if ( $page == 'wpinv-settings' ) {
-            if ( !empty( $_REQUEST['tab'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['tab'] );
+        if ($page == 'wpinv-settings') {
+            if (!empty($_REQUEST['tab'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['tab']);
             }
             
-            if ( !empty( $_REQUEST['section'] ) ) {
-                $settings_class[] = sanitize_text_field( $_REQUEST['section'] );
+            if (!empty($_REQUEST['section'])) {
+                $settings_class[] = sanitize_text_field($_REQUEST['section']);
             }
             
-            $settings_class[] = isset( $_REQUEST['wpi_sub'] ) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field( $_REQUEST['wpi_sub'] ) : 'main';
+            $settings_class[] = isset($_REQUEST['wpi_sub']) && $_REQUEST['wpi_sub'] !== '' ? sanitize_text_field($_REQUEST['wpi_sub']) : 'main';
         }
         
-        if ( !empty( $settings_class ) ) {
-            $classes .= ' wpi-' . wpinv_sanitize_key( implode( $settings_class, '-' ) );
+        if (!empty($settings_class)) {
+            $classes .= ' wpi-' . wpinv_sanitize_key(implode($settings_class, '-'));
         }
         
         $post_type = wpinv_admin_post_type();
         
-        if ( $post_type == 'wpi_invoice' || $add_class !== false ) {
+        if ($post_type == 'wpi_invoice' || $add_class !== false) {
             return $classes .= ' wpinv';
         } else {
             return $classes;
@@ -331,26 +331,26 @@ 
     public function admin_print_scripts_edit_php() {
         $post_type = wpinv_admin_post_type();
         
-        if ( $post_type == 'wpi_item' ) {
-            wp_enqueue_script( 'wpinv-inline-edit-post', WPINV_PLUGIN_URL . 'assets/js/quick-edit.js', array( 'jquery', 'inline-edit-post' ), '', true );
+        if ($post_type == 'wpi_item') {
+            wp_enqueue_script('wpinv-inline-edit-post', WPINV_PLUGIN_URL . 'assets/js/quick-edit.js', array('jquery', 'inline-edit-post'), '', true);
         }
     }
     
     public function wpinv_actions() {
-        if ( isset( $_REQUEST['wpi_action'] ) ) {
-            do_action( 'wpinv_' . wpinv_sanitize_key( $_REQUEST['wpi_action'] ), $_REQUEST );
+        if (isset($_REQUEST['wpi_action'])) {
+            do_action('wpinv_' . wpinv_sanitize_key($_REQUEST['wpi_action']), $_REQUEST);
         }
     }
     
-    public function pre_get_posts( $wp_query ) {
-        if ( !empty( $wp_query->query_vars['post_type'] ) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query() ) {
-            $wp_query->query_vars['post_status'] = array_keys( wpinv_get_invoice_statuses() );
+    public function pre_get_posts($wp_query) {
+        if (!empty($wp_query->query_vars['post_type']) && $wp_query->query_vars['post_type'] == 'wpi_invoice' && is_user_logged_in() && is_single() && $wp_query->is_main_query()) {
+            $wp_query->query_vars['post_status'] = array_keys(wpinv_get_invoice_statuses());
         }
         
         return $wp_query;
     }
     
     public function bp_invoicing_init() {
-        require_once( WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php' );
+        require_once(WPINV_PLUGIN_DIR . 'includes/class-wpinv-bp-core.php');
     }
 }
\ No newline at end of file

includes/class-wpinv-session.php

Spacing +60 added lines, -60 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * WPInv_Session Class.
@@ -46,44 +46,44 @@ 
 	public function __construct() {
 		$this->use_php_sessions = $this->use_php_sessions();
 
-		if ( $this->use_php_sessions ) {
-			if ( is_multisite() ) {
+		if ($this->use_php_sessions) {
+			if (is_multisite()) {
 				$this->prefix = '_' . get_current_blog_id();
 			}
 
 			// Use PHP SESSION (must be enabled via the WPINV_USE_PHP_SESSIONS constant)
-			add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
+			add_action('init', array($this, 'maybe_start_session'), -2);
 		} else {
 			// Use WP_Session (default)
-			if ( !defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'wpinv_wp_session' );
+			if (!defined('WP_SESSION_COOKIE')) {
+				define('WP_SESSION_COOKIE', 'wpinv_wp_session');
 			}
 
-			if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
+			if (!class_exists('Recursive_ArrayAccess')) {
 				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-recursive-arrayaccess.php';
 			}
             
-			if ( !class_exists( 'WP_Session_Utils' ) ) {
+			if (!class_exists('WP_Session_Utils')) {
 				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session-utils.php';
 			}
             
-			if ( defined( 'WP_CLI' ) && WP_CLI && !class_exists( 'WP_Session_Command' ) ) {
+			if (defined('WP_CLI') && WP_CLI && !class_exists('WP_Session_Command')) {
 				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-cli.php';
 			}
 
-			if ( !class_exists( 'WP_Session' ) ) {
+			if (!class_exists('WP_Session')) {
 				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/class-wp-session.php';
 				require_once WPINV_PLUGIN_DIR . 'includes/libraries/wp-session/wp-session.php';
 			}
 
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+			add_filter('wp_session_expiration_variant', array($this, 'set_expiration_variant_time'), 99999);
+			add_filter('wp_session_expiration', array($this, 'set_expiration_time'), 99999);
 		}
 
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
-			add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
+		if (empty($this->session) && !$this->use_php_sessions) {
+			add_action('plugins_loaded', array($this, 'init'), -1);
 		} else {
-			add_action( 'init', array( $this, 'init' ), -1 );
+			add_action('init', array($this, 'init'), -1);
 		}
 	}
 
@@ -95,8 +95,8 @@ 
 	 * @return void
 	 */
 	public function init() {
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION['wpi' . $this->prefix ] ) && is_array( $_SESSION['wpi' . $this->prefix ] ) ? $_SESSION['wpi' . $this->prefix ] : array();
+		if ($this->use_php_sessions) {
+			$this->session = isset($_SESSION['wpi' . $this->prefix]) && is_array($_SESSION['wpi' . $this->prefix]) ? $_SESSION['wpi' . $this->prefix] : array();
 		} else {
 			$this->session = WP_Session::get_instance();
 		}
@@ -112,10 +112,10 @@ 
 	 * @return string Session ID
 	 */
 	public function get_id() {
-		if ( $this->use_php_sessions ) {
-			$session_id = !empty( $_SESSION ) && function_exists( 'session_id' ) ? session_id() : NULL;
+		if ($this->use_php_sessions) {
+			$session_id = !empty($_SESSION) && function_exists('session_id') ? session_id() : NULL;
 		} else {
-			$session_id = !empty( $this->session ) && isset( $this->session->session_id ) ? $this->session->session_id : NULL;
+			$session_id = !empty($this->session) && isset($this->session->session_id) ? $this->session->session_id : NULL;
 		}
 		return $session_id;
 	}
@@ -128,9 +128,9 @@ 
 	 * @param string $key Session key
 	 * @return string Session variable
 	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+	public function get($key) {
+		$key = sanitize_key($key);
+		return isset($this->session[$key]) ? maybe_unserialize($this->session[$key]) : false;
 	}
 
 	/**
@@ -142,20 +142,20 @@ 
 	 * @param integer $value Session variable
 	 * @return string Session variable
 	 */
-	public function set( $key, $value ) {
-		$key = sanitize_key( $key );
+	public function set($key, $value) {
+		$key = sanitize_key($key);
 
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = maybe_serialize( $value );
+		if (is_array($value)) {
+			$this->session[$key] = maybe_serialize($value);
 		} else {
-			$this->session[ $key ] = $value;
+			$this->session[$key] = $value;
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['wpi' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['wpi' . $this->prefix] = $this->session;
 		}
 
-		return $this->session[ $key ];
+		return $this->session[$key];
 	}
 	
 	/**
@@ -167,29 +167,29 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function un_set( $key ) {
-		if ( empty( $key ) ) {
+	public function un_set($key) {
+		if (empty($key)) {
 			return false;
 		}
 		
-		if ( is_array( $key ) ) {
+		if (is_array($key)) {
 			foreach ($key as $index) {
-				$index = sanitize_key( $index );
+				$index = sanitize_key($index);
 			
-				if ( $index && isset( $this->session[ $index ] ) ) {
-					unset( $this->session[ $index ] );
+				if ($index && isset($this->session[$index])) {
+					unset($this->session[$index]);
 				}
 			}
 		} else {
-			$key = sanitize_key( $key );
+			$key = sanitize_key($key);
 			
-			if ( isset( $this->session[ $key ] ) ) {
-				unset( $this->session[ $key ] );
+			if (isset($this->session[$key])) {
+				unset($this->session[$key]);
 			}
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['wpi' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['wpi' . $this->prefix] = $this->session;
 		}
 
 		return true;
@@ -204,14 +204,14 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function is_set( $key ) {
-		$key = sanitize_key( $key );
+	public function is_set($key) {
+		$key = sanitize_key($key);
 		
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		if ( isset( $this->session[ $key ] ) ) {
+		if (isset($this->session[$key])) {
 			return true;
 		}
 
@@ -226,8 +226,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_variant_time( $exp ) {
-		return ( 30 * 60 * 23 );
+	public function set_expiration_variant_time($exp) {
+		return (30 * 60 * 23);
 	}
 
 	/**
@@ -238,8 +238,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_time( $exp ) {
-		return ( 30 * 60 * 24 );
+	public function set_expiration_time($exp) {
+		return (30 * 60 * 24);
 	}
 
 	/**
@@ -257,18 +257,18 @@ 
 		$ret = false;
 
 		// If the database variable is already set, no need to run autodetection
-		$wpinv_use_php_sessions = (bool)get_option( 'wpinv_use_php_sessions' );
+		$wpinv_use_php_sessions = (bool)get_option('wpinv_use_php_sessions');
 
-		if (!$wpinv_use_php_sessions ) {
+		if (!$wpinv_use_php_sessions) {
 			// Attempt to detect if the server supports PHP sessions
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
-				$this->set( 'wpinv_use_php_sessions', 1 );
+			if (function_exists('session_start') && !ini_get('safe_mode')) {
+				$this->set('wpinv_use_php_sessions', 1);
 				
-				if ( $this->get( 'wpinv_use_php_sessions' ) ) {
+				if ($this->get('wpinv_use_php_sessions')) {
 					$ret = true;
 
 					// Set the database option
-					update_option( 'wpinv_use_php_sessions', true );
+					update_option('wpinv_use_php_sessions', true);
 				}
 			}
 		} else {
@@ -276,20 +276,20 @@ 
 		}
 
 		// Enable or disable PHP Sessions based on the WPINV_USE_PHP_SESSIONS constant
-		if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && WPINV_USE_PHP_SESSIONS ) {
+		if (defined('WPINV_USE_PHP_SESSIONS') && WPINV_USE_PHP_SESSIONS) {
 			$ret = true;
-		} else if ( defined( 'WPINV_USE_PHP_SESSIONS' ) && ! WPINV_USE_PHP_SESSIONS ) {
+		} else if (defined('WPINV_USE_PHP_SESSIONS') && !WPINV_USE_PHP_SESSIONS) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'wpinv_use_php_sessions', $ret );
+		return (bool)apply_filters('wpinv_use_php_sessions', $ret);
 	}
 
 	/**
 	 * Starts a new session if one hasn't started yet.
 	 */
 	public function maybe_start_session() {
-		if ( !session_id() && !headers_sent() ) {
+		if (!session_id() && !headers_sent()) {
 			session_start();
 		}
 	}

includes/class-wpinv-item.php

Spacing +111 added lines, -111 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 class WPInv_Item {
     public $ID = 0;
@@ -34,26 +34,26 @@ 
     public $filter;
 
 
-    public function __construct( $_id = false, $_args = array() ) {
-        $item = WP_Post::get_instance( $_id );
-        return $this->setup_item( $item );
+    public function __construct($_id = false, $_args = array()) {
+        $item = WP_Post::get_instance($_id);
+        return $this->setup_item($item);
     }
 
-    private function setup_item( $item ) {
-        if( ! is_object( $item ) ) {
+    private function setup_item($item) {
+        if (!is_object($item)) {
             return false;
         }
 
-        if( ! is_a( $item, 'WP_Post' ) ) {
+        if (!is_a($item, 'WP_Post')) {
             return false;
         }
 
-        if( 'wpi_item' !== $item->post_type ) {
+        if ('wpi_item' !== $item->post_type) {
             return false;
         }
 
-        foreach ( $item as $key => $value ) {
-            switch ( $key ) {
+        foreach ($item as $key => $value) {
+            switch ($key) {
                 default:
                     $this->$key = $value;
                     break;
@@ -63,76 +63,76 @@ 
         return true;
     }
 
-    public function __get( $key ) {
-        if ( method_exists( $this, 'get_' . $key ) ) {
-            return call_user_func( array( $this, 'get_' . $key ) );
+    public function __get($key) {
+        if (method_exists($this, 'get_' . $key)) {
+            return call_user_func(array($this, 'get_' . $key));
         } else {
-            return new WP_Error( 'wpinv-item-invalid-property', sprintf( __( 'Can\'t get property %s', 'invoicing' ), $key ) );
+            return new WP_Error('wpinv-item-invalid-property', sprintf(__('Can\'t get property %s', 'invoicing'), $key));
         }
     }
 
-    public function create( $data = array(), $wp_error = false ) {
-        if ( $this->ID != 0 ) {
+    public function create($data = array(), $wp_error = false) {
+        if ($this->ID != 0) {
             return false;
         }
 
         $defaults = array(
             'post_type'   => 'wpi_item',
             'post_status' => 'draft',
-            'post_title'  => __( 'New Invoice Item', 'invoicing' )
+            'post_title'  => __('New Invoice Item', 'invoicing')
         );
 
-        $args = wp_parse_args( $data, $defaults );
+        $args = wp_parse_args($data, $defaults);
 
-        do_action( 'wpinv_item_pre_create', $args );
+        do_action('wpinv_item_pre_create', $args);
 
-        $id = wp_insert_post( $args, $wp_error );
+        $id = wp_insert_post($args, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
         
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
             $this->save_metas($data['meta']);
         }
 
-        do_action( 'wpinv_item_create', $id, $args );
+        do_action('wpinv_item_create', $id, $args);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
     
-    public function update( $data = array(), $wp_error = false ) {
-        if ( !$this->ID > 0 ) {
+    public function update($data = array(), $wp_error = false) {
+        if (!$this->ID > 0) {
             return false;
         }
         
         $data['ID'] = $this->ID;
 
-        do_action( 'wpinv_item_pre_update', $data );
+        do_action('wpinv_item_pre_update', $data);
         
-        $id = wp_update_post( $data, $wp_error );
+        $id = wp_update_post($data, $wp_error);
         if ($wp_error && is_wp_error($id)) {
             return $id;
         }
         
-        if ( !$id ) {
+        if (!$id) {
             return false;
         }
 
-        $item = WP_Post::get_instance( $id );
+        $item = WP_Post::get_instance($id);
         if (!empty($item) && !empty($data['meta'])) {
             $this->ID = $item->ID;
             $this->save_metas($data['meta']);
         }
 
-        do_action( 'wpinv_item_update', $id, $data );
+        do_action('wpinv_item_update', $id, $data);
 
-        return $this->setup_item( $item );
+        return $this->setup_item($item);
     }
 
     public function get_ID() {
@@ -140,95 +140,95 @@ 
     }
 
     public function get_name() {
-        return get_the_title( $this->ID );
+        return get_the_title($this->ID);
     }
     
     public function get_summary() {
-        return get_the_excerpt( $this->ID );
+        return get_the_excerpt($this->ID);
     }
 
     public function get_price() {
-        if ( ! isset( $this->price ) ) {
-            $this->price = get_post_meta( $this->ID, '_wpinv_price', true );
+        if (!isset($this->price)) {
+            $this->price = get_post_meta($this->ID, '_wpinv_price', true);
             
-            if ( $this->price ) {
-                $this->price = wpinv_sanitize_amount( $this->price );
+            if ($this->price) {
+                $this->price = wpinv_sanitize_amount($this->price);
             } else {
                 $this->price = 0;
             }
         }
         
-        return apply_filters( 'wpinv_get_item_price', $this->price, $this->ID );
+        return apply_filters('wpinv_get_item_price', $this->price, $this->ID);
     }
     
     public function get_the_price() {
-        $item_price = wpinv_price( wpinv_format_amount( $this->price ) );
+        $item_price = wpinv_price(wpinv_format_amount($this->price));
         
-        return apply_filters( 'wpinv_get_the_item_price', $item_price, $this->ID );
+        return apply_filters('wpinv_get_the_item_price', $item_price, $this->ID);
     }
     
     public function get_vat_rule() {
         global $wpinv_euvat;
         
-        if( !isset( $this->vat_rule ) ) {
-            $this->vat_rule = get_post_meta( $this->ID, '_wpinv_vat_rule', true );
+        if (!isset($this->vat_rule)) {
+            $this->vat_rule = get_post_meta($this->ID, '_wpinv_vat_rule', true);
 
-            if ( empty( $this->vat_rule ) ) {        
+            if (empty($this->vat_rule)) {        
                 $this->vat_rule = $wpinv_euvat->allow_vat_rules() ? 'digital' : 'physical';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_rule', $this->vat_rule, $this->ID );
+        return apply_filters('wpinv_get_item_vat_rule', $this->vat_rule, $this->ID);
     }
     
     public function get_vat_class() {
-        if( !isset( $this->vat_class ) ) {
-            $this->vat_class = get_post_meta( $this->ID, '_wpinv_vat_class', true );
+        if (!isset($this->vat_class)) {
+            $this->vat_class = get_post_meta($this->ID, '_wpinv_vat_class', true);
 
-            if ( empty( $this->vat_class ) ) {        
+            if (empty($this->vat_class)) {        
                 $this->vat_class = '_standard';
             }
         }
         
-        return apply_filters( 'wpinv_get_item_vat_class', $this->vat_class, $this->ID );
+        return apply_filters('wpinv_get_item_vat_class', $this->vat_class, $this->ID);
     }
     
     public function get_cpt_singular_name() {
-        if( ! isset( $this->cpt_singular_name ) ) {
-            $this->cpt_singular_name = get_post_meta( $this->ID, '_wpinv_cpt_singular_name', true );
+        if (!isset($this->cpt_singular_name)) {
+            $this->cpt_singular_name = get_post_meta($this->ID, '_wpinv_cpt_singular_name', true);
         }
 
-        return apply_filters( 'wpinv_item_get_cpt_singular_name', $this->cpt_singular_name, $this->ID );
+        return apply_filters('wpinv_item_get_cpt_singular_name', $this->cpt_singular_name, $this->ID);
     }
 
     public function get_type() {
-        if( ! isset( $this->type ) ) {
-            $this->type = get_post_meta( $this->ID, '_wpinv_type', true );
+        if (!isset($this->type)) {
+            $this->type = get_post_meta($this->ID, '_wpinv_type', true);
 
-            if ( empty( $this->type ) ) {
+            if (empty($this->type)) {
                 $this->type = 'custom';
             }
         }
 
-        return apply_filters( 'wpinv_get_item_type', $this->type, $this->ID );
+        return apply_filters('wpinv_get_item_type', $this->type, $this->ID);
     }
     
     public function is_recurring() {
-        $is_recurring = get_post_meta( $this->ID, '_wpinv_is_recurring', true );
+        $is_recurring = get_post_meta($this->ID, '_wpinv_is_recurring', true);
 
-        return (bool)apply_filters( 'wpinv_is_recurring_item', $is_recurring, $this->ID );
+        return (bool)apply_filters('wpinv_is_recurring_item', $is_recurring, $this->ID);
 
     }
     
-    public function get_recurring_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_recurring_period', true );
+    public function get_recurring_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_recurring_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -244,45 +244,45 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_recurring_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_recurring_period', $period, $full, $this->ID);
 
     }
     
     public function get_recurring_interval() {
-        $interval = (int)get_post_meta( $this->ID, '_wpinv_recurring_interval', true );
+        $interval = (int)get_post_meta($this->ID, '_wpinv_recurring_interval', true);
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_recurring_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_recurring_interval', $interval, $this->ID);
 
     }
     
     public function get_recurring_limit() {
-        $limit = get_post_meta( $this->ID, '_wpinv_recurring_limit', true );
+        $limit = get_post_meta($this->ID, '_wpinv_recurring_limit', true);
 
-        return (int)apply_filters( 'wpinv_item_recurring_limit', $limit, $this->ID );
+        return (int)apply_filters('wpinv_item_recurring_limit', $limit, $this->ID);
 
     }
     
     public function has_free_trial() {
-        $free_trial = get_post_meta( $this->ID, '_wpinv_free_trial', true );
-        $free_trial = $this->is_recurring() && !empty( $free_trial ) ? true : false;
+        $free_trial = get_post_meta($this->ID, '_wpinv_free_trial', true);
+        $free_trial = $this->is_recurring() && !empty($free_trial) ? true : false;
 
-        return (bool)apply_filters( 'wpinv_item_has_free_trial', $free_trial, $this->ID );
+        return (bool)apply_filters('wpinv_item_has_free_trial', $free_trial, $this->ID);
 
     }
     
-    public function get_trial_period( $full = false ) {
-        $period = get_post_meta( $this->ID, '_wpinv_trial_period', true );
+    public function get_trial_period($full = false) {
+        $period = get_post_meta($this->ID, '_wpinv_trial_period', true);
         
-        if ( !in_array( $period, array( 'D', 'W', 'M', 'Y' ) ) ) {
+        if (!in_array($period, array('D', 'W', 'M', 'Y'))) {
             $period = 'D';
         }
         
-        if ( $full ) {
-            switch( $period ) {
+        if ($full) {
+            switch ($period) {
                 case 'D':
                     $period = 'day';
                 break;
@@ -298,47 +298,47 @@ 
             }
         }
 
-        return apply_filters( 'wpinv_item_trial_period', $period, $full, $this->ID );
+        return apply_filters('wpinv_item_trial_period', $period, $full, $this->ID);
 
     }
     
     public function get_trial_interval() {
-        $interval = absint( get_post_meta( $this->ID, '_wpinv_trial_interval', true ) );
+        $interval = absint(get_post_meta($this->ID, '_wpinv_trial_interval', true));
         
-        if ( !$interval > 0 ) {
+        if (!$interval > 0) {
             $interval = 1;
         }
 
-        return apply_filters( 'wpinv_item_trial_interval', $interval, $this->ID );
+        return apply_filters('wpinv_item_trial_interval', $interval, $this->ID);
 
     }
 
     public function is_free() {
         $is_free = false;
         
-        $price = get_post_meta( $this->ID, '_wpinv_price', true );
+        $price = get_post_meta($this->ID, '_wpinv_price', true);
 
-        if ( (float)$price == 0 ) {
+        if ((float)$price == 0) {
             $is_free = true;
         }
 
-        return (bool) apply_filters( 'wpinv_is_free_item', $is_free, $this->ID );
+        return (bool)apply_filters('wpinv_is_free_item', $is_free, $this->ID);
 
     }
     
     public function is_package() {
         $is_package = $this->get_type() == 'package' ? true : false;
 
-        return (bool) apply_filters( 'wpinv_is_package_item', $is_package, $this->ID );
+        return (bool)apply_filters('wpinv_is_package_item', $is_package, $this->ID);
 
     }
     
-    public function save_metas( $metas = array() ) {
-        if ( empty( $metas ) ) {
+    public function save_metas($metas = array()) {
+        if (empty($metas)) {
             return false;
         }
         
-        foreach ( $metas as $meta_key => $meta_value ) {
+        foreach ($metas as $meta_key => $meta_value) {
             $meta_key = strpos($meta_key, '_wpinv_') !== 0 ? '_wpinv_' . $meta_key : $meta_key;
             
             $this->update_meta($meta_key, $meta_value);
@@ -347,66 +347,66 @@ 
         return true;
     }
 
-    public function update_meta( $meta_key = '', $meta_value = '', $prev_value = '' ) {
-        if ( empty( $meta_key ) ) {
+    public function update_meta($meta_key = '', $meta_value = '', $prev_value = '') {
+        if (empty($meta_key)) {
             return false;
         }
         
-        $meta_value = apply_filters( 'wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID );
+        $meta_value = apply_filters('wpinv_update_item_meta_' . $meta_key, $meta_value, $this->ID);
 
-        return update_post_meta( $this->ID, $meta_key, $meta_value, $prev_value );
+        return update_post_meta($this->ID, $meta_key, $meta_value, $prev_value);
     }
     
-    public function get_fees( $type = 'fee', $item_id = 0 ) {
+    public function get_fees($type = 'fee', $item_id = 0) {
         global $wpi_session;
         
-        $fees = $wpi_session->get( 'wpi_cart_fees' );
+        $fees = $wpi_session->get('wpi_cart_fees');
 
-        if ( ! wpinv_get_cart_contents() ) {
+        if (!wpinv_get_cart_contents()) {
             // We can only get item type fees when the cart is empty
             $type = 'custom';
         }
 
-        if ( ! empty( $fees ) && ! empty( $type ) && 'all' !== $type ) {
-            foreach( $fees as $key => $fee ) {
-                if( ! empty( $fee['type'] ) && $type != $fee['type'] ) {
-                    unset( $fees[ $key ] );
+        if (!empty($fees) && !empty($type) && 'all' !== $type) {
+            foreach ($fees as $key => $fee) {
+                if (!empty($fee['type']) && $type != $fee['type']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) && ! empty( $item_id ) ) {
+        if (!empty($fees) && !empty($item_id)) {
             // Remove fees that don't belong to the specified Item
-            foreach ( $fees as $key => $fee ) {
-                if ( (int) $item_id !== (int)$fee['item_id'] ) {
-                    unset( $fees[ $key ] );
+            foreach ($fees as $key => $fee) {
+                if ((int)$item_id !== (int)$fee['item_id']) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        if ( ! empty( $fees ) ) {
+        if (!empty($fees)) {
             // Remove fees that belong to a specific item but are not in the cart
-            foreach( $fees as $key => $fee ) {
-                if( empty( $fee['item_id'] ) ) {
+            foreach ($fees as $key => $fee) {
+                if (empty($fee['item_id'])) {
                     continue;
                 }
 
-                if ( !wpinv_item_in_cart( $fee['item_id'] ) ) {
-                    unset( $fees[ $key ] );
+                if (!wpinv_item_in_cart($fee['item_id'])) {
+                    unset($fees[$key]);
                 }
             }
         }
 
-        return ! empty( $fees ) ? $fees : array();
+        return !empty($fees) ? $fees : array();
     }
     
     public function can_purchase() {
         $can_purchase = true;
 
-        if ( !current_user_can( 'edit_post', $this->ID ) && $this->post_status != 'publish' ) {
+        if (!current_user_can('edit_post', $this->ID) && $this->post_status != 'publish') {
             $can_purchase = false;
         }
 
-        return (bool)apply_filters( 'wpinv_can_purchase_item', $can_purchase, $this );
+        return (bool)apply_filters('wpinv_can_purchase_item', $can_purchase, $this);
     }
 }

includes/gateways/worldpay.php

Spacing +60 added lines, -60 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-add_action( 'wpinv_worldpay_cc_form', '__return_false' );
+add_action('wpinv_worldpay_cc_form', '__return_false');
 
-function wpinv_process_worldpay_payment( $purchase_data ) {
-    if( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'wpi-gateway' ) ) {
-        wp_die( __( 'Nonce verification has failed', 'invoicing' ), __( 'Error', 'invoicing' ), array( 'response' => 403 ) );
+function wpinv_process_worldpay_payment($purchase_data) {
+    if (!wp_verify_nonce($purchase_data['gateway_nonce'], 'wpi-gateway')) {
+        wp_die(__('Nonce verification has failed', 'invoicing'), __('Error', 'invoicing'), array('response' => 403));
     }
     
     // Collect payment data
@@ -24,120 +24,120 @@ 
     );
 
     // Record the pending payment
-    $invoice = wpinv_get_invoice( $purchase_data['invoice_id'] );
+    $invoice = wpinv_get_invoice($purchase_data['invoice_id']);
     
-    if ( !empty( $invoice ) ) {
+    if (!empty($invoice)) {
         $quantities_enabled = wpinv_item_quantities_enabled();
         
-        $instId     = wpinv_get_option( 'worldpay_instId', false );
+        $instId     = wpinv_get_option('worldpay_instId', false);
         $cartId     = $invoice->get_number();
-        $testMode   = wpinv_is_test_mode( 'worldpay' ) ? 100 : 0;
+        $testMode   = wpinv_is_test_mode('worldpay') ? 100 : 0;
         $name       = $invoice->get_user_full_name();
-        $address    = wp_strip_all_tags( $invoice->get_address(), true );
+        $address    = wp_strip_all_tags($invoice->get_address(), true);
         $postcode   = $invoice->zip;
         $tel        = $invoice->phone;
         $email      = $invoice->get_email();
         $country    = $invoice->country;
-        $amount     = wpinv_sanitize_amount( $invoice->get_total() );
+        $amount     = wpinv_sanitize_amount($invoice->get_total());
         $currency   = wpinv_get_currency();
         
         $items      = array();
-        foreach ( $invoice->get_cart_details() as $item ) {
+        foreach ($invoice->get_cart_details() as $item) {
             $item_desc  = $item['name'];
-            $quantity   = !empty( $item['quantity'] ) && $item['quantity'] > 0 ? $item['quantity'] : 1;
-            $item_desc .= ' (' . ( $quantities_enabled ? $quantity . 'x ' : '' ) . wpinv_price( wpinv_format_amount( $item['item_price'] ) ) . ')';
+            $quantity   = !empty($item['quantity']) && $item['quantity'] > 0 ? $item['quantity'] : 1;
+            $item_desc .= ' (' . ($quantities_enabled ? $quantity . 'x ' : '') . wpinv_price(wpinv_format_amount($item['item_price'])) . ')';
             
             $items[] = $item_desc;
         }
         
-        $desc = implode( ', ', $items );
-        if ( wpinv_use_taxes() && $invoice->get_tax() > 0 ) {
-            $desc .= ', ' . wp_sprintf( __( 'Tax: %s', 'invoicing' ), $invoice->get_tax( true ) );
+        $desc = implode(', ', $items);
+        if (wpinv_use_taxes() && $invoice->get_tax() > 0) {
+            $desc .= ', ' . wp_sprintf(__('Tax: %s', 'invoicing'), $invoice->get_tax(true));
         }
         
         $extra_params                   = array();
         $extra_params['MC_description'] = $desc;
-        $extra_params['MC_callback']    = wpinv_get_ipn_url( 'worldpay' );
+        $extra_params['MC_callback']    = wpinv_get_ipn_url('worldpay');
         $extra_params['MC_key']         = $invoice->get_key();
         $extra_params['MC_invoice_id']  = $invoice->ID;
         $extra_params['address1']       = $address;
         $extra_params['town']           = $invoice->city;
         $extra_params['region']         = $invoice->state;
-        $extra_params['amountString']   = $invoice->get_total( true );
-        $extra_params['countryString']  = wpinv_country_name( $invoice->country );
+        $extra_params['amountString']   = $invoice->get_total(true);
+        $extra_params['countryString']  = wpinv_country_name($invoice->country);
         $extra_params['compName']       = $invoice->company;
         
-        $extra_params   = apply_filters( 'wpinv_worldpay_form_extra_parameters', $extra_params, $invoice );
+        $extra_params   = apply_filters('wpinv_worldpay_form_extra_parameters', $extra_params, $invoice);
         
-        $redirect_text  = __( 'Redirecting to Worldpay site, click on button if not redirected.', 'invoicing' );
-        $redirect_text  = apply_filters( 'wpinv_worldpay_redirect_text', $redirect_text, $invoice );
+        $redirect_text  = __('Redirecting to Worldpay site, click on button if not redirected.', 'invoicing');
+        $redirect_text  = apply_filters('wpinv_worldpay_redirect_text', $redirect_text, $invoice);
         
         // Empty the shopping cart
         wpinv_empty_cart();
         ?>
 <div class="wpi-worldpay-form" style="padding:20px;font-family:arial,sans-serif;text-align:center;color:#555">
-<?php do_action( 'wpinv_worldpay_form_before', $invoice ); ?>
-<h3><?php echo $redirect_text ;?></h3>
+<?php do_action('wpinv_worldpay_form_before', $invoice); ?>
+<h3><?php echo $redirect_text; ?></h3>
 <form action="<?php echo wpinv_get_worldpay_redirect(); ?>" name="wpi_worldpay_form" method="POST">
-    <input type="hidden" value="<?php echo $amount;?>" name="amount">
-    <input type="hidden" value="<?php echo esc_attr( $cartId );?>" name="cartId">
-    <input type="hidden" value="<?php echo $currency;?>" name="currency">
-    <input type="hidden" value="<?php echo $instId;?>" name="instId">
-    <input type="hidden" value="<?php echo $testMode;?>" name="testMode">
-    <input type="hidden" value="<?php echo esc_attr( $name );?>" name="name">
-    <input type="hidden" value="<?php echo esc_attr( $address );?>" name="address">
-    <input type="hidden" value="<?php echo esc_attr( $postcode );?>" name="postcode">
-    <input type="hidden" value="<?php echo esc_attr( $tel );?>" name="tel">
-    <input type="hidden" value="<?php echo esc_attr( $email );?>" name="email">
-    <input type="hidden" value="<?php echo esc_attr( $country );?>" name="country">
-    <input type="hidden" value="<?php echo esc_attr( $desc );?>" name="desc">
-    <?php foreach ( $extra_params as $param => $value ) { ?>
-        <?php if ( !empty( $value !== false ) ) { ?>
-    <input type="hidden" value="<?php echo esc_attr( $value );?>" name="<?php echo esc_attr( $param );?>">
+    <input type="hidden" value="<?php echo $amount; ?>" name="amount">
+    <input type="hidden" value="<?php echo esc_attr($cartId); ?>" name="cartId">
+    <input type="hidden" value="<?php echo $currency; ?>" name="currency">
+    <input type="hidden" value="<?php echo $instId; ?>" name="instId">
+    <input type="hidden" value="<?php echo $testMode; ?>" name="testMode">
+    <input type="hidden" value="<?php echo esc_attr($name); ?>" name="name">
+    <input type="hidden" value="<?php echo esc_attr($address); ?>" name="address">
+    <input type="hidden" value="<?php echo esc_attr($postcode); ?>" name="postcode">
+    <input type="hidden" value="<?php echo esc_attr($tel); ?>" name="tel">
+    <input type="hidden" value="<?php echo esc_attr($email); ?>" name="email">
+    <input type="hidden" value="<?php echo esc_attr($country); ?>" name="country">
+    <input type="hidden" value="<?php echo esc_attr($desc); ?>" name="desc">
+    <?php foreach ($extra_params as $param => $value) { ?>
+        <?php if (!empty($value !== false)) { ?>
+    <input type="hidden" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($param); ?>">
         <?php } ?>
     <?php } ?>
-    <?php do_action( 'wpinv_worldpay_form_parameters', $invoice ); ?>
-    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e( 'Pay by Debit/Credit Card (WorldPay)', 'invoicing' ) ;?>">
+    <?php do_action('wpinv_worldpay_form_parameters', $invoice); ?>
+    <input type="submit" name="wpi_worldpay_submit" value="<?php esc_attr_e('Pay by Debit/Credit Card (WorldPay)', 'invoicing'); ?>">
 </form>
 <script type="text/javascript">document.wpi_worldpay_form.submit();</script>
-<?php do_action( 'wpinv_worldpay_form_after', $invoice ); ?>
+<?php do_action('wpinv_worldpay_form_after', $invoice); ?>
 </div>
         <?php
     } else {
-        wpinv_record_gateway_error( __( 'Payment Error', 'invoicing' ), sprintf( __( 'Payment creation failed while processing a worldpay payment. Payment data: %s', 'invoicing' ), json_encode( $payment_data ) ), $invoice );
+        wpinv_record_gateway_error(__('Payment Error', 'invoicing'), sprintf(__('Payment creation failed while processing a worldpay payment. Payment data: %s', 'invoicing'), json_encode($payment_data)), $invoice);
         // If errors are present, send the user back to the purchase page so they can be corrected
-        wpinv_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['wpi-gateway'] );
+        wpinv_send_back_to_checkout('?payment-mode=' . $purchase_data['post_data']['wpi-gateway']);
     }
 }
-add_action( 'wpinv_gateway_worldpay', 'wpinv_process_worldpay_payment' );
+add_action('wpinv_gateway_worldpay', 'wpinv_process_worldpay_payment');
 
 function wpinv_get_worldpay_redirect() {
-    $redirect = wpinv_is_test_mode( 'worldpay' ) ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
+    $redirect = wpinv_is_test_mode('worldpay') ? 'https://secure-test.worldpay.com/wcc/purchase' : 'https://secure.worldpay.com/wcc/purchase';
     
-    return apply_filters( 'wpinv_worldpay_redirect', $redirect );
+    return apply_filters('wpinv_worldpay_redirect', $redirect);
 }
 
 function wpinv_process_worldpay_ipn() {
-    $request = wpinv_get_post_data( 'post' );
+    $request = wpinv_get_post_data('post');
     
-    if ( !empty( $request['cartId'] ) && !empty( $request['transStatus'] ) && !empty( $request['installation'] ) && isset( $request['testMode'] ) && isset( $request['MC_invoice_id'] ) && isset( $request['MC_key'] ) ) {
+    if (!empty($request['cartId']) && !empty($request['transStatus']) && !empty($request['installation']) && isset($request['testMode']) && isset($request['MC_invoice_id']) && isset($request['MC_key'])) {
         $invoice_id = $request['MC_invoice_id'];
         
-        if ( $invoice_id == wpinv_get_invoice_id_by_key( $request['MC_key'] ) && $invoice = wpinv_get_invoice( $invoice_id ) ) {
-            if ( $request['transStatus'] == 'Y' ) {                
-                wpinv_update_payment_status( $invoice_id, 'publish' );
-                wpinv_set_payment_transaction_id( $invoice_id, $request['transId'] );
-                wpinv_insert_payment_note( $invoice_id, sprintf( __( 'Worldpay Transaction ID: %s', 'invoicing' ), $request['transId'] ) );
+        if ($invoice_id == wpinv_get_invoice_id_by_key($request['MC_key']) && $invoice = wpinv_get_invoice($invoice_id)) {
+            if ($request['transStatus'] == 'Y') {                
+                wpinv_update_payment_status($invoice_id, 'publish');
+                wpinv_set_payment_transaction_id($invoice_id, $request['transId']);
+                wpinv_insert_payment_note($invoice_id, sprintf(__('Worldpay Transaction ID: %s', 'invoicing'), $request['transId']));
                 return;
-            } else if ( $request['transStatus'] == 'C' ) {
-                wpinv_update_payment_status( $invoice_id, 'failed' );
-                wpinv_insert_payment_note( $invoice_id, __( 'Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing' ) );
+            } else if ($request['transStatus'] == 'C') {
+                wpinv_update_payment_status($invoice_id, 'failed');
+                wpinv_insert_payment_note($invoice_id, __('Payment transaction failed while processing Worldpay payment, kindly check IPN log.', 'invoicing'));
                 
-                wpinv_record_gateway_error( __( 'IPN Error', 'invoicing' ), sprintf( __( 'Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing' ), json_encode( $request ) ), $invoice_id );
+                wpinv_record_gateway_error(__('IPN Error', 'invoicing'), sprintf(__('Payment transaction failed while processing Worldpay payment. IPN data: %s', 'invoicing'), json_encode($request)), $invoice_id);
                 return;
             }
         }
     }
     return;
 }
-add_action( 'wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn' );
\ No newline at end of file
+add_action('wpinv_verify_worldpay_ipn', 'wpinv_process_worldpay_ipn');
\ No newline at end of file

includes/gateways/authorizenet/Authorize.Net-XML/AuthnetXML.class.php

Spacing +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
 
 	public function __construct($login, $transkey, $test = self::USE_PRODUCTION_SERVER)
 	{
-		$login    = trim($login);
+		$login = trim($login);
         $transkey = trim($transkey);
         if (empty($login) || empty($transkey))
         {
@@ -59,7 +59,7 @@ 
 
         $this->login    = trim($login);
         $this->transkey = trim($transkey);
-        $test           = (bool) $test;
+        $test           = (bool)$test;
 
         $subdomain = ($test) ? 'apitest' : 'api';
         $this->url = 'https://' . $subdomain . '.authorize.net/xml/v1/request.api';
@@ -73,14 +73,14 @@ 
     private function removeResponseXMLNS($input)
     {
         // why remove them one at a time? all three aren't consistantly used in the response
-        $input = str_replace(' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"','',$input);
-        $input = str_replace(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"','',$input);
-        return str_replace(' xmlns:xsd="http://www.w3.org/2001/XMLSchema"','',$input);
+        $input = str_replace(' xmlns="AnetApi/xml/v1/schema/AnetApiSchema.xsd"', '', $input);
+        $input = str_replace(' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"', '', $input);
+        return str_replace(' xmlns:xsd="http://www.w3.org/2001/XMLSchema"', '', $input);
     }
 
 	public function __toString()
 	{
-	    $output  = '';
+	    $output = '';
         $output .= '<table summary="Authorize.Net Results" id="authnet">' . "\n";
         $output .= '<tr>' . "\n\t\t" . '<th colspan="2"><b>Class Parameters</b></th>' . "\n" . '</tr>' . "\n";
         $output .= '<tr>' . "\n\t\t" . '<td><b>API Login ID</b></td><td>' . $this->login . '</td>' . "\n" . '</tr>' . "\n";
@@ -159,9 +159,9 @@ 
             {
                 if (is_array($value))
                 {
-                    if(is_numeric($key))
+                    if (is_numeric($key))
                     {
-                        if($first === true)
+                        if ($first === true)
                         {
                             $xmlx  = $xml;
                             $first = false;
@@ -200,7 +200,7 @@ 
     	curl_setopt($this->ch, CURLOPT_SSL_VERIFYHOST, 2);
     	curl_setopt($this->ch, CURLOPT_CAINFO, dirname(__FILE__) . '/ssl/cert.pem');
 
-        if(($this->response = curl_exec($this->ch)) !== false)
+        if (($this->response = curl_exec($this->ch)) !== false)
         {
             $this->response_xml = @new SimpleXMLElement($this->response);
 

includes/gateways/authorizenet/anet_php_sdk/lib/AuthorizeNetAIM.php

Spacing +19 added lines, -19 removed lines

@@ -77,19 +77,19 @@ 
      * A list of all fields in the AIM API.
      * Used to warn user if they try to set a field not offered in the API.
      */
-    private $_all_aim_fields = array("address","allow_partial_auth","amount",
-        "auth_code","authentication_indicator", "bank_aba_code","bank_acct_name",
-        "bank_acct_num","bank_acct_type","bank_check_number","bank_name",
-        "card_code","card_num","cardholder_authentication_value","city","company",
-        "country","cust_id","customer_ip","delim_char","delim_data","description",
-        "duplicate_window","duty","echeck_type","email","email_customer",
-        "encap_char","exp_date","fax","first_name","footer_email_receipt",
-        "freight","header_email_receipt","invoice_num","last_name","line_item",
-        "login","method","phone","po_num","recurring_billing","relay_response",
-        "ship_to_address","ship_to_city","ship_to_company","ship_to_country",
-        "ship_to_first_name","ship_to_last_name","ship_to_state","ship_to_zip",
-        "split_tender_id","state","tax","tax_exempt","test_request","tran_key",
-        "trans_id","type","version","zip"
+    private $_all_aim_fields = array("address", "allow_partial_auth", "amount",
+        "auth_code", "authentication_indicator", "bank_aba_code", "bank_acct_name",
+        "bank_acct_num", "bank_acct_type", "bank_check_number", "bank_name",
+        "card_code", "card_num", "cardholder_authentication_value", "city", "company",
+        "country", "cust_id", "customer_ip", "delim_char", "delim_data", "description",
+        "duplicate_window", "duty", "echeck_type", "email", "email_customer",
+        "encap_char", "exp_date", "fax", "first_name", "footer_email_receipt",
+        "freight", "header_email_receipt", "invoice_num", "last_name", "line_item",
+        "login", "method", "phone", "po_num", "recurring_billing", "relay_response",
+        "ship_to_address", "ship_to_city", "ship_to_company", "ship_to_country",
+        "ship_to_first_name", "ship_to_last_name", "ship_to_state", "ship_to_zip",
+        "split_tender_id", "state", "tax", "tax_exempt", "test_request", "tran_key",
+        "trans_id", "type", "version", "zip"
         );
     
     /**
@@ -403,7 +403,7 @@ 
             // Split Array
             $this->response = $response;
             if ($encap_char) {
-                $this->_response_array = explode($encap_char.$delimiter.$encap_char, substr($response, 1, -1));
+                $this->_response_array = explode($encap_char . $delimiter . $encap_char, substr($response, 1, -1));
             } else {
                 $this->_response_array = explode($delimiter, $response);
             }
@@ -457,7 +457,7 @@ 
             $this->duty                 = $this->_response_array[33];
             $this->freight              = $this->_response_array[34];
             $this->tax_exempt           = $this->_response_array[35];
-            $this->purchase_order_number= $this->_response_array[36];
+            $this->purchase_order_number = $this->_response_array[36];
             $this->md5_hash             = $this->_response_array[37];
             $this->card_code_response   = $this->_response_array[38];
             $this->cavv_response        = $this->_response_array[39];
@@ -484,10 +484,10 @@ 
             
             if ($this->error) {
                 $this->error_message = "AuthorizeNet Error:
-                Response Code: ".$this->response_code."
-                Response Subcode: ".$this->response_subcode."
-                Response Reason Code: ".$this->response_reason_code."
-                Response Reason Text: ".$this->response_reason_text."
+                Response Code: ".$this->response_code . "
+                Response Subcode: ".$this->response_subcode . "
+                Response Reason Code: ".$this->response_reason_code . "
+                Response Reason Text: ".$this->response_reason_text . "
                 ";
             }
         } else {

includes/gateways/authorizenet/anet_php_sdk/lib/shared/AuthorizeNetRequest.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
             curl_setopt($curl_request, CURLOPT_SSL_VERIFYPEER, false);
         }
         
-        if (preg_match('/xml/',$post_url)) {
+        if (preg_match('/xml/', $post_url)) {
             curl_setopt($curl_request, CURLOPT_HTTPHEADER, Array("Content-Type: text/xml"));
         }
         

includes/gateways/authorizenet/anet_php_sdk/lib/shared/AuthorizeNetXMLResponse.php

Spacing +4 added lines, -4 removed lines

@@ -29,7 +29,7 @@ 
             $this->xml = @simplexml_load_string($response);
             
             // Remove namespaces for use with XPath.
-            $this->xpath_xml = @simplexml_load_string(preg_replace('/ xmlns:xsi[^>]+/','',$response));
+            $this->xpath_xml = @simplexml_load_string(preg_replace('/ xmlns:xsi[^>]+/', '', $response));
         }
     }
     
@@ -116,12 +116,12 @@ 
     {
         $start = "<$elementName>";
         $end = "</$elementName>";
-        if (strpos($this->response,$start) === false || strpos($this->response,$end) === false) {
+        if (strpos($this->response, $start) === false || strpos($this->response, $end) === false) {
             return false;
         } else {
-            $start_position = strpos($this->response, $start)+strlen($start);
+            $start_position = strpos($this->response, $start) + strlen($start);
             $end_position = strpos($this->response, $end);
-            return substr($this->response, $start_position, $end_position-$start_position);
+            return substr($this->response, $start_position, $end_position - $start_position);
         }
     }